Changeset 1271 for trunk

Timestamp:

06/20/09 00:12:21 (15 months ago)

Author:

dom

Message:

Return HTTP 404 status when displaying a node that doens't exist (fixes #102)

Location:

trunk

Files:

• Changes (modified) (1 diff)
• lib/OpenGuides.pm (modified) (6 diffs)
• t/51_display_node.t (modified) (2 diffs)

trunk/Changes

@@ -7 +7 @@
         Fix some more broken POD and add POD unit test (#268)
         Don't display revision info for nodes that don't exist (#193)
+        Return HTTP 404 status when displaying a node that doens't exist (#102)
 
 0.64    23 February 2009

trunk/lib/OpenGuides.pm

@@ -274 +274 @@
                         );
 
+    my $node_exists = $wiki->node_exists($id);
+    my $http_status = $node_exists ? undef : '404 Not Found';
     %tt_vars = (
                    %tt_vars,
@@ -287 +289 @@
                    wgs84_long    => $wgs84_long,
                    wgs84_lat     => $wgs84_lat,
-                   empty_node    => !$wiki->node_exists($id)
+                   empty_node    => !$node_exists
                );
 
@@ -309 +311 @@
                                                   template      => "node.tt",
                                                   tt_vars       => \%tt_vars,
+                                                  http_status   => $http_status
                                                 );
             return $output if $return_output;
@@ -364 +367 @@
                                                 template      => "home_node.tt",
                                                 tt_vars       => \%tt_vars,
+                                                http_status   => $http_status
                                             );
         return $output if $return_output;
@@ -373 +377 @@
                                                 template      => "node.tt",
                                                 tt_vars       => \%tt_vars,
+                                                http_status   => $http_status
                                             );
         return $output if $return_output;
@@ -2252 +2257 @@
     my ($self, %args) = @_;
     my %output_conf = (
-                          wiki     => $self->wiki,
-                          config   => $self->config,
-                          node     => $args{id},
-                          template => $args{template},
-                          vars     => $args{tt_vars},
-                          cookies  => $args{cookies},
+                          wiki        => $self->wiki,
+                          config      => $self->config,
+                          node        => $args{id},
+                          template    => $args{template},
+                          vars        => $args{tt_vars},
+                          cookies     => $args{cookies},
+                          http_status => $args{http_status}
                       );
     if ( $args{content_type} ) {

trunk/t/51_display_node.t

@@ -14 +14 @@
 }
 
-plan tests => 18;
+plan tests => 19;
 
 Wiki::Toolkit::Setup::SQLite::cleardb( { dbname => "t/node.db" } );
@@ -121 +121 @@
 unlike( $output, qr{\QLast edited},
     "bogus last edited doesn't show up" );
+like ( $output, qr{404 Not Found}, "404 status for empty node" );