Changeset 990

Timestamp:

03/24/07 23:24:17 (20 months ago)

Author:

kake

Message:

Strip leading/trailing whitespace from node_image fields before committing (ticket #197).

Location:

trunk

Files:

• lib/OpenGuides/Template.pm (modified) (1 diff)
• t/44_node_image.t (modified) (2 diffs)

trunk/lib/OpenGuides/Template.pm

@@ -331 +331 @@
             my $value = $args{metadata} ? $metadata{$key}[0]
                                         : $q->param( $key );
+            if ( $value ) {
+                $value =~ s/^\s+//g;
+                $value =~ s/\s+$//g;
+            }
             $vars{$key} = $value if $value;
         }

trunk/t/44_node_image.t

@@ -16 +16 @@
 }
 
-plan tests => 28;
+plan tests => 30;
 
 my ( $config, $guide, $wiki );
@@ -187 +187 @@
 Test::HTML::Content::text_ok( $output, "http://eg.com/~kake/",
                               "...as does new node_image_url value" );
+
+# Write node with node_image field consisting only of whitespace, make
+# sure it gets stripped.
+OpenGuides::Test->write_data(
+                              guide => $guide,
+                              node  => "Angel and Greyhound",
+                              node_image => " ",
+                            );
+%node_data = $wiki->retrieve_node( "Angel and Greyhound" );
+#use Data::Dumper; print Dumper \%node_data;
+ok( !$node_data{metadata}{node_image},
+    "node_image of whitespace only isn't saved to database" );
+
+$output = $guide->display_node(
+                                id            => "Angel and Greyhound",
+                                return_output => 1,
+                              );
+$output =~ s/^Content-Type.*[\r\n]+//m;
+Test::HTML::Content::no_tag( $output, "img" => { id => "node_image" },
+                             "...or displayed on page" );