Changeset 1026

Timestamp:

04/28/07 09:40:21 (19 months ago)

Author:

kake

Message:

Fixed bug in OpenGuides::Feed - HTML equivalent link now works even if your script_name isn't blank.

Location:

trunk

Files:

• Changes (modified) (1 diff)
• lib/OpenGuides/Feed.pm (modified) (2 diffs)
• t/22_feed_recent_changes.t (modified) (7 diffs)

trunk/Changes

@@ -5 +5 @@
 
 0.60
+        Fixed bug in OpenGuides::Feed - HTML equivalent link now works even
+          if your script_name isn't blank.
         Rewrote the HTML of the edit page to use <div>s rather than tables.
           Note that you will probably want to provide at least basic styling

trunk/lib/OpenGuides/Feed.pm

@@ -11 +11 @@
 use URI::Escape;
 use Carp 'croak';
+
+use base qw( Class::Accessor );
+# Add more here if we need them - this one added for testing purposes.
+my @variables = qw( html_equiv_link );
+OpenGuides::Feed->mk_accessors( @variables );
 
 sub new {
@@ -53 +58 @@
     $self->{site_description} = $config->site_desc         || "";
     $self->{og_version}       = $args{og_version};
-    $self->{html_equiv_link}  = $self->{config}->script_url . '?action=rc';
+    $self->{html_equiv_link}  = $self->{config}->script_url
+                                . $self->{config}->script_name . '?action=rc';
 
     $self;

trunk/t/22_feed_recent_changes.t

@@ -4 +4 @@
 use OpenGuides;
 use OpenGuides::Feed;
+use OpenGuides::Test;
 use OpenGuides::Utils;
 use Test::More;
@@ -21 +22 @@
 # Which feed types do we test?
 my @feed_types = qw( rss atom );
-plan tests => 10 * scalar @feed_types;
+plan tests => 12 * scalar @feed_types;
 
 my %content_types = (rss=>'application/rdf+xml', atom=>'application/atom+xml');
@@ -31 +32 @@
 
     Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } );
-    my $config = OpenGuides::Config->new(
-           vars => {
-                     dbtype             => "sqlite",
-                     dbname             => "t/node.db",
-                     indexing_directory => "t/indexes",
-                     script_name        => "wiki.cgi",
-                     script_url         => "http://example.com/",
-                     site_name          => "Test Site",
-                     template_path      => "./templates",
-                     home_name          => "Home",
-                     use_plucene        => 1,
-                     http_charset       => "UTF-7",
-                   }
-    );
+    my $config = OpenGuides::Test->make_basic_config;
+    $config->script_name( "wiki.cgi" );
+    $config->script_url( "http://example.com/" );
+    $config->http_charset( "UTF-7" );
 
     # Basic sanity check first.
@@ -52 +43 @@
                                       config => $config );
     is( $feed->default_content_type($feed_type), $content_types{$feed_type}, "Return the right content type" );
+
+    like( $feed->html_equiv_link, qr|http://example.com/wiki.cgi\?|,
+          "html_equiv_link looks right" );
 
     my $feed_output = eval { $feed->make_feed(feed_type => $feed_type, feed_listing => 'recent_changes'); };
@@ -65 +59 @@
     # Now write some data, first a minor edit then a non-minor one.
     my $guide = OpenGuides->new( config => $config );
-        
-    # Set up CGI parameters ready for a node write.
-    # Most of these are in here to avoid uninitialised value warnings.
-    my $q = CGI->new;
-    $q->param( -name => "content", -value => "foo" );
-    $q->param( -name => "categories", -value => "" );
-    $q->param( -name => "locales", -value => "" );
-    $q->param( -name => "phone", -value => "" );
-    $q->param( -name => "fax", -value => "" );
-    $q->param( -name => "website", -value => "" );
-    $q->param( -name => "hours_text", -value => "" );
-    $q->param( -name => "address", -value => "" );
-    $q->param( -name => "postcode", -value => "" );
-    $q->param( -name => "map_link", -value => "" );
-    $q->param( -name => "os_x", -value => "" );
-    $q->param( -name => "os_y", -value => "" );
-    $q->param( -name => "username", -value => "bob" );
-    $q->param( -name => "comment", -value => "foo" );
-    $q->param( -name => "edit_type", -value => "Minor tidying" );
-    $ENV{REMOTE_ADDR} = "127.0.0.1";
 
-    my $output = $guide->commit_node(
-                                      return_output => 1,
-                                      id => "Wombats",
-                                      cgi_obj => $q,
-                                    );
-
-    $q->param( -name => "edit_type", -value => "Normal edit" );
-    $output = $guide->commit_node(
-                                   return_output => 1,
-                                   id => "Badgers",
-                                   cgi_obj => $q,
-                                 );
-
-    $q->param( -name => "username", -value => "Kake" );
-    $output = $guide->commit_node(
-                                   return_output => 1,
-                                   id => "Wombles",
-                                   cgi_obj => $q,
-                                 );
+    OpenGuides::Test->write_data(
+                                  node          => "Wombats",
+                                  guide         => $guide,
+                                  username      => "bob",
+                                  edit_type     => "Minor tidying",
+                                  return_output => 1,
+                                );
+    OpenGuides::Test->write_data(
+                                  node          => "Badgers",
+                                  guide         => $guide,
+                                  username      => "bob",
+                                  edit_type     => "Normal edit",
+                                  return_output => 1,
+                                );
+    OpenGuides::Test->write_data(
+                                  node          => "Wombles",
+                                  guide         => $guide,
+                                  username      => "Kake",
+                                  edit_type     => "Normal edit",
+                                  return_output => 1,
+                                );
 
     # Check that the writes went in.
@@ -112 +88 @@
 
     # Check that the minor edits can be filtered out.
-    $output = $guide->display_feed(
-                                   feed_type          => $feed_type,
-                                   feed_listing       => "recent_changes",
-                                   items              => 5,
-                                   username           => "bob",
-                                   ignore_minor_edits => 1,
-                                   return_output      => 1,
-                                 );
+    my $output = $guide->display_feed(
+                                       feed_type          => $feed_type,
+                                       feed_listing       => "recent_changes",
+                                       items              => 5,
+                                       username           => "bob",
+                                       ignore_minor_edits => 1,
+                                       return_output      => 1,
+                                     );
     unlike( $output, qr/Wombats/, "minor edits filtered out when required" );
     like( $output, qr/Badgers/, "but normal edits still in" );
@@ -125 +101 @@
     # Check that the username parameter is taken notice of.
     unlike( $output, qr/Wombles/, "username parameter taken note of" );
+
+    # Now make sure that the HTTP euiv link still works with a blank scriptname
+    $config->script_name( "" );
+    $wiki = OpenGuides::Utils->make_wiki_object( config => $config );
+
+    $feed = OpenGuides::Feed->new( wiki   => $wiki,
+                                   config => $config );
+    like( $feed->html_equiv_link, qr|http://example.com/\?|,
+          "html_equiv_link looks right with blank script_name" );
 }