openguides-commits June 2006

openguides-commits@lists.openguides.org

1 participants
24 discussions

r816 - trunk/templates
by svnadmin＠urchin.earth.li 22 Jun '06

22 Jun '06

Author: nick Date: 2006-06-22 15:51:06 +0100 (Thu, 22 Jun 2006) New Revision: 816 Modified: trunk/templates/site_index.tt Log: (Correctly) add links to rdf, rss and atom Modified: trunk/templates/site_index.tt =================================================================== --- trunk/templates/site_index.tt 2006-06-22 14:43:15 UTC (rev 815) +++ trunk/templates/site_index.tt 2006-06-22 14:51:06 UTC (rev 816) @@ -30,11 +30,11 @@ <p> This list is available as - <a href="[% cgi_url %]?action=index;index_type=[% type %];index_value=[% value %];format=rdf">rdf</a>, + <a href="[% cgi_url %]?action=index;index_type=[% criterion.type %];index_value=[% criterion.value %];format=rdf">rdf</a>, or as a - <a href="[% cgi_url %]?action=index;index_type=[% type %];index_value=[% value %];format=rss">rss feed</a>, + <a href="[% cgi_url %]?action=index;index_type=[% criterion.type %];index_value=[% criterion.value %];format=rss">rss feed</a>, or as an - <a href="[% cgi_url %]?action=index;index_type=[% type %];index_value=[% value %];format=atom">atom feed</a>. + <a href="[% cgi_url %]?action=index;index_type=[% criterion.type %];index_value=[% criterion.value %];format=atom">atom feed</a>. </p> [% INCLUDE footer.tt %]

1 0

r815 - trunk/templates
by svnadmin＠urchin.earth.li 22 Jun '06

22 Jun '06

Author: nick Date: 2006-06-22 15:43:15 +0100 (Thu, 22 Jun 2006) New Revision: 815 Modified: trunk/templates/site_index.tt Log: Add links to rdf, rss and atom Modified: trunk/templates/site_index.tt =================================================================== --- trunk/templates/site_index.tt 2006-06-22 14:30:44 UTC (rev 814) +++ trunk/templates/site_index.tt 2006-06-22 14:43:15 UTC (rev 815) @@ -27,4 +27,14 @@ [% END %] </ol> </div> + +<p> + This list is available as + <a href="[% cgi_url %]?action=index;index_type=[% type %];index_value=[% value %];format=rdf">rdf</a>, + or as a + <a href="[% cgi_url %]?action=index;index_type=[% type %];index_value=[% value %];format=rss">rss feed</a>, + or as an + <a href="[% cgi_url %]?action=index;index_type=[% type %];index_value=[% value %];format=atom">atom feed</a>. +</p> + [% INCLUDE footer.tt %]

1 0

r814 - in trunk: lib t
by svnadmin＠urchin.earth.li 22 Jun '06

22 Jun '06

Author: nick Date: 2006-06-22 15:30:44 +0100 (Thu, 22 Jun 2006) New Revision: 814 Modified: trunk/lib/OpenGuides.pm trunk/t/53_show_index.t Log: Support RSS and Atom for category and locale indicies, + test for this Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2006-06-22 14:11:27 UTC (rev 813) +++ trunk/lib/OpenGuides.pm 2006-06-22 14:30:44 UTC (rev 814) @@ -484,6 +484,13 @@ format => "rdf", ); + # RSS / Atom version (recent changes style). + $guide->show_index( + type => "locale", + value => "Holborn", + format => "rss", + ); + # Or return output as a string (useful for writing tests). $guide->show_index( type => "category", @@ -567,6 +574,24 @@ $tt_vars{display_google_maps} = 1; # override for this page $template = "map_index.tt"; + } elsif( $args{format} eq "rss" || $args{format} eq "atom") { + # They really wanted a recent changes style rss/atom feed + my $feed_type = $args{format}; + my ($feed,$content_type) = $self->get_feed_and_content_type($feed_type); + + # Grab the actual node data out of @nodes + my @node_data; + foreach my $node (@nodes) { + $node->{node_data}->{name} = $node->{name}; + push @node_data, $node->{node_data}; + } + + my $output = "Content-Type: ".$content_type."\n"; + $output .= $feed->build_feed_for_nodes($feed_type, @node_data); + + return $output if $args{return_output}; + print $output; + return; } } else { $template = "site_index.tt"; @@ -640,6 +665,37 @@ print $output; } +=item B<get_feed_and_content_type> + +Fetch the OpenGuides feed object, and the output content type, for the +supplied feed type. + +Handles all the setup for the OpenGuides feed object. +=cut +sub get_feed_and_content_type { + my ($self, $feed_type) = @_; + + my $feed = OpenGuides::Feed->new( + wiki => $self->wiki, + config => $self->config, + og_version => $VERSION, + ); + + my $content_type; + + if ($feed_type eq 'rss') { + $content_type = "application/rdf+xml"; + } + elsif ($feed_type eq 'atom') { + $content_type = "application/atom+xml"; + } + else { + croak "Unknown feed type given: $feed_type"; + } + + return ($feed, $content_type); +} + =item B<display_feed> # Last ten non-minor edits to Hammersmith pages in RSS 1.0 format @@ -712,24 +768,11 @@ } - my $feed = OpenGuides::Feed->new( - wiki => $self->wiki, - config => $self->config, - og_version => $VERSION, - ); + # Get the feed object, and the content type + my ($feed,$content_type) = $self->get_feed_and_content_type($feed_type); - my $output; + my $output = "Content-Type: ".$content_type."\n"; - if ($feed_type eq 'rss') { - $output = "Content-Type: application/rdf+xml\n"; - } - elsif ($feed_type eq 'atom') { - $output = "Content-Type: application/atom+xml\n"; - } - else { - croak "Unknown feed type given: $feed_type"; - } - # Get the feed, and the timestamp, in one go my ($feed_output, $feed_timestamp) = $feed->make_feed( %criteria ); Modified: trunk/t/53_show_index.t =================================================================== --- trunk/t/53_show_index.t 2006-06-22 14:11:27 UTC (rev 813) +++ trunk/t/53_show_index.t 2006-06-22 14:30:44 UTC (rev 814) @@ -2,13 +2,13 @@ use Wiki::Toolkit::Setup::SQLite; use OpenGuides; use OpenGuides::Test; -use Test::More tests => 6; +use Test::More tests => 17; # 19 when all enabled eval { require DBD::SQLite; }; my $have_sqlite = $@ ? 0 : 1; SKIP: { - skip "DBD::SQLite not installed - no database to test with", 6 + skip "DBD::SQLite not installed - no database to test with", 17 unless $have_sqlite; Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); @@ -32,6 +32,8 @@ $wiki->write_node( "Test Page 2", "foo", undef, { category => "Alpha" } ) or die "Couldn't write node"; + + # Test the normal, HTML version my $output = eval { $guide->show_index( type => "category", @@ -44,6 +46,7 @@ "...and includes correct links" ); unlike( $output, qr|<title>\s*-|, "...sets <title> correctly" ); + # Test the RDF version $output = $guide->show_index( type => "category", value => "Alpha", @@ -52,4 +55,43 @@ ); like( $output, qr|Content-Type: application/rdf\+xml|, "RDF output gets content-type of application/rdf+xml" ); + like( $output, qr|<rdf:RDF|, "Really is rdf" ); + like( $output, qr|<dc:title>Category Alpha</dc:title>|, "Right rdf title" ); + my @entries = ($output =~ /(\<rdf\:li\>)/g); + is( 2, scalar @entries, "Right number of nodes included in rdf" ); + + # Test the RSS version + $output = eval { + $guide->show_index( + type => "category", + value => "Alpha", + return_output => 1, + format => "rss", + ); + }; + is( $@, "", "->show_index doesn't die when asked for rss" ); + like( $output, qr|Content-Type: application/rdf\+xml|, + "RSS output gets content-type of application/rdf+xml" ); + like( $output, "/\<rdf\:RDF.*?http\:\/\/purl.org\/rss\//s", "Really is rss" ); + #like( $output, qr|<title>Category Alpha</title>|, "Right rss title" ); + my @entries = ($output =~ /(\<\/item\>)/g); + is( 2, scalar @entries, "Right number of nodes included in rss" ); +warn($output); + + # Test the Atom version + $output = eval { + $guide->show_index( + type => "category", + value => "Alpha", + return_output => 1, + format => "atom", + ); + }; + is( $@, "", "->show_index doesn't die when asked for atom" ); + like( $output, qr|Content-Type: application/atom\+xml|, + "Atom output gets content-type of application/atom+xml" ); + like( $output, qr|<feed|, "Really is atom" ); + #like( $output, qr|<title>Category Alpha</title>|, "Right atom title" ); + my @entries = ($output =~ /(\<entry\>)/g); + is( 2, scalar @entries, "Right number of nodes included in atom" ); }

1 0

r813 - trunk/lib/OpenGuides
by svnadmin＠urchin.earth.li 22 Jun '06

22 Jun '06

Author: nick Date: 2006-06-22 15:11:27 +0100 (Thu, 22 Jun 2006) New Revision: 813 Modified: trunk/lib/OpenGuides/Feed.pm Log: Add method for generating a feed from an arbitary list of nodes Modified: trunk/lib/OpenGuides/Feed.pm =================================================================== --- trunk/lib/OpenGuides/Feed.pm 2006-06-22 13:53:46 UTC (rev 812) +++ trunk/lib/OpenGuides/Feed.pm 2006-06-22 14:11:27 UTC (rev 813) @@ -56,6 +56,17 @@ $self; } +=item B<make_feed> +Produce one of the standard feeds, in the requested format. + + +my $feed_contents = feeds->make_feed( + feed_type => 'rss', + feed_listing => 'recent_changes' + ); + +Passes additional arguments through to the underlying Wiki::Toolkit::Feed +=cut sub make_feed { my ($self, %args) = @_; @@ -82,6 +93,41 @@ } } +=item B<build_feed_for_nodes> +For the given feed type, build a feed from the supplied list of nodes. +Will figure out the feed timestamp from the newest node, and output a + last modified header based on this. + +my @nodes = $wiki->fetch_me_nodes_I_like(); +my $feed_contents = $feed->build_feed_for_nodes("rss", @nodes); +=cut +sub build_feed_for_nodes { + my ($self, $format, @nodes) = @_; + + # Grab our feed maker + my $maker = $self->fetch_maker($format); + + # Find our newest node, so we can use that for the feed timestamp + my $newest_node; + foreach my $node (@nodes) { + if($node->{last_modified}) { + if((!$newest_node) || $node->{last_modified} < $newest_node->{last_modified}) { + $newest_node = $node; + } + } + } + + # Grab the timestamp, and do our header + my $timestamp = $maker->feed_timestamp($newest_node); + + my $feed = "Last-Modified: ".$timestamp."\n\n"; + + # Generate the feed itself + $feed .= $maker->generate_node_list_feed($timestamp, @nodes); + + return $feed; +} + =item B<fetch_maker> For the given feed type, identify and return the maker routine for feeds of that type.

1 0

r812 - trunk/t
by svnadmin＠urchin.earth.li 22 Jun '06

22 Jun '06

Author: nick Date: 2006-06-22 14:53:46 +0100 (Thu, 22 Jun 2006) New Revision: 812 Modified: trunk/t/68_bug_website_displayed.t Log: Update the test for the new microformat templates Modified: trunk/t/68_bug_website_displayed.t =================================================================== --- trunk/t/68_bug_website_displayed.t 2006-06-15 14:55:54 UTC (rev 811) +++ trunk/t/68_bug_website_displayed.t 2006-06-22 13:53:46 UTC (rev 812) @@ -21,6 +21,6 @@ id => "South Croydon Station", return_output => 1, ); - like( $output, qr#Website:</span> <a href="http://www.example.com/">http://www.example.com/</a>#, "website correctly displayed" ); + like( $output, qr#Website:</span> <span class="url"><a href="http://www.example.com/">http://www.example.com/</a>#, "website correctly displayed" ); }

1 0

r811 - trunk/templates
by svnadmin＠urchin.earth.li 15 Jun '06

15 Jun '06

Author: nick Date: 2006-06-15 15:55:54 +0100 (Thu, 15 Jun 2006) New Revision: 811 Modified: trunk/templates/display_metadata.tt trunk/templates/node.tt trunk/templates/node_history.tt trunk/templates/recent_changes.tt Log: Microformat fun - support hCard, hReview and geo microformats where possible Modified: trunk/templates/display_metadata.tt =================================================================== --- trunk/templates/display_metadata.tt 2006-06-14 21:27:32 UTC (rev 810) +++ trunk/templates/display_metadata.tt 2006-06-15 14:55:54 UTC (rev 811) @@ -1,14 +1,16 @@ [% USE CGI %]  -<div id="metadata"> +<div id="metadata" class="vcard"> +  + <span class="fn" style="display:none">[% node_name %]</span> [% IF phone OR fax OR address OR postcode OR formatted_website_text OR hours_text OR map_link %] <ul id="general_metadata"> [% IF phone %] <li class="telephone"> - <span class="metadata_label">Telephone:</span> [% CGI.escapeHTML(phone) %] + <span class="metadata_label">Telephone:</span> <span class="tel">[% CGI.escapeHTML(phone) %]</span> </li> [% END %] [% IF fax %] @@ -19,7 +21,7 @@ [% IF address %] <li class="address"> <span class="metadata_label">Address:</span> - [% CGI.escapeHTML(address) %] [%# uncomment at left to show city %] + <span class="adr"><span class="street-address">[% CGI.escapeHTML(address) %]</span></span> [%# uncomment at left to show city %] [% IF map_link %] <a href="[% map_link %]">(map of this place)</a> [% END %] @@ -32,12 +34,12 @@ [% IF postcode %] <li class="postcode"> <span class="metadata_label">Postcode:</span> - [% CGI.escapeHTML(postcode) %] + <span class="adr"><span class="postal-code">[% CGI.escapeHTML(postcode) %]</span></span> </li> [% END %] [% IF formatted_website_text %] <li class="website_link"> - <span class="metadata_label">Website:</span> [% formatted_website_text %] + <span class="metadata_label">Website:</span> <span class="url">[% formatted_website_text %]</span> </li> [% END %] [% IF hours_text %] @@ -56,7 +58,7 @@ <li class="categories_list"> <span class="metadata_label">Categories:</span> [% FOREACH category = categories %] - <a href="[% category.url %]">[% category.name %]</a>[%- "," UNLESS loop.last %] + <a href="[% category.url %]" class="category">[% category.name %]</a>[%- "," UNLESS loop.last %] [% END %] </li> [% END %] @@ -65,7 +67,7 @@ <li class="locales_list"> <span class="metadata_label">Locales:</span> [% FOREACH locale = locales %] - <a href="[% locale.url %]">[% locale.name %]</a>[%- "," UNLESS loop.last %] + <a href="[% locale.url %]" class="addr locality">[% locale.name %]</a>[%- "," UNLESS loop.last %] [% END %] </li> [% END %] Modified: trunk/templates/node.tt =================================================================== --- trunk/templates/node.tt 2006-06-14 21:27:32 UTC (rev 810) +++ trunk/templates/node.tt 2006-06-15 14:55:54 UTC (rev 811) @@ -3,7 +3,7 @@ [% INCLUDE banner.tt %] <div id="content"> [% INCLUDE navbar.tt %] -<div id="maincontent"> +<div id="maincontent" class="hreview"> [% IF oldid %] <div id="redirect_message">(redirected from <a href="[% full_cgi_url %]?id=[% oldid %];redirect=0">[% oldid.replace('_', ' ') %]</a>)</div> [% END %] @@ -14,7 +14,7 @@ //<![CDATA[ var map = new GMap(document.getElementById("map")); map.addControl(new GSmallMapControl()); - map.centerAndZoom(new GPoint([% longitude %], [% latitude %]), 3); + map.centerAndZoom(new GPoint([% wgs84_long %], [% wgs84_lat %]), 3); var point0 = new GPoint([% wgs84_long %], [% wgs84_lat %]); var marker0 = new GMarker(point0,baseIcon); GEvent.addListener(marker0, "click", function() { @@ -45,7 +45,9 @@ [% INCLUDE display_metadata.tt %]  +<div id="content_text" class="description"> [% content %] +</div>  [% TRY %] @@ -72,21 +74,34 @@ </div> [% END %] [% IF (latitude AND longitude) OR (os_x AND os_y) OR (osie_x AND osie_y) %] -<div id="coordinates"> +<div id="coordinates" class="geo"> [% END %] [% IF os_x AND os_y %] - <small>OS X co-ord: [% CGI.escapeHTML(os_x) %]</small> + <small>OS X co-ord: + <abbr class="osgb_x" title="[% CGI.escapeHTML(os_x) %]">[% CGI.escapeHTML(os_x) %]</abbr> + </small>     - <small>OS Y co-ord: [% CGI.escapeHTML(os_y) %]</small> + <small>OS Y co-ord: + <abbr class="osgb_y" title="[% CGI.escapeHTML(os_y) %]">[% CGI.escapeHTML(os_y) %]</abbr> + </small>     [% ELSIF osie_x AND osie_y %] - <small>OS IE X co-ord: [% CGI.escapeHTML(osie_x) %]</small> + <small>OS IE X co-ord: + <abbr class="osie_x" title="[% CGI.escapeHTML(osie_x) %]">[% CGI.escapeHTML(osie_x) %]</abbr> + </small>     - <small>OS IE Y co-ord: [% CGI.escapeHTML(osie_y) %]</small> + <small>OS IE Y co-ord: + <abbr class="osie_y" title="[% CGI.escapeHTML(osie_y) %]">[% CGI.escapeHTML(osie_y) %]</abbr> + </small>     [% END %] [% IF latitude AND longitude %] - <small>(Latitude: [% latitude %] Longitude: [% longitude %])</small> + <small> + (Latitude: + <abbr class="latitude" title="[% wgs84_lat %]">[% latitude %]</abbr> + Longitude: + <abbr class="longitude" title="[% wgs84_long %]">[% longitude %]</abbr>) + </small> [% END %] [% IF (latitude AND longitude) OR (os_x AND os_y) OR (osie_x AND osie_y)%] </div> @@ -111,7 +126,8 @@ <a href="[% cgi_url %]?id=[% node_param %];version=[% version - 1 %];diffversion=[% version %]">diff</a>). [% END %] [% ELSE %] - This is version [% version %] (as of [% last_modified %]). + This is version <span class="version">[% version %]</span> + (as of [% last_modified %]). <a href="[% cgi_url %]?[% node_param %]">View current version.</a> [% END %] [% IF version AND version > 1 %] Modified: trunk/templates/node_history.tt =================================================================== --- trunk/templates/node_history.tt 2006-06-14 21:27:32 UTC (rev 810) +++ trunk/templates/node_history.tt 2006-06-15 14:55:54 UTC (rev 811) @@ -38,4 +38,11 @@ <a href="[% cgi_url %]?[% node_param %]">View current revision</a> </p> +<p> + This list is available as a + <a href="[% cgi_url %]?action=list_all_versions;format=rss;id=[% node_param %]">rss feed</a> + and as an + <a href="[% cgi_url %]?action=list_all_versions;format=atom;id=[% node_param %]">atom feed</a>. +</p> + [% INCLUDE footer.tt %] Modified: trunk/templates/recent_changes.tt =================================================================== --- trunk/templates/recent_changes.tt 2006-06-14 21:27:32 UTC (rev 810) +++ trunk/templates/recent_changes.tt 2006-06-15 14:55:54 UTC (rev 811) @@ -80,4 +80,11 @@ [% END %] </div> + +<p> + This list is available as a + <a href="[% cgi_url %]?action=rc;format=rss">rss feed</a> + and as an + <a href="[% cgi_url %]?action=rc;format=atom">atom feed</a>. +</p> [% INCLUDE footer.tt %]

1 0

r810 - in trunk: . lib
by svnadmin＠urchin.earth.li 14 Jun '06

14 Jun '06

Author: dom Date: 2006-06-14 22:27:32 +0100 (Wed, 14 Jun 2006) New Revision: 810 Modified: trunk/Changes trunk/PREREQUISITES trunk/lib/OpenGuides.pm trunk/wiki.cgi Log: Release bug-fix Modified: trunk/Changes =================================================================== --- trunk/Changes 2006-06-14 18:30:55 UTC (rev 809) +++ trunk/Changes 2006-06-14 21:27:32 UTC (rev 810) @@ -1,5 +1,9 @@ "#" items refer to tickets. See <http://dev.openguides.org/report/9> for details. +0.56 14 June 2006 + Fix bug introduced in feed formatting where Atom feeds would be + produced when asked for RSS and vice versa. + 0.55 13 June 2006 Versioned dependency on Wiki::Toolkit to avoid development versions Modified: trunk/PREREQUISITES =================================================================== --- trunk/PREREQUISITES 2006-06-14 18:30:55 UTC (rev 809) +++ trunk/PREREQUISITES 2006-06-14 21:27:32 UTC (rev 810) @@ -1,4 +1,4 @@ -Modules required by OpenGuides 0.55 +Modules required by OpenGuides 0.56 =================================== Algorithm::Diff (version 0.13 or later. Note that the latest version uses Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2006-06-14 18:30:55 UTC (rev 809) +++ trunk/lib/OpenGuides.pm 2006-06-14 21:27:32 UTC (rev 810) @@ -14,7 +14,7 @@ use vars qw( $VERSION ); -$VERSION = '0.55'; +$VERSION = '0.56'; =head1 NAME Modified: trunk/wiki.cgi =================================================================== --- trunk/wiki.cgi 2006-06-14 18:30:55 UTC (rev 809) +++ trunk/wiki.cgi 2006-06-14 21:27:32 UTC (rev 810) @@ -4,7 +4,7 @@ use warnings; use vars qw( $VERSION ); -$VERSION = '0.55'; +$VERSION = '0.56'; use CGI qw/:standard/; use CGI::Carp qw(croak);

1 0

r809 - trunk
by svnadmin＠urchin.earth.li 14 Jun '06

14 Jun '06

Author: nick Date: 2006-06-14 19:30:55 +0100 (Wed, 14 Jun 2006) New Revision: 809 Modified: trunk/Changes Log: Add a note about the node versions feed Modified: trunk/Changes =================================================================== --- trunk/Changes 2006-06-14 17:43:03 UTC (rev 808) +++ trunk/Changes 2006-06-14 18:30:55 UTC (rev 809) @@ -3,6 +3,9 @@ 0.55 13 June 2006 Versioned dependency on Wiki::Toolkit to avoid development versions + Support generating feeds of a node's version listing, in addition + to feeds of the recent changes. For more information on OpenGuides + feeds, see http://dev.openguides.org/wiki/FeedsIntro 0.54_02 8 June 2006 Pass the feed_listing (currently just recent_changes) through all

1 0

r808 - trunk/t
by svnadmin＠urchin.earth.li 14 Jun '06

14 Jun '06

Author: nick Date: 2006-06-14 18:43:03 +0100 (Wed, 14 Jun 2006) New Revision: 808 Modified: trunk/t/22_feed_recent_changes.t trunk/t/23_feed_node_all_versions.t Log: Check to ensure the feed type turns up in the feed (should spot when we invert atom and rss, for example) Modified: trunk/t/22_feed_recent_changes.t =================================================================== --- trunk/t/22_feed_recent_changes.t 2006-06-14 17:41:53 UTC (rev 807) +++ trunk/t/22_feed_recent_changes.t 2006-06-14 17:43:03 UTC (rev 808) @@ -21,7 +21,7 @@ # Which feed types do we test? my @feed_types = qw( rss atom ); -plan tests => 7 * scalar @feed_types; +plan tests => 8 * scalar @feed_types; foreach my $feed_type (@feed_types) { @@ -50,9 +50,13 @@ my $feed = OpenGuides::Feed->new( wiki => $wiki, config => $config ); - my $rss = eval { $feed->make_feed(feed_type => $feed_type, feed_listing => 'recent_changes'); }; + my $feed_output = eval { $feed->make_feed(feed_type => $feed_type, feed_listing => 'recent_changes'); }; is( $@, "", "->make_feed for $feed_type doesn't croak" ); + # Ensure that the feed actually contained rss/atom (a good guide + # that we actually got the right feed) + like( $feed_output, "/$feed_type/i", "Does contain the feed type" ); + # Now write some data, first a minor edit then a non-minor one. my $guide = OpenGuides->new( config => $config ); Modified: trunk/t/23_feed_node_all_versions.t =================================================================== --- trunk/t/23_feed_node_all_versions.t 2006-06-14 17:41:53 UTC (rev 807) +++ trunk/t/23_feed_node_all_versions.t 2006-06-14 17:43:03 UTC (rev 808) @@ -21,7 +21,7 @@ # Which feed types do we test? my @feed_types = qw( rss atom ); -plan tests => 10 * scalar @feed_types; +plan tests => 11 * scalar @feed_types; foreach my $feed_type (@feed_types) { @@ -50,10 +50,14 @@ my $feed = OpenGuides::Feed->new( wiki => $wiki, config => $config ); - my $rss = eval { $feed->make_feed(feed_type => $feed_type, feed_listing => 'recent_changes'); }; + my $feed_output = eval { $feed->make_feed(feed_type => $feed_type, feed_listing => 'recent_changes'); }; is( $@, "", "->make_feed for $feed_type doesn't croak" ); + # Ensure that the feed actually contained rss/atom (a good guide + # that we actually got the right feed) + like( $feed_output, "/$feed_type/i", "Does contain the feed type" ); + # Now write some data: 3 versions of one node, and 1 of another my $guide = OpenGuides->new( config => $config );

1 0

r807 - trunk/lib/OpenGuides
by svnadmin＠urchin.earth.li 14 Jun '06

14 Jun '06

Author: nick Date: 2006-06-14 18:41:53 +0100 (Wed, 14 Jun 2006) New Revision: 807 Modified: trunk/lib/OpenGuides/Feed.pm Log: Typo fix - get the feeds the right way around! Modified: trunk/lib/OpenGuides/Feed.pm =================================================================== --- trunk/lib/OpenGuides/Feed.pm 2006-06-13 12:48:54 UTC (rev 806) +++ trunk/lib/OpenGuides/Feed.pm 2006-06-14 17:41:53 UTC (rev 807) @@ -95,8 +95,8 @@ my ($self,$feed_type) = @_; my %known_types = ( - 'rss' => \&atom_maker, - 'atom' => \&rss_maker, + 'atom' => \&atom_maker, + 'rss' => \&rss_maker, ); croak "No feed type specified" unless $feed_type;

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

openguides-commits June 2006