Ticket #203: feature-203-ip-address-mod-whitelist-01.diff

lib/Wiki/Toolkit/Store/Database.pm

@@ -450 +450 @@
 Making sure that locking/unlocking/transactions happen is left up to
 you (or your chosen subclass). This method shouldn't really be used
 directly as it might overwrite someone else's changes. Croaks on error
-but otherwise returns true.
+but otherwise returns the version number of the update just made.
 
 Supplying a ref to an array of nodes that this ones links to is
 optional, but if you do supply it then this node will be returned when
@@ -657 +657 @@
         }
     }
 
-    return 1;
+    return $version;
 }
 
 # Returns the timestamp of now, unless epoch is supplied.

lib/Wiki/Toolkit/Store/MySQL.pm

@@ -45 +45 @@
 
 Locks the node, verifies the checksum, calls
 C<write_node_post_locking> with all supplied arguments, unlocks the
-node. Returns 1 on successful writing, 0 if checksum doesn't match,
-croaks on error.
+node. Returns the version of the updated node  on successful writing, 0 if
+checksum doesn't match, croaks on error.
 
 Note:  Uses MySQL's user level locking, so any locks are released when
 the database handle disconnects.  Doing it like this because I can't seem

lib/Wiki/Toolkit/Store/Pg.pm

@@ -45 +45 @@
 
 Locks the node, verifies the checksum, calls
 C<write_node_post_locking> with all supplied arguments, unlocks the
-node. Returns 1 on successful writing, 0 if checksum doesn't match,
-croaks on error.
+node. Returns the version of the updated node  on successful writing, 0 if
+checksum doesn't match, croaks on error.
 
 =cut
 

lib/Wiki/Toolkit/Store/SQLite.pm

@@ -56 +56 @@
 
 Locks the node, verifies the checksum, calls
 C<write_node_post_locking> with all supplied arguments, unlocks the
-node. Returns 1 on successful writing, 0 if checksum doesn't match,
-croaks on error.
+node. Returns the version of the updated node  on successful writing, 0 if
+checksum doesn't match, croaks on error.
 
 =cut
 

lib/Wiki/Toolkit.pm

@@ -792 +792 @@
 is ignored except on new nodes. For existing nodes, use 
 $wiki->toggle_node_moderation to change the node moderation flag.
 
-Returns 1 on success, 0 on conflict, croaks on error.
+Returns the version of the updated node  on success, 0 on conflict, croaks on
+error.
 
 B<Note> on the metadata hashref: Any data in here that you wish to
 access directly later must be a key-value pair in which the value is
@@ -852 +853 @@
     if ($search and $content) {
         $search->index_node($node, $store->charset_encode($content) );
     }
-    return 1;
+    return $ret;
 }
 
 =item B<format>

t/021_moderation.t

@@ -6 +6 @@
 if ( scalar @Wiki::Toolkit::TestLib::wiki_info == 0 ) {
     plan skip_all => "no backends configured";
 } else {
-    plan tests => ( 86 * scalar @Wiki::Toolkit::TestLib::wiki_info );
+    plan tests => ( 89 * scalar @Wiki::Toolkit::TestLib::wiki_info );
 }
 
 my $iterator = Wiki::Toolkit::TestLib->new_wiki_maker;
@@ -61 +61 @@
 
 
        # Update it
-    ok( $wiki->write_node("Moderation", "yy", $mn_data{checksum}),
-               "Can update where moderation is enabled" );
+    my $nmn_ver = $wiki->write_node("Moderation", "yy", $mn_data{checksum});
+       ok( $nmn_ver, "Can update where moderation is enabled" );
     my %nmn_data = $wiki->retrieve_node("Moderation");
     my %nmnv_data = $wiki->retrieve_node(name=>"Moderation", version=>2);
+    is( $nmn_data{version}, '1', "Latest moderated version" );
+    is( $nmnv_data{version}, '2', "Latest unmoderated version" );
+    is( $nmn_ver, '2', "Latest (unmoderated) version returned by write_node" );
 
        # Check content was updated right
        is( $nmnv_data{content}, "yy", "Version 2 text");