openguides-commits June 2006

openguides-commits@lists.openguides.org

1 participants
24 discussions

r796 - trunk/t
by svnadmin＠urchin.earth.li 01 Jun '06

01 Jun '06

Author: nick Date: 2006-06-01 15:48:23 +0100 (Thu, 01 Jun 2006) New Revision: 796 Added: trunk/t/22_feed_recent_changes.t Removed: trunk/t/22_rss_modwiki.t Log: Rename to better reflect test purpose Copied: trunk/t/22_feed_recent_changes.t (from rev 795, trunk/t/22_rss_modwiki.t) Deleted: trunk/t/22_rss_modwiki.t =================================================================== --- trunk/t/22_rss_modwiki.t 2006-06-01 14:47:57 UTC (rev 795) +++ trunk/t/22_rss_modwiki.t 2006-06-01 14:48:23 UTC (rev 796) @@ -1,118 +0,0 @@ -use strict; -use Wiki::Toolkit::Setup::SQLite; -use OpenGuides::Config; -use OpenGuides; -use OpenGuides::Feed; -use OpenGuides::Utils; -use Test::More; - -eval { require DBD::SQLite; }; -if ( $@ ) { - plan skip_all => "DBD::SQLite not installed"; - exit 0; -} - -eval { require Wiki::Toolkit::Search::Plucene; }; -if ( $@ ) { - plan skip_all => "Plucene not installed"; - exit 0; -} - - -# Which feed types do we test? -my @feed_types = qw( rss atom ); -plan tests => 7 * scalar @feed_types; - - -foreach my $feed_type (@feed_types) { - # Clear out the database from any previous runs. - unlink "t/node.db"; - unlink <t/indexes/*>; - - 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 - } - ); - - # Basic sanity check first. - my $wiki = OpenGuides::Utils->make_wiki_object( config => $config ); - - my $feed = OpenGuides::Feed->new( wiki => $wiki, - config => $config ); - - my $rss = eval { $feed->make_feed(feed_type => $feed_type, feed_listing => 'recent_changes'); }; - is( $@, "", "->make_feed for $feed_type doesn't croak" ); - - # 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, - ); - - # Check that the writes went in. - ok( $wiki->node_exists( "Wombats" ), "Wombats written" ); - ok( $wiki->node_exists( "Badgers" ), "Badgers written" ); - ok( $wiki->node_exists( "Wombles" ), "Wombles written" ); - - # 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, - ); - unlike( $output, qr/Wombats/, "minor edits filtered out when required" ); - like( $output, qr/Badgers/, "but normal edits still in" ); - - # Check that the username parameter is taken notice of. - unlike( $output, qr/Wombles/, "username parameter taken note of" ); -}

1 0

r795 - trunk/t
by svnadmin＠urchin.earth.li 01 Jun '06

01 Jun '06

Author: nick Date: 2006-06-01 15:47:57 +0100 (Thu, 01 Jun 2006) New Revision: 795 Modified: trunk/t/22_rss_modwiki.t Log: Test both rss and atom feeds Modified: trunk/t/22_rss_modwiki.t =================================================================== --- trunk/t/22_rss_modwiki.t 2006-06-01 14:40:59 UTC (rev 794) +++ trunk/t/22_rss_modwiki.t 2006-06-01 14:47:57 UTC (rev 795) @@ -18,95 +18,101 @@ exit 0; } -plan tests => 7; -# Clear out the database from any previous runs. -unlink "t/node.db"; -unlink <t/indexes/*>; +# Which feed types do we test? +my @feed_types = qw( rss atom ); +plan tests => 7 * scalar @feed_types; -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 - } -); -# Basic sanity check first. -my $wiki = OpenGuides::Utils->make_wiki_object( config => $config ); +foreach my $feed_type (@feed_types) { + # Clear out the database from any previous runs. + unlink "t/node.db"; + unlink <t/indexes/*>; -my $feed = OpenGuides::Feed->new( wiki => $wiki, - config => $config ); + 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 + } + ); -my $rss = eval { $feed->make_feed(feed_type => 'rss', feed_listing => 'recent_changes'); }; -is( $@, "", "->make_feed for rss doesn't croak" ); + # Basic sanity check first. + my $wiki = OpenGuides::Utils->make_wiki_object( config => $config ); -# 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 $feed = OpenGuides::Feed->new( wiki => $wiki, + config => $config ); -my $output = $guide->commit_node( - return_output => 1, - id => "Wombats", - cgi_obj => $q, - ); + my $rss = eval { $feed->make_feed(feed_type => $feed_type, feed_listing => 'recent_changes'); }; + is( $@, "", "->make_feed for $feed_type doesn't croak" ); -$q->param( -name => "edit_type", -value => "Normal edit" ); -$output = $guide->commit_node( - return_output => 1, - id => "Badgers", - cgi_obj => $q, - ); + # 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"; -$q->param( -name => "username", -value => "Kake" ); -$output = $guide->commit_node( - return_output => 1, - id => "Wombles", - cgi_obj => $q, - ); + my $output = $guide->commit_node( + return_output => 1, + id => "Wombats", + cgi_obj => $q, + ); -# Check that the writes went in. -ok( $wiki->node_exists( "Wombats" ), "Wombats written" ); -ok( $wiki->node_exists( "Badgers" ), "Badgers written" ); -ok( $wiki->node_exists( "Wombles" ), "Wombles written" ); + $q->param( -name => "edit_type", -value => "Normal edit" ); + $output = $guide->commit_node( + return_output => 1, + id => "Badgers", + cgi_obj => $q, + ); -# Check that the minor edits can be filtered out. -$output = $guide->display_feed( - feed_type => "rss", - 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" ); + $q->param( -name => "username", -value => "Kake" ); + $output = $guide->commit_node( + return_output => 1, + id => "Wombles", + cgi_obj => $q, + ); -# Check that the username parameter is taken notice of. -unlike( $output, qr/Wombles/, "username parameter taken note of" ); + # Check that the writes went in. + ok( $wiki->node_exists( "Wombats" ), "Wombats written" ); + ok( $wiki->node_exists( "Badgers" ), "Badgers written" ); + ok( $wiki->node_exists( "Wombles" ), "Wombles written" ); + + # 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, + ); + unlike( $output, qr/Wombats/, "minor edits filtered out when required" ); + like( $output, qr/Badgers/, "but normal edits still in" ); + + # Check that the username parameter is taken notice of. + unlike( $output, qr/Wombles/, "username parameter taken note of" ); +}

1 0

r794 - trunk/lib
by svnadmin＠urchin.earth.li 01 Jun '06

01 Jun '06

Author: nick Date: 2006-06-01 15:40:59 +0100 (Thu, 01 Jun 2006) New Revision: 794 Modified: trunk/lib/OpenGuides.pm Log: Push much of the feed criteria into if blocks, specific to the feed_listing requested Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2006-06-01 14:33:55 UTC (rev 793) +++ trunk/lib/OpenGuides.pm 2006-06-01 14:40:59 UTC (rev 794) @@ -682,28 +682,36 @@ my $return_output = $args{return_output} ? 1 : 0; - my $items = $args{items} || ""; - my $days = $args{days} || ""; - my $ignore_minor_edits = $args{ignore_minor_edits} ? 1 : 0; - my $username = $args{username} || ""; - my $category = $args{category} || ""; - my $locale = $args{locale} || ""; + # Basic criteria, whatever the feed listing type is my %criteria = ( - items => $items, - days => $days, - ignore_minor_edits => $ignore_minor_edits, feed_type => $feed_type, feed_listing => $feed_listing, also_return_timestamp => 1, ); - my %filter; - $filter{username} = $username if $username; - $filter{category} = $category if $category; - $filter{locale} = $locale if $locale; - if ( scalar keys %filter ) { - $criteria{filter_on_metadata} = \%filter; + + # Feed listing specific criteria + if($feed_listing eq "recent_changes") { + $criteria{items} = $args{items} || ""; + $criteria{days} = $args{days} || ""; + $criteria{ignore_minor_edits} = $args{ignore_minor_edits} ? 1 : 0; + + my $username = $args{username} || ""; + my $category = $args{category} || ""; + my $locale = $args{locale} || ""; + + my %filter; + $filter{username} = $username if $username; + $filter{category} = $category if $category; + $filter{locale} = $locale if $locale; + if ( scalar keys %filter ) { + $criteria{filter_on_metadata} = \%filter; + } } + elsif($feed_listing eq "node_all_versions") { + $criteria{name} = $args{name}; + } + my $feed = OpenGuides::Feed->new( wiki => $self->wiki, config => $self->config,

1 0

r793 - trunk/lib/OpenGuides
by svnadmin＠urchin.earth.li 01 Jun '06

01 Jun '06

Author: nick Date: 2006-06-01 15:33:55 +0100 (Thu, 01 Jun 2006) New Revision: 793 Modified: trunk/lib/OpenGuides/Feed.pm Log: Remove some duplication, by having a helper method to return the built feed maker Modified: trunk/lib/OpenGuides/Feed.pm =================================================================== --- trunk/lib/OpenGuides/Feed.pm 2006-05-25 17:16:21 UTC (rev 792) +++ trunk/lib/OpenGuides/Feed.pm 2006-06-01 14:33:55 UTC (rev 793) @@ -62,39 +62,49 @@ my $feed_type = $args{feed_type}; my $feed_listing = $args{feed_listing}; - my %known_types = ( - 'rss' => 1, - 'atom' => 1, - ); my %known_listings = ( 'recent_changes' => 1, 'node_all_versions' => 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') { - if ($feed_listing eq 'recent_changes') { - return $self->rss_maker->recent_changes(%args); - } - elsif ($feed_listing eq 'node_all_versions') { - return $self->rss_maker->node_all_versions(%args); - } + # Fetch the right Wiki::Toolkit::Feeds::Listing instance to use + my $maker = $self->fetch_maker($feed_type); + + # Call the appropriate feed listing from it + if ($feed_listing eq 'recent_changes') { + return $maker->recent_changes(%args); } - elsif ($feed_type eq 'atom') { - if ($feed_listing eq 'recent_changes') { - return $self->atom_maker->recent_changes(%args); - } - elsif ($feed_listing eq 'node_all_versions') { - return $self->atom_maker->node_all_versions(%args); - } + elsif ($feed_listing eq 'node_all_versions') { + return $maker->node_all_versions(%args); } } +=item B<fetch_maker> +For the given feed type, identify and return the maker routine for feeds +of that type. + +my $maker = $feed->fetch_maker("rss"); +my $feed_contents = maker->node_all_versions(%options); + +Will always return something of type Wiki::Toolkit::Feed::Listing +=cut +sub fetch_maker { + my ($self,$feed_type) = @_; + + my %known_types = ( + 'rss' => \&atom_maker, + 'atom' => \&rss_maker, + ); + + croak "No feed type specified" unless $feed_type; + croak "Unknown feed type: $feed_type" unless $known_types{$feed_type}; + + return &{$known_types{$feed_type}}; +} + sub atom_maker { my $self = shift;

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