Changeset 790

Timestamp:

05/19/06 12:08:19 (3 years ago)

Author:

nick

Message:

Pass the requested feed listing through all the feeds code, rather than just assuming it's recent_changes

Location:

trunk

Files:

• . (modified) (1 prop)
• Changes (modified) (1 diff)
• lib/OpenGuides.pm (modified) (5 diffs)
• lib/OpenGuides/Feed.pm (modified) (2 diffs)
• t/22_rss_modwiki.t (modified) (2 diffs)
• wiki.cgi (modified) (2 diffs)

trunk/Changes

@@ -1 +1 @@
 "#" items refer to tickets. See <http://dev.openguides.org/report/9> for details.
+
+0.54_02 
+        Pass the feed_listing (currently just recent_changes) through all
+        the feed related code, rather than assuming it'll only ever be
+        recent changes. Will allow other listings of nodes to be handled
+        in the future.
 
 0.54_01 16 May 2006

trunk/lib/OpenGuides.pm

@@ -646 +646 @@
   $guide->display_feed(
                          feed_type          => 'rss',
+                         feed_listing       => 'recent_changes',
                          items              => 10,
                          ignore_minor_edits => 1,
@@ -653 +654 @@
   # All edits bob has made to pub pages in the last week in Atom format
   $guide->display_feed(
-                         feed_type => 'atom',
-                         days      => 7,
-                         username  => "bob",
-                         category  => "Pubs",
+                         feed_type    => 'atom',
+                         feed_listing => 'recent_changes',
+                         days         => 7,
+                         username     => "bob",
+                         category     => "Pubs",
                      );
 
@@ -662 +664 @@
 "rss" and "atom".
 
+C<feed_listing> is a mandatory parameter. Supported values at present 
+are "recent_changes". (More values are coming soon though!)
+
 As with other methods, the C<return_output> parameter can be used to
 return the output instead of printing it to STDOUT.
@@ -672 +677 @@
     my $feed_type = $args{feed_type};
     croak "No feed type given" unless $feed_type;
+
+    my $feed_listing = $args{feed_listing};
+    croak "No feed listing given" unless $feed_listing;
     
     my $return_output = $args{return_output} ? 1 : 0;
@@ -686 +694 @@
                        ignore_minor_edits => $ignore_minor_edits,
                        feed_type          => $feed_type,
+                       feed_listing       => $feed_listing,
                    );
     my %filter;

trunk/lib/OpenGuides/Feed.pm

@@ -61 +61 @@
     
     my $feed_type = $args{feed_type};
+    my $feed_listing = $args{feed_listing};
     
     my %known_types = (
@@ -66 +67 @@
                           'atom' => 1,
                       );
+    my %known_listings = (
+                          'recent_changes' => 1,
+                         );
                       
     croak "No feed type specified" unless $feed_type;
     croak "Unknown feed type: $feed_type" unless $known_types{$feed_type};
 
+    croak "No feed listing specified" unless $feed_listing;
+    croak "Unknown feed listing: $feed_listing" unless $known_listings{$feed_listing};
+
     if ($feed_type eq 'rss') {
-        return $self->rss_maker->recent_changes(%args);
+        if ($feed_listing eq 'recent_changes') {
+            return $self->rss_maker->recent_changes(%args);
+        }
     }
     elsif ($feed_type eq 'atom') {
-        return $self->atom_maker->recent_changes(%args);
+        if ($feed_listing eq 'recent_changes') {
+            return $self->atom_maker->recent_changes(%args);
+        }
     }
 }

trunk/t/22_rss_modwiki.t

@@ -46 +46 @@
                                   config => $config );
 
-my $rss = eval { $feed->make_feed(feed_type => 'rss'); };
+my $rss = eval { $feed->make_feed(feed_type => 'rss', feed_listing => 'recent_changes'); };
 is( $@, "", "->make_feed for rss doesn't croak" );
 
@@ -100 +100 @@
 $output = $guide->display_feed(
                                feed_type          => "rss",
+                               feed_listing       => "recent_changes",
                                items              => 5,
                                username           => "bob",

trunk/wiki.cgi

@@ -105 +105 @@
                                category locale );
                 $args{feed_type} = 'rss';
+                $args{feed_listing} = 'recent_changes';
                 $guide->display_feed( %args );
             } elsif ( $feed eq "chef_dan" ) {
@@ -116 +117 @@
                            category locale );
             $args{feed_type} = 'atom';
+            $args{feed_listing} = 'recent_changes';
             $guide->display_feed( %args );
         } else {