Changeset 12543

Timestamp:

09/18/11 11:45:57 (20 months ago)

Author:

PaulHarvey

Message:

Item11135: wiring up the new store API - now the unit test infrastructure doesn't crash - next up, make some tests pass

Location:

branches/scratch/core/lib

Files:

• Foswiki.pm (modified) (4 diffs)
• Foswiki/Access/TopicACLAccess.pm (modified) (3 diffs)
• Foswiki/Address.pm (modified) (4 diffs)
• Foswiki/Meta.pm (modified) (51 diffs)
• Foswiki/Prefs.pm (modified) (6 diffs)
• Foswiki/Serialise/Embedded.pm (modified) (5 diffs)
• Foswiki/Store.pm (modified) (8 diffs)
• Foswiki/Store/VC/Handler.pm (modified) (1 diff)
• Foswiki/Store/VC/Store.pm (modified) (20 diffs)
• Foswiki/UI/Register.pm (modified) (2 diffs)

branches/scratch/core/lib/Foswiki.pm

@@ -1892 +1892 @@
     #Monitor::MARK("Loaded default prefs");
 
+        #pre-cache the admin user membership before we foswiki-setuid to session user
+    $this->{users}->eachGroupMember($Foswiki::cfg{SuperAdminGroup});
+
     # SMELL: what happens if we move this into the Foswiki::Users::new?
     $this->{user} = $this->{users}->initialiseUser( $this->{remoteUser} );
-    $this->store->changeDefaultUser($this->{user});
+    $this->{store}->changeDefaultUser($this->{user});
 
     #Monitor::MARK("Initialised user");
@@ -3692 +3695 @@
 
     ASSERT( UNTAINTED($web), 'web is tainted' ) if DEBUG;
-    return $this->{store}->webExists($web);
+    return $this->{store}->exists( address=>{web=>$web});
 }
 
@@ -3709 +3712 @@
     ASSERT( UNTAINTED($web),   'web is tainted' )   if DEBUG;
     ASSERT( UNTAINTED($topic), 'topic is tainted' ) if DEBUG;
-    return $this->{store}->topicExists( $web, $topic );
+    return $this->{store}->exists( address=>{web=>$web, topic=>$topic});
 }
 
@@ -3754 +3757 @@
 Foswiki - The Free and Open Source Wiki, http://foswiki.org/
 
-Copyright (C) 2008-2010 Foswiki Contributors. Foswiki Contributors
+Copyright (C) 2008-2011 Foswiki Contributors. Foswiki Contributors
 are listed in the AUTHORS file in the root of this distribution.
 NOTE: Please extend that file, not this notice.

branches/scratch/core/lib/Foswiki/Access/TopicACLAccess.pm

@@ -28 +28 @@
     ASSERT( $session->isa('Foswiki') ) if DEBUG;
     my $this = bless( { session => $session }, $class );
+    
+    ASSERT(defined($this->{session})) if DEBUG;
 
     return $this;
@@ -46 +48 @@
 
 sub haveAccess {
+    if ($_[$#_-1] eq 'dontload') {
+        #print STDERR "-------------say its ok, even if its not $_[$#_-1] => $_[$#_]\n";
+        return 1 ;
+    }
     my ( $this, $mode, $cUID, $param1, $param2, $param3 ) = @_;
     $mode ||= 'VIEW';
     $cUID ||= $this->{session}->{user};
+    
+    #print STDERR "cUID isa ".ref($cUID)."\n";
+    ASSERT(ref($cUID) eq '') if DEBUG;
+    
+    ASSERT(ref($this) eq 'Foswiki::Access::TopicACLAccess') if DEBUG;
+    ASSERT(defined($this->{session})) if DEBUG;
+
 
     my $session = $this->{session};
@@ -58 +71 @@
 
         #scalar - treat as web, topic
-        $meta = Foswiki::Meta->load( $session, $param1, $param2 );
+        $meta = Foswiki::Store::load(address=>{web=>$param1, topic=>$param2});
+
         ASSERT(not defined($param3)) if DEBUG;  #attachment ACL not currently supported in traditional topic ACL
     }
     else {
         if ( ref($param1) eq 'Foswiki::Address' ) {
-            $meta =
-              Foswiki::Meta->load( $session, $param1->web(), $param1->topic() );
+            $meta = Foswiki::Store::load(address=>$param1);
         }
         else {

branches/scratch/core/lib/Foswiki/Address.pm

@@ -70 +70 @@
 #use Data::Dumper;
 use constant TRACE  => 0;    # Don't forget to uncomment dumper
-use constant TRACE2 => 0;
+use constant TRACE2 => 1;
 
 my %atomiseAs = (
@@ -252 +252 @@
 
 sub new {
-    my ( $class, %opts ) = @_;
+    my $class = shift;
     my $this;
-
+    
+    if (ref($_[0]) and $_[0]->isa('Foswiki::Address')) {
+#print STDERR "COPY CONCTRUCTOR ($class, $_[0])\n";
+        #need a copy construtor 
+        #TODO: Paul -  help?
+        $this = bless(             {
+                    webpath => $_[0]->{webpath},
+                    web => $_[0]->web(),
+                    topic   => $_[0]->{topic},
+                    tompath => $_[0]->{tompath},
+                    rev     => $_[0]->{rev},
+                }, $class );
+        #$this->parse( $_[0]->{string} );
+        return $this;
+    }
+    
+    my %opts = @_;
+    
     if ( $opts{string} ) {
         ASSERT( not $opts{topic} or ( $opts{webpath} and $opts{topic} ) )
@@ -1004 +1021 @@
 
 sub stringify {
+        return getPath(@_);
+}
+
+
+sub getPath {
     my ( $this, %opts ) = @_;
 
@@ -1117 +1139 @@
     my ( $this, $web ) = @_;
 
-    ASSERT( $this->{web} or ref( $this->{webpath} ) eq 'ARRAY' ) if DEBUG;
-    if ( scalar(@_) == 2 ) {
+    ASSERT( scalar(@_) == 2  or (defined($this->{webpath}) and ref( $this->{webpath} ) eq 'ARRAY') ) if DEBUG;
+    if ( scalar(@_) == 2  ) {
         $this->webpath( [ split( /[\/\.]/, $web ) ] );
     }
-    if ( not $this->{web} ) {
+    if ( not $this->{web} and defined($this->{webpath} )) {
         $this->{web} = join( '/', @{ $this->{webpath} } );
     }
-
+    ASSERT($this->{web}) if DEBUG;
     return $this->{web};
 }

branches/scratch/core/lib/Foswiki/Meta.pm

@@ -345 +345 @@
 =cut
 
-sub new {
+sub OLDnew {
     my ( $class, $session, $web, $topic, $text ) = @_;
-
+die 'no';
     if ( $session->isa('Foswiki::Meta') ) {
-
+#die 'ke';
         # Prototype
         ASSERT( !defined($web) && !defined($topic) && !defined($text) )
@@ -355 +355 @@
         return $class->new( $session->session, $session->web, $session->topic );
     }
+
+    ASSERT(( caller(0) )[3] eq 'load') if DEBUG;
+    #die 'asdf';
+    
 
     my $this = (ref($class) || $class)->SUPER::new( web=>$web, topic=>$topic );
@@ -411 +415 @@
 }
 
+sub new {
+    my ( $class, $session, $web, $topic, $text ) = @_;
+
+    if ( $session->isa('Foswiki::Meta') ) {
+#die 'ke';
+        # Prototype
+        ASSERT( !defined($web) && !defined($topic) && !defined($text) )
+          if DEBUG;
+        return $class->new( $session->session, $session->web, $session->topic );
+    }
+
+    #ASSERT(( caller(0) )[3] eq 'load') if DEBUG;
+    #die 'asdf';
+    
+
+    #my $this = (ref($class) || $class)->SUPER::new( web=>$web, topic=>$topic );
+    
+    my $metaObject = Foswiki::Store::load(address=>{web=>$web, topic=>$topic});
+    return $metaObject;
+}
+
+#should only be called by the store..
+sub NEWnew {
+    my $class = shift;
+    use Data::Dumper;
+    die Dumper(\@_) unless (defined($_[2]));
+    my %args = @_;
+    
+    #copy the Foswiki::Address obj (which by this time it is :/)
+    my $this = (ref($class) || $class)->SUPER::new( $args{address} );
+    #TODO: fix the Foswiki::Address constructor to allow inheritance
+    @{$this}{keys(%{$args{data}})} = values(%{$args{data}}) if (defined($args{data}));
+    
+    #TODO: remove this.
+    $this->{_session} = $Foswiki::Plugins::SESSION;
+    # Index keyed on top level type mapping entry names to their
+    # index within the data array.
+    $this->{_indices} = undef;
+    $this->{FILEATTACHMENT} = [];
+    
+    #die "-complete NEWnew --- = ".Dumper($this)."\n";
+    
+    return $this;
+}
+
+
 =begin TML
 
@@ -548 +598 @@
     #if its an intentional ref to an object, please add it to the undef's above.
 
-#SMELL: Sven noticed during development that something is adding a $this->{store} to a meta obj - havn't found it yet
+#SMELL: Sven noticed during development that something is adding a Foswiki::Store to a meta obj - havn't found it yet
 #ASSERT(not defined($this->{store})) if DEBUG;
 
@@ -570 +620 @@
 sub session {
     return $_[0]->{_session};
-}
-
-=begin TML
-
----++ ObjectMethod web([$name])
-   * =$name= - optional, change the web name in the object
-      * *Since* 28 Nov 2008
-Get/set the web name associated with the object.
-
-=cut
-
-sub web {
-    my ( $this, $web ) = @_;
-    $this->{web} = $web if defined $web;
-    return $this->{web};
-}
-
-=begin TML
-
----++ ObjectMethod topic([$name])
-   * =$name= - optional, change the topic name in the object
-      * *Since* 28 Nov 2008
-Get/set the topic name associated with the object.
-
-=cut
-
-sub topic {
-    my ( $this, $topic ) = @_;
-    $this->{topic} = $topic if defined $topic;
-    return $this->{topic};
 }
 
@@ -612 +632 @@
 =cut
 
-sub getPath {
+sub OLDgetPath {
     my $this = shift;
     my $path = $this->{web};
@@ -708 +728 @@
         $this->addDependency();
 
-        return $this->{_session}->{store}
-          ->exists(address=>$this);
+        return Foswiki::Store->exists(address=>$this);
     }
     elsif ( defined $this->{web} ) {
-        return $this->{_session}->{store}->exists(address=> $this );
+        return Foswiki::Store->exists(address=> $this );
     }
     else {
@@ -821 +840 @@
     # Validate that template web exists, or error should be thrown
     if ($templateWeb) {
-        unless ( $session->exists(address=>$templateWeb) ) {
+        unless ( Foswiki::Store->exists(address=>{web=>$templateWeb}) ) {
             throw Error::Simple(
                 'Template web ' . $templateWeb . ' does not exist' );
@@ -830 +849 @@
     my $prefsTopicObject;
     if (
-        !$session->exists(address=>[
-            $this->{web}, $Foswiki::cfg{WebPrefsTopicName}
-        ]
+        !Foswiki::Store->exists(address=>{web=>
+            $this->{web}, topic=>$Foswiki::cfg{WebPrefsTopicName} }
         )
       )
     {
         my $prefsText = 'Preferences';
-        $prefsTopicObject =
-          $this->new( $this->{_session}, $this->{web},
-            $Foswiki::cfg{WebPrefsTopicName}, $prefsText );
+        $prefsTopicObject = Foswiki::Store::create(address=>{web=>$this->{web},
+            topic=>$Foswiki::cfg{WebPrefsTopicName}}, data=>{_text=>$prefsText} );
         $prefsTopicObject->save();
     }
@@ -913 +930 @@
 sub query {
     my ( $query, $inputTopicSet, $options ) = @_;
-    return $Foswiki::Plugins::SESSION->{store}
-      ->query( $query, $inputTopicSet, $Foswiki::Plugins::SESSION, $options );
+    return Foswiki::Store->query( $query, $inputTopicSet, $Foswiki::Plugins::SESSION, $options );
 }
 
@@ -934 +950 @@
     # Works on the root, so {web} may be undef
     ASSERT( !$this->{topic}, 'this object may not contain webs' ) if DEBUG;
-    return $this->{_session}->{store}->eachWeb( $this, $all );
+    return Foswiki::Store->eachWeb( address=>$this, all=>$all );
 
 }
@@ -956 +972 @@
         return new Foswiki::ListIterator( [] );
     }
-    return $this->{_session}->{store}->eachTopic($this);
+    return Foswiki::Store->eachTopic(address=>$this);
 }
 
@@ -976 +992 @@
     ASSERT( $this->{web} && $this->{topic}, 'this is not a topic object' )
       if DEBUG;
-    return $this->{_session}->{store}->eachAttachment($this);
+    return Foswiki::Store->eachAttachment(address=>$this);
 }
 
@@ -999 +1015 @@
     ASSERT( $this->{web} && !$this->{topic}, 'this is not a web object' )
       if DEBUG;
-    return $this->{_session}->{store}->eachChange( $this, $time );
+    return Foswiki::Store->eachChange( address=>$this, from=>$time, to=>time());
 }
 
 ############# TOPIC METHODS #############
 
-=begin TML
-
----++ ObjectMethod loadVersion($rev) -> $version
-
-Load the object from the store. The object must not be already loaded
-with a different rev (verified by an ASSERT)
-
-See =getLoadedRev= to determine what revision is currently being viewed.
-   * =$rev= - revision to load. If undef, 0, '' or > max available rev, will
-     load the latest rev. If the revision is in range but does not exist,
-     then will return an unloaded meta object (getLoadedRev() will be undef)
-
-Returns the version identifier for the loaded revision. (and undef if it failed to load)
-
-WARNING: see notes on revision numbers under =getLoadedRev=
-
-=cut
-
-sub loadVersion {
-    my ( $this, $rev ) = @_;
-
-    return unless $this->{topic};
-
-    # If no specific rev was requested, check that the latest rev is
-    # loaded.
-    if ( !defined $rev || !$rev ) {
-
-        # Trying to load the latest
-        if ( $this->{_latestIsLoaded} ) {
-
-            #TODO: these asserts trip up Comment Plugin
-            #ASSERT(defined($this->{_loadedRev})) if DEBUG;
-            #ASSERT($rev == $this->{_loadedRev}) if DEBUG;
-            return;
-        }
-        ASSERT( not( $this->{_loadedRev} ) ) if DEBUG;
-    }
-    elsif ( defined( $this->{_loadedRev} ) ) {
-
-        # Cannot load a different rev into an already-loaded
-        # Foswiki::Meta object
-        $rev = -1 unless defined $rev;
-        ASSERT( 0, "Attempt to reload $rev over version $this->{_loadedRev}" )
-            if DEBUG;
-    }
-
-    # Is it already loaded?
-    ASSERT( !($rev) or $rev =~ /^\s*\d+\s*/ ) if DEBUG;    # looks like a number
-    return $this->{_loadedRev}
-      if ( $rev && $this->{_loadedRev} && $rev == $this->{_loadedRev} );
-
-    ASSERT( not( $this->{_loadedRev} ) ) if DEBUG;
-
-    ( $this->{_loadedRev}, $this->{_latestIsLoaded} ) =
-      $this->{_session}->{store}->readTopic( $this, $rev );
-    if ( defined( $this->{_loadedRev} ) ) {
-
-        # Make sure text always has a value once loadVersion has been called
-        # once.
-        $this->{_text} = '' unless defined $this->{_text};
-
-        $this->addDependency();
-    }
-    else {
-
-        #we didn't load, so how could it be latest?
-        ASSERT( not $this->{_latestIsLoaded} ) if DEBUG;
-    }
-
-    return $this->{_loadedRev};
-}
 
 =begin TML
@@ -1089 +1034 @@
 sub text {
     my ( $this, $val ) = @_;
+
     ASSERT( $this->{web} && $this->{topic}, 'this is not a topic object' )
       if DEBUG;
     if ( defined($val) ) {
         $this->{_text} = $val;
-    }
-    else {
-
-        # Lazy load. Reload with no params will reload the _loadedRev,
-        # or load the latest if that is not defined.
-        $this->loadVersion() unless defined( $this->{_text} );
     }
     return $this->{_text};
@@ -1261 +1201 @@
         }
         else {
+            ASSERT(ref($data) eq 'ARRAY', $data) if DEBUG;
             return $data->[0];
         }
@@ -1377 +1318 @@
         return if $type =~ /^_/;
         my @data;
+        
+        #HACK. DELETE and replace with serialise only registered tpes?
+        return unless (ref($other->{$type}) eq 'ARRAY');    #data from Foswiki::Address
+        return if ($type eq 'webpath');
+
+        
         foreach my $item ( @{ $other->{$type} } ) {
             if ( !$filter
@@ -1507 +1454 @@
 
         # Delegate to the store
-        $info = $this->{_session}->{store}->getVersionInfo($this);
+        $info = Foswiki::Store->getVersionInfo(address=>$this);
 
         # cache the result
@@ -1904 +1851 @@
     my $newRev;
     try {
-        $newRev = $this->saveAs( $this->{web}, $this->{topic}, %opts );
+        $newRev = $this->__internal_save( %opts );
     }
     catch Error::Simple with {
@@ -1937 +1884 @@
 =begin TML
 
----++ ObjectMethod saveAs( $web, $topic, %options  ) -> $rev
+---++ ObjectMethod __internal_save( %options  ) -> $rev
 
 Save the current topic to a store location. Only works on topics.
 *without* invoking plugins handlers.
-   * =$web.$topic= - where to move to
    * =%options= - Hash of options, may include:
       * =forcenewrevision= - force an increment in the revision number,
@@ -1962 +1908 @@
 # SMELL: arguably save should only be permitted if the loaded rev
 # of the object is the same as the latest rev.
-sub saveAs {
+sub __internal_save {
     my $this = shift;
     ASSERT( $this->{web} && $this->{topic}, 'this is not a topic object' )
       if DEBUG;
-
-    my $newWeb   = shift;
-    my $newTopic = shift;
     ASSERT( scalar(@_) % 2 == 0 ) if DEBUG;
     my %opts = @_;
     my $cUID = $opts{author} || $this->{_session}->{user};
-    $this->{web}   = $newWeb   if $newWeb;
-    $this->{topic} = $newTopic if $newTopic;
     ASSERT( $this->{web} && $this->{topic}, 'this is not a topic object' )
       if DEBUG;
@@ -1981 +1922 @@
         # Don't verify web existance for WebPreferences, as saving
         # WebPreferences creates the web.
-        unless ( $this->{_session}->{store}->exists(address=> $this->{web}  )) {
+        unless ( Foswiki::Store->exists(address=> {web=> $this->web()}  )) {
             throw Error::Simple( 'Unable to save topic '
                   . $this->{topic}
@@ -1991 +1932 @@
 
     $this->_atomicLock($cUID);
-    my $i = $this->{_session}->{store}->getRevisionHistory($this);
+    my $i = Foswiki::Store->getRevisionHistory(address=>$this);
     my $currentRev = $i->hasNext() ? $i->next() : 1;
     try {
@@ -1998 +1939 @@
             # See if we want to replace the existing top revision
             my $mtime1 =
-              $this->{_session}->{store}
-              ->getApproxRevTime( $this->{web}, $this->{topic} );
+              Foswiki::Store->getApproxRevTime( address=>$this );
             my $mtime2 = time();
             my $dt     = abs( $mtime2 - $mtime1 );
             if ( $dt <= $Foswiki::cfg{ReplaceIfEditedAgainWithin} ) {
-                my $info = $this->{_session}->{store}->getVersionInfo($this);
+                my $info = Foswiki::Store->getVersionInfo(address=>$this);
 
                 # same user?
@@ -2014 +1954 @@
                     $info->{date} = $opts{forcedate} || time();
                     $this->setRevisionInfo(%$info);
-                    $this->{_session}->{store}->repRev( $this, $cUID, %opts );
+                    Foswiki::Store->repRev( address=>$this, cuid=>$cUID, %opts );
                     $this->{_loadedRev} = $currentRev;
                     return $currentRev;
@@ -2020 +1960 @@
             }
         }
-        my $nextRev = $this->{_session}->{store}->getNextRevision($this);
+        my $nextRev = Foswiki::Store->getNextRevision(address=>$this);
         $this->setRevisionInfo(
             date => $opts{forcedate} || time(),
@@ -2028 +1968 @@
 
         my $checkSave =
-          $this->{_session}->{store}->saveTopic( $this, $cUID, \%opts );
+          Foswiki::Store->save( address=>$this, cuid=>$cUID, %opts );
         ASSERT( $checkSave == $nextRev, "$checkSave != $nextRev" ) if DEBUG;
         $this->{_loadedRev} = $nextRev;
@@ -2057 +1997 @@
         while (1) {
             my ( $user, $time ) =
-              $this->{_session}->{store}->atomicLockInfo($this);
+              Foswiki::Store->atomicLockInfo(address=>$this);
             last if ( !$user || $cUID eq $user );
             $logger->log( 'warning',
@@ -2071 +2011 @@
                 $logger->log( 'warning',
                     $cUID . " broke ${user}s lock on " . $this->getPath() );
-                $this->{_session}->{store}->atomicUnlock( $this, $cUID );
+                Foswiki::Store->atomicUnlock( address=>$this, cuid=>$cUID );
                 last;
             }
@@ -2080 +2020 @@
 
         # Topic
-        $this->{_session}->{store}->atomicLock( $this, $cUID );
+        Foswiki::Store->atomicLock( address=>$this, cuid=>$cUID );
     }
     else {
@@ -2103 +2043 @@
     my ( $this, $cUID ) = @_;
     if ( $this->{topic} ) {
-        $this->{_session}->{store}->atomicUnlock($this);
+        Foswiki::Store->atomicUnlock(address=>$this);
     }
     else {
@@ -2176 +2116 @@
                 dontlog => 1, # no statistics
             );
-            $from->{_session}->{store}->moveTopic( $from, $to, $cUID );
+            Foswiki::Store->moveTopic( from=>$from, address=>$to, cuid=>$cUID );
             $to->loadVersion();
             ASSERT( defined($to) and defined( $to->{_loadedRev} ) ) if DEBUG;
@@ -2191 +2131 @@
 
         # Move web
-        ASSERT( !$this->{_session}->{store}->exists(address=> $to ),
+        ASSERT( !Foswiki::Store->exists(address=> $to ),
             "$to->{web} does not exist" )
           if DEBUG;
         $this->_atomicLock($cUID);
-        $this->{_session}->{store}->moveWeb( $this, $to, $cUID );
+        Foswiki::Store->moveWeb( from=>$this, address=>$to, cuid=>$cUID );
 
         # No point in unlocking $this - it's moved!
@@ -2232 +2172 @@
     $this->_atomicLock($cUID);
     try {
-        $rev = $this->{_session}->{store}->delRev( $this, $cUID );
+        $rev = Foswiki::Store->delRev( address=>$this, cuid=>$cUID );
     }
     finally {
@@ -2295 +2235 @@
 
     try {
-        $this->{_session}->{store}->repRev( $this, $cUID, @_ );
+        Foswiki::Store->repRev( address=>$this, cuid=>$cUID, @_ );
     }
     finally {
@@ -2339 +2279 @@
 #    }
 
-    return $this->{_session}->{store}->getRevisionHistory( $this, $attachment );
+    return Foswiki::Store->getRevisionHistory( address=>$this, attachment=>$attachment );
 }
 
@@ -2421 +2361 @@
 sub removeFromStore {
     my ( $this, $attachment ) = @_;
-    my $store = $this->{_session}->{store};
+    
     ASSERT( $this->{web}, 'this is not a removable object' ) if DEBUG;
 
-    if ( !$store->exists(address=> $this->{web}  )) {
+    if ( !Foswiki::Store->exists(address=> {web=>$this->{web}}  )) {
         throw Error::Simple( 'No such web ' . $this->{web} );
     }
     if ( $this->{topic}
-        && !$store->exists(address=>[ $this->{web}, $this->{topic} ] ))
+        && !Foswiki::Store->exists(address=>$this ))
     {
         throw Error::Simple(
@@ -2442 +2382 @@
     }
 
-    $store->remove( $this->{_session}->{user}, $this, $attachment );
+    Foswiki::Store->remove( address=>$this, attachment=>$attachment );
 }
 
@@ -2468 +2408 @@
     ASSERT( $this->{web} && $this->{topic}, 'this is not a topic object' )
       if DEBUG;
-    return $this->{_session}->{store}
-      ->getRevisionDiff( $this, $rev2, $contextLines );
+    return Foswiki::Store->getRevisionDiff( from=>$this, address=>$rev2, contextLines=>$contextLines );
 }
 
@@ -2487 +2426 @@
     ASSERT( $this->{web} && $this->{topic}, 'this is not a topic object' )
       if DEBUG;
-    return $this->{_session}->{store}->getRevisionAtTime( $this, $time );
+    return Foswiki::Store->getRevisionAtTime( address=>$this, time=>$time );
 }
 
@@ -2510 +2449 @@
         taken   => $t
     };
-    return $this->{_session}->{store}->setLease( $this, $lease );
+    return Foswiki::Store->setLease( address=>$this, length=>$lease );
 }
 
@@ -2530 +2469 @@
     ASSERT( $this->{web} && $this->{topic}, 'this is not a topic object' )
       if DEBUG;
-    return $this->{_session}->{store}->getLease($this);
+    return Foswiki::Store->getLease(address=>$this);
 }
 
@@ -2551 +2490 @@
           . ' this is not a topic object'
     ) if DEBUG;
-    $this->{_session}->{store}->setLease($this);
+    Foswiki::Store->setLease(address=>$this);
 }
 
@@ -2587 +2526 @@
         # Clean up spurious leases that may have been left behind
         # during cancelled topic creation
-        $this->{_session}->{store}->removeSpuriousLeases( $this->getPath() )
+        Foswiki::Store->removeSpuriousLeases( address=>$this )
           if $this->getPath();
     }
@@ -2616 +2555 @@
       if DEBUG;
 
-    return $this->{_session}->{store}
-      ->getAttachmentVersionInfo( $this, $fromrev, $attachment );
+    return Foswiki::Store
+      ->getAttachmentVersionInfo( address=>$this, rev=>$fromrev, attachment=>$attachment );
 }
 
@@ -2768 +2707 @@
         my $error;
         try {
-            $this->{_session}->{store}
-              ->saveAttachment( $this, $opts{name}, $opts{stream},
-                $opts{author} || $this->{_session}->{user}, $opts{comment} );
+            Foswiki::Store
+              ->saveAttachment( address=>$this, attachment=>$opts{name}, stream=>$opts{stream},
+                cuid=>($opts{author} || $this->{_session}->{user}) );
         }
         finally {
@@ -2839 +2778 @@
     ASSERT( $this->{web} && $this->{topic}, 'this is not a topic object' )
       if DEBUG;
-    return $this->{_session}->{store}->attachmentExists( $this, $name );
+    return Foswiki::Store->attachmentExists( address=>$this, attachment=>$name );
 }
 
@@ -2891 +2830 @@
 
     return
-      return $this->{_session}->{store}
-      ->testAttachment( $this, $attachment, $test );
+      return Foswiki::Store
+      ->testAttachment( address=>$this, attachment=>$attachment, test=>$test );
 }
 
@@ -2924 +2863 @@
       if DEBUG;
 
-    return $this->{_session}->{store}
-      ->openAttachment( $this, $attachment, $mode, @opts );
+    return Foswiki::Store
+      ->openAttachment( address=>$this, attachment=>$attachment, mode=>$mode, @opts );
 
 }
@@ -2958 +2897 @@
 
     try {
-        $this->{_session}->{store}
-          ->moveAttachment( $this, $name, $to, $newName, $cUID );
+        Foswiki::Store
+          ->moveAttachment( from=>$this, fromattachment=>$name, address=>$to, toattachment=>$newName, cuid=>$cUID );
 
         # Modify the cache of the old topic
@@ -3048 +2987 @@
 
     try {
-        $from->{_session}->{store}
-          ->copyAttachment( $from, $name, $to, $newName, $cUID );
+        Foswiki::Store
+          ->copyAttachment( from=>$from, fromattachment=>$name, address=>$to, toattachment=>$newName, cuid=>$cUID );
 
         # Add file attachment to new topic by copying the old one

branches/scratch/core/lib/Foswiki/Prefs.pm

@@ -137 +137 @@
     my $this       = shift;
 
-    my $metaObject = Foswiki::Meta->new( $this->{session}, @_ );
+    return undef unless (Foswiki::Store::exists(address=>{web=>$_[0], topic=>$_[1]}));
+    my $metaObject = Foswiki::Store::load(address=>{web=>$_[0], topic=>$_[1]});
     my $path = $metaObject->getPath();
     unless ( exists $this->{paths}{$path} ) {
@@ -160 +161 @@
         $subWeb .= $_;
         $back = $this->_getBackend( $subWeb, $Foswiki::cfg{WebPrefsTopicName} );
-        $stack->newLevel($back);
+        $stack->newLevel($back) if (defined($back));
     }
 }
@@ -220 +221 @@
     my ( $this, $topicObject ) = @_;
 
-    my $path = $topicObject->getPath();
-
+    #my $path = $topicObject->getPath();
     #    $topicObject->session->logger->log( 'debug',
     #        "Loading preferences for $path\n" )
@@ -275 +275 @@
         $subWeb .= $_;
         $back = $this->_getBackend( $subWeb, $Foswiki::cfg{WebPrefsTopicName} );
-        $stack->newLevel($back);
+        $stack->newLevel($back) if (defined($back));
     }
     $back = $this->_getBackend( $web, $topic );
-    $stack->newLevel($back);
+    $stack->newLevel($back) if (defined($back));
     $stack->newLevel( Foswiki::Prefs::HASH->new() );
 
@@ -343 +343 @@
     my ( $this, $wn ) = @_;
     my $back = $this->_getBackend( $Foswiki::cfg{UsersWebName}, $wn );
-    $this->{main}->newLevel($back);
+    $this->{main}->newLevel($back) if (defined($back));
 }
 
@@ -375 +375 @@
           ->normalizeWebTopicName( undef, $Foswiki::cfg{LocalSitePreferences} );
         my $back = $this->_getBackend( $web, $topic );
-        $this->{main}->newLevel($back);
+        $this->{main}->newLevel($back) if (defined($back));
     }
 }

branches/scratch/core/lib/Foswiki/Serialise/Embedded.pm

@@ -19 +19 @@
 use Assert;
 
+#debug!
+    use Data::Dumper;
+
 =begin TML
 
@@ -41 +44 @@
 #really awkward - setEmbeddedStoreForm interleaves reading from text and calling Meta calls to update cache information
 #need to separate these out in a performant way.
-sub read {
-    die 'not implemented';
+sub DELETEMEread {
     my $module = shift;
     my ( $session, $result ) = @_;
 
-    ASSERT( $result->isa('Foswiki::Meta') ) if DEBUG;
-    return setEmbeddedStoreForm($result);
+    my @elements = split(/^(%META:.*)%\n/, $result);   
+
+    print STDERR "-elements --- = ".Dumper(@elements)."\n";
+
+
+    #split(/(\%META:.*\%\n)/, $result);
+    my %output;
+    foreach my $element (@elements) {
+            #1.0 compatibility
+            #$text =~ s/^%META:([^{]+){(.*)}%\n/ ..... /gem
+            #$text =~ s/^(%META:([^{]+){(.*)}%\n)/ ..... /gem
+        
+        #if ($element =~ /%META:([A..Z0..9]*)({.*})%/ ) {
+        if ($element =~ /^%META/ ) {
+            #TODO: find the marco parsing code?
+            print STDERR "Meta $1 - params $2\n"
+        } else {
+            print STDERR "text - $element\n";
+            ASSERT(not defined($output{text})) if DEBUG;
+            $output{text} = $element;
+        }
+    }
+    print STDERR "-complete --- = ".Dumper(%output)."\n";
+    die;
+    return \%output;
+}
+sub read {
+    my $module = shift;
+    my ( $session, $result ) = @_;
+
+    my %output;
+    $result =~ s/^%META:([^{]+){(.*)}%\n/push(@{$output{$1}}, _readKeyValues($2));''/gem;
+    
+    #correct the META for which there can be only one. (ignore all but first)
+    map {
+         $output{$_} = $output{$_}[0] if (defined($output{$_}));
+     } qw(TOPICINFO TOPICPARENT TOPICMOVED);
+    
+    $output{_text} = $result;
+
+    #die "-complete --- = ".Dumper(\%output)."\n";
+
+    return \%output;
 }
 
@@ -71 +114 @@
     my $this = shift;
 
-    ASSERT( $this->{_web} && $this->{_topic}, 'this is not a topic object' )
+    ASSERT( $this->{web} && $this->{topic}, 'this is not a topic object' )
       if DEBUG;
     $this->{_text} ||= '';
@@ -130 +173 @@
         my $data = $this->{$type};
         next if !defined $data;
+        
+        #HACK. DELETE and replace with serialise only registered tpes?
+        next unless (ref($data) eq 'ARRAY');    #data from Foswiki::Address
+        next if ($type eq 'webpath');
+        
         foreach my $item (@$data) {
             next if ($item =~ /^_/ );
@@ -180 +228 @@
 }
 
+=begin TML
+
+---++ StaticMethod dataDecode( $encoded ) -> $decoded
+
+Decode escapes in a string that was encoded using dataEncode
+
+The encoding has to be exported because Foswiki (and plugins) use
+encoded field data in other places e.g. RDiff, mainly as a shorthand
+for the properly parsed meta object. Some day we may be able to
+eliminate that....
+
+=cut
+
+sub dataDecode {
+    my $datum = shift;
+
+    $datum =~ s/%([\da-f]{2})/chr(hex($1))/gei;
+    return $datum;
+}
+
+
+# STATIC Build a hash by parsing name=value comma separated pairs
+# SMELL: duplication of Foswiki::Attrs, using a different
+# system of escapes :-(
+sub _readKeyValues {
+    my ($args) = @_;
+    my %res;
+
+    # Format of data is name='value' name1='value1' [...]
+    $args =~ s/\s*([^=]+)="([^"]*)"/
+      $res{$1} = dataDecode( $2 ), ''/ge;
+
+    return \%res;
+}
+
 1;
 __END__

branches/scratch/core/lib/Foswiki/Store.pm

@@ -74 +74 @@
 
 sub changeDefaultUser {
-    $singleton->{cuid} = shift;
+    #pick the last param, so that we can be class or object called.
+    $singleton->{cuid} = $_[$#_];
+
+    ASSERT(not defined($singleton->{cuid}) or ref($singleton->{cuid}) eq '') if DEBUG;
+    die 'snow '.ref($singleton->{cuid}) if (ref($singleton->{cuid}) ne '');
+    
     ASSERT((not defined($singleton->{cuid}))
                 or 
@@ -101 +106 @@
 
 sub load {
-    return template_function( 'load', @_ );
+    shift if ((ref($_[0]) eq 'Foswiki::Store') or ($_[0] eq 'Foswiki::Store'));
+    
+    #default cuid from the singleton
+    my %args = ( cuid=>$singleton->{cuid}, @_ );
+    $args{functionname} = 'load';
+    
+    #print STDERR ".cUID isa ".ref($args{cuid})." ($args{cuid}) - default (".ref($singleton->{cuid}).")\n";
+    #ASSERT(not defined($args{cuid}) or ref($args{cuid}) eq '') if DEBUG;
+    #die 'here' if (ref($args{cuid}) ne '');
+
+    my $access_type = $args{writeable} ? 'CHANGE' : 'VIEW';
+
+    my $result;
+    $args{address} = $singleton->getResourceAddressOrCachedResource($args{address});
+    die "recursion? - load(".$singleton->{count}{load}{$args{address}->getPath()}.") ".$args{address}->getPath() if ($singleton->{count}{load}{$args{address}->getPath()}++ > 10);
+
+    print STDERR "-call: load ".($args{address}->getPath())."\n";
+
+
+    if (ref($args{address}) eq 'Foswiki::Meta') {
+        $result = $args{address};
+    } else {
+
+    #see if we are _able_ to test permissions using just an unloaded topic, if not, fall through to load&then test
+        throw AccessException( $singleton->{access}->getReason() )
+          if (  defined( $args{cuid} )  and 
+                not ($singleton->{access}
+              ->haveAccess( $access_type, $args{cuid}, $args{address}, 
+                  dontload => 1 ) ));
+          
+#       if ( defined( $args{from} ) ) {
+#
+#            #load will throw exceptions if things go wrong
+#            $args{from} = load( address => $args{from} )
+#              unless ( $args{from}->isa('Foswiki::Address') );
+#        }
+
+    #$cfg::Foswiki{Stores} is an ordered list, managed by configure that prioritises the cache stores first.
+        foreach my $impl ( @{ $singleton->{stores} } ) {
+
+    #the impl is also able to throw exceptions - as there might be a store based permissions impl
+            if (not defined($impl->{impl})) {
+                eval "require ".$impl->{module};
+                ASSERT( !$@, $@ ) if DEBUG;
+                $impl->{impl} = $Foswiki::cfg{Store}{Implementation}->new();
+            }
+            #$impl->{impl} ||= $impl.'::new'( store => $impl ) || next;
+            $result = $impl->{impl}->load(%args);
+            last if ( defined($result) );
+        }
+        if (ref($result) eq 'Foswiki::Meta') {
+            #ok, we have a resource object that actually exists in a store
+            $singleton->cacheResource(%args, return=>$result);
+        }
+        
+        if ( not defined($result) and $args{create} ) {
+            $result = create(%args);
+        }
+
+        throw DoesNotExist(%args)
+          unless ( defined($result) );
+      }
+
+    if (ref($result) eq 'Foswiki::Meta') {
+        #now to make sure we're allowed to give it to the user.
+
+        foreach my $impl ( @{ $singleton->{stores} } ) {
+            if (not defined($impl->{impl})) {
+                eval "require ".$impl->{module};
+                ASSERT( !$@, $@ ) if DEBUG;
+                $impl->{impl} = $Foswiki::cfg{Store}{Implementation}->new();
+            }
+
+    #a listener for load events.
+    #TODO: kill this and replace with call to logger, which stores can choose to consume!
+            $impl->{impl}->log( %args, return => $result );
+        }
+
+    #can't do any better with the __current__ ACL impl, but there should be a call before the readData for real store-fastening
+        ASSERT(ref($args{cuid}) eq '');
+        #print STDERR "..cUID isa ".ref($args{cuid})." ($args{cuid})\n";
+
+        throw AccessException( $singleton->{access}->getReason() )
+          if (  defined( $args{cuid} )  and 
+                not ($singleton->{access}
+              ->haveAccess( $access_type, $args{cuid}, $result ) ));
+    }
+          
+    $singleton->{count}{load}{$args{address}->getPath()}--;          
+
+    return $result;
 }
 
@@ -117 +212 @@
 
 returns an object of the appropriate type from the Foswiki::Object:: hieracy
-
-TODO: note that most of the methods here will have the same codepath as load(), 
-so it might be better to write it all as a switchboard..
 
 =cut
@@ -152 +244 @@
 =pod
 
-=head2 ClassMethod delete(address=>$address, cuid=>$cuid, -> success?
+=head2 ClassMethod remove(address=>$address, cuid=>$cuid, -> success?
    * =address= - (required) Address - can be a specific revision, in which case it requests the store to =delRev=
    * cuid=>$cuid (canonical user id) - if undefined, presume 'admin' (or no perms check) access
@@ -162 +254 @@
 =cut
 
-sub delete {
-    return template_function( 'delete', @_ );
+sub remove {
+    return template_function( 'remove', @_ );
 }
 
@@ -398 +490 @@
 =pod
 
+=head2 ClassMethod eachWeb( address=>$address) -> $iterator
+
+Get an iterator over the list of all elements of type '$type' that are sub elements of the addressed one
+
+=cut
+
+sub eachWeb {
+    return template_function( 'eachWeb', @_ );
+}
+
+=pod
+
+=head2 ClassMethod eachTopic( address=>$address) -> $iterator
+
+Get an iterator over the list of all elements of type '$type' that are sub elements of the addressed one
+
+=cut
+
+sub eachTopic {
+    return template_function( 'eachTopic', @_ );
+}
+
+=pod
+
 =head2 ClassMethod query($query, $inputTopicSet, $session, \%options) -> $outputTopicSet
 
@@ -457 +573 @@
 =pod
 
-=head2 ClassMethod setLease( address=>$address, cuid=>$cuid, $length )
+=head2 ClassMethod setLease( address=>$address, cuid=>$cuid, length=>$length )
 
    * =$topicObject= - Foswiki::Meta topic object
@@ -493 +609 @@
 sub template_function {
     my $functionname = shift;
-    shift if (ref($_[0]) eq 'Foswiki::Store');
+    shift if ((ref($_[0]) eq 'Foswiki::Store') or ($_[0] eq 'Foswiki::Store'));
     
     #default cuid from the singleton
     my %args = ( cuid=>$singleton->{cuid}, @_ );
     $args{functionname} = $functionname;
-
-    #TODO: or can I delay this to the point where its not needed at all?
-    $args{address} = Foswiki::Address->new( $args{address} )
-      if (ref($args{address}) eq '');   #justa string/scalar
-    $args{address} = Foswiki::Address->new( @{$args{address}} )
-      if (ref($args{address}) eq 'ARRAY');
+    
+    #print STDERR ".cUID isa ".ref($args{cuid})." ($args{cuid}) - default (".ref($singleton->{cuid}).")\n";
+    #ASSERT(not defined($args{cuid}) or ref($args{cuid}) eq '') if DEBUG;
+    #die 'here' if (ref($args{cuid}) ne '');
+
     my $access_type = $args{writeable} ? 'CHANGE' : 'VIEW';
 
-#see if we are _able_ to test permissions using just an unloaded topic, if not, fall through to load&then test
-    throw AccessException( store()->{access}->getReason() )
-      if (  defined( $args{cuid} )  and 
-            not (store()->{access}
-          ->haveAccess( $args{address}, $access_type, $args{cuid},
-              dontload => 1 ) ));
-      
-    if ( defined( $args{from} ) ) {
-
-        #load will throw exceptions if things go wrong
-        $args{from} = load( address => $args{from} )
-          unless ( $args{from}->isa('Foswiki::Address') );
+    my $result;
+    $args{address} = $singleton->getResourceAddressOrCachedResource($args{address});
+    die "recursion? - $functionname(".$singleton->{count}{$functionname}{$args{address}->getPath()}.") ".$args{address}->getPath() if ($singleton->{count}{$functionname}{$args{address}->getPath()}++ > 10);
+
+    print STDERR "-call: $functionname: ".($args{address}->getPath())."\n";
+
+
+#    if (ref($args{address}) eq 'Foswiki::Meta') {
+#        $result = $args{address};
+#    } else 
+{
+
+    #see if we are _able_ to test permissions using just an unloaded topic, if not, fall through to load&then test
+        throw AccessException( $singleton->{access}->getReason() )
+          if (  defined( $args{cuid} )  and 
+                not ($singleton->{access}
+              ->haveAccess( $access_type, $args{cuid}, $args{address}, 
+                  dontload => 1 ) ));
+          
+#        if ( defined( $args{from} ) ) {
+#
+#            #load will throw exceptions if things go wrong
+#            $args{from} = load( address => $args{from} )
+#              unless ( $args{from}->isa('Foswiki::Address') );
+#        }
+
+    #$cfg::Foswiki{Stores} is an ordered list, managed by configure that prioritises the cache stores first.
+        foreach my $impl ( @{ $singleton->{stores} } ) {
+
+    #the impl is also able to throw exceptions - as there might be a store based permissions impl
+            if (not defined($impl->{impl})) {
+                eval "require ".$impl->{module};
+                ASSERT( !$@, $@ ) if DEBUG;
+                $impl->{impl} = $Foswiki::cfg{Store}{Implementation}->new();
+            }
+            #$impl->{impl} ||= $impl.'::new'( store => $impl ) || next;
+            $result = $impl->{impl}->$functionname(%args);
+            last if ( defined($result) );
+        }
+        if (
+                    ($functionname eq 'exists') or 
+                    ($functionname eq 'atomicLockInfo') or 
+                    ($functionname eq 'atomicLock')
+                    ) {
+            print STDERR "-$functionname => ".(defined($result)?$result:'undef')."\n";
+            return $result ;
+        }
+        throw DoesNotExist(%args)
+          unless ( defined($result) );
+      }
+
+    if (ref($result) eq 'Foswiki::Meta') {
+        #now to make sure we're allowed to give it to the user.
+
+        foreach my $impl ( @{ $singleton->{stores} } ) {
+            if (not defined($impl->{impl})) {
+                eval "require ".$impl->{module};
+                ASSERT( !$@, $@ ) if DEBUG;
+                $impl->{impl} = $Foswiki::cfg{Store}{Implementation}->new();
+            }
+
+    #a listener for load events.
+    #TODO: kill this and replace with call to logger, which stores can choose to consume!
+            $impl->{impl}->log( %args, return => $result );
+        }
+
+    #can't do any better with the __current__ ACL impl, but there should be a call before the readData for real store-fastening
+        ASSERT(ref($args{cuid}) eq '');
+        #print STDERR "..cUID isa ".ref($args{cuid})." ($args{cuid})\n";
+
+        throw AccessException( $singleton->{access}->getReason() )
+          if (  defined( $args{cuid} )  and 
+                not ($singleton->{access}
+              ->haveAccess( $access_type, $args{cuid}, $result ) ));
     }
 
-#$cfg::Foswiki{Stores} is an ordered list, managed by configure that prioritises the cache stores first.
-    my $result;
-    foreach my $impl ( @{ $singleton->{stores} } ) {
-
-#the impl is also able to throw exceptions - as there might be a store based permissions impl
-        if (not defined($impl->{impl})) {
-            eval "require ".$impl->{module};
-            ASSERT( !$@, $@ ) if DEBUG;
-            $impl->{impl} = $Foswiki::cfg{Store}{Implementation}->new();
-        }
-        #$impl->{impl} ||= $impl.'::new'( store => $impl ) || next;
-        $result = $impl->{impl}->$functionname(%args);
-        last if ( defined($result) );
-    }
-    if ( not defined($result) and $args{create} ) {
-        $result = create(%args);
-    }
-    throw DoesNotExist()
-      unless ( defined($result) );
-
-    foreach my $impl ( @{ $singleton->{stores} } ) {
-        if (not defined($impl->{impl})) {
-            eval "require ".$impl->{module};
-            ASSERT( !$@, $@ ) if DEBUG;
-            $impl->{impl} = $Foswiki::cfg{Store}{Implementation}->new();
-        }
-
-#a listener for load events.
-#TODO: kill this and replace with call to logger, which stores can choose to consume!
-        $impl->{impl}->log( %args, return => $result );
-    }
-
-#can't do any better with the __current__ ACL impl, but there should be a call before the readData for real store-fastening
-    throw AccessException( store()->{access}->getReason() )
-      if (  defined( $args{cuid} )  and 
-            not (store()->{access}
-          ->haveAccess( $args{address}, $access_type, $args{cuid} ) ));
+          
+    $singleton->{count}{$functionname}{$args{address}->getPath()}--;          
+
     return $result;
 }
+
+sub cacheResource {
+    my $self = shift;
+    my %args = @_;
+    
+    #ASSERT(defined($obj->{_text})) if DEBUG; if itsa topic.
+    print STDERR "cacheResource(".$args{functionname}.", ".$args{return}->getPath().") \n";
+    
+    return unless ($args{functionname} eq 'load');
+    
+    my $name = $args{return}->getPath();
+    $self->{cache}{$name} = $args{return};
+}
+
+sub getResourceAddressOrCachedResource {
+    my $self = shift;
+    my $address = shift;
+
+    $address = Foswiki::Address->new( string=>$address )
+      if (ref($address) eq '');   #justa string/scalar
+    $address = Foswiki::Address->new( @$address )
+      if (ref($address) eq 'ARRAY');
+    $address = Foswiki::Address->new( %$address )
+      if (ref($address) eq 'HASH');
+    
+    
+    my $name = $address->getPath();
+    return $self->{cache}{$name} if (defined($self->{cache}{$name}));
+    return $address;
+}
+
+sub finish {
+    undef $singleton->{cache};
+    undef $singleton;
+    print STDERR "--------------------------------- end Store singleton\n";
+}
+
 
 1;

branches/scratch/core/lib/Foswiki/Store/VC/Handler.pm

@@ -57 +57 @@
     ASSERT( $store->isa('Foswiki::Store::Interfaces::Store') ) if DEBUG;
 
-    if ( UNIVERSAL::isa( $web, 'Foswiki::Meta' ) ) {
+    if ( UNIVERSAL::isa( $web, 'Foswiki::Address' ) ) {
 
         # $web refers to a meta object

branches/scratch/core/lib/Foswiki/Store/VC/Store.pm

@@ -43 +43 @@
 use Foswiki::Meta    ();
 use Foswiki::Sandbox ();
+use Foswiki::Serialise();
 
 BEGIN {
@@ -73 +74 @@
 sub getHandler {
 
-    #my ( $this, $web, $topic, $attachment ) = @_;
+    #my ( $this, $web, $topic, $args{attachment} ) = @_;
     ASSERT( 0, "Must be implemented by subclasses" ) if DEBUG;
 }
 
 sub readTopic {
-    my ( $this, $topicObject, $version ) = @_;
-
-    my ( $gotRev, $isLatest ) = $this->askListeners($topicObject, $version);
+    my ( $this, %args ) = @_;
+
+    my ( $gotRev, $isLatest ) = $this->askListeners($args{address}, $args{rev});
 
     if ( defined($gotRev) and ( $gotRev > 0 or ($isLatest)) ) {
@@ -87 +88 @@
     ASSERT( not $isLatest ) if DEBUG;
 
-    my $handler = $this->getHandler($topicObject);
+    my $handler = $this->getHandler($args{address});
     $isLatest = 0;
 
     # check that the requested revision actually exists
-    if ( defined $version ) {
-        if ( !$version || !$handler->revisionExists($version) ) {
-            $version = $handler->getLatestRevisionID();
+    if ( defined $args{rev} ) {
+        if ( !$args{rev} || !$handler->revisionExists($args{rev}) ) {
+            $args{rev} = $handler->getLatestRevisionID();
         }
     }
 
-    ( my $text, $isLatest ) = $handler->getRevision($version);
+    ( my $text, $isLatest ) = $handler->getRevision($args{rev});
     unless ( defined $text ) {
         ASSERT( not $isLatest ) if DEBUG;
@@ -104 +105 @@
 
     $text =~ s/\r//g;    # Remove carriage returns
-    $topicObject->setEmbeddedStoreForm($text);
+    $args{address}->setEmbeddedStoreForm($text);
 
     unless ($handler->noCheckinPending()) {
         # If a checkin is pending, fix the TOPICINFO
-        my $ri = $topicObject->get('TOPICINFO');
+        my $ri = $args{address}->get('TOPICINFO');
         my $truth = $handler->getInfo($version);
         for my $i qw(author version date) {
@@ -132 +133 @@
     # Only check the currently requested topic.
     if (   $Foswiki::cfg{RCS}{AutoAttachPubFiles}
-        && $topicObject->isSessionTopic() )
+        && $args{address}->isSessionTopic() )
     {
-        my @knownAttachments = $topicObject->find('FILEATTACHMENT');
+        my @knownAttachments = $args{address}->find('FILEATTACHMENT');
         my @attachmentsFoundInPub =
           $handler->synchroniseAttachmentsList( \@knownAttachments );
@@ -150 +151 @@
                 print STDERR 'AutoAttachPubFiles ignoring '
                   . $foundAttachment->{name} . ' in '
-                  . $topicObject->getPath()
+                  . $args{address}->getPath()
                   . ' - not a valid Foswiki Attachment filename';
             }
@@ -157 +158 @@
                 $this->tellListeners(
                     verb          => 'autoattach',
-                    newmeta       => $topicObject,
+                    newmeta       => $args{address},
                     newattachment => $foundAttachment
                 );
@@ -163 +164 @@
         }
 
-        $topicObject->putAll( 'FILEATTACHMENT', @validAttachmentsFound )
+        $args{address}->putAll( 'FILEATTACHMENT', @validAttachmentsFound )
           if @validAttachmentsFound;
     }
@@ -172 +173 @@
 
 sub moveAttachment {
-    my ( $this, $oldTopicObject, $oldAttachment, $newTopicObject,
-        $newAttachment, $cUID )
+    my ( $this, %args )
       = @_;
 
-    my $handler = $this->getHandler( $oldTopicObject, $oldAttachment );
+    my $handler = $this->getHandler( $args{from}, $args{fromattachment} );
     if ( $handler->storedDataExists() ) {
-        $handler->moveAttachment( $this, $newTopicObject->web,
-            $newTopicObject->topic, $newAttachment );
+        $handler->moveAttachment( $this, $args{address}->web,
+            $args{address}->topic, $args{attachment} );
         $this->tellListeners(
             verb          => 'update',
-            oldmeta       => $oldTopicObject,
-            oldattachment => $oldAttachment,
-            newmeta       => $newTopicObject,
-            newattachment => $newAttachment
+            oldmeta       => $args{from},
+            oldattachment => $args{fromattachment},
+            newmeta       => $args{address},
+            newattachment => $args{attachment}
         );
-        $handler->recordChange( $cUID, 0 );
+        $handler->recordChange( $args{cuid}, 0 );
     }
 }
 
 sub copyAttachment {
-    my ( $this, $oldTopicObject, $oldAttachment, $newTopicObject,
-        $newAttachment, $cUID )
+    my ( $this, %args )
       = @_;
 
-    my $handler = $this->getHandler( $oldTopicObject, $oldAttachment );
+    my $handler = $this->getHandler( $args{from}, $args{fromattachment} );
     if ( $handler->storedDataExists() ) {
-        $handler->copyAttachment( $this, $newTopicObject->web,
-            $newTopicObject->topic, $newAttachment );
+        $handler->copyAttachment( $this, $args{address}->web,
+            $args{address}->topic, $args{attachment} );
         $this->tellListeners(
             verb          => 'insert',
-            newmeta       => $newTopicObject,
-            newattachment => $newAttachment
+            newmeta       => $args{address},
+            newattachment => $args{attachment}
         );
-        $handler->recordChange( $cUID, 0 );
+        $handler->recordChange( $args{cuid}, 0 );
     }
 }
 
 sub attachmentExists {
-    my ( $this, $topicObject, $att ) = @_;
-    my $handler = $this->getHandler( $topicObject, $att );
+    my ( $this, %args ) = @_;
+    my $handler = $this->getHandler( $args{address}, $args{attachment} );
     return $handler->storedDataExists();
 }
 
 sub moveTopic {
-    my ( $this, $oldTopicObject, $newTopicObject, $cUID ) = @_;
-    ASSERT($cUID) if DEBUG;
-
-    my $handler = $this->getHandler( $oldTopicObject, '' );
-    my $rev = $handler->getLatestRevisionID();
-
-    $handler->moveTopic( $this, $newTopicObject->web, $newTopicObject->topic );
+    my ( $this, %args ) = @_;
+    ASSERT($args{cuid}) if DEBUG;
+
+    my $handler = $this->getHandler( $args{from}, '' );
+    $args{rev} = $handler->getLatestRevisionID();
+
+    $handler->moveTopic( $this, $args{address}->web, $args{address}->topic );
 
     $this->tellListeners(
         verb    => 'update',
-        oldmeta => $oldTopicObject,
-        newmeta => $newTopicObject
+        oldmeta => $args{from},
+        newmeta => $args{address}
     );
 
-    if ( $newTopicObject->web ne $oldTopicObject->web ) {
+    if ( $args{address}->web ne $args{from}->web ) {
 
         # Record that it was moved away
-        $handler->recordChange( $cUID, $rev );
-    }
-
-    $handler = $this->getHandler( $newTopicObject, '' );
-    $handler->recordChange( $cUID, $rev );
+        $handler->recordChange( $args{cuid}, $args{rev} );
+    }
+
+    $handler = $this->getHandler( $args{address}, '' );
+    $handler->recordChange( $args{cuid}, $args{rev} );
 }
 
 sub moveWeb {
-    my ( $this, $oldWebObject, $newWebObject, $cUID ) = @_;
-    ASSERT($cUID) if DEBUG;
-
-    my $handler = $this->getHandler($oldWebObject);
-    $handler->moveWeb( $newWebObject->web );
+    my ( $this, %args ) = @_;
+    ASSERT($args{cuid}) if DEBUG;
+
+    my $handler = $this->getHandler($args{from});
+    $handler->moveWeb( $args{address}->web );
 
     $this->tellListeners(
         verb    => 'update',
-        oldmeta => $oldWebObject,
-        newmeta => $newWebObject
+        oldmeta => $args{from},
+        newmeta => $args{address}
     );
 
     # We have to log in the new web, otherwise we would re-create the dir with
     # a useless .changes. See Item9278
-    $handler = $this->getHandler($newWebObject);
-    $handler->recordChange( $cUID, 0, 'Moved from ' . $oldWebObject->web );
+    $handler = $this->getHandler($args{address});
+    $handler->recordChange( $args{cuid}, 0, 'Moved from ' . $args{from}->web );
 }
 
 sub testAttachment {
-    my ( $this, $topicObject, $attachment, $test ) = @_;
-    my $handler = $this->getHandler( $topicObject, $attachment );
-    return $handler->test($test);
+    my ( $this, %args ) = @_;
+    my $handler = $this->getHandler( $args{address}, $args{attachment} );
+    return $handler->test($args{test});
 }
 
 sub openAttachment {
-    my ( $this, $topicObject, $att, $mode, @opts ) = @_;
-
-    my $handler = $this->getHandler( $topicObject, $att );
-    return $handler->openStream( $mode, @opts );
+    my ( $this, %args ) = @_;
+
+    my $handler = $this->getHandler( $args{address}, $args{attachment} );
+    return $handler->openStream( $args{mode}, %args );
 }
 
 sub getRevisionHistory {
-    my ( $this, $topicObject, $attachment ) = @_;
-
-    my $itr = $this->askListenersRevisionHistory($topicObject, $attachment);
+    my ( $this, %args ) = @_;
+    
+    my $itr = $this->askListenersRevisionHistory($args{address}, $args{attachment});
 
     if ( defined($itr) ) {
@@ -281 +280 @@
     }
 
-    my $handler = $this->getHandler( $topicObject, $attachment );
+    my $handler = $this->getHandler( $args{address}, $args{attachment} );
     return $handler->getRevisionHistory();
 }
 
 sub getNextRevision {
-    my ( $this, $topicObject ) = @_;
-    my $handler = $this->getHandler($topicObject);
+    my ( $this, %args ) = @_;
+    my $handler = $this->getHandler($args{address});
     return $handler->getNextRevisionID();
 }
 
 sub getRevisionDiff {
-    my ( $this, $topicObject, $rev2, $contextLines ) = @_;
-    ASSERT( defined($contextLines) ) if DEBUG;
-
-    my $rcs = $this->getHandler($topicObject);
-    return $rcs->revisionDiff( $topicObject->getLoadedRev(), $rev2,
-        $contextLines );
+    my ( $this, %args ) = @_;
+    ASSERT( defined($args{contextLines}) ) if DEBUG;
+
+    my $rcs = $this->getHandler($args{address});
+    return $rcs->revisionDiff( $args{address}->getLoadedRev(), $args{rev},
+        $args{contextLines} );
 }
 
 sub getAttachmentVersionInfo {
-    my ( $this, $topicObject, $rev, $attachment ) = @_;
-    my $handler = $this->getHandler( $topicObject, $attachment );
-    return $handler->getInfo( $rev || 0 );
+    my ( $this, %args ) = @_;
+    my $handler = $this->getHandler( $args{address}, $args{attachment} );
+    return $handler->getInfo( $args{rev} || 0 );
 }
 
 sub getVersionInfo {
-    my ( $this, $topicObject ) = @_;
-    my $handler = $this->getHandler($topicObject);
-    return $handler->getInfo( $topicObject->getLoadedRev() );
+    my ( $this, %args ) = @_;
+    my $handler = $this->getHandler($args{address});
+    return $handler->getInfo( $args{address}->getLoadedRev() );
 }
 
 sub saveAttachment {
-    my ( $this, $topicObject, $name, $stream, $cUID, $comment ) = @_;
-    my $handler    = $this->getHandler( $topicObject, $name );
+    my ( $this, %args ) = @_;
+    my $handler    = $this->getHandler( $args{address}, $args{name} );
     my $currentRev = $handler->getLatestRevisionID();
     my $nextRev    = $currentRev + 1;
-    my $verb = ( $topicObject->hasAttachment($name) ) ? 'update' : 'insert';
-    $handler->addRevisionFromStream( $stream, $comment, $cUID );
+    my $verb = ( $args{address}->hasAttachment($args{name}) ) ? 'update' : 'insert';
+    $handler->addRevisionFromStream( $args{stream}, 'save attachment', $args{cuid} );
     $this->tellListeners(
         verb          => $verb,
-        newmeta       => $topicObject,
-        newattachment => $name
+        newmeta       => $args{address},
+        newattachment => $args{name}
     );
-    $handler->recordChange( $cUID, $nextRev );
+    $handler->recordChange( $args{cuid}, $nextRev );
     return $nextRev;
 }
 
 sub saveTopic {
-    my ( $this, $topicObject, $cUID, $options ) = @_;
-    ASSERT( $topicObject->isa('Foswiki::Meta') ) if DEBUG;
-    ASSERT($cUID) if DEBUG;
-
-    my $handler = $this->getHandler($topicObject);
-
-    my $verb = ( $topicObject->existsInStore() ) ? 'update' : 'insert';
+    my ( $this, %args, $options ) = @_;
+    ASSERT( $args{address}->isa('Foswiki::Meta') ) if DEBUG;
+    ASSERT($args{cuid}) if DEBUG;
+
+    my $handler = $this->getHandler($args{address});
+
+    my $verb = ( $args{address}->existsInStore() ) ? 'update' : 'insert';
 
     # just in case they are not sequential
@@ -343 +342 @@
     $ti->{author} = $cUID;
 
-    $handler->addRevisionFromText( $topicObject->getEmbeddedStoreForm(),
-        'save topic', $cUID, $options->{forcedate} );
+    $handler->addRevisionFromText( $args{address}->getEmbeddedStoreForm(),
+        'save topic', $args{cuid}, $options->{forcedate} );
 
     my $extra = $options->{minor} ? 'minor' : '';
-    $handler->recordChange( $cUID, $nextRev, $extra );
-
-    $this->tellListeners( verb => $verb, newmeta => $topicObject );
+    $handler->recordChange( $args{cuid}, $nextRev, $extra );
+
+    $this->tellListeners( verb => $verb, newmeta => $args{address} );
 
     return $nextRev;
@@ -355 +354 @@
 
 sub repRev {
-    my ( $this, $topicObject, $cUID, %options ) = @_;
-    ASSERT( $topicObject->isa('Foswiki::Meta') ) if DEBUG;
-    ASSERT($cUID) if DEBUG;
-    my $info    = $topicObject->getRevisionInfo();
-    my $handler = $this->getHandler($topicObject);
-    $handler->replaceRevision( $topicObject->getEmbeddedStoreForm(),
-        'reprev', $cUID, $info->{date} );
-    my $rev = $handler->getLatestRevisionID();
-    $handler->recordChange( $cUID, $rev, 'minor, reprev' );
-
-    $this->tellListeners( verb => 'update', newmeta => $topicObject );
-
-    return $rev;
+    my ( $this, %args, %options ) = @_;
+    ASSERT( $args{address}->isa('Foswiki::Meta') ) if DEBUG;
+    ASSERT($args{cuid}) if DEBUG;
+
+    my $info    = $args{address}->getRevisionInfo();
+    my $handler = $this->getHandler($args{address});
+    $handler->replaceRevision( $args{address}->getEmbeddedStoreForm(),
+        'reprev', $info->{author}, $info->{date} );
+    $args{rev} = $handler->getLatestRevisionID();
+    $handler->recordChange( $args{cuid}, $args{rev}, 'minor, reprev' );
+
+    $this->tellListeners( verb => 'update', newmeta => $args{address} );
+
+    return $args{rev};
 }
 
 sub delRev {
-    my ( $this, $topicObject, $cUID ) = @_;
-    ASSERT( $topicObject->isa('Foswiki::Meta') ) if DEBUG;
-    ASSERT($cUID) if DEBUG;
-
-    my $handler = $this->getHandler($topicObject);
-    my $rev     = $handler->getLatestRevisionID();
-    if ( $rev <= 1 ) {
+    my ( $this, %args ) = @_;
+    ASSERT( $args{address}->isa('Foswiki::Meta') ) if DEBUG;
+    ASSERT($args{cuid}) if DEBUG;
+
+    my $handler = $this->getHandler($args{address});
+    $args{rev}     = $handler->getLatestRevisionID();
+    if ( $args{rev} <= 1 ) {
         throw Error::Simple( 'Cannot delete initial revision of '
-              . $topicObject->web . '.'
-              . $topicObject->topic );
+              . $args{address}->web . '.'
+              . $args{address}->topic );
     }
     $handler->deleteRevision();
 
     # restore last topic from repository
-    $handler->restoreLatestRevision($cUID);
+    $handler->restoreLatestRevision($args{cuid});
 
     # reload the topic object
-    $topicObject->unload();
-    $topicObject->loadVersion();
-
-    $this->tellListeners( verb => 'update', newmeta => $topicObject );
-
-    $handler->recordChange( $cUID, $rev );
-
-    return $rev;
+    $args{address}->unload();
+    $args{address}->loadVersion();
+
+    $this->tellListeners( verb => 'update', newmeta => $args{address} );
+
+    $handler->recordChange( $args{cuid}, $args{rev} );
+
+    return $args{rev};
 }
 
 sub atomicLockInfo {
-    my ( $this, $topicObject ) = @_;
-    my $handler = $this->getHandler($topicObject);
+    my ( $this, %args ) = @_;
+    my $handler = $this->getHandler($args{address});
     return $handler->isLocked();
 }
@@ -407 +407 @@
 # (doesn't work on all platforms)
 sub atomicLock {
-    my ( $this, $topicObject, $cUID ) = @_;
-    my $handler = $this->getHandler($topicObject);
-    $handler->setLock( 1, $cUID );
+    my ( $this, %args ) = @_;
+    my $handler = $this->getHandler($args{address});
+    $handler->setLock( 1, $args{cuid} );
 }
 
 sub atomicUnlock {
-    my ( $this, $topicObject, $cUID ) = @_;
-
-    my $handler = $this->getHandler($topicObject);
-    $handler->setLock( 0, $cUID );
+    my ( $this, %args ) = @_;
+
+    my $handler = $this->getHandler($args{address});
+    $handler->setLock( 0, $args{cuid} );
 }
 
@@ -443 +443 @@
 sub topicExists {
     my ( $this, $web, $topic ) = @_;
-
+    
     return 0 unless defined $web && $web ne '';
     $web =~ s#\.#/#go;
@@ -467 +467 @@
 
 sub eachAttachment {
-    my ( $this, $topicObject ) = @_;
-
-    my $handler = $this->getHandler($topicObject);
+    my ( $this, %args ) = @_;
+
+    my $handler = $this->getHandler($args{address});
     my @list    = $handler->getAttachmentList();
     require Foswiki::ListIterator;
@@ -510 +510 @@
 
 sub remove {
-    my ( $this, $cUID, $topicObject, $attachment ) = @_;
-    ASSERT( $topicObject->web ) if DEBUG;
-
-    my $handler = $this->getHandler( $topicObject, $attachment );
+    my ( $this, %args ) = @_;
+    ASSERT( $args{address}->web ) if DEBUG;
+
+    my $handler = $this->getHandler( $args{address}, $args{attachment} );
     $handler->remove();
 
     $this->tellListeners(
         verb          => 'remove',
-        oldmeta       => $topicObject,
-        oldattachment => $attachment
+        oldmeta       => $args{address},
+        oldattachment => $args{attachment}
     );
 
     # Only log when deleting topics or attachment, otherwise we would re-create
     # an empty directory with just a .changes. See Item9278
-    if ( my $topic = $topicObject->topic ) {
-        $handler->recordChange( $cUID, 0, 'Deleted ' . $topic );
-    }
-    elsif ($attachment) {
-        $handler->recordChange( $cUID, 0, 'Deleted attachment ' . $attachment );
+    if ( my $topic = $args{address}->topic ) {
+        $handler->recordChange( $args{cuid}, 0, 'Deleted ' . $topic );
+    }
+    elsif ($args{attachment}) {
+        $handler->recordChange( $args{cuid}, 0, 'Deleted attachment ' . $args{attachment} );
     }
 }
@@ -566 +566 @@
 
 sub getRevisionAtTime {
-    my ( $this, $topicObject, $time ) = @_;
-
-    my $handler = $this->getHandler($topicObject);
-    return $handler->getRevisionAtTime($time);
+    my ( $this, %args ) = @_;
+
+    my $handler = $this->getHandler($args{address});
+    return $handler->getRevisionAtTime($args{time});
 }
 
 sub getLease {
-    my ( $this, $topicObject ) = @_;
-
-    my $handler = $this->getHandler($topicObject);
+    my ( $this, %args ) = @_;
+
+    my $handler = $this->getHandler($args{address});
     my $lease   = $handler->getLease();
     return $lease;
@@ -581 +581 @@
 
 sub setLease {
-    my ( $this, $topicObject, $lease ) = @_;
-
-    my $handler = $this->getHandler($topicObject);
-    $handler->setLease($lease);
+    my ( $this, %args ) = @_;
+
+    my $handler = $this->getHandler($args{address});
+    $handler->setLease($args{lease});
 }
 
@@ -594 +594 @@
 ############################################################################
 # new foswiki 2.0 API methods
+
+sub save {
+    my $this = shift;
+    my %args = @_;
+    ASSERT($args{address}) if DEBUG;
+    my $type = $args{address}->type();
+#    ASSERT($type) if DEBUG;
+    if ($type eq 'webpath') {
+        return $this->saveWeb($args{address}->web);
+    } elsif ($type eq 'topic') {
+        return $this->saveTopic(%args);
+    } 
+    die "can't call save(".$args{address}->getPath().")" if DEBUG;
+}
 
 sub exists {
@@ -600 +614 @@
     ASSERT($args{address}) if DEBUG;
     my $type = $args{address}->type();
-    ASSERT($type) if DEBUG;
-    if ($type eq 'web') {
+#    ASSERT($type) if DEBUG;
+    if ($type eq 'webpath') {
         return $this->webExists($args{address}->web);
     } elsif ($type eq 'topic') {
         return $this->topicExists($args{address}->web, $args{address}->topic);
     } 
-    die "can't call exists($type)" if DEBUG;
+    die "can't call exists(".$args{address}->getPath().") cos its type = $type " if DEBUG;
+}
+
+sub create {
+    my $this = shift;
+    my %args = @_;
+    ASSERT($args{address}) if DEBUG;
+    my $type = $args{address}->type();
+    ASSERT($type) if DEBUG;
+    if ($type eq 'webpath') {
+        my $newResource =  Foswiki::Meta->NEWnew( @_ );
+        return $newResource;
+    } elsif ($type eq 'topic') {
+        my $newResource =  Foswiki::Meta->NEWnew( @_ );
+        return $newResource;
+    } 
+    die "can't call load($type)" if DEBUG;
+}
+
+sub load {
+    my $this = shift;
+    my %args = @_;
+    ASSERT($args{address}) if DEBUG;
+    my $type = $args{address}->type();
+    ASSERT($type) if DEBUG;
+    if ($type eq 'webpath') {
+        my $newResource =  Foswiki::Meta->NEWnew( @_ );
+        return $newResource;
+    } elsif ($type eq 'topic') {
+        my $handler = $this->getHandler($args{address});
+
+        # check that the requested revision actually exists
+        $args{rev} = $args{address}->rev();
+        if ( defined $args{rev} ) {
+            if ( !$args{rev} || !$handler->revisionExists($args{rev}) ) {
+                $args{rev} = $handler->getLatestRevisionID();
+            }
+        }
+
+        #read the raw text file.
+        my ( $text, $isLatest ) = $handler->getRevision($args{rev});
+        unless ( defined $text ) {
+            ASSERT( not $isLatest ) if DEBUG;
+            return undef;
+        }
+
+        #parse it into a hash so we can use it to create a new Foswiki::Object
+        #$text =~ s/\r//g;    # Remove carriage returns
+        #$args{address}->setEmbeddedStoreForm($text);
+        my $parsedObj = Foswiki::Serialise::deserialise( $Foswiki::Plugins::SESSION, $text, 'embedded' );
+      
+#        return $this->topicExists($args{address}->web, $args{address}->topic);
+        my $newResource =  Foswiki::Meta->NEWnew( data=>$parsedObj, @_ );
+        return $newResource;
+    } 
+    die "can't call load($type)" if DEBUG;
 }
 

branches/scratch/core/lib/Foswiki/UI/Register.pm

@@ -1007 +1007 @@
         $fromWeb = $Foswiki::cfg{SystemWebName};
     }
-    my $tobj = Foswiki::Meta->load( $session, $fromWeb, $template );
+    my $tobj = Foswiki::Store::load(address=>{web=>$fromWeb, topic=>$template});
 
     my $log =
@@ -1036 +1036 @@
     my $user = $data->{WikiName};
 
-    my $topicObject =
-      Foswiki::Meta->new( $session, $Foswiki::cfg{UsersWebName}, $user );
+    my $topicObject = Foswiki::Store::create(address=>{web=>$Foswiki::cfg{UsersWebName}, topic=>$user});
     my $log;
     my $addText;