Changeset 577

Timestamp:

Apr 12, 2015, 2:33:25 PM (6 years ago)

Author:

kake

Message:

Make ->rename_node try to ensure a valid new node name (depending on formatter parameters).

Location:

wiki-toolkit/trunk

Files:

• Changes (modified) (1 diff)
• lib/Wiki/Toolkit/Store/Database.pm (modified) (1 diff)
• t/040_rename.t (modified) (2 diffs)

wiki-toolkit/trunk/Changes

@@ -1 @@
-0.84   23 February 2014
+0.85
+        Make ->rename_node try to ensure a valid new node name (depending on
+          formatter parameters).
+
+0.84    23 February 2014
         Add new options to Lucy and Plucene backends: (1) content munging
           before search indexing, (2) total exclusion of certain nodes from

wiki-toolkit/trunk/lib/Wiki/Toolkit/Store/Database.pm

@@ -723 +723 @@
     my $dbh = $self->dbh;
     my $formatter = $wiki->{_formatter};
+
+    # For formatters that support it, run the new name through the node name
+    # to param conversion and back again, to make sure any necessary munging
+    # gets done.
+    if ( $formatter->can( "node_name_to_node_param" )
+         && $formatter->can( "node_param_to_node_name" ) ) {
+        $new_name = $formatter->node_param_to_node_name(
+                        $formatter->node_name_to_node_param( $new_name ) );
+    }
 
     my $timestamp = $self->_get_timestamp();

wiki-toolkit/trunk/t/040_rename.t

@@ -7 +7 @@
     plan skip_all => "no backends configured";
 } else {
-    plan tests => ( 35 * scalar @Wiki::Toolkit::TestLib::wiki_info );
+    plan tests => ( 39 * scalar @Wiki::Toolkit::TestLib::wiki_info );
 }
 
@@ -173 +173 @@
     is( 1, $anode3{'version'}, "no new version" );
 
-    # Now with implicit and explicit
+    # Ensure force_ucfirst_nodes is respected if and only if it's switched on.
+    # Note that this isn't the same as the perl function ucfirst, which only
+    # uppercases the first character of a string - it uppercases the first
+    # character of each word.
+    eval { require Wiki::Toolkit::Formatter::UseMod; };
+    SKIP: {
+        skip "Wiki::Toolkit::Formatter::UseMod not available", 4 if $@;
+
+        # First check with it on.
+        $wiki->{_formatter} = Wiki::Toolkit::Formatter::UseMod->new(
+            force_ucfirst_nodes => 1,
+            munge_urls => 1,
+        );
+        $wiki->write_node( "Test Node", "A test node" )
+            or die "Couldn't write Test Node";
+        # "testing node" should be forced to "Testing Node"
+        $wiki->rename_node( "Test Node", "testing node" );
+        ok( $wiki->retrieve_node( "Testing Node" ),
+            "New name for renamed node is forced ucfirst if we want it to be");
+        ok( !$wiki->retrieve_node( "testing node" ),
+            "... and the non-ucfirst name is not found" );
+
+        # And now check with it off.
+        $wiki->{_formatter} = Wiki::Toolkit::Formatter::UseMod->new(
+            force_ucfirst_nodes => 0,
+            munge_urls => 1,
+        );
+        $wiki->write_node( "Test Node Two", "Another test node" )
+            or die "Couldn't write Test Node Two";
+        $wiki->rename_node( "Test Node Two", "testing node two" );
+        ok( !$wiki->retrieve_node( "Testing Node Two" ),
+            "New name for renamed node isn't forced ucfirst if we don't "
+            . "want it to be" );
+        ok( $wiki->retrieve_node( "testing node two" ),
+            "... and the non-ucfirst name is found instead" );
+    }
 }