openguides-commits June 2006

openguides-commits@lists.openguides.org

1 participants
24 discussions

r806 - in trunk: . lib
by svnadmin＠urchin.earth.li 13 Jun '06

13 Jun '06

Author: dom Date: 2006-06-13 13:48:54 +0100 (Tue, 13 Jun 2006) New Revision: 806 Modified: trunk/Build.PL trunk/Changes trunk/PREREQUISITES trunk/lib/OpenGuides.pm trunk/wiki.cgi Log: Go for a real release Modified: trunk/Build.PL =================================================================== --- trunk/Build.PL 2006-06-08 21:54:59 UTC (rev 805) +++ trunk/Build.PL 2006-06-13 12:48:54 UTC (rev 806) @@ -219,7 +219,7 @@ 'CGI' => '2.92', # avoid escapeHTML bug 'CGI::Carp' => 0, 'CGI::Cookie' => 0, - 'Wiki::Toolkit' => 0, + 'Wiki::Toolkit' => '0.70', 'Wiki::Toolkit::Feed::Atom' => 0, 'Wiki::Toolkit::Feed::RSS' => 0, 'Wiki::Toolkit::Formatter::UseMod' => 0, Modified: trunk/Changes =================================================================== --- trunk/Changes 2006-06-08 21:54:59 UTC (rev 805) +++ trunk/Changes 2006-06-13 12:48:54 UTC (rev 806) @@ -1,5 +1,9 @@ "#" items refer to tickets. See <http://dev.openguides.org/report/9> for details. +0.55 13 June 2006 + Versioned dependency on Wiki::Toolkit to avoid development + versions + 0.54_02 8 June 2006 Pass the feed_listing (currently just recent_changes) through all the feed related code, rather than assuming it'll only ever be Modified: trunk/PREREQUISITES =================================================================== --- trunk/PREREQUISITES 2006-06-08 21:54:59 UTC (rev 805) +++ trunk/PREREQUISITES 2006-06-13 12:48:54 UTC (rev 806) @@ -1,12 +1,12 @@ -Modules required by OpenGuides 0.54_02 -====================================== +Modules required by OpenGuides 0.55 +=================================== 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 -Wiki::Toolkit +Wiki::Toolkit (version 0.70 or later) Wiki::Toolkit::Feed::Atom Wiki::Toolkit::Feed::RSS Wiki::Toolkit::Formatter::UseMod Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2006-06-08 21:54:59 UTC (rev 805) +++ trunk/lib/OpenGuides.pm 2006-06-13 12:48:54 UTC (rev 806) @@ -14,7 +14,7 @@ use vars qw( $VERSION ); -$VERSION = '0.54_02'; +$VERSION = '0.55'; =head1 NAME Modified: trunk/wiki.cgi =================================================================== --- trunk/wiki.cgi 2006-06-08 21:54:59 UTC (rev 805) +++ trunk/wiki.cgi 2006-06-13 12:48:54 UTC (rev 806) @@ -4,7 +4,7 @@ use warnings; use vars qw( $VERSION ); -$VERSION = '0.54_02'; +$VERSION = '0.55'; use CGI qw/:standard/; use CGI::Carp qw(croak);

1 0

r805 - in trunk: . lib
by svnadmin＠urchin.earth.li 08 Jun '06

08 Jun '06

Author: dom Date: 2006-06-08 22:54:59 +0100 (Thu, 08 Jun 2006) New Revision: 805 Modified: trunk/Changes trunk/PREREQUISITES trunk/lib/OpenGuides.pm trunk/wiki.cgi Log: No, not a real release yet Modified: trunk/Changes =================================================================== --- trunk/Changes 2006-06-08 21:30:28 UTC (rev 804) +++ trunk/Changes 2006-06-08 21:54:59 UTC (rev 805) @@ -1,6 +1,6 @@ "#" items refer to tickets. See <http://dev.openguides.org/report/9> for details. -0.55 +0.54_02 8 June 2006 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 Modified: trunk/PREREQUISITES =================================================================== --- trunk/PREREQUISITES 2006-06-08 21:30:28 UTC (rev 804) +++ trunk/PREREQUISITES 2006-06-08 21:54:59 UTC (rev 805) @@ -1,5 +1,5 @@ -Modules required by OpenGuides 0.55 -=================================== +Modules required by OpenGuides 0.54_02 +====================================== Algorithm::Diff (version 0.13 or later. Note that the latest version uses .zip rather than .tar.gz and breaks some automated installs) Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2006-06-08 21:30:28 UTC (rev 804) +++ trunk/lib/OpenGuides.pm 2006-06-08 21:54:59 UTC (rev 805) @@ -14,7 +14,7 @@ use vars qw( $VERSION ); -$VERSION = '0.55'; +$VERSION = '0.54_02'; =head1 NAME Modified: trunk/wiki.cgi =================================================================== --- trunk/wiki.cgi 2006-06-08 21:30:28 UTC (rev 804) +++ trunk/wiki.cgi 2006-06-08 21:54:59 UTC (rev 805) @@ -4,7 +4,7 @@ use warnings; use vars qw( $VERSION ); -$VERSION = '0.55'; +$VERSION = '0.54_02'; use CGI qw/:standard/; use CGI::Carp qw(croak);

1 0

r804 - in trunk: . t
by svnadmin＠urchin.earth.li 08 Jun '06

08 Jun '06

Author: dom Date: 2006-06-08 22:30:28 +0100 (Thu, 08 Jun 2006) New Revision: 804 Modified: trunk/Changes trunk/t/11_utils.t Log: test fix for wiki::toolkit change (we won't be releasing quite yet then) Modified: trunk/Changes =================================================================== --- trunk/Changes 2006-06-08 21:14:25 UTC (rev 803) +++ trunk/Changes 2006-06-08 21:30:28 UTC (rev 804) @@ -1,6 +1,6 @@ "#" items refer to tickets. See <http://dev.openguides.org/report/9> for details. -0.55 8 June 2006 +0.55 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 Modified: trunk/t/11_utils.t =================================================================== --- trunk/t/11_utils.t 2006-06-08 21:14:25 UTC (rev 803) +++ trunk/t/11_utils.t 2006-06-08 21:30:28 UTC (rev 804) @@ -1,4 +1,5 @@ use strict; +use Wiki::Toolkit::Setup::SQLite; use OpenGuides::Config; use OpenGuides::Utils; use Test::More tests => 7; @@ -16,6 +17,11 @@ skip "DBD::SQLite not installed - no database to test with", 5 unless $have_sqlite; + # 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",

1 0

r803 - in trunk: . lib
by svnadmin＠urchin.earth.li 08 Jun '06

08 Jun '06

Author: dom Date: 2006-06-08 22:14:25 +0100 (Thu, 08 Jun 2006) New Revision: 803 Modified: trunk/Changes trunk/PREREQUISITES trunk/lib/OpenGuides.pm trunk/wiki.cgi Log: Let's try a release Modified: trunk/Changes =================================================================== --- trunk/Changes 2006-06-06 10:55:16 UTC (rev 802) +++ trunk/Changes 2006-06-08 21:14:25 UTC (rev 803) @@ -1,6 +1,6 @@ "#" items refer to tickets. See <http://dev.openguides.org/report/9> for details. -0.54_02 +0.55 8 June 2006 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 Modified: trunk/PREREQUISITES =================================================================== --- trunk/PREREQUISITES 2006-06-06 10:55:16 UTC (rev 802) +++ trunk/PREREQUISITES 2006-06-08 21:14:25 UTC (rev 803) @@ -1,5 +1,5 @@ -Modules required by OpenGuides 0.54_01 -====================================== +Modules required by OpenGuides 0.55 +=================================== Algorithm::Diff (version 0.13 or later. Note that the latest version uses .zip rather than .tar.gz and breaks some automated installs) Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2006-06-06 10:55:16 UTC (rev 802) +++ trunk/lib/OpenGuides.pm 2006-06-08 21:14:25 UTC (rev 803) @@ -14,7 +14,7 @@ use vars qw( $VERSION ); -$VERSION = '0.54_01'; +$VERSION = '0.55'; =head1 NAME Modified: trunk/wiki.cgi =================================================================== --- trunk/wiki.cgi 2006-06-06 10:55:16 UTC (rev 802) +++ trunk/wiki.cgi 2006-06-08 21:14:25 UTC (rev 803) @@ -4,7 +4,7 @@ use warnings; use vars qw( $VERSION ); -$VERSION = '0.54_01'; +$VERSION = '0.55'; use CGI qw/:standard/; use CGI::Carp qw(croak);

1 0

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

06 Jun '06

Author: earle Date: 2006-06-06 11:55:16 +0100 (Tue, 06 Jun 2006) New Revision: 802 Modified: trunk/lib/OpenGuides.pm Log: Update copyright message to reflect new slogan wording. Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2006-06-06 10:54:28 UTC (rev 801) +++ trunk/lib/OpenGuides.pm 2006-06-06 10:55:16 UTC (rev 802) @@ -863,7 +863,7 @@ </p> <p> Copyright ©2003-2006, <a href="http://openguides.org/">The OpenGuides -Project</a>. "OpenGuides", "[The] Open Guide To..." and "The guides built by +Project</a>. "OpenGuides", "[The] Open Guide To..." and "The guides made by you" are trademarks of The OpenGuides Project. Any uses on this site are made with permission. </p>

1 0

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

06 Jun '06

Author: earle Date: 2006-06-06 11:54:28 +0100 (Tue, 06 Jun 2006) New Revision: 801 Modified: trunk/lib/OpenGuides.pm Log: Remove border from around logo image. Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2006-06-06 10:51:35 UTC (rev 800) +++ trunk/lib/OpenGuides.pm 2006-06-06 10:54:28 UTC (rev 801) @@ -821,7 +821,6 @@ h1 { margin-bottom: 0px; font-style: italic; } h2 { margin-top: 0px; } #logo { text-align: center; } -#logo a img { border: 1px solid #000; } #about { margin: 0em 0em 1em 0em; border-top: 1px solid #ddd; border-bottom: 1px solid #ddd; } #meta { font-size: small; text-align: center;} </style>

1 0

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

06 Jun '06

Author: earle Date: 2006-06-06 11:51:35 +0100 (Tue, 06 Jun 2006) New Revision: 800 Modified: trunk/lib/OpenGuides.pm Log: Update logo URL and fix wording in slogan. Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2006-06-01 16:41:11 UTC (rev 799) +++ trunk/lib/OpenGuides.pm 2006-06-06 10:51:35 UTC (rev 800) @@ -834,10 +834,10 @@ <div id="content"> <div id="logo"> <a href="http://openguides.org/"><img -src="http://openguides.org/img/logo.jpg" alt="OpenGuides.org"></a> +src="http://openguides.org/img/logo.png" alt="OpenGuides"></a> <h1><a href="$script_name">$site_name</a></h1> <h2>is powered by <a href="http://openguides.org/">OpenGuides</a> -<br> -the guides built by you.</h2> +the guides made by you.</h2> <h3>version <a href="http://search.cpan.org/~dom/OpenGuides-$VERSION">$VERSION</a></h3> </div> <div id="about">

1 0

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

01 Jun '06

Author: nick Date: 2006-06-01 17:41:11 +0100 (Thu, 01 Jun 2006) New Revision: 799 Modified: trunk/lib/OpenGuides/Search.pm Log: Add in a guide to how the searching code works, to aid in following it Modified: trunk/lib/OpenGuides/Search.pm =================================================================== --- trunk/lib/OpenGuides/Search.pm 2006-06-01 15:34:58 UTC (rev 798) +++ trunk/lib/OpenGuides/Search.pm 2006-06-01 16:41:11 UTC (rev 799) @@ -118,6 +118,19 @@ These two parameters exist to make testing easier; you probably don't want to use them in production. + +In case you're struggling to follow the code, it does the following: +1) Processes the parameters, and bails out if it hit a problem with them +2) If a search string was given, do a text search +3) If distance search paramaters were given, do a distance search +4) If no search has occured, print out the search form +5) If an error occured, bail out +6) If we got a single hit on a string search, redirect to it +7) If no results were found, give an empty search results page +8) Sort the results by either score or distance +9) Decide which results to show, based on paging +10) Display the appropriate page of the results + =back =cut

1 0

r798 - trunk
by svnadmin＠urchin.earth.li 01 Jun '06

01 Jun '06

Author: nick Date: 2006-06-01 16:34:58 +0100 (Thu, 01 Jun 2006) New Revision: 798 Modified: trunk/wiki.cgi Log: Allow feed version of list_all_versions if requested Modified: trunk/wiki.cgi =================================================================== --- trunk/wiki.cgi 2006-06-01 15:23:29 UTC (rev 797) +++ trunk/wiki.cgi 2006-06-01 15:34:58 UTC (rev 798) @@ -95,7 +95,16 @@ host => $q->param("host") || "", ); } elsif ($action eq 'list_all_versions') { - $guide->list_all_versions( id => $node ); + if($format && ($format eq "rss" || $format eq "atom")) { + my %args = ( + feed_type => $format, + feed_listing => 'node_all_versions', + name => $node + ); + $guide->display_feed( %args ); + } else { + $guide->list_all_versions( id => $node ); + } } elsif ($action eq 'rc') { if ($format && $format eq 'rss') { my $feed = $q->param("feed");

1 0

r797 - in trunk: . t
by svnadmin＠urchin.earth.li 01 Jun '06

01 Jun '06

Author: nick Date: 2006-06-01 16:23:29 +0100 (Thu, 01 Jun 2006) New Revision: 797 Added: trunk/t/17_commit_node.t trunk/t/23_feed_node_all_versions.t Modified: trunk/MANIFEST Log: Proper test for committing nodes. Tests for the nodes_all_versions feeds Modified: trunk/MANIFEST =================================================================== --- trunk/MANIFEST 2006-06-01 14:48:23 UTC (rev 796) +++ trunk/MANIFEST 2006-06-01 15:23:29 UTC (rev 797) @@ -62,8 +62,10 @@ t/14_recent_changes_cookies.t t/15_template.t t/16_test_tester.t +t/17_commit_node.t t/21_rdf.t -t/22_rss_modwiki.t +t/22_feed_recent_changes.t +t/23_feed_node_all_versions.t t/25_write_geo_data.t t/26_geo_data_search_form.t t/27_geo_data_edit_form.t Added: trunk/t/17_commit_node.t =================================================================== --- trunk/t/17_commit_node.t 2006-06-01 14:48:23 UTC (rev 796) +++ trunk/t/17_commit_node.t 2006-06-01 15:23:29 UTC (rev 797) @@ -0,0 +1,99 @@ +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; +} + + +plan tests => 5; + +# 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 ); + + +# Write the first version +my $guide = OpenGuides->new( config => $config ); + +# Set up CGI parameters ready for a node write. +# Most of these are in here to avoid uninitialised value warnings. +my $q = CGI->new; +$q->param( -name => "content", -value => "foo" ); +$q->param( -name => "categories", -value => "" ); +$q->param( -name => "locales", -value => "" ); +$q->param( -name => "phone", -value => "" ); +$q->param( -name => "fax", -value => "" ); +$q->param( -name => "website", -value => "" ); +$q->param( -name => "hours_text", -value => "" ); +$q->param( -name => "address", -value => "" ); +$q->param( -name => "postcode", -value => "" ); +$q->param( -name => "map_link", -value => "" ); +$q->param( -name => "os_x", -value => "" ); +$q->param( -name => "os_y", -value => "" ); +$q->param( -name => "username", -value => "bob" ); +$q->param( -name => "comment", -value => "foo" ); +$q->param( -name => "edit_type", -value => "Minor tidying" ); +$ENV{REMOTE_ADDR} = "127.0.0.1"; + +my $output = $guide->commit_node( + return_output => 1, + id => "Wombats", + cgi_obj => $q, + ); + +# Check we have it +ok( $wiki->node_exists( "Wombats" ), "Wombats written" ); + +my %node = $wiki->retrieve_node("Wombats"); +is( $node{version}, 1, "First version" ); +is( $node{metadata}->{edit_type}[0], "Minor tidying", "Right edit type" ); + + +# Now write a second version of it +$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, + ); + +# Check it's as expected +%node = $wiki->retrieve_node("Wombats"); +is( $node{version}, 2, "First version" ); +is( $node{metadata}->{edit_type}[0], "Normal edit", "Right edit type" ); Added: trunk/t/23_feed_node_all_versions.t =================================================================== --- trunk/t/23_feed_node_all_versions.t 2006-06-01 14:48:23 UTC (rev 796) +++ trunk/t/23_feed_node_all_versions.t 2006-06-01 15:23:29 UTC (rev 797) @@ -0,0 +1,142 @@ +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 => 10 * scalar @feed_types; + + +foreach my $feed_type (@feed_types) { + # Clear out the database from any previous runs. + unlink "t/node.db"; + unlink <t/indexes/*>; + + Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); + my $config = OpenGuides::Config->new( + vars => { + dbtype => "sqlite", + dbname => "t/node.db", + indexing_directory => "t/indexes", + script_name => "wiki.cgi", + script_url => "http://example.com/", + site_name => "Test Site", + template_path => "./templates", + home_name => "Home", + use_plucene => 1 + } + ); + + # Basic sanity check first. + my $wiki = OpenGuides::Utils->make_wiki_object( config => $config ); + + my $feed = OpenGuides::Feed->new( wiki => $wiki, + config => $config ); + + my $rss = eval { $feed->make_feed(feed_type => $feed_type, feed_listing => 'recent_changes'); }; + is( $@, "", "->make_feed for $feed_type doesn't croak" ); + + + # Now write some data: 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"); + + # Fetch for Badgers + $output = $guide->display_feed( + return_output => 1, + feed_type => $feed_type, + feed_listing => "node_all_versions", + name => "Badgers" + ); + unlike( $output, qr/<title>Wombats/, "Was on Badgers, so no wombats" ); + like( $output, qr/<title>Badgers/, "Badgers correctly found" ); + + # Now for Wombats + $output = $guide->display_feed( + return_output => 1, + feed_type => $feed_type, + feed_listing => "node_all_versions", + name => "Wombats" + ); + unlike( $output, qr/<title>Badgers/, "Was on Wombats, so no badgers" ); + like( $output, qr/<title>Wombats/, "Wombats correctly found" ); + + my @wombats = $output =~ /(<title>Wombats)/g; + is( scalar @wombats, 3, "All 3 wombat versions found" ); +}

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

openguides-commits June 2006