openguides-commits May 2006

openguides-commits@lists.openguides.org

1 participants
9 discussions

r792 - trunk/t
by svnadmin＠urchin.earth.li 25 May '06

25 May '06

Author: nick Date: 2006-05-25 18:16:21 +0100 (Thu, 25 May 2006) New Revision: 792 Modified: trunk/t/28_wgs84_coords.t Log: Need to create the sqlite db, having trashed it Modified: trunk/t/28_wgs84_coords.t =================================================================== --- trunk/t/28_wgs84_coords.t 2006-05-25 17:09:10 UTC (rev 791) +++ trunk/t/28_wgs84_coords.t 2006-05-25 17:16:21 UTC (rev 792) @@ -8,7 +8,10 @@ # Clear out the database from any previous runs. unlink "t/node.db"; +# And give us a new one +Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); +# Now we can start testing my $config = OpenGuides::Test->make_basic_config; $config->force_wgs84 (1);

1 0

r791 - in trunk/lib: . OpenGuides
by svnadmin＠urchin.earth.li 25 May '06

25 May '06

Author: nick Date: 2006-05-25 18:09:10 +0100 (Thu, 25 May 2006) New Revision: 791 Modified: trunk/lib/OpenGuides.pm trunk/lib/OpenGuides/Feed.pm Log: Explicitly request the feed timestamp at the same time as the feed, to avoid Wiki::Toolkit having to do the node fetch twice. The feed_timestamp method on OpenGuides::Feed should no longer be used, as it requires another fetch, and only makes sense if you only ever deal with recent changes Modified: trunk/lib/OpenGuides/Feed.pm =================================================================== --- trunk/lib/OpenGuides/Feed.pm 2006-05-19 11:08:19 UTC (rev 790) +++ trunk/lib/OpenGuides/Feed.pm 2006-05-25 17:09:10 UTC (rev 791) @@ -68,6 +68,7 @@ ); my %known_listings = ( 'recent_changes' => 1, + 'node_all_versions' => 1, ); croak "No feed type specified" unless $feed_type; @@ -80,11 +81,17 @@ 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); + } } 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); + } } } @@ -132,8 +139,9 @@ sub feed_timestamp { my ($self, %args) = @_; - # The timestamp methods in our feeds are equivalent, we might as well - # use the RSS one. + # Call the compatability timestamping method on the RSS Feed. + # People should really just pass in also_return_timestamp to the + # feed method, and get the timestamp at the same time as their data $self->rss_maker->rss_timestamp(%args); } @@ -161,12 +169,15 @@ og_version => '1.0', ); # Ten most recent changes in RSS format. - print "Content-Type: application/rdf+xml\n"; - print "Last-Modified: " . $self->feed_timestamp( items => 10 ) . "\n\n"; my %args = ( items => 10, - feed_type => 'rss', ); - print $feed->make_feed( %args ); + feed_type => 'rss', + also_return_timestamp => 1 ); + my ($feed_output,$feed_timestamp) = $feed->make_feed( %args ); + print "Content-Type: application/rdf+xml\n"; + print "Last-Modified: " . $feed_timestamp . "\n\n"; + print $feed_output; + =head1 METHODS =over 4 @@ -195,30 +206,42 @@ =item B<make_feed> # Ten most recent changes in RSS format. + my %args = ( items => 10, + feed_type => 'rss', + also_return_timestamp => 1 ); + my ($feed_output,$feed_timestamp) = $rdf_writer->make_feed( %args ); + print "Content-Type: application/rdf+xml\n"; - print "Last-Modified: " . $feed->feed_timestamp( items => 10 ) . "\n\n"; - my %args = ( items => 10, - feed_type => 'rss', ); + print "Last-Modified: " . $feed_timestamp . "\n\n"; + print $feed_output; print $rdf_writer->make_feed( %args ); + # All the changes made by bob in the past week, ignoring minor edits, in Atom. $args{days} = 7; $args{ignore_minor_edits = 1; $args{filter_on_metadata} => { username => "bob" }; + $args{also_return_timestamp} => 1; + my ($feed_output,$feed_timestamp) = $rdf_writer->make_feed( %args ); print "Content-Type: application/atom+xml\n"; - print "Last-Modified: " . $feed->feed_timestamp( %args ) . "\n\n"; - print $feed->make_feed( %args ); + print "Last-Modified: " . $feed_timestamp . "\n\n"; + print $feed_output; =item B<feed_timestamp> +Instead of calling this, you should instead pass in the 'also_return_timestamp' +option. You will then get back the feed timestamp, along with the feed output. + +This method will be removed in future, and currently will only return +meaningful values if your arguments relate to recent changes. + print "Last-Modified: " . $feed->feed_timestamp( %args ) . "\n\n"; -Returns the timestamp of the data feed in POSIX::strftime style ("Tue, 29 Feb 2000 -12:34:56 GMT"), which is equivalent to the timestamp of the most recent item -in the feed. Takes the same arguments as make_recentchanges_rss(). You will most -likely need this to print a Last-Modified HTTP header so user-agents can determine -whether they need to reload the feed or not. +Returns the timestamp of something in POSIX::strftime style ("Tue, 29 Feb 2000 +12:34:56 GMT"). Takes the same arguments as make_recentchanges_rss(). +You will most likely need this to print a Last-Modified HTTP header so +user-agents can determine whether they need to reload the feed or not. =back Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2006-05-19 11:08:19 UTC (rev 790) +++ trunk/lib/OpenGuides.pm 2006-05-25 17:09:10 UTC (rev 791) @@ -689,11 +689,12 @@ my $category = $args{category} || ""; my $locale = $args{locale} || ""; my %criteria = ( - items => $items, - days => $days, - ignore_minor_edits => $ignore_minor_edits, - feed_type => $feed_type, - feed_listing => $feed_listing, + 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; @@ -721,9 +722,12 @@ croak "Unknown feed type given: $feed_type"; } - $output .= "Last-Modified: " . $feed->feed_timestamp( %criteria ) . "\n\n"; + # Get the feed, and the timestamp, in one go + my ($feed_output, $feed_timestamp) = + $feed->make_feed( %criteria ); - $output .= $feed->make_feed( %criteria ); + $output .= "Last-Modified: " . $feed_timestamp . "\n\n"; + $output .= $feed_output; return $output if $return_output; print $output;

1 0

r790 - in trunk: . lib lib/OpenGuides t
by svnadmin＠urchin.earth.li 19 May '06

19 May '06

Author: nick Date: 2006-05-19 12:08:19 +0100 (Fri, 19 May 2006) New Revision: 790 Modified: trunk/ trunk/Changes trunk/lib/OpenGuides.pm trunk/lib/OpenGuides/Feed.pm trunk/t/22_rss_modwiki.t trunk/wiki.cgi Log: Pass the requested feed listing through all the feeds code, rather than just assuming it's recent_changes Property changes on: trunk ___________________________________________________________________ Name: svn:ignore + .vimrc *.swp Modified: trunk/Changes =================================================================== --- trunk/Changes 2006-05-16 18:32:55 UTC (rev 789) +++ trunk/Changes 2006-05-19 11:08:19 UTC (rev 790) @@ -1,5 +1,11 @@ "#" 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 Support for Atom feeds for RecentChanges. #118 Use Wiki::Toolkit. NOTE this is a development snapshot and is Modified: trunk/lib/OpenGuides/Feed.pm =================================================================== --- trunk/lib/OpenGuides/Feed.pm 2006-05-16 18:32:55 UTC (rev 789) +++ trunk/lib/OpenGuides/Feed.pm 2006-05-19 11:08:19 UTC (rev 790) @@ -60,20 +60,31 @@ my ($self, %args) = @_; 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, + ); 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); + } } } Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2006-05-16 18:32:55 UTC (rev 789) +++ trunk/lib/OpenGuides.pm 2006-05-19 11:08:19 UTC (rev 790) @@ -645,6 +645,7 @@ # Last ten non-minor edits to Hammersmith pages in RSS 1.0 format $guide->display_feed( feed_type => 'rss', + feed_listing => 'recent_changes', items => 10, ignore_minor_edits => 1, locale => "Hammersmith", @@ -652,15 +653,19 @@ # 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", ); C<feed_type> is a mandatory parameter. Supported values at present are "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. @@ -671,6 +676,9 @@ 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; @@ -685,6 +693,7 @@ days => $days, ignore_minor_edits => $ignore_minor_edits, feed_type => $feed_type, + feed_listing => $feed_listing, ); my %filter; $filter{username} = $username if $username; Modified: trunk/t/22_rss_modwiki.t =================================================================== --- trunk/t/22_rss_modwiki.t 2006-05-16 18:32:55 UTC (rev 789) +++ trunk/t/22_rss_modwiki.t 2006-05-19 11:08:19 UTC (rev 790) @@ -45,7 +45,7 @@ my $feed = OpenGuides::Feed->new( wiki => $wiki, 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" ); # Now write some data, first a minor edit then a non-minor one. @@ -99,6 +99,7 @@ # 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, Modified: trunk/wiki.cgi =================================================================== --- trunk/wiki.cgi 2006-05-16 18:32:55 UTC (rev 789) +++ trunk/wiki.cgi 2006-05-19 11:08:19 UTC (rev 790) @@ -104,6 +104,7 @@ qw( feed items days ignore_minor_edits username category locale ); $args{feed_type} = 'rss'; + $args{feed_listing} = 'recent_changes'; $guide->display_feed( %args ); } elsif ( $feed eq "chef_dan" ) { display_node_rdf( node => $node ); @@ -115,6 +116,7 @@ qw( feed items days ignore_minor_edits username category locale ); $args{feed_type} = 'atom'; + $args{feed_listing} = 'recent_changes'; $guide->display_feed( %args ); } else { $guide->display_node( id => 'RecentChanges' );

1 0

r789 - trunk
by svnadmin＠urchin.earth.li 16 May '06

16 May '06

Author: dom Date: 2006-05-16 19:32:55 +0100 (Tue, 16 May 2006) New Revision: 789 Modified: trunk/Changes Log: Date of release Modified: trunk/Changes =================================================================== --- trunk/Changes 2006-05-14 15:56:29 UTC (rev 788) +++ trunk/Changes 2006-05-16 18:32:55 UTC (rev 789) @@ -1,6 +1,6 @@ "#" items refer to tickets. See <http://dev.openguides.org/report/9> for details. -0.54_01 ??? +0.54_01 16 May 2006 Support for Atom feeds for RecentChanges. #118 Use Wiki::Toolkit. NOTE this is a development snapshot and is not suitable for production use. It may eat your data! Tests on

1 0

r788 - trunk
by svnadmin＠urchin.earth.li 14 May '06

14 May '06

Author: dom Date: 2006-05-14 16:56:29 +0100 (Sun, 14 May 2006) New Revision: 788 Modified: trunk/wiki.cgi Log: version fix Modified: trunk/wiki.cgi =================================================================== --- trunk/wiki.cgi 2006-05-14 15:55:52 UTC (rev 787) +++ trunk/wiki.cgi 2006-05-14 15:56:29 UTC (rev 788) @@ -4,7 +4,7 @@ use warnings; use vars qw( $VERSION ); -$VERSION = '0.55-svn'; +$VERSION = '0.54_01'; use CGI qw/:standard/; use CGI::Carp qw(croak);

1 0

r787 - trunk/lib
by svnadmin＠urchin.earth.li 14 May '06

14 May '06

Author: dom Date: 2006-05-14 16:55:52 +0100 (Sun, 14 May 2006) New Revision: 787 Modified: trunk/lib/OpenGuides.pm Log: Version fix. Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2006-05-14 15:54:45 UTC (rev 786) +++ trunk/lib/OpenGuides.pm 2006-05-14 15:55:52 UTC (rev 787) @@ -14,7 +14,7 @@ use vars qw( $VERSION ); -$VERSION = '0.55-svn'; +$VERSION = '0.54_01'; =head1 NAME

1 0

r786 - trunk/t
by svnadmin＠urchin.earth.li 14 May '06

14 May '06

Author: dom Date: 2006-05-14 16:54:45 +0100 (Sun, 14 May 2006) New Revision: 786 Modified: trunk/t/01_load.t Log: Test loading the Feed module. Modified: trunk/t/01_load.t =================================================================== --- trunk/t/01_load.t 2006-05-14 15:54:22 UTC (rev 785) +++ trunk/t/01_load.t 2006-05-14 15:54:45 UTC (rev 786) @@ -1,8 +1,9 @@ -use Test::More tests => 7; +use Test::More tests => 8; use_ok( "OpenGuides" ); use_ok( "OpenGuides::CGI" ); use_ok( "OpenGuides::Config" ); +use_ok( "OpenGuides::Feed" ); use_ok( "OpenGuides::RDF" ); use_ok( "OpenGuides::Search" ); use_ok( "OpenGuides::Template" );

1 0

r785 - in trunk: . lib lib/OpenGuides lib/OpenGuides/UK t
by svnadmin＠urchin.earth.li 14 May '06

14 May '06

Author: dom Date: 2006-05-14 16:54:22 +0100 (Sun, 14 May 2006) New Revision: 785 Modified: trunk/Build.PL trunk/Changes trunk/INSTALL trunk/PREREQUISITES trunk/README trunk/lib/OpenGuides.pm trunk/lib/OpenGuides/Build.pm trunk/lib/OpenGuides/Feed.pm trunk/lib/OpenGuides/RDF.pm trunk/lib/OpenGuides/Search.pm trunk/lib/OpenGuides/Template.pm trunk/lib/OpenGuides/Test.pm trunk/lib/OpenGuides/UK/PubCrawl.pm trunk/lib/OpenGuides/Utils.pm trunk/t/11_utils.t trunk/t/12_macros.t trunk/t/14_recent_changes_cookies.t trunk/t/15_template.t trunk/t/16_test_tester.t trunk/t/21_rdf.t trunk/t/22_rss_modwiki.t trunk/t/25_write_geo_data.t trunk/t/26_geo_data_search_form.t trunk/t/27_geo_data_edit_form.t trunk/t/28_wgs84_coords.t trunk/t/31_search.t trunk/t/32_search_simple_metadata.t trunk/t/33_search_advanced_search.t trunk/t/33_search_advanced_search_utm.t trunk/t/34_search_paging.t trunk/t/35_search_two_searches.t trunk/t/36_search_order.t trunk/t/37_search_summaries.t trunk/t/38_search_params.t trunk/t/39_search_form.t trunk/t/41_deletion.t trunk/t/51_display_node.t trunk/t/52_display_diffs.t trunk/t/53_show_index.t trunk/t/54_redirect.t trunk/t/55_node_history.t trunk/t/56_diffs_with_macros.t trunk/t/61_bug_textareas.t trunk/t/62_bug_trailing_whitespace.t trunk/t/63_bug_map_link_no_address.t trunk/t/64_bug_node_history.t trunk/t/65_bug_metadata_escape.t trunk/t/66_bug_latlong_representation.t trunk/t/67_bug_first_version.t trunk/t/68_bug_website_displayed.t trunk/wiki.cgi Log: Use Wiki::Toolkit. Note that CGI::Wiki::Plugin::Diff hasn't been converted yet, so tests will be broken for now. Modified: trunk/Build.PL =================================================================== --- trunk/Build.PL 2006-05-14 15:27:00 UTC (rev 784) +++ trunk/Build.PL 2006-05-14 15:54:22 UTC (rev 785) @@ -215,34 +215,34 @@ dist_version_from => "wiki.cgi", license => "perl", requires => { - 'Algorithm::Diff' => '0.13', # for sdiff - 'CGI' => '2.92', # avoid escapeHTML bug - 'CGI::Carp' => 0, - 'CGI::Cookie' => 0, - 'CGI::Wiki' => '0.62', # fixed delete version - 'CGI::Wiki::Formatter::UseMod' => '0.16', # macros - 'CGI::Wiki::Plugin::Atom' => 0, - 'CGI::Wiki::Plugin::Categoriser' => 0, - 'CGI::Wiki::Plugin::Diff' => '0.08', # earlier buggy - 'CGI::Wiki::Plugin::Locator::Grid'=> '0.02', # cope with sqlite 3 - 'CGI::Wiki::Plugin::RSS::ModWiki' => '0.09', # fixes date formatting bug - 'CGI::Wiki::Plugin::RSS::Reader' => '1.3', # earlier versions don't support RSS 2.0 - 'Class::Accessor' => 0, - 'Config::Tiny' => 0, - 'Data::Dumper' => 0, - $drivers{$dbtype} => 0, - 'File::Spec::Functions' => 0, - 'File::Temp' => 0, - 'Geography::NationalGrid' => 0, - 'LWP::Simple' => 0, - 'Parse::RecDescent' => 0, - $search_module => 0, - 'POSIX' => 0, - 'Template' => 0, - 'Test::MockObject' => '0.07', # earlier doesn't use 'mock' - 'Time::Piece' => 0, - 'URI::Escape' => 0, - 'XML::RSS' => 0, + 'Algorithm::Diff' => '0.13', # for sdiff + 'CGI' => '2.92', # avoid escapeHTML bug + 'CGI::Carp' => 0, + 'CGI::Cookie' => 0, + 'Wiki::Toolkit' => 0, + 'Wiki::Toolkit::Feed::Atom' => 0, + 'Wiki::Toolkit::Feed::RSS' => 0, + 'Wiki::Toolkit::Formatter::UseMod' => 0, + 'Wiki::Toolkit::Plugin::Categoriser' => 0, + 'Wiki::Toolkit::Plugin::Diff' => 0, + 'Wiki::Toolkit::Plugin::Locator::Grid'=> 0, + 'Wiki::Toolkit::Plugin::RSS::Reader' => 0, + 'Class::Accessor' => 0, + 'Config::Tiny' => 0, + 'Data::Dumper' => 0, + $drivers{$dbtype} => 0, + 'File::Spec::Functions' => 0, + 'File::Temp' => 0, + 'Geography::NationalGrid' => 0, + 'LWP::Simple' => 0, + 'Parse::RecDescent' => 0, + $search_module => 0, + 'POSIX' => 0, + 'Template' => 0, + 'Test::MockObject' => '0.07', # earlier doesn't use 'mock' + 'Time::Piece' => 0, + 'URI::Escape' => 0, + 'XML::RSS' => 0, }, build_requires => { 'Module::Build' => '0.18', # earlier doesn't install script files Modified: trunk/Changes =================================================================== --- trunk/Changes 2006-05-14 15:27:00 UTC (rev 784) +++ trunk/Changes 2006-05-14 15:54:22 UTC (rev 785) @@ -1,8 +1,12 @@ "#" items refer to tickets. See <http://dev.openguides.org/report/9> for details. -0.55 ??? +0.54_01 ??? Support for Atom feeds for RecentChanges. - #118 Use Wiki::Toolkit + #118 Use Wiki::Toolkit. NOTE this is a development snapshot and is + not suitable for production use. It may eat your data! Tests on + development mirrors of live data are highly welcomed; the underlying + database schema provided by Wiki::Toolkit has changed and the upgrade + process needs some rigorous testing. 0.54 21 April 2006 #112 Fixed website display bug introduced in 0.53. Modified: trunk/INSTALL =================================================================== --- trunk/INSTALL 2006-05-14 15:27:00 UTC (rev 784) +++ trunk/INSTALL 2006-05-14 15:54:22 UTC (rev 785) @@ -104,7 +104,7 @@ From version 0.39 of OpenGuides, you have the option of using Plucene to index your wiki instead of Search::InvertedIndex. If you answer yes to this question, you will need to make sure you have installed -both Plucene, and CGI::Wiki version 0.56 or later. +both Plucene, and Wiki::Toolkit version 0.56 or later. If you are changing to Plucene from Search::InvertedIndex, you will need to do two things: @@ -350,7 +350,7 @@ above; however since we only want one copy of the modules and CGI programs, it isn't appropriate to run them again. So we will make use of the utility program "cgi-wiki-setupdb" which is included with the -CGI::Wiki distribution. Documentation for this command can be found in +Wiki::Toolkit distribution. Documentation for this command can be found in its man page; run this with the appropriate arguments to create the new database. Modified: trunk/PREREQUISITES =================================================================== --- trunk/PREREQUISITES 2006-05-14 15:27:00 UTC (rev 784) +++ trunk/PREREQUISITES 2006-05-14 15:54:22 UTC (rev 785) @@ -1,19 +1,19 @@ -Modules required by OpenGuides 0.54 -=================================== +Modules required by OpenGuides 0.54_01 +====================================== Algorithm::Diff (version 0.13 or later. Note that the latest version uses .zip rather than .tar.gz and breaks some automated installs) CGI (version 2.92 or later) CGI::Carp CGI::Cookie -CGI::Wiki (version 0.62 or later) -CGI::Wiki::Formatter::UseMod (version 0.16 or later) -CGI::Wiki::Plugin::Atom -CGI::Wiki::Plugin::Categoriser -CGI::Wiki::Plugin::Diff (version 0.08 or later) -CGI::Wiki::Plugin::Locator::Grid (version 0.02 or later) -CGI::Wiki::Plugin::RSS::ModWiki (version 0.09 or later) -CGI::Wiki::Plugin::RSS::Reader (version 1.3 or later) +Wiki::Toolkit +Wiki::Toolkit::Feed::Atom +Wiki::Toolkit::Feed::RSS +Wiki::Toolkit::Formatter::UseMod +Wiki::Toolkit::Plugin::Categoriser +Wiki::Toolkit::Plugin::Diff +Wiki::Toolkit::Plugin::Locator::Grid +Wiki::Toolkit::Plugin::RSS::Reader Class::Accessor Config::Tiny Data::Dumper Modified: trunk/README =================================================================== --- trunk/README 2006-05-14 15:27:00 UTC (rev 784) +++ trunk/README 2006-05-14 15:54:22 UTC (rev 785) @@ -22,7 +22,7 @@ SEE ALSO * http://london.openguides.org/, the first and biggest OpenGuides site. * http://openguides.org/, with a list of all live OpenGuides installs. - * CGI::Wiki, the Wiki toolkit which does the heavy lifting for + * Wiki::Toolkit, the Wiki toolkit which does the heavy lifting for OpenGuides FEEDBACK Modified: trunk/lib/OpenGuides/Build.pm =================================================================== --- trunk/lib/OpenGuides/Build.pm 2006-05-14 15:27:00 UTC (rev 784) +++ trunk/lib/OpenGuides/Build.pm 2006-05-14 15:54:22 UTC (rev 785) @@ -26,7 +26,7 @@ mysql => "MySQL", sqlite => "SQLite" ); - my $cgi_wiki_module = "CGI::Wiki::Setup::" . $cgi_wiki_exts{$dbtype}; + my $cgi_wiki_module = "Wiki::Toolkit::Setup::" . $cgi_wiki_exts{$dbtype}; eval "require $cgi_wiki_module"; die "There was a problem: $@" if $@; Modified: trunk/lib/OpenGuides/Feed.pm =================================================================== --- trunk/lib/OpenGuides/Feed.pm 2006-05-14 15:27:00 UTC (rev 784) +++ trunk/lib/OpenGuides/Feed.pm 2006-05-14 15:54:22 UTC (rev 785) @@ -5,8 +5,8 @@ use vars qw( $VERSION ); $VERSION = '0.01'; -use CGI::Wiki::Plugin::Atom; -use CGI::Wiki::Plugin::RSS::ModWiki; +use Wiki::Toolkit::Feed::Atom; +use Wiki::Toolkit::Feed::RSS; use Time::Piece; use URI::Escape; use Carp 'croak'; @@ -23,8 +23,8 @@ my $wiki = $args{wiki}; - unless ( $wiki && UNIVERSAL::isa( $wiki, "CGI::Wiki" ) ) { - croak "No CGI::Wiki object supplied."; + unless ( $wiki && UNIVERSAL::isa( $wiki, "Wiki::Toolkit" ) ) { + croak "No Wiki::Toolkit object supplied."; } $self->{wiki} = $wiki; @@ -81,7 +81,7 @@ my $self = shift; unless ($self->{atom_maker}) { - $self->{atom_maker} = CGI::Wiki::Plugin::Atom->new( + $self->{atom_maker} = Wiki::Toolkit::Feed::Atom->new( wiki => $self->{wiki}, site_name => $self->{site_name}, site_url => $self->{config}->script_url, @@ -102,7 +102,7 @@ my $self = shift; unless ($self->{rss_maker}) { - $self->{rss_maker} = CGI::Wiki::Plugin::RSS::ModWiki->new( + $self->{rss_maker} = Wiki::Toolkit::Feed::RSS->new( wiki => $self->{wiki}, site_name => $self->{site_name}, site_url => $self->{config}->script_url, @@ -139,11 +139,11 @@ =head1 SYNOPSIS - use CGI::Wiki; + use Wiki::Toolkit; use OpenGuides::Config; use OpenGuides::Feed; - my $wiki = CGI::Wiki->new( ... ); + my $wiki = Wiki::Toolkit->new( ... ); my $config = OpenGuides::Config->new( file => "wiki.conf" ); my $feed = OpenGuides::Feed->new( wiki => $wiki, config => $config, @@ -166,19 +166,19 @@ config => $config, og_version => '1.0', ); -C<wiki> must be a L<CGI::Wiki> object and C<config> must be an +C<wiki> must be a L<Wiki::Toolkit> object and C<config> must be an L<OpenGuides::Config> object. Both of these arguments are mandatory. C<og_version> is an optional argument specifying the version of OpenGuides for inclusion in the feed. =item B<rss_maker> -Returns a raw L<CGI::Wiki::Plugin::RSS::ModWiki> object created with the values you +Returns a raw L<Wiki::Toolkit::Feed::RSS> object created with the values you invoked this module with. =item B<atom_maker> -Returns a raw L<CGI::Wiki::Plugin::Atom> object created with the values you +Returns a raw L<Wiki::Toolkit::Feed::Atom> object created with the values you invoked this module with. =item B<make_feed> @@ -215,7 +215,7 @@ =over 4 -=item * L<CGI::Wiki>, L<CGI::Wiki::Plugin::RSS::ModWiki> and L<CGI::Wiki::Plugin::Atom> +=item * L<Wiki::Toolkit>, L<Wiki::Toolkit::Feed::RSS> and L<Wiki::Toolkit::Feed::Atom> =item * L<http://openguides.org/> Modified: trunk/lib/OpenGuides/RDF.pm =================================================================== --- trunk/lib/OpenGuides/RDF.pm 2006-05-14 15:27:00 UTC (rev 784) +++ trunk/lib/OpenGuides/RDF.pm 2006-05-14 15:54:22 UTC (rev 785) @@ -5,7 +5,6 @@ use vars qw( $VERSION ); $VERSION = '0.09'; -use CGI::Wiki::Plugin::RSS::ModWiki; use Time::Piece; use URI::Escape; use Carp 'croak'; @@ -22,8 +21,8 @@ my $wiki = $args{wiki}; - unless ( $wiki && UNIVERSAL::isa( $wiki, "CGI::Wiki" ) ) { - croak "No CGI::Wiki object supplied."; + unless ( $wiki && UNIVERSAL::isa( $wiki, "Wiki::Toolkit" ) ) { + croak "No Wiki::Toolkit object supplied."; } $self->{wiki} = $wiki; @@ -105,7 +104,7 @@ my $timestamp = $node_data{last_modified}; # Make a Time::Piece object. - my $timestamp_fmt = $CGI::Wiki::Store::Database::timestamp_fmt; + my $timestamp_fmt = $Wiki::Toolkit::Store::Database::timestamp_fmt; if ( $timestamp ) { my $time = Time::Piece->strptime($timestamp, $timestamp_fmt); @@ -227,11 +226,11 @@ =head1 SYNOPSIS - use CGI::Wiki; + use Wiki::Toolkit; use OpenGuides::Config; use OpenGuides::RDF; - my $wiki = CGI::Wiki->new( ... ); + my $wiki = Wiki::Toolkit->new( ... ); my $config = OpenGuides::Config->new( file => "wiki.conf" ); my $rdf_writer = OpenGuides::RDF->new( wiki => $wiki, config => $config ); @@ -249,7 +248,7 @@ my $rdf_writer = OpenGuides::RDF->new( wiki => $wiki, config => $config ); -C<wiki> must be a L<CGI::Wiki> object and C<config> must be an +C<wiki> must be a L<Wiki::Toolkit> object and C<config> must be an L<OpenGuides::Config> object. Both arguments mandatory. @@ -268,7 +267,7 @@ B<Note:> Some of the fields emitted by the RDF/XML generator are taken from the node metadata. The form of this metadata is I<not> mandated -by L<CGI::Wiki>. Your wiki application should make sure to store some or +by L<Wiki::Toolkit>. Your wiki application should make sure to store some or all of the following metadata when calling C<write_node>: =over 4 @@ -295,7 +294,7 @@ =over 4 -=item * L<CGI::Wiki> +=item * L<Wiki::Toolkit> =item * L<http://openguides.org/> Modified: trunk/lib/OpenGuides/Search.pm =================================================================== --- trunk/lib/OpenGuides/Search.pm 2006-05-14 15:27:00 UTC (rev 784) +++ trunk/lib/OpenGuides/Search.pm 2006-05-14 15:54:22 UTC (rev 785) @@ -3,7 +3,7 @@ our $VERSION = '0.10'; use CGI qw( :standard ); -use CGI::Wiki::Plugin::Locator::Grid; +use Wiki::Toolkit::Plugin::Locator::Grid; use File::Spec::Functions qw(:ALL); use OpenGuides::Template; use OpenGuides::Utils; @@ -64,7 +64,7 @@ %locator_params = ( x => "easting", y => "northing" ); } - my $locator = CGI::Wiki::Plugin::Locator::Grid->new( %locator_params ); + my $locator = Wiki::Toolkit::Plugin::Locator::Grid->new( %locator_params ); $wiki->register_plugin( plugin => $locator ); $self->{locator} = $locator; @@ -75,7 +75,7 @@ my $wiki = $search->wiki; -An accessor; returns the underlying L<CGI::Wiki> object. +An accessor; returns the underlying L<Wiki::Toolkit> object. =cut @@ -429,7 +429,7 @@ my %contents_res = $wiki->search_nodes( $phrase ); # Rationalise the scores a little. The scores returned by - # CGI::Wiki::Search::Plucene are simply a ranking. + # Wiki::Toolkit::Search::Plucene are simply a ranking. my $num_results = scalar keys %contents_res; foreach my $node ( keys %contents_res ) { $contents_res{$node} = int( $contents_res{$node} / $num_results ) + 1; Modified: trunk/lib/OpenGuides/Template.pm =================================================================== --- trunk/lib/OpenGuides/Template.pm 2006-05-14 15:27:00 UTC (rev 784) +++ trunk/lib/OpenGuides/Template.pm 2006-05-14 15:54:22 UTC (rev 785) @@ -237,9 +237,9 @@ ); Picks out things like categories, locales, phone number etc from -EITHER the metadata hash returned by L<CGI::Wiki> OR the query +EITHER the metadata hash returned by L<Wiki::Toolkit> OR the query parameters in a L<CGI> object, and packages them nicely for passing to -templates or storing in L<CGI::Wiki> datastore. If you supply both +templates or storing in L<Wiki::Toolkit> datastore. If you supply both C<metadata> and C<cgi_obj> then C<metadata> will take precedence, but don't do that. Modified: trunk/lib/OpenGuides/Test.pm =================================================================== --- trunk/lib/OpenGuides/Test.pm 2006-05-14 15:27:00 UTC (rev 784) +++ trunk/lib/OpenGuides/Test.pm 2006-05-14 15:54:22 UTC (rev 785) @@ -67,7 +67,7 @@ } ); - eval { require CGI::Wiki::Search::Plucene; }; + eval { require Wiki::Toolkit::Search::Plucene; }; if ( $@ ) { $config->use_plucene ( 0 ) }; return $config; Modified: trunk/lib/OpenGuides/UK/PubCrawl.pm =================================================================== --- trunk/lib/OpenGuides/UK/PubCrawl.pm 2006-05-14 15:27:00 UTC (rev 784) +++ trunk/lib/OpenGuides/UK/PubCrawl.pm 2006-05-14 15:54:22 UTC (rev 785) @@ -5,10 +5,10 @@ $VERSION = '0.02'; use Carp qw( croak ); -use CGI::Wiki::Plugin; -use CGI::Wiki::Plugin::Locator::UK; +use Wiki::Toolkit::Plugin; +use Wiki::Toolkit::Plugin::Locator::UK; -@ISA = qw( CGI::Wiki::Plugin ); +@ISA = qw( Wiki::Toolkit::Plugin ); =head1 NAME @@ -23,14 +23,14 @@ =head1 SYNOPSIS - use CGI::Wiki; - use CGI::Wiki::Plugin::Locator::UK; + use Wiki::Toolkit; + use Wiki::Toolkit::Plugin::Locator::UK; use OpenGuides::UK::PubCrawl; - my $wiki = CGI::Wiki->new( ... ); - my $locator = CGI::Wiki::Plugin::Locator::UK->new; + my $wiki = Wiki::Toolkit->new( ... ); + my $locator = Wiki::Toolkit::Plugin::Locator::UK->new; $wiki->register_plugin( plugin => $locator ); - my $categoriser = CGI::Wiki::Plugin::Categoriser->new; + my $categoriser = Wiki::Toolkit::Plugin::Categoriser->new; $wiki->register_plugin( plugin => $categoriser ); my $crawler = OpenGuides::UK::PubCrawl->new( @@ -50,8 +50,8 @@ my $crawler = OpenGuides::UK::PubCrawl->new( locator => $locator ); -Croaks unless a C<CGI::Wiki::Plugin::Locator::UK> object and a -C<CGI::Wiki::Plugin::Categoriser> object are supplied. +Croaks unless a C<Wiki::Toolkit::Plugin::Locator::UK> object and a +C<Wiki::Toolkit::Plugin::Categoriser> object are supplied. =cut @@ -59,12 +59,12 @@ my ($class, %args) = @_; my $locator = $args{locator} or croak "No locator parameter supplied"; - croak "Locator parameter is not a CGI::Wiki::Plugin::Locator::UK" - unless UNIVERSAL::isa( $locator, "CGI::Wiki::Plugin::Locator::UK" ); + croak "Locator parameter is not a Wiki::Toolkit::Plugin::Locator::UK" + unless UNIVERSAL::isa( $locator, "Wiki::Toolkit::Plugin::Locator::UK" ); my $categoriser = $args{categoriser} or croak "No categoriser parameter supplied"; - croak "Categoriser parameter is not a CGI::Wiki::Plugin::Categoriser" - unless UNIVERSAL::isa( $categoriser, "CGI::Wiki::Plugin::Categoriser" ); + croak "Categoriser parameter is not a Wiki::Toolkit::Plugin::Categoriser" + unless UNIVERSAL::isa( $categoriser, "Wiki::Toolkit::Plugin::Categoriser" ); my $self = { _locator => $locator, _categoriser => $categoriser }; bless $self, $class; Modified: trunk/lib/OpenGuides/Utils.pm =================================================================== --- trunk/lib/OpenGuides/Utils.pm 2006-05-14 15:27:00 UTC (rev 784) +++ trunk/lib/OpenGuides/Utils.pm 2006-05-14 15:54:22 UTC (rev 785) @@ -5,9 +5,9 @@ $VERSION = '0.09'; use Carp qw( croak ); -use CGI::Wiki; -use CGI::Wiki::Formatter::UseMod; -use CGI::Wiki::Plugin::RSS::Reader; +use Wiki::Toolkit; +use Wiki::Toolkit::Formatter::UseMod; +use Wiki::Toolkit::Plugin::RSS::Reader; use URI::Escape; =head1 NAME @@ -39,7 +39,7 @@ my $wiki = OpenGuides::Utils->make_wiki_object( config => $config ); Croaks unless an C<OpenGuides::Config> object is supplied. Returns a -C<CGI::Wiki> object made from the given config file on success, +C<Wiki::Toolkit> object made from the given config file on success, croaks if any other error occurs. The config file needs to define at least the following variables: @@ -77,7 +77,7 @@ sqlite => "SQLite", ); - my $cgi_wiki_module = "CGI::Wiki::Store::" . $cgi_wiki_exts{$dbtype}; + my $cgi_wiki_module = "Wiki::Toolkit::Store::" . $cgi_wiki_exts{$dbtype}; eval "require $cgi_wiki_module"; croak "Can't 'require' $cgi_wiki_module.\n" if $@; @@ -95,18 +95,18 @@ && ( lc($config->use_plucene) eq "y" || $config->use_plucene == 1 ) ) { - require CGI::Wiki::Search::Plucene; - $search = CGI::Wiki::Search::Plucene->new( + require Wiki::Toolkit::Search::Plucene; + $search = Wiki::Toolkit::Search::Plucene->new( path => $config->indexing_directory, ); } else { - require CGI::Wiki::Search::SII; + require Wiki::Toolkit::Search::SII; require Search::InvertedIndex::DB::DB_File_SplitHash; my $indexdb = Search::InvertedIndex::DB::DB_File_SplitHash->new( -map_name => $config->indexing_directory, -lock_mode => "EX" ); - $search = CGI::Wiki::Search::SII->new( indexdb => $indexdb ); + $search = Wiki::Toolkit::Search::SII->new( indexdb => $indexdb ); } # Make formatter. @@ -118,10 +118,10 @@ qq(<form action="$search_url" method="get"><input type="text" size="20" name="search"><input type="submit" name="Go" value="Search"></form>), qr/\@INDEX_LINK\s+\[\[(Category|Locale)\s+([^\]|]+)\|?([^\]]+)?\]\]/ => sub { - # We may be being called by CGI::Wiki::Plugin::Diff, + # We may be being called by Wiki::Toolkit::Plugin::Diff, # which doesn't know it has to pass us $wiki - and # we don't use it anyway. - if ( UNIVERSAL::isa( $_[0], "CGI::Wiki" ) ) { + if ( UNIVERSAL::isa( $_[0], "Wiki::Toolkit" ) ) { shift; # just throw it away } my $link_title = $_[2] || "View all pages in $_[0] $_[1]"; @@ -131,9 +131,9 @@ sub { my ($wiki, $type, $value) = @_; - # We may be being called by CGI::Wiki::Plugin::Diff, + # We may be being called by Wiki::Toolkit::Plugin::Diff, # which doesn't know it has to pass us $wiki - unless ( UNIVERSAL::isa( $wiki, "CGI::Wiki" ) ) { + unless ( UNIVERSAL::isa( $wiki, "Wiki::Toolkit" ) ) { return "(unprocessed INDEX_LIST macro)"; } @@ -158,10 +158,10 @@ return $return; }, qr/\(a)RSS\s+(.+)/ => sub { - # We may be being called by CGI::Wiki::Plugin::Diff, + # We may be being called by Wiki::Toolkit::Plugin::Diff, # which doesn't know it has to pass us $wiki - and # we don't use it anyway. - if ( UNIVERSAL::isa( $_[0], "CGI::Wiki" ) ) { + if ( UNIVERSAL::isa( $_[0], "Wiki::Toolkit" ) ) { shift; # just throw it away } @@ -173,7 +173,7 @@ $url = $1; } - my $rss = CGI::Wiki::Plugin::RSS::Reader->new(url => $url); + my $rss = Wiki::Toolkit::Plugin::RSS::Reader->new(url => $url); my @items = $rss->retrieve; # Ten items only at this till. @@ -195,7 +195,7 @@ }, ); - my $formatter = CGI::Wiki::Formatter::UseMod->new( + my $formatter = Wiki::Toolkit::Formatter::UseMod->new( extended_links => 1, implicit_links => 0, allowed_tags => [qw(a p b strong i em pre small img table td @@ -212,7 +212,7 @@ search => $search, formatter => $formatter ); - my $wiki = CGI::Wiki->new( %conf ); + my $wiki = Wiki::Toolkit->new( %conf ); return $wiki; } Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2006-05-14 15:27:00 UTC (rev 784) +++ trunk/lib/OpenGuides.pm 2006-05-14 15:54:22 UTC (rev 785) @@ -3,8 +3,8 @@ use Carp "croak"; use CGI; -use CGI::Wiki::Plugin::Diff; -use CGI::Wiki::Plugin::Locator::Grid; +use Wiki::Toolkit::Plugin::Diff; +use Wiki::Toolkit::Plugin::Locator::Grid; use OpenGuides::CGI; use OpenGuides::Feed; use OpenGuides::Template; @@ -50,18 +50,18 @@ my $geo_handler = $self->config->geo_handler; my $locator; if ( $geo_handler == 1 ) { - $locator = CGI::Wiki::Plugin::Locator::Grid->new( + $locator = Wiki::Toolkit::Plugin::Locator::Grid->new( x => "os_x", y => "os_y" ); } elsif ( $geo_handler == 2 ) { - $locator = CGI::Wiki::Plugin::Locator::Grid->new( + $locator = Wiki::Toolkit::Plugin::Locator::Grid->new( x => "osie_x", y => "osie_y" ); } else { - $locator = CGI::Wiki::Plugin::Locator::Grid->new( + $locator = Wiki::Toolkit::Plugin::Locator::Grid->new( x => "easting", y => "northing" ); } $wiki->register_plugin( plugin => $locator ); $self->{locator} = $locator; - my $differ = CGI::Wiki::Plugin::Diff->new; + my $differ = Wiki::Toolkit::Plugin::Diff->new; $wiki->register_plugin( plugin => $differ ); $self->{differ} = $differ; return $self; @@ -69,7 +69,7 @@ =item B<wiki> -An accessor, returns the underlying L<CGI::Wiki> object. +An accessor, returns the underlying L<Wiki::Toolkit> object. =cut @@ -91,7 +91,7 @@ =item B<locator> -An accessor, returns the underlying L<CGI::Wiki::Plugin::Locator::UK> object. +An accessor, returns the underlying L<Wiki::Toolkit::Plugin::Locator::UK> object. =cut @@ -102,7 +102,7 @@ =item B<differ> -An accessor, returns the underlying L<CGI::Wiki::Plugin::Diff> object. +An accessor, returns the underlying L<Wiki::Toolkit::Plugin::Diff> object. =cut @@ -957,7 +957,7 @@ } $metadata{host} = $ENV{REMOTE_ADDR}; - # CGI::Wiki::Plugin::RSS::ModWiki wants "major_change" to be set. + # Wiki::Toolkit::Plugin::RSS::ModWiki wants "major_change" to be set. $metadata{major_change} = ( $metadata{edit_type} eq "Normal edit" ) ? 1 : 0; @@ -1135,7 +1135,7 @@ =item * L<http://openguides.org/|The OpenGuides website>, with a list of all live OpenGuides installs. -=item * L<CGI::Wiki>, the Wiki toolkit which does the heavy lifting for OpenGuides +=item * L<Wiki::Toolkit>, the Wiki toolkit which does the heavy lifting for OpenGuides =back Modified: trunk/t/11_utils.t =================================================================== --- trunk/t/11_utils.t 2006-05-14 15:27:00 UTC (rev 784) +++ trunk/t/11_utils.t 2006-05-14 15:54:22 UTC (rev 785) @@ -26,7 +26,7 @@ } ); - eval { require CGI::Wiki::Search::Plucene; }; + eval { require Wiki::Toolkit::Search::Plucene; }; if ( $@ ) { $config->use_plucene ( 0 ) }; my $wiki = eval { @@ -34,7 +34,7 @@ }; is( $@, "", "...but not with an OpenGuides::Config object with suitable data" ); - isa_ok( $wiki, "CGI::Wiki" ); + isa_ok( $wiki, "Wiki::Toolkit" ); ok( $wiki->store, "...and store defined" ); ok( $wiki->search_obj, "...and search defined" ); Modified: trunk/t/12_macros.t =================================================================== --- trunk/t/12_macros.t 2006-05-14 15:27:00 UTC (rev 784) +++ trunk/t/12_macros.t 2006-05-14 15:54:22 UTC (rev 785) @@ -1,5 +1,5 @@ use strict; -use CGI::Wiki::Setup::SQLite; +use Wiki::Toolkit::Setup::SQLite; use OpenGuides; use OpenGuides::Test; use Test::More tests => 6; @@ -14,7 +14,7 @@ # Clear out the database from any previous runs. unlink "t/node.db"; unlink <t/indexes/*>; - CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } ); + Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Test->make_basic_config; my $guide = OpenGuides->new( config => $config ); Modified: trunk/t/14_recent_changes_cookies.t =================================================================== --- trunk/t/14_recent_changes_cookies.t 2006-05-14 15:27:00 UTC (rev 784) +++ trunk/t/14_recent_changes_cookies.t 2006-05-14 15:54:22 UTC (rev 785) @@ -1,5 +1,5 @@ use strict; -use CGI::Wiki::Setup::SQLite; +use Wiki::Toolkit::Setup::SQLite; use OpenGuides::Config; use OpenGuides; use OpenGuides::CGI; @@ -57,7 +57,7 @@ skip "DBD::SQLite not installed - no database to test with", 2 unless $have_sqlite; - CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } ); + Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Config->new( vars => { dbtype => "sqlite", @@ -70,7 +70,7 @@ home_name => "Home", } ); - eval { require CGI::Wiki::Search::Plucene; }; + eval { require Wiki::Toolkit::Search::Plucene; }; if ( $@ ) { $config->use_plucene ( 0 ) }; my $guide = OpenGuides->new( config => $config ); Modified: trunk/t/15_template.t =================================================================== --- trunk/t/15_template.t 2006-05-14 15:27:00 UTC (rev 784) +++ trunk/t/15_template.t 2006-05-14 15:54:22 UTC (rev 785) @@ -1,7 +1,7 @@ use strict; use Cwd; use CGI::Cookie; -use CGI::Wiki::Formatter::UseMod; +use Wiki::Toolkit::Formatter::UseMod; use OpenGuides::Config; use OpenGuides::Template; use Test::MockObject; @@ -10,7 +10,7 @@ my $config = OpenGuides::Config->new( vars => { template_path => cwd . '/t/templates', - site_name => 'CGI::Wiki Test Site', + site_name => 'Wiki::Toolkit Test Site', script_url => 'http://wiki.example.com/', script_name => 'mywiki.cgi', default_country => 'United Kingdom', @@ -28,7 +28,7 @@ # object passed in, and I CBA to make a proper wiki object here. my $fake_wiki = Test::MockObject->new; $fake_wiki->mock("formatter", - sub { return CGI::Wiki::Formatter::UseMod->new( munge_urls => 1 ); } ); + sub { return Wiki::Toolkit::Formatter::UseMod->new( munge_urls => 1 ); } ); eval { OpenGuides::Template->output( wiki => $fake_wiki, config => $config ); }; @@ -74,7 +74,7 @@ template => "15_test.tt" ); -like( $output, qr/SITE NAME: CGI::Wiki Test Site/, "site_name var set" ); +like( $output, qr/SITE NAME: Wiki::Toolkit Test Site/, "site_name var set" ); like( $output, qr/CGI URL: mywiki.cgi/, "cgi_url var set" ); like( $output, qr/FULL CGI URL: http:\/\/wiki.example.com\/mywiki.cgi/, "full_cgi_url var set" ); @@ -116,7 +116,7 @@ $config = OpenGuides::Config->new( vars => { template_path => cwd . '/t/templates', - site_name => 'CGI::Wiki Test Site', + site_name => 'Wiki::Toolkit Test Site', script_url => 'http://wiki.example.com/', script_name => 'mywiki.cgi', formatting_rules_node => 'Some External Help', @@ -135,7 +135,7 @@ $config = OpenGuides::Config->new( vars => { template_path => cwd . '/t/templates', - site_name => 'CGI::Wiki Test Site', + site_name => 'Wiki::Toolkit Test Site', script_url => 'http://wiki.example.com/', script_name => '', } @@ -153,7 +153,7 @@ $config = OpenGuides::Config->new( vars => { template_path => cwd . '/t/templates', - site_name => 'CGI::Wiki Test Site', + site_name => 'Wiki::Toolkit Test Site', script_url => 'http://wiki.example.com', script_name => 'wiki.cgi', } Modified: trunk/t/16_test_tester.t =================================================================== --- trunk/t/16_test_tester.t 2006-05-14 15:27:00 UTC (rev 784) +++ trunk/t/16_test_tester.t 2006-05-14 15:54:22 UTC (rev 785) @@ -1,5 +1,5 @@ use strict; -use CGI::Wiki::Setup::SQLite; +use Wiki::Toolkit::Setup::SQLite; use OpenGuides; use OpenGuides::Test; use Test::More; @@ -20,7 +20,7 @@ unlink "t/node.db"; unlink <t/indexes/*>; -CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } ); +Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Test->make_basic_config; $config->site_name( "Test Site" ); my $guide = OpenGuides->new( config => $config ); Modified: trunk/t/21_rdf.t =================================================================== --- trunk/t/21_rdf.t 2006-05-14 15:27:00 UTC (rev 784) +++ trunk/t/21_rdf.t 2006-05-14 15:54:22 UTC (rev 785) @@ -1,4 +1,4 @@ -use CGI::Wiki::Setup::SQLite; +use Wiki::Toolkit::Setup::SQLite; use OpenGuides; use OpenGuides::Config; use OpenGuides::RDF; @@ -14,7 +14,7 @@ skip "DBD::SQLite not installed - no database to test with", 24 unless $have_sqlite; - CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } ); + Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Config->new( vars => { dbtype => "sqlite", @@ -22,12 +22,12 @@ indexing_directory => "t/indexes", script_url => "http://wiki.example.com/", script_name => "mywiki.cgi", - site_name => "CGI::Wiki Test Site", + site_name => "Wiki::Toolkit Test Site", default_city => "London", default_country => "United Kingdom", } ); - eval { require CGI::Wiki::Search::Plucene; }; + eval { require Wiki::Toolkit::Search::Plucene; }; if ( $@ ) { $config->use_plucene ( 0 ) }; @@ -80,7 +80,7 @@ like( $rdfxml, qr|<foaf:homepage rdf:resource="test website" />|, "picks up website" ); like( $rdfxml, - qr|<dc:title>CGI::Wiki Test Site: Calthorpe Arms</dc:title>|, + qr|<dc:title>Wiki::Toolkit Test Site: Calthorpe Arms</dc:title>|, "sets the title correctly" ); like( $rdfxml, qr|<foaf:Person rdf:ID="Kake">|, Modified: trunk/t/22_rss_modwiki.t =================================================================== --- trunk/t/22_rss_modwiki.t 2006-05-14 15:27:00 UTC (rev 784) +++ trunk/t/22_rss_modwiki.t 2006-05-14 15:54:22 UTC (rev 785) @@ -1,8 +1,8 @@ use strict; -use CGI::Wiki::Setup::SQLite; +use Wiki::Toolkit::Setup::SQLite; use OpenGuides::Config; use OpenGuides; -use OpenGuides::RDF; +use OpenGuides::Feed; use OpenGuides::Utils; use Test::More; @@ -12,7 +12,7 @@ exit 0; } -eval { require CGI::Wiki::Search::Plucene; }; +eval { require Wiki::Toolkit::Search::Plucene; }; if ( $@ ) { plan skip_all => "Plucene not installed"; exit 0; @@ -24,7 +24,7 @@ unlink "t/node.db"; unlink <t/indexes/*>; -CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } ); +Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Config->new( vars => { dbtype => "sqlite", Modified: trunk/t/25_write_geo_data.t =================================================================== --- trunk/t/25_write_geo_data.t 2006-05-14 15:27:00 UTC (rev 784) +++ trunk/t/25_write_geo_data.t 2006-05-14 15:54:22 UTC (rev 785) @@ -1,5 +1,5 @@ use strict; -use CGI::Wiki::Setup::SQLite; +use Wiki::Toolkit::Setup::SQLite; use OpenGuides::Config; use OpenGuides; use OpenGuides::Test; @@ -35,7 +35,7 @@ unlink "t/node.db"; unlink <t/indexes/*>; -CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } ); +Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Config->new( vars => { dbtype => "sqlite", Modified: trunk/t/26_geo_data_search_form.t =================================================================== --- trunk/t/26_geo_data_search_form.t 2006-05-14 15:27:00 UTC (rev 784) +++ trunk/t/26_geo_data_search_form.t 2006-05-14 15:54:22 UTC (rev 785) @@ -1,5 +1,5 @@ use strict; -use CGI::Wiki::Setup::SQLite; +use Wiki::Toolkit::Setup::SQLite; use OpenGuides; use OpenGuides::Test; use Test::More; @@ -40,7 +40,7 @@ unlink "t/node.db"; unlink <t/indexes/*>; -CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } ); +Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Test->make_basic_config; $config->use_plucene( 1 ); Modified: trunk/t/27_geo_data_edit_form.t =================================================================== --- trunk/t/27_geo_data_edit_form.t 2006-05-14 15:27:00 UTC (rev 784) +++ trunk/t/27_geo_data_edit_form.t 2006-05-14 15:54:22 UTC (rev 785) @@ -1,5 +1,5 @@ use strict; -use CGI::Wiki::Setup::SQLite; +use Wiki::Toolkit::Setup::SQLite; use OpenGuides; use OpenGuides::Test; use Test::More; @@ -41,7 +41,7 @@ unlink "t/node.db"; unlink <t/indexes/*>; -CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } ); +Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Test->make_basic_config; $config->use_plucene( 1 ); Modified: trunk/t/28_wgs84_coords.t =================================================================== --- trunk/t/28_wgs84_coords.t 2006-05-14 15:27:00 UTC (rev 784) +++ trunk/t/28_wgs84_coords.t 2006-05-14 15:54:22 UTC (rev 785) @@ -1,5 +1,5 @@ use strict; -use CGI::Wiki::Setup::SQLite; +use Wiki::Toolkit::Setup::SQLite; use OpenGuides; use OpenGuides::Test; use Test::More; Modified: trunk/t/31_search.t =================================================================== --- trunk/t/31_search.t 2006-05-14 15:27:00 UTC (rev 784) +++ trunk/t/31_search.t 2006-05-14 15:54:22 UTC (rev 785) @@ -1,5 +1,5 @@ use strict; -use CGI::Wiki::Setup::SQLite; +use Wiki::Toolkit::Setup::SQLite; use OpenGuides::Search; use OpenGuides::Test; use Test::More; @@ -14,13 +14,13 @@ unlink "t/node.db"; unlink <t/indexes/*>; - CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } ); + 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 CGI::Wiki::Search::Plucene; }; + eval { require Wiki::Toolkit::Search::Plucene; }; if ( $@ ) { $config->use_plucene( 0 ) }; my $search = OpenGuides::Search->new( config => $config ); Modified: trunk/t/32_search_simple_metadata.t =================================================================== --- trunk/t/32_search_simple_metadata.t 2006-05-14 15:27:00 UTC (rev 784) +++ trunk/t/32_search_simple_metadata.t 2006-05-14 15:54:22 UTC (rev 785) @@ -1,5 +1,5 @@ use strict; -use CGI::Wiki::Setup::SQLite; +use Wiki::Toolkit::Setup::SQLite; use OpenGuides::Config; use OpenGuides::Search; use Test::More tests => 10; @@ -15,7 +15,7 @@ unlink "t/node.db"; unlink <t/indexes/*>; - CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } ); + Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Config->new( vars => { dbtype => "sqlite", @@ -29,7 +29,7 @@ ); # Plucene is the recommended searcher now. - eval { require CGI::Wiki::Search::Plucene; }; + eval { require Wiki::Toolkit::Search::Plucene; }; if ( $@ ) { $config->use_plucene( 0 ) }; my $search = OpenGuides::Search->new( config => $config ); Modified: trunk/t/33_search_advanced_search.t =================================================================== --- trunk/t/33_search_advanced_search.t 2006-05-14 15:27:00 UTC (rev 784) +++ trunk/t/33_search_advanced_search.t 2006-05-14 15:54:22 UTC (rev 785) @@ -1,6 +1,6 @@ use strict; -use CGI::Wiki::Plugin::Locator::Grid; # use directly to help debug -use CGI::Wiki::Setup::SQLite; +use Wiki::Toolkit::Plugin::Locator::Grid; # use directly to help debug +use Wiki::Toolkit::Setup::SQLite; use OpenGuides::Config; use OpenGuides::Search; use OpenGuides::Test; @@ -26,7 +26,7 @@ # Clear out the database from any previous runs. unlink "t/node.db"; unlink <t/indexes/*>; -CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } ); +Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Config->new( vars => { @@ -78,7 +78,7 @@ # Sanity check. print "# Distances should be:\n"; -my $locator = CGI::Wiki::Plugin::Locator::Grid->new(x => "os_x", y => "os_y"); +my $locator = Wiki::Toolkit::Plugin::Locator::Grid->new(x => "os_x", y => "os_y"); my $wiki = $guide->wiki; $wiki->register_plugin( plugin => $locator ); foreach my $node ( "Blue Anchor", "Crabtree Tavern", "Hammersmith Bridge"){ Modified: trunk/t/33_search_advanced_search_utm.t =================================================================== --- trunk/t/33_search_advanced_search_utm.t 2006-05-14 15:27:00 UTC (rev 784) +++ trunk/t/33_search_advanced_search_utm.t 2006-05-14 15:54:22 UTC (rev 785) @@ -1,5 +1,5 @@ use strict; -use CGI::Wiki::Setup::SQLite; +use Wiki::Toolkit::Setup::SQLite; use OpenGuides::Config; use OpenGuides::Search; use OpenGuides::Test; @@ -25,7 +25,7 @@ # Clear out the database from any previous runs. unlink "t/node.db"; unlink <t/indexes/*>; -CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } ); +Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Config->new( vars => { Modified: trunk/t/34_search_paging.t =================================================================== --- trunk/t/34_search_paging.t 2006-05-14 15:27:00 UTC (rev 784) +++ trunk/t/34_search_paging.t 2006-05-14 15:54:22 UTC (rev 785) @@ -1,5 +1,5 @@ use strict; -use CGI::Wiki::Setup::SQLite; +use Wiki::Toolkit::Setup::SQLite; use OpenGuides::Config; use OpenGuides::Search; use OpenGuides::Test; @@ -20,7 +20,7 @@ # Clear out the database from any previous runs. unlink "t/node.db"; unlink <t/indexes/*>; -CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } ); +Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Test->make_basic_config; $config->use_plucene( 1 ); Modified: trunk/t/35_search_two_searches.t =================================================================== --- trunk/t/35_search_two_searches.t 2006-05-14 15:27:00 UTC (rev 784) +++ trunk/t/35_search_two_searches.t 2006-05-14 15:54:22 UTC (rev 785) @@ -1,5 +1,5 @@ use strict; -use CGI::Wiki::Setup::SQLite; +use Wiki::Toolkit::Setup::SQLite; use OpenGuides::Config; use OpenGuides::Search; use Test::More; @@ -34,7 +34,7 @@ unlink "t/node.db"; unlink <t/indexes/*>; -CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } ); +Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Config->new( vars => { dbtype => "sqlite", @@ -49,7 +49,7 @@ ); # Plucene is the recommended searcher now. -eval { require CGI::Wiki::Search::Plucene; }; +eval { require Wiki::Toolkit::Search::Plucene; }; if ( $@ ) { $config->use_plucene( 0 ) }; my $search = OpenGuides::Search->new( config => $config ); Modified: trunk/t/36_search_order.t =================================================================== --- trunk/t/36_search_order.t 2006-05-14 15:27:00 UTC (rev 784) +++ trunk/t/36_search_order.t 2006-05-14 15:54:22 UTC (rev 785) @@ -1,5 +1,5 @@ use strict; -use CGI::Wiki::Setup::SQLite; +use Wiki::Toolkit::Setup::SQLite; use OpenGuides::Config; use OpenGuides::Search; use Test::More; @@ -10,7 +10,7 @@ exit 0; } -eval { require CGI::Wiki::Search::Plucene; }; +eval { require Wiki::Toolkit::Search::Plucene; }; if ( $@ ) { plan skip_all => "Plucene not installed"; exit 0; @@ -22,7 +22,7 @@ unlink "t/node.db"; unlink <t/indexes/*>; -CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } ); +Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Config->new( vars => { dbtype => "sqlite", Modified: trunk/t/37_search_summaries.t =================================================================== --- trunk/t/37_search_summaries.t 2006-05-14 15:27:00 UTC (rev 784) +++ trunk/t/37_search_summaries.t 2006-05-14 15:54:22 UTC (rev 785) @@ -1,5 +1,5 @@ use strict; -use CGI::Wiki::Setup::SQLite; +use Wiki::Toolkit::Setup::SQLite; use OpenGuides::Config; use OpenGuides::Search; use Test::More; @@ -14,7 +14,7 @@ unlink "t/node.db"; unlink <t/indexes/*>; - CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } ); + Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Config->new( vars => { dbtype => "sqlite", @@ -28,7 +28,7 @@ ); # Plucene is the recommended searcher now. - eval { require CGI::Wiki::Search::Plucene; }; + eval { require Wiki::Toolkit::Search::Plucene; }; if ( $@ ) { $config->use_plucene( 0 ) }; my $search = OpenGuides::Search->new( config => $config ); Modified: trunk/t/38_search_params.t =================================================================== --- trunk/t/38_search_params.t 2006-05-14 15:27:00 UTC (rev 784) +++ trunk/t/38_search_params.t 2006-05-14 15:54:22 UTC (rev 785) @@ -1,6 +1,6 @@ use strict; use CGI; -use CGI::Wiki::Setup::SQLite; +use Wiki::Toolkit::Setup::SQLite; use OpenGuides::Config; use OpenGuides::Search; use Test::More; @@ -11,7 +11,7 @@ exit 0; } -eval { require CGI::Wiki::Search::Plucene; }; +eval { require Wiki::Toolkit::Search::Plucene; }; if ( $@ ) { plan skip_all => "Plucene not installed"; exit 0; @@ -36,7 +36,7 @@ unlink "t/node.db"; unlink <t/indexes/*>; -CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } ); +Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Config->new( vars => { dbtype => "sqlite", Modified: trunk/t/39_search_form.t =================================================================== --- trunk/t/39_search_form.t 2006-05-14 15:27:00 UTC (rev 784) +++ trunk/t/39_search_form.t 2006-05-14 15:54:22 UTC (rev 785) @@ -1,5 +1,5 @@ use strict; -use CGI::Wiki::Setup::SQLite; +use Wiki::Toolkit::Setup::SQLite; use OpenGuides::Search; use OpenGuides::Test; use Test::More; @@ -40,7 +40,7 @@ unlink "t/node.db"; unlink <t/indexes/*>; -CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } ); +Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Test->make_basic_config; $config->use_plucene( 1 ); Modified: trunk/t/41_deletion.t =================================================================== --- trunk/t/41_deletion.t 2006-05-14 15:27:00 UTC (rev 784) +++ trunk/t/41_deletion.t 2006-05-14 15:54:22 UTC (rev 785) @@ -1,5 +1,5 @@ use strict; -use CGI::Wiki::Formatter::UseMod; +use Wiki::Toolkit::Formatter::UseMod; use OpenGuides::Template; use OpenGuides::Test; use Test::MockObject; @@ -15,7 +15,7 @@ # info to make a proper wiki object here. my $fake_wiki = Test::MockObject->new; $fake_wiki->mock("formatter", - sub { return CGI::Wiki::Formatter::UseMod->new( munge_urls => 1 ); } ); + sub { return Wiki::Toolkit::Formatter::UseMod->new( munge_urls => 1 ); } ); my $output = OpenGuides::Template->output( wiki => $fake_wiki, Modified: trunk/t/51_display_node.t =================================================================== --- trunk/t/51_display_node.t 2006-05-14 15:27:00 UTC (rev 784) +++ trunk/t/51_display_node.t 2006-05-14 15:54:22 UTC (rev 785) @@ -1,5 +1,5 @@ use strict; -use CGI::Wiki::Setup::SQLite; +use Wiki::Toolkit::Setup::SQLite; use OpenGuides::Config; use OpenGuides; use Test::More tests => 7; @@ -11,7 +11,7 @@ skip "DBD::SQLite not installed - no database to test with", 5 unless $have_sqlite; - CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } ); + Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Config->new( vars => { dbtype => "sqlite", @@ -24,13 +24,13 @@ home_name => "Home", } ); - eval { require CGI::Wiki::Search::Plucene; }; + eval { require Wiki::Toolkit::Search::Plucene; }; if ( $@ ) { $config->use_plucene ( 0 ) }; my $guide = OpenGuides->new( config => $config ); isa_ok( $guide, "OpenGuides" ); my $wiki = $guide->wiki; - isa_ok( $wiki, "CGI::Wiki" ); + isa_ok( $wiki, "Wiki::Toolkit" ); $wiki->write_node( "Test Page", "foo", undef, { source => "alternate.cgi?Test_Page" } ); my $output = eval { $guide->display_node( id => "Test Page", return_output => 1 ); Modified: trunk/t/52_display_diffs.t =================================================================== --- trunk/t/52_display_diffs.t 2006-05-14 15:27:00 UTC (rev 784) +++ trunk/t/52_display_diffs.t 2006-05-14 15:54:22 UTC (rev 785) @@ -1,5 +1,5 @@ use strict; -use CGI::Wiki::Setup::SQLite; +use Wiki::Toolkit::Setup::SQLite; use OpenGuides; use OpenGuides::Test; use Test::More tests => 5; @@ -11,7 +11,7 @@ skip "DBD::SQLite not installed - no database to test with", 5 unless $have_sqlite; - CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } ); + Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Test->make_basic_config; my $guide = OpenGuides->new( config => $config ); my $wiki = $guide->wiki; Modified: trunk/t/53_show_index.t =================================================================== --- trunk/t/53_show_index.t 2006-05-14 15:27:00 UTC (rev 784) +++ trunk/t/53_show_index.t 2006-05-14 15:54:22 UTC (rev 785) @@ -1,5 +1,5 @@ use strict; -use CGI::Wiki::Setup::SQLite; +use Wiki::Toolkit::Setup::SQLite; use OpenGuides; use OpenGuides::Test; use Test::More tests => 6; @@ -11,14 +11,14 @@ skip "DBD::SQLite not installed - no database to test with", 6 unless $have_sqlite; - CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } ); + 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/" ); my $guide = OpenGuides->new( config => $config ); isa_ok( $guide, "OpenGuides" ); my $wiki = $guide->wiki; - isa_ok( $wiki, "CGI::Wiki" ); + isa_ok( $wiki, "Wiki::Toolkit" ); # Clear out the database from any previous runs. foreach my $del_node ( $wiki->list_all_nodes ) { Modified: trunk/t/54_redirect.t =================================================================== --- trunk/t/54_redirect.t 2006-05-14 15:27:00 UTC (rev 784) +++ trunk/t/54_redirect.t 2006-05-14 15:54:22 UTC (rev 785) @@ -1,5 +1,5 @@ use strict; -use CGI::Wiki::Setup::SQLite; +use Wiki::Toolkit::Setup::SQLite; use OpenGuides::Config; use OpenGuides; use Test::More tests => 2; @@ -11,7 +11,7 @@ skip "DBD::SQLite not installed - no database to test with", 2 unless $have_sqlite; - CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } ); + Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Config->new( vars => { dbtype => "sqlite", @@ -23,7 +23,7 @@ template_path => "./templates", } ); - eval { require CGI::Wiki::Search::Plucene; }; + eval { require Wiki::Toolkit::Search::Plucene; }; if ( $@ ) { $config->use_plucene ( 0 ) }; my $guide = OpenGuides->new( config => $config ); Modified: trunk/t/55_node_history.t =================================================================== --- trunk/t/55_node_history.t 2006-05-14 15:27:00 UTC (rev 784) +++ trunk/t/55_node_history.t 2006-05-14 15:54:22 UTC (rev 785) @@ -1,4 +1,4 @@ -use CGI::Wiki::Setup::SQLite; +use Wiki::Toolkit::Setup::SQLite; use OpenGuides; use OpenGuides::Test; use Test::More tests => 2; @@ -10,8 +10,8 @@ skip "DBD::SQLite not installed - no database to test with", 2 unless $have_sqlite; - CGI::Wiki::Setup::SQLite::cleardb( { dbname => "t/node.db" } ); - CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } ); + Wiki::Toolkit::Setup::SQLite::cleardb( { dbname => "t/node.db" } ); + Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Test->make_basic_config; $config->script_name( "mywiki.cgi" ); $config->script_url( "http://example.com/" ); Modified: trunk/t/56_diffs_with_macros.t =================================================================== --- trunk/t/56_diffs_with_macros.t 2006-05-14 15:27:00 UTC (rev 784) +++ trunk/t/56_diffs_with_macros.t 2006-05-14 15:54:22 UTC (rev 785) @@ -1,5 +1,5 @@ use strict; -use CGI::Wiki::Setup::SQLite; +use Wiki::Toolkit::Setup::SQLite; use File::Temp qw( tempfile ); use OpenGuides; use OpenGuides::Test; @@ -16,7 +16,7 @@ # Clear out the database from any previous runs. unlink "t/node.db"; unlink <t/indexes/*>; -CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } ); +Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Test->make_basic_config; my $guide = OpenGuides->new( config => $config ); Modified: trunk/t/61_bug_textareas.t =================================================================== --- trunk/t/61_bug_textareas.t 2006-05-14 15:27:00 UTC (rev 784) +++ trunk/t/61_bug_textareas.t 2006-05-14 15:54:22 UTC (rev 785) @@ -1,4 +1,4 @@ -use CGI::Wiki::Setup::SQLite; +use Wiki::Toolkit::Setup::SQLite; use OpenGuides::Template; use OpenGuides::Test; use OpenGuides::Utils; @@ -11,7 +11,7 @@ skip "DBD::SQLite not installed - no database to test with", 1 unless $have_sqlite; - CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } ); + Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Test->make_basic_config; my $wiki = OpenGuides::Utils->make_wiki_object( config => $config ); Modified: trunk/t/62_bug_trailing_whitespace.t =================================================================== --- trunk/t/62_bug_trailing_whitespace.t 2006-05-14 15:27:00 UTC (rev 784) +++ trunk/t/62_bug_trailing_whitespace.t 2006-05-14 15:54:22 UTC (rev 785) @@ -1,4 +1,4 @@ -use CGI::Wiki::Setup::SQLite; +use Wiki::Toolkit::Setup::SQLite; use OpenGuides::Config; use OpenGuides; use OpenGuides::Template; @@ -16,7 +16,7 @@ # Clear out the database from any previous runs. unlink "t/node.db"; unlink <t/indexes/*>; -CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } ); +Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Test->make_basic_config; my $guide = OpenGuides->new( config => $config ); Modified: trunk/t/63_bug_map_link_no_address.t =================================================================== --- trunk/t/63_bug_map_link_no_address.t 2006-05-14 15:27:00 UTC (rev 784) +++ trunk/t/63_bug_map_link_no_address.t 2006-05-14 15:54:22 UTC (rev 785) @@ -1,4 +1,4 @@ -use CGI::Wiki::Setup::SQLite; +use Wiki::Toolkit::Setup::SQLite; use OpenGuides; use OpenGuides::Test; use Test::More tests => 1; @@ -10,8 +10,8 @@ skip "DBD::SQLite not installed - no database to test with", 1 unless $have_sqlite; - CGI::Wiki::Setup::SQLite::cleardb( { dbname => "t/node.db" } ); - CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } ); + Wiki::Toolkit::Setup::SQLite::cleardb( { dbname => "t/node.db" } ); + Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Test->make_basic_config; my $guide = OpenGuides->new( config => $config ); Modified: trunk/t/64_bug_node_history.t =================================================================== --- trunk/t/64_bug_node_history.t 2006-05-14 15:27:00 UTC (rev 784) +++ trunk/t/64_bug_node_history.t 2006-05-14 15:54:22 UTC (rev 785) @@ -1,4 +1,4 @@ -use CGI::Wiki::Setup::SQLite; +use Wiki::Toolkit::Setup::SQLite; use OpenGuides::Config; use Cwd; use OpenGuides; @@ -11,8 +11,8 @@ skip "DBD::SQLite not installed - no database to test with", 1 unless $have_sqlite; - CGI::Wiki::Setup::SQLite::cleardb( { dbname => "t/node.db" } ); - CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } ); + Wiki::Toolkit::Setup::SQLite::cleardb( { dbname => "t/node.db" } ); + Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Config->new( vars => { dbtype => "sqlite", @@ -20,11 +20,11 @@ indexing_directory => "t/indexes", script_url => "http://wiki.example.com/", script_name => "mywiki.cgi", - site_name => "CGI::Wiki Test Site", + site_name => "Wiki::Toolkit Test Site", template_path => cwd . "/templates", } ); - eval { require CGI::Wiki::Search::Plucene; }; + eval { require Wiki::Toolkit::Search::Plucene; }; if ( $@ ) { $config->use_plucene ( 0 ) }; my $guide = OpenGuides->new( config => $config ); Modified: trunk/t/65_bug_metadata_escape.t =================================================================== --- trunk/t/65_bug_metadata_escape.t 2006-05-14 15:27:00 UTC (rev 784) +++ trunk/t/65_bug_metadata_escape.t 2006-05-14 15:54:22 UTC (rev 785) @@ -1,4 +1,4 @@ -use CGI::Wiki::Setup::SQLite; +use Wiki::Toolkit::Setup::SQLite; use OpenGuides::Config; use Cwd; use OpenGuides; @@ -10,8 +10,8 @@ } else { plan tests => 1; - CGI::Wiki::Setup::SQLite::cleardb( { dbname => "t/node.db" } ); - CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } ); + Wiki::Toolkit::Setup::SQLite::cleardb( { dbname => "t/node.db" } ); + Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Config->new( vars => { dbtype => "sqlite", @@ -19,11 +19,11 @@ indexing_directory => "t/indexes", script_url => "http://wiki.example.com/", script_name => "mywiki.cgi", - site_name => "CGI::Wiki Test Site", + site_name => "Wiki::Toolkit Test Site", template_path => cwd . "/templates", } ); - eval { require CGI::Wiki::Search::Plucene; }; + eval { require Wiki::Toolkit::Search::Plucene; }; if ( $@ ) { $config->use_plucene ( 0 ) }; my $guide = OpenGuides->new( config => $config ); Modified: trunk/t/66_bug_latlong_representation.t =================================================================== --- trunk/t/66_bug_latlong_representation.t 2006-05-14 15:27:00 UTC (rev 784) +++ trunk/t/66_bug_latlong_representation.t 2006-05-14 15:54:22 UTC (rev 785) @@ -1,6 +1,6 @@ use strict; use CGI; -use CGI::Wiki::Setup::SQLite; +use Wiki::Toolkit::Setup::SQLite; use OpenGuides::Config; use OpenGuides::CGI; use OpenGuides; @@ -23,7 +23,7 @@ unlink "t/node.db"; unlink <t/indexes/*>; -CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } ); +Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Config->new( vars => { dbtype => "sqlite", @@ -40,7 +40,7 @@ ); # Plucene is the recommended searcher now. -eval { require CGI::Wiki::Search::Plucene; }; +eval { require Wiki::Toolkit::Search::Plucene; }; if ( $@ ) { $config->use_plucene( 0 ) }; my $guide = OpenGuides->new( config => $config ); Modified: trunk/t/67_bug_first_version.t =================================================================== --- trunk/t/67_bug_first_version.t 2006-05-14 15:27:00 UTC (rev 784) +++ trunk/t/67_bug_first_version.t 2006-05-14 15:54:22 UTC (rev 785) @@ -1,4 +1,4 @@ -use CGI::Wiki::Setup::SQLite; +use Wiki::Toolkit::Setup::SQLite; use OpenGuides::Config; use OpenGuides; use OpenGuides::Template; @@ -16,7 +16,7 @@ # Clear out the database from any previous runs. unlink "t/node.db"; unlink <t/indexes/*>; -CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } ); +Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Test->make_basic_config; my $guide = OpenGuides->new( config => $config ); Modified: trunk/t/68_bug_website_displayed.t =================================================================== --- trunk/t/68_bug_website_displayed.t 2006-05-14 15:27:00 UTC (rev 784) +++ trunk/t/68_bug_website_displayed.t 2006-05-14 15:54:22 UTC (rev 785) @@ -1,4 +1,4 @@ -use CGI::Wiki::Setup::SQLite; +use Wiki::Toolkit::Setup::SQLite; use OpenGuides; use OpenGuides::Test; use Test::More tests => 1; @@ -10,8 +10,8 @@ skip "DBD::SQLite not installed - no database to test with", 1 unless $have_sqlite; - CGI::Wiki::Setup::SQLite::cleardb( { dbname => "t/node.db" } ); - CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } ); + Wiki::Toolkit::Setup::SQLite::cleardb( { dbname => "t/node.db" } ); + Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Test->make_basic_config; my $guide = OpenGuides->new( config => $config ); Modified: trunk/wiki.cgi =================================================================== --- trunk/wiki.cgi 2006-05-14 15:27:00 UTC (rev 784) +++ trunk/wiki.cgi 2006-05-14 15:54:22 UTC (rev 785) @@ -8,7 +8,7 @@ use CGI qw/:standard/; use CGI::Carp qw(croak); -use CGI::Wiki; +use Wiki::Toolkit; use Geography::NationalGrid; use Geography::NationalGrid::GB; use OpenGuides;

1 0

r784 - in trunk: . lib lib/OpenGuides
by svnadmin＠urchin.earth.li 14 May '06

14 May '06

Author: dom Date: 2006-05-14 16:27:00 +0100 (Sun, 14 May 2006) New Revision: 784 Modified: trunk/Build.PL trunk/Changes trunk/PREREQUISITES trunk/lib/OpenGuides.pm trunk/lib/OpenGuides/Feed.pm trunk/wiki.cgi Log: Revert changeset 769 to reintroduce Atom support. Modified: trunk/Build.PL =================================================================== --- trunk/Build.PL 2006-04-21 09:45:45 UTC (rev 783) +++ trunk/Build.PL 2006-05-14 15:27:00 UTC (rev 784) @@ -221,6 +221,7 @@ 'CGI::Cookie' => 0, 'CGI::Wiki' => '0.62', # fixed delete version 'CGI::Wiki::Formatter::UseMod' => '0.16', # macros + 'CGI::Wiki::Plugin::Atom' => 0, 'CGI::Wiki::Plugin::Categoriser' => 0, 'CGI::Wiki::Plugin::Diff' => '0.08', # earlier buggy 'CGI::Wiki::Plugin::Locator::Grid'=> '0.02', # cope with sqlite 3 Modified: trunk/Changes =================================================================== --- trunk/Changes 2006-04-21 09:45:45 UTC (rev 783) +++ trunk/Changes 2006-05-14 15:27:00 UTC (rev 784) @@ -1,5 +1,9 @@ "#" items refer to tickets. See <http://dev.openguides.org/report/9> for details. +0.55 ??? + Support for Atom feeds for RecentChanges. + #118 Use Wiki::Toolkit + 0.54 21 April 2006 #112 Fixed website display bug introduced in 0.53. Modified: trunk/PREREQUISITES =================================================================== --- trunk/PREREQUISITES 2006-04-21 09:45:45 UTC (rev 783) +++ trunk/PREREQUISITES 2006-05-14 15:27:00 UTC (rev 784) @@ -8,6 +8,7 @@ CGI::Cookie CGI::Wiki (version 0.62 or later) CGI::Wiki::Formatter::UseMod (version 0.16 or later) +CGI::Wiki::Plugin::Atom CGI::Wiki::Plugin::Categoriser CGI::Wiki::Plugin::Diff (version 0.08 or later) CGI::Wiki::Plugin::Locator::Grid (version 0.02 or later) Modified: trunk/lib/OpenGuides/Feed.pm =================================================================== --- trunk/lib/OpenGuides/Feed.pm 2006-04-21 09:45:45 UTC (rev 783) +++ trunk/lib/OpenGuides/Feed.pm 2006-05-14 15:27:00 UTC (rev 784) @@ -5,6 +5,7 @@ use vars qw( $VERSION ); $VERSION = '0.01'; +use CGI::Wiki::Plugin::Atom; use CGI::Wiki::Plugin::RSS::ModWiki; use Time::Piece; use URI::Escape; @@ -62,6 +63,7 @@ my %known_types = ( 'rss' => 1, + 'atom' => 1, ); croak "No feed type specified" unless $feed_type; @@ -70,8 +72,32 @@ if ($feed_type eq 'rss') { return $self->rss_maker->recent_changes(%args); } + elsif ($feed_type eq 'atom') { + return $self->atom_maker->recent_changes(%args); + } } +sub atom_maker { + my $self = shift; + + unless ($self->{atom_maker}) { + $self->{atom_maker} = CGI::Wiki::Plugin::Atom->new( + wiki => $self->{wiki}, + site_name => $self->{site_name}, + 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', + atom_link => $self->{config}->script_url . '?action=rc&format=atom', + software_name => 'OpenGuides', + software_homepage => 'http://openguides.org/', + software_version => $self->{og_version}, + ); + } + + $self->{atom_maker}; +} + sub rss_maker { my $self = shift; @@ -106,7 +132,7 @@ =head1 DESCRIPTION -Produces RSS 1.0 feeds for OpenGuides. Distributed and +Produces RSS 1.0 and Atom 1.0 feeds for OpenGuides. Distributed and installed as part of the OpenGuides project, not intended for independent installation. This documentation is probably only useful to OpenGuides developers. @@ -150,6 +176,11 @@ Returns a raw L<CGI::Wiki::Plugin::RSS::ModWiki> object created with the values you invoked this module with. +=item B<atom_maker> + +Returns a raw L<CGI::Wiki::Plugin::Atom> object created with the values you +invoked this module with. + =item B<make_feed> # Ten most recent changes in RSS format. @@ -159,6 +190,15 @@ feed_type => 'rss', ); print $rdf_writer->make_feed( %args ); + # All the changes made by bob in the past week, ignoring minor edits, in Atom. + $args{days} = 7; + $args{ignore_minor_edits = 1; + $args{filter_on_metadata} => { username => "bob" }; + + print "Content-Type: application/atom+xml\n"; + print "Last-Modified: " . $feed->feed_timestamp( %args ) . "\n\n"; + print $feed->make_feed( %args ); + =item B<feed_timestamp> print "Last-Modified: " . $feed->feed_timestamp( %args ) . "\n\n"; @@ -175,7 +215,7 @@ =over 4 -=item * L<CGI::Wiki> and L<CGI::Wiki::Plugin::RSS::ModWiki> +=item * L<CGI::Wiki>, L<CGI::Wiki::Plugin::RSS::ModWiki> and L<CGI::Wiki::Plugin::Atom> =item * L<http://openguides.org/> Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2006-04-21 09:45:45 UTC (rev 783) +++ trunk/lib/OpenGuides.pm 2006-05-14 15:27:00 UTC (rev 784) @@ -156,6 +156,9 @@ $tt_vars{"rss_".lc($type)."_url"} = $config->script_name . "?action=rc;format=rss;" . lc($type) . "=" . lc(CGI->escape($2)); + $tt_vars{"atom_".lc($type)."_url"} = + $config->script_name . "?action=rc;format=atom;" + . lc($type) . "=" . lc(CGI->escape($2)); } my %current_data = $wiki->retrieve_node( $id ); @@ -647,8 +650,16 @@ locale => "Hammersmith", ); + # 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", + ); + C<feed_type> is a mandatory parameter. Supported values at present are -"rss". +"rss" and "atom". As with other methods, the C<return_output> parameter can be used to return the output instead of printing it to STDOUT. @@ -693,7 +704,11 @@ if ($feed_type eq 'rss') { $output = "Content-Type: application/rdf+xml\n"; - } else { + } + elsif ($feed_type eq 'atom') { + $output = "Content-Type: application/atom+xml\n"; + } + else { croak "Unknown feed type given: $feed_type"; } Modified: trunk/wiki.cgi =================================================================== --- trunk/wiki.cgi 2006-04-21 09:45:45 UTC (rev 783) +++ trunk/wiki.cgi 2006-05-14 15:27:00 UTC (rev 784) @@ -110,6 +110,12 @@ } else { croak "Unknown RSS feed type '$feed'"; } + } elsif ($format && $format eq 'atom') { + my %args = map { $_ => ( $q->param($_) || "" ) } + qw( feed items days ignore_minor_edits username + category locale ); + $args{feed_type} = 'atom'; + $guide->display_feed( %args ); } else { $guide->display_node( id => 'RecentChanges' ); }

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

openguides-commits May 2006