openguides-commits July 2006

openguides-commits@lists.openguides.org

1 participants
6 discussions

by svnadmin＠urchin.earth.li

Author: nick Date: 2006-07-27 18:13:52 +0100 (Thu, 27 Jul 2006) New Revision: 822 Added: trunk/templates/admin_home.tt Modified: trunk/MANIFEST trunk/lib/OpenGuides.pm Log: Start on the admin interface Modified: trunk/MANIFEST =================================================================== --- trunk/MANIFEST 2006-07-27 16:27:54 UTC (rev 821) +++ trunk/MANIFEST 2006-07-27 17:13:52 UTC (rev 822) @@ -27,6 +27,7 @@ newpage.cgi preferences.cgi search.cgi +templates/admin_home.tt templates/backlink_results.tt templates/banner.tt templates/delete_confirm.tt Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2006-07-27 16:27:54 UTC (rev 821) +++ trunk/lib/OpenGuides.pm 2006-07-27 17:13:52 UTC (rev 822) @@ -1132,6 +1132,68 @@ } } +=item B<display_admin_interface> +Fetch everything we need to display the admin interface, and passes it off + to the template +=cut +sub display_admin_interface { + my ($self, %args) = @_; + my $return_tt_vars = $args{return_tt_vars} || 0; + my $return_output = $args{return_output} || 0; + + my $wiki = $self->wiki; + my $formatter = $self->wiki->formatter; + my $script_url = $self->config->script_url; + + # Grab all the nodes + my @all_nodes = $wiki->list_all_nodes(with_details=>1); + @all_nodes = sort { $a->{'name'} cmp $b->{'name'} } @all_nodes; + + + # Split into nodes, Locales and Categories + my @nodes; + my @categories; + my @locales; + for my $node (@all_nodes) { + # Make the URLs + my $node_param = uri_escape( $formatter->node_name_to_node_param( $node->{'name'} ) ); + $node->{'view_url'} = $script_url . "?id=" . $node_param; + $node->{'versions_url'} = $script_url . "?action=list_all_versions;id=" . $node_param; + $node->{'moderation_url'} = $script_url . "?action=set_moderation;id=" . $node_param; + + # Filter + if($node->{'name'} =~ /^Category /) { + $node->{'page_name'} = $node->{'name'}; + $node->{'name'} =~ s/^Category //; + push @categories, $node; + } elsif($node->{'name'} =~ /^Locale /) { + $node->{'page_name'} = $node->{'name'}; + $node->{'name'} =~ s/^Locale //; + push @locales, $node; + } else { + push @nodes, $node; + } + } + + # Render in a template + my %tt_vars = ( + not_editable => 1, + not_deletable => 1, + deter_robots => 1, + nodes => \@nodes, + categories => \@categories, + locales => \@locales + ); + return %tt_vars if $return_tt_vars; + my $output = $self->process_template( + id => "", + template => "admin_home.tt", + tt_vars => \%tt_vars, + ); + return $output if $return_output; + print $output; +} + sub process_template { my ($self, %args) = @_; my %output_conf = ( Added: trunk/templates/admin_home.tt =================================================================== --- trunk/templates/admin_home.tt 2006-07-27 16:27:54 UTC (rev 821) +++ trunk/templates/admin_home.tt 2006-07-27 17:13:52 UTC (rev 822) @@ -0,0 +1,66 @@ +[% INCLUDE header.tt page_title = "Admin - $site_name" %] +[% INCLUDE banner.tt %] +<div id="content"> +[% INCLUDE navbar.tt %] +<div id="maincontent"> +<h2>Site Administration</h2> +<ul> + <li><a href="#nodes">Nodes</a></li> + <li><a href="#locales">Locales</a></li> + <li><a href="#categories">Categories</a></li> +</ul> + +<a name="nodes"></a> +<table id="nodes"> +<tr><th>Node name</th><th>Current Version</th><th>Moderation</th><th>Actions</th></tr> + [% FOREACH node = nodes %] + <tr> + <td><a href="[% node.view_url %]">[% node.name %]</a></td> + <td>[% node.version %]</td> + <td>[% node.moderate %]</td> + <td><a href="[% node.view_url %]">View</a> or + <a href="[% node.versions_url %]">View all versions</a> or + <a href="[% node.moderation_url %]">Set Moderation</a> + </td> + </tr> + [% END %] +</table> + +<br /><br /> + +<a name="locales"></a> +<table id="locales"> +<tr><th>Locale name</th><th>Current Version</th><th>Moderation</th><th>Actions</th></tr> + [% FOREACH locale = locales %] + <tr> + <td><a href="[% locale.view_url %]">[% locale.name %]</a></td> + <td>[% locale.version %]</td> + <td>[% locale.moderate %]</td> + <td><a href="[% locale.view_url %]">View</a> or + <a href="[% locale.versions_url %]">View all versions</a> or + <a href="[% locale.moderation_url %]">Set Moderation</a> + </td> + </tr> + [% END %] +</table> + +<br /><br /> + +<a name="categories"></a> +<table id="categories"> +<tr><th>Category name</th><th>Current Version</th><th>Moderation</th><th>Actions</th></tr> + [% FOREACH cat = categories %] + <tr> + <td><a href="[% cat.view_url %]">[% cat.name %]</a></td> + <td>[% cat.version %]</td> + <td>[% cat.moderate %]</td> + <td><a href="[% cat.view_url %]">View</a> or + <a href="[% cat.versions_url %]">View all versions</a> or + <a href="[% cat.moderation_url %]">Set Moderation</a> + </td> + </tr> + [% END %] +</table> + +</div> +[% INCLUDE footer.tt %]

16 years, 7 months

r821 - in trunk: . templates

by svnadmin＠urchin.earth.li

Author: nick Date: 2006-07-27 17:27:54 +0100 (Thu, 27 Jul 2006) New Revision: 821 Added: trunk/templates/needing_moderation.tt Modified: trunk/MANIFEST trunk/wiki.cgi Log: Add the page to list nodes needing moderation Modified: trunk/MANIFEST =================================================================== --- trunk/MANIFEST 2006-07-06 17:57:51 UTC (rev 820) +++ trunk/MANIFEST 2006-07-27 16:27:54 UTC (rev 821) @@ -42,6 +42,7 @@ templates/home_node.tt templates/map_index.tt templates/navbar.tt +templates/needing_moderation.tt templates/newpage.tt templates/node.tt templates/node_history.tt Added: trunk/templates/needing_moderation.tt =================================================================== --- trunk/templates/needing_moderation.tt 2006-07-06 17:57:51 UTC (rev 820) +++ trunk/templates/needing_moderation.tt 2006-07-27 16:27:54 UTC (rev 821) @@ -0,0 +1,25 @@ +[% INCLUDE header.tt page_title = "Pages Needing Moderation - $site_name" %] +[% INCLUDE banner.tt %] +<div id="content"> +[% INCLUDE navbar.tt %] +<div id="maincontent"> +<h2>Pages Needing Moderation</h2> +<p> +These are nodes which have been created/edited, but not yet moderated. +</p> +<table id="wanted_pages" style="width:80%"> +<tr><th>Node name</th><th>Pending Version</th><th>Latest Moderated Version</th><th>Action</th></tr> + [% FOREACH node = nodes %] + <tr> + <td>[% node.name %]</td> + <td>[% node.version %]</td> + <td>[% node.moderated_version %]</td> + <td><a href="[% node.moderate_url %]">Moderate this version</a> + or <a href="[% node.diff_url %]">See changes</a> + </td> + </tr> + [% END %] +</table> + +</div> +[% INCLUDE footer.tt %] Modified: trunk/wiki.cgi =================================================================== --- trunk/wiki.cgi 2006-07-06 17:57:51 UTC (rev 820) +++ trunk/wiki.cgi 2006-07-27 16:27:54 UTC (rev 821) @@ -65,6 +65,8 @@ $guide->show_backlinks( id => $node ); } elsif ($action eq 'show_wanted_pages') { show_wanted_pages(); + } elsif ($action eq 'show_needing_moderation') { + show_needing_moderation(); } elsif ($action eq 'index') { $guide->show_index( type => $q->param("index_type") || "Full", @@ -80,6 +82,20 @@ id => $node, metres => $q->param("distance_in_metres") ); + } elsif ( $action eq 'admin' ) { + $guide->display_admin_interface(); + } elsif ( $action eq 'set_moderation' ) { + $guide->set_node_moderation( + id => $node, + password => $q->param("password") || "", + moderation_flag => $q->param("moderation_flat") || "", + ); + } elsif ( $action eq 'moderate' ) { + $guide->moderate_node( + id => $node, + version => $q->param("version") || "", + password => $q->param("password") || "", + ); } elsif ( $action eq 'delete' and ( lc($config->enable_page_deletion) eq "y" or $config->enable_page_deletion eq "1" ) @@ -366,3 +382,21 @@ wanted => \@wanted } ); } +sub show_needing_moderation { + my @nodes = $wiki->list_unmoderated_nodes; + + # Build the moderate link + foreach my $node (@nodes) { + my $node_param = + uri_escape($formatter->node_name_to_node_param($node->{'name'})); + $node->{'moderate_url'} = $script_url . "?action=moderate&id=".$node_param."&version=".$node->{'version'}; + $node->{'diff_url'} = $script_url . "?id=".$node_param."&version=".$node->{'moderated_version'}."&diffversion=".$node->{'version'}; + } + + process_template( "needing_moderation.tt", + "", + { not_editable => 1, + not_deletable => 1, + deter_robots => 1, + nodes => \@nodes } ); +}

16 years, 7 months

r820 - in trunk: lib lib/OpenGuides t

by svnadmin＠urchin.earth.li

Author: nick Date: 2006-07-06 18:57:51 +0100 (Thu, 06 Jul 2006) New Revision: 820 Modified: trunk/lib/OpenGuides.pm trunk/lib/OpenGuides/Feed.pm trunk/lib/OpenGuides/Search.pm trunk/t/53_show_index.t Log: Make it possible for a feed to override the default feed title and self url, and have the feeds do so Modified: trunk/lib/OpenGuides/Feed.pm =================================================================== --- trunk/lib/OpenGuides/Feed.pm 2006-07-06 17:16:53 UTC (rev 819) +++ trunk/lib/OpenGuides/Feed.pm 2006-07-06 17:57:51 UTC (rev 820) @@ -47,15 +47,37 @@ $node_url; }; - $self->{site_name} = $config->site_name; - $self->{default_city} = $config->default_city || ""; - $self->{default_country} = $config->default_country || ""; - $self->{site_description} = $config->site_desc || ""; + $self->{site_name} = $config->site_name . " - Recent Changes"; + $self->{default_city} = $config->default_city || ""; + $self->{default_country} = $config->default_country || ""; + $self->{site_description} = $config->site_desc || ""; $self->{og_version} = $args{og_version}; + $self->{html_equiv_link} = $self->{config}->script_url . '?action=rc'; $self; } +=item B<set_feed_name_and_url_params> +Overrides the default feed name and default feed http equivalent url. +Useful on custom feeds, where the defaults are incorrect. + + $feed->set_feed_name_and_url("Search Results", "search=pub"); + $feed->build_mini_feed_for_nodes("rss", @search_results); +=cut +sub set_feed_name_and_url_params { + my ($self, $name, $url) = @_; + + unless($url =~ /^http/) { + my $b_url = $self->{config}->script_url; + unless($url =~ /\.cgi\?/) { $b_url .= "?"; } + $b_url .= $url; + $url = $b_url; + } + + $self->{site_name} = $self->{config}->{site_name} . " - " . $name; + $self->{html_equiv_link} = $url; +} + =item B<make_feed> Produce one of the standard feeds, in the requested format. @@ -81,9 +103,20 @@ croak "No feed listing specified" unless $feed_listing; croak "Unknown feed listing: $feed_listing" unless $known_listings{$feed_listing}; + + # Tweak any settings, as required by our feed listing + if ($feed_listing eq 'node_all_versions') { + $self->set_feed_name_and_url_params( + "All versions of ".$args{'name'}, + "action=list_all_versions;id=".$args{'name'} + ); + } + + # 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); @@ -210,8 +243,8 @@ site_url => $self->{config}->script_url, site_description => $self->{site_description}, make_node_url => $self->{make_node_url}, - html_equiv_link => $self->{config}->script_url . '?action=rc', - atom_link => $self->{config}->script_url . '?action=rc&format=atom', + html_equiv_link => $self->{html_equiv_link}, + atom_link => $self->{html_equiv_link} . ";format=atom", software_name => 'OpenGuides', software_homepage => 'http://openguides.org/', software_version => $self->{og_version}, @@ -231,7 +264,7 @@ site_url => $self->{config}->script_url, site_description => $self->{site_description}, make_node_url => $self->{make_node_url}, - html_equiv_link => $self->{config}->script_url . '?action=rc', + html_equiv_link => $self->{html_equiv_link}, software_name => 'OpenGuides', software_homepage => 'http://openguides.org/', software_version => $self->{og_version}, Modified: trunk/lib/OpenGuides/Search.pm =================================================================== --- trunk/lib/OpenGuides/Search.pm 2006-07-06 17:16:53 UTC (rev 819) +++ trunk/lib/OpenGuides/Search.pm 2006-07-06 17:57:51 UTC (rev 820) @@ -714,6 +714,11 @@ config => $self->config, og_version => $VERSION, ); + $feed->set_feed_name_and_url_params( + "Search Results for ".$tt_vars->{search_terms}, + "search.cgi?search=".$tt_vars->{search_terms} + ); + $output = "Content-Type: ".$feed->default_content_type($format)."\n"; $output .= $feed->build_mini_feed_for_nodes($format,@nodes); } else { Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2006-07-06 17:16:53 UTC (rev 819) +++ trunk/lib/OpenGuides.pm 2006-07-06 17:57:51 UTC (rev 820) @@ -578,6 +578,10 @@ # 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); + $feed->set_feed_name_and_url_params( + "Index of $args{type} $args{value}", + "action=index;index_type=$args{type};index_value=$args{value}" + ); # Grab the actual node data out of @nodes my @node_data; Modified: trunk/t/53_show_index.t =================================================================== --- trunk/t/53_show_index.t 2006-07-06 17:16:53 UTC (rev 819) +++ trunk/t/53_show_index.t 2006-07-06 17:57:51 UTC (rev 820) @@ -76,7 +76,6 @@ #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 {

16 years, 8 months

r819 - trunk/templates

by svnadmin＠urchin.earth.li

Author: nick Date: 2006-07-06 18:16:53 +0100 (Thu, 06 Jul 2006) New Revision: 819 Modified: trunk/templates/header.tt trunk/templates/site_index.tt Log: Include atom rc link, and optionally atom+rss links for the current page (if requested) Modified: trunk/templates/header.tt =================================================================== --- trunk/templates/header.tt 2006-07-06 17:01:05 UTC (rev 818) +++ trunk/templates/header.tt 2006-07-06 17:16:53 UTC (rev 819) @@ -17,11 +17,16 @@ [% IF stylesheet %] <link rel="stylesheet" href="[% stylesheet %]" type="text/css" title="Stylesheet for [% site_name %]" /> [% END %] + [% IF feed_base %] + <link rel="alternate" type="application/rss+xml" title="Page as RSS" href="[% feed_base %];format=rss" /> + <link rel="alternate" type="application/atom+xml" title="Page as Atom" href="[% feed_base %];format=atom" /> + [% END %] [% IF latitude AND longitude %] <meta name="ICBM" content="[% latitude %], [% longitude %]" /> <meta name="DC.title" content="[% site_name %]" /> [% END %] <link rel="alternate" type="application/rss+xml" title="[% site_name %] - Recent Changes (RSS 1.0)" href="[% full_cgi_url %]?action=rc;format=rss" /> + <link rel="alternate" type="application/atom+xml" title="[% site_name %] - Recent Changes (Atom)" href="[% full_cgi_url %]?action=rc;format=atom" /> [% IF deter_robots %] <meta name="robots" content="noindex,nofollow" /> [% END %] Modified: trunk/templates/site_index.tt =================================================================== --- trunk/templates/site_index.tt 2006-07-06 17:01:05 UTC (rev 818) +++ trunk/templates/site_index.tt 2006-07-06 17:16:53 UTC (rev 819) @@ -1,5 +1,8 @@ [% IF criterion %] - [% INCLUDE header.tt page_title = "Index of $criterion.name - $site_name" %] + [% INCLUDE header.tt + page_title = "Index of $criterion.name - $site_name" + feed_base = "$cgi_url?action=index;index_type=$criterion.type;index_value=$criterion.value" + %] [% ELSE %] [% INCLUDE header.tt page_title = "Things within $limit of $origin - $site_name" %] [% END %]

16 years, 8 months

r818 - in trunk: . lib/OpenGuides t

by svnadmin＠urchin.earth.li

Author: nick Date: 2006-07-06 18:01:05 +0100 (Thu, 06 Jul 2006) New Revision: 818 Added: trunk/t/40_search_as_feed.t Modified: trunk/MANIFEST trunk/lib/OpenGuides/Search.pm Log: Support (+test) searching as a feed Modified: trunk/MANIFEST =================================================================== --- trunk/MANIFEST 2006-07-06 16:09:18 UTC (rev 817) +++ trunk/MANIFEST 2006-07-06 17:01:05 UTC (rev 818) @@ -66,6 +66,7 @@ t/21_rdf.t t/22_feed_recent_changes.t t/23_feed_node_all_versions.t +t/24_feed_node_listings.t t/25_write_geo_data.t t/26_geo_data_search_form.t t/27_geo_data_edit_form.t @@ -80,6 +81,7 @@ t/37_search_summaries.t t/38_search_params.t t/39_search_form.t +t/40_search_as_feed.t t/41_deletion.t t/51_display_node.t t/52_display_diffs.t Modified: trunk/lib/OpenGuides/Search.pm =================================================================== --- trunk/lib/OpenGuides/Search.pm 2006-07-06 16:09:18 UTC (rev 817) +++ trunk/lib/OpenGuides/Search.pm 2006-07-06 17:01:05 UTC (rev 818) @@ -149,6 +149,7 @@ } my %tt_vars = ( + format => $args{'vars'}->{'format'}, ss_version => $VERSION, ss_info_url => 'http://openguides.org/page/search_help' ); @@ -693,7 +694,7 @@ return $self; } -# thin wrapper around OpenGuides::Template +# thin wrapper around OpenGuides::Template, or OpenGuides::Feed sub process_template { my ($self, %args) = @_; @@ -701,12 +702,29 @@ $tt_vars->{not_editable} = 1; $tt_vars->{not_deletable} = 1; return %$tt_vars if $self->{return_tt_vars}; - my $output = OpenGuides::Template->output( + + # Do we want a feed, or TT html? + my $output; + if($tt_vars->{'format'}) { + my $format = $tt_vars->{'format'}; + my @nodes = @{$tt_vars->{'results'}}; + + my $feed = OpenGuides::Feed->new( + wiki => $self->wiki, + config => $self->config, + og_version => $VERSION, + ); + $output = "Content-Type: ".$feed->default_content_type($format)."\n"; + $output .= $feed->build_mini_feed_for_nodes($format,@nodes); + } else { + $output = OpenGuides::Template->output( wiki => $self->wiki, config => $self->config, template => "search.tt", vars => $tt_vars, ); + } + return $output if $self->{return_output}; print $output; Added: trunk/t/40_search_as_feed.t =================================================================== --- trunk/t/40_search_as_feed.t 2006-07-06 16:09:18 UTC (rev 817) +++ trunk/t/40_search_as_feed.t 2006-07-06 17:01:05 UTC (rev 818) @@ -0,0 +1,61 @@ +use strict; +use Wiki::Toolkit::Setup::SQLite; +use OpenGuides::Search; +use OpenGuides::Test; +use Test::More; + +eval { require DBD::SQLite; }; +if ( $@ ) { + plan skip_all => "DBD::SQLite not installed"; +} else { + plan tests => 7; + + # 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::Test->make_basic_config; + $config->script_name( "wiki.cgi" ); + $config->script_url( "http://example.com/" ); + + # Plucene is the recommended searcher now. + eval { require Wiki::Toolkit::Search::Plucene; }; + if ( $@ ) { $config->use_plucene( 0 ) }; + + my $search = OpenGuides::Search->new( config => $config ); + isa_ok( $search, "OpenGuides::Search" ); + + # Pop some test data in + my $wiki = $search->{wiki}; # white boxiness + $wiki->write_node( "Banana", "banana" ); + $wiki->write_node( "Monkey", "banana brains" ); + $wiki->write_node( "Monkey Brains", "BRANES" ); + $wiki->write_node( "Want Pie Now", "weebl" ); + $wiki->write_node( "Punctuation", "*" ); + $wiki->write_node( "Choice", "Eenie meenie minie mo"); + + # RSS search, should give 2 hits + my $output = $search->run( + return_output => 1, + vars => { search => "banana", format => "rss" }, + ); + + like($output, qr/<rdf:RDF/, "Really was RSS"); + like($output, qr/<items>/, "Really was RSS"); + + my @found = ($output =~ /(<rdf:li)/g); + is( scalar @found, 2, "found right entries in feed" ); + + + # Atom search, should give 1 hit + $output = $search->run( + return_output => 1, + vars => { search => "weebl", format => "atom" }, + ); + like($output, qr/<feed/, "Really was Atom"); + like($output, qr/<entry>/, "Really was Atom"); + + @found = ($output =~ /(<entry>)/g); + is( scalar @found, 1, "found right entries in feed" ); +}

16 years, 8 months

r817 - in trunk: lib lib/OpenGuides t

by svnadmin＠urchin.earth.li

Author: nick Date: 2006-07-06 17:09:18 +0100 (Thu, 06 Jul 2006) New Revision: 817 Added: trunk/t/24_feed_node_listings.t Modified: trunk/lib/OpenGuides.pm trunk/lib/OpenGuides/Feed.pm trunk/t/22_feed_recent_changes.t Log: Shift the content type method Add mini feed method Start to do urls, names etc for feeds properly New tests Modified: trunk/lib/OpenGuides/Feed.pm =================================================================== --- trunk/lib/OpenGuides/Feed.pm 2006-06-22 14:51:06 UTC (rev 816) +++ trunk/lib/OpenGuides/Feed.pm 2006-07-06 16:09:18 UTC (rev 817) @@ -103,7 +103,29 @@ =cut sub build_feed_for_nodes { my ($self, $format, @nodes) = @_; + return $self->render_feed_for_nodes($format, undef, 1, @nodes); +} +=item B<build_mini_feed_for_nodes> +For the given feed type, build a mini feed (name and distance) 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->search_near_here(); +my $feed_contents = $feed->build_mini_feed_for_nodes("rss", @nodes); +=cut +sub build_mini_feed_for_nodes { + my ($self, $format, @nodes) = @_; + return $self->render_feed_for_nodes($format, undef, 0, @nodes); +} + +=item B<render_feed_for_nodes> +Normally internal method to perform the appropriate building of a feed + based on a list of nodes. +=cut +sub render_feed_for_nodes { + my ($self, $format, $html_url, $is_full, @nodes) = @_; + # Grab our feed maker my $maker = $self->fetch_maker($format); @@ -123,11 +145,38 @@ my $feed = "Last-Modified: ".$timestamp."\n\n"; # Generate the feed itself - $feed .= $maker->generate_node_list_feed($timestamp, @nodes); + if($is_full) { + $feed .= $maker->generate_node_list_feed($timestamp, @nodes); + } else { + $feed .= $maker->generate_node_name_distance_feed($timestamp, @nodes); + } return $feed; } +=item B<default_content_type> +For the given feed type, return the default content type for that feed. + +my $content_type = $feed->default_content_type("rss"); +=cut +sub default_content_type { + my ($self,$feed_type) = @_; + + 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 $content_type; +} + =item B<fetch_maker> For the given feed type, identify and return the maker routine for feeds of that type. @@ -161,7 +210,7 @@ site_url => $self->{config}->script_url, site_description => $self->{site_description}, make_node_url => $self->{make_node_url}, - recent_changes_link => $self->{config}->script_url . '?action=rc', + html_equiv_link => $self->{config}->script_url . '?action=rc', atom_link => $self->{config}->script_url . '?action=rc&format=atom', software_name => 'OpenGuides', software_homepage => 'http://openguides.org/', @@ -182,7 +231,7 @@ site_url => $self->{config}->script_url, site_description => $self->{site_description}, make_node_url => $self->{make_node_url}, - recent_changes_link => $self->{config}->script_url . '?action=rc', + html_equiv_link => $self->{config}->script_url . '?action=rc', software_name => 'OpenGuides', software_homepage => 'http://openguides.org/', software_version => $self->{og_version}, Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2006-06-22 14:51:06 UTC (rev 816) +++ trunk/lib/OpenGuides.pm 2006-07-06 16:09:18 UTC (rev 817) @@ -681,17 +681,7 @@ 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"; - } + my $content_type = $feed->default_content_type($feed_type); return ($feed, $content_type); } Modified: trunk/t/22_feed_recent_changes.t =================================================================== --- trunk/t/22_feed_recent_changes.t 2006-06-22 14:51:06 UTC (rev 816) +++ trunk/t/22_feed_recent_changes.t 2006-07-06 16:09:18 UTC (rev 817) @@ -21,8 +21,9 @@ # Which feed types do we test? my @feed_types = qw( rss atom ); -plan tests => 8 * scalar @feed_types; +plan tests => 9 * scalar @feed_types; +my %content_types = (rss=>'application/rdf+xml', atom=>'application/atom+xml'); foreach my $feed_type (@feed_types) { # Clear out the database from any previous runs. @@ -49,6 +50,7 @@ my $feed = OpenGuides::Feed->new( wiki => $wiki, config => $config ); + is( $feed->default_content_type($feed_type), $content_types{$feed_type}, "Return the right content type" ); my $feed_output = eval { $feed->make_feed(feed_type => $feed_type, feed_listing => 'recent_changes'); }; is( $@, "", "->make_feed for $feed_type doesn't croak" ); Added: trunk/t/24_feed_node_listings.t =================================================================== --- trunk/t/24_feed_node_listings.t 2006-06-22 14:51:06 UTC (rev 816) +++ trunk/t/24_feed_node_listings.t 2006-07-06 16:09:18 UTC (rev 817) @@ -0,0 +1,176 @@ +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 => 17 * 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 $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 ); + + # 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"; + + # First version of Wombats + my $output = $guide->commit_node( + return_output => 1, + id => "Wombats", + cgi_obj => $q, + ); + my %node = $wiki->retrieve_node(name=>"Wombats"); + + # Now second and third + $q->param( -name => "edit_type", -value => "Normal edit" ); + $q->param( -name => "checksum", -value => $node{"checksum"} ); + $output = $guide->commit_node( + return_output => 1, + id => "Wombats", + cgi_obj => $q, + ); + + %node = $wiki->retrieve_node(name=>"Wombats"); + $q->param( -name => "username", -value => "Kake" ); + $q->param( -name => "checksum", -value => $node{"checksum"} ); + $output = $guide->commit_node( + return_output => 1, + id => "Wombats", + cgi_obj => $q, + ); + + # Now a different node + $q->delete('checksum'); + $output = $guide->commit_node( + return_output => 1, + id => "Badgers", + cgi_obj => $q, + ); + + # Check that the writes went in. + ok( $wiki->node_exists( "Wombats" ), "Wombats written" ); + ok( $wiki->node_exists( "Badgers" ), "Badgers written" ); + is( scalar $wiki->list_node_all_versions("Wombats"), 3, "3 Wombat versions"); + is( scalar $wiki->list_node_all_versions("Badgers"), 1, "1 Badger version"); + + + + # Grab a list of all the nodes + my @all_names = $wiki->list_all_nodes(); + my @all_nodes; + foreach my $name (@all_names) { + my %node = $wiki->retrieve_node(name=>$name); + $node{name} = $name; + push @all_nodes, \%node; + } + + # Ask build_feed_for_nodes to make a feed of these + my $output = $feed->build_feed_for_nodes($feed_type,@all_nodes); + + like( $output, qr/<title>Wombats/, "Found wombats" ); + like( $output, qr/<title>Badgers/, "Found badgers" ); + + # Check it had the extra metadata + if($feed_type eq "rss") { + like( $output, qr/<dc:date>/, "Found metadata" ); + like( $output, qr/<modwiki:diff>/, "Found metadata" ); + like( $output, qr/<modwiki:version>/, "Found metadata" ); + } else { + like( $output, qr/<updated>/, "Found metadata" ); + like( $output, qr/<summary>/, "Found metadata" ); + like( $output, qr/<author>/, "Found metadata" ); + } + + + # Grab a list of the different versions of Wombats + my @wombats = $wiki->list_node_all_versions("Wombats"); + + # Ask build_mini_feed_for_nodes to make a mini feed of these + $output = $feed->build_mini_feed_for_nodes($feed_type,@wombats); + + like( $output, qr/<title>Wombats/, "Wombats had wombats" ); + unlike( $output, qr/<title>Badgers/, "Wombats didn't have Badgers" ); + + my @wombats = $output =~ /(<title>Wombats)/g; + is( scalar @wombats, 3, "All 3 wombat versions found" ); + + # Check it was really the mini version + + if($feed_type eq "rss") { + like( $output, qr/<link>/, "Has link" ); + unlike( $output, qr/<dc:contributor>/, "Really mini version" ); + unlike( $output, qr/<modwiki:history>/, "Really mini version" ); + } else { + like( $output, qr/<link href=/, "Has link" ); + unlike( $output, qr/<summary>/, "Really mini version" ); + unlike( $output, qr/<author>/, "Really mini version" ); + } +}

16 years, 8 months

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

openguides-commits July 2006