openguides-commits March 2012

openguides-commits@lists.openguides.org

1 participants
14 discussions

r1316 - trunk/t
by svnadmin＠urchin.earth.li 20 Mar '12

20 Mar '12

Author: kake Date: 2012-03-20 12:16:15 +0000 (Tue, 20 Mar 2012) New Revision: 1316 Modified: trunk/t/34_search_paging.t Log: Skip the right number of tests. Modified: trunk/t/34_search_paging.t =================================================================== --- trunk/t/34_search_paging.t 2012-03-18 09:48:44 UTC (rev 1315) +++ trunk/t/34_search_paging.t 2012-03-20 12:16:15 UTC (rev 1316) @@ -30,7 +30,7 @@ # Test with OS co-ords. eval { require Geo::Coordinates::OSGB; }; SKIP: { - skip "Geo::Coordinates::OSGB not installed", 3 if $@; + skip "Geo::Coordinates::OSGB not installed", 6 if $@; $config->geo_handler( 1 ); foreach my $i ( 1 .. 50 ) { @@ -69,7 +69,7 @@ # Test with OSIE co-ords. eval { require Geo::Coordinates::ITM; }; SKIP: { - skip "Geo::Coordinates::ITM not installed", 3 if $@; + skip "Geo::Coordinates::ITM not installed", 6 if $@; # We must create a new search object after changing the geo_handler # in order to force it to create a fresh locator. @@ -111,7 +111,7 @@ # Test with UTM. eval { require Geo::Coordinates::UTM; }; SKIP: { - skip "Geo::Coordinates::UTM not installed", 3 if $@; + skip "Geo::Coordinates::UTM not installed", 6 if $@; # We must create a new search object after changing the geo_handler # in order to force it to create a fresh locator.

1 0

r1315 - in trunk: . lib/OpenGuides t
by svnadmin＠urchin.earth.li 18 Mar '12

18 Mar '12

Author: kake Date: 2012-03-18 09:48:44 +0000 (Sun, 18 Mar 2012) New Revision: 1315 Added: trunk/t/92_node_name_from_cgi_obj.t trunk/t/93_redirect_without_spaces.t Modified: trunk/Changes trunk/MANIFEST trunk/lib/OpenGuides/CGI.pm trunk/wiki.cgi Log: Added code to deal with node name parameters in URLs having spaces instead of underscores, to take account of people typing manually (#114). Modified: trunk/Changes =================================================================== --- trunk/Changes 2012-03-16 16:08:13 UTC (rev 1314) +++ trunk/Changes 2012-03-18 09:48:44 UTC (rev 1315) @@ -5,6 +5,9 @@ 0.66 ? All templates now have access to the "username" TT variable. + Node name parameters in URLs are now accepted with spaces instead of + underscores, to take account of people typing manually - these will + redirect (303) to the proper URLs with underscores (#114). Add CSS classes for each category and locale to the "content" div (and hence we now require version 2.24 of Template). Switch to using Geo::Coordinates::OSGB/ITM instead of Modified: trunk/MANIFEST =================================================================== --- trunk/MANIFEST 2012-03-16 16:08:13 UTC (rev 1314) +++ trunk/MANIFEST 2012-03-18 09:48:44 UTC (rev 1315) @@ -156,6 +156,8 @@ t/86_recent_changes.t t/90_css_category_locale_classes.t t/91_username_in_templates.t +t/92_node_name_from_cgi_obj.t +t/93_redirect_without_spaces.t t/templates/15_test.tt wiki.cgi META.json Modified: trunk/lib/OpenGuides/CGI.pm =================================================================== --- trunk/lib/OpenGuides/CGI.pm 2012-03-16 16:08:13 UTC (rev 1314) +++ trunk/lib/OpenGuides/CGI.pm 2012-03-18 09:48:44 UTC (rev 1315) @@ -71,6 +71,142 @@ =over 4 +=item B<extract_node_param> + + my $config_file = $ENV{OPENGUIDES_CONFIG_FILE} || "wiki.conf"; + my $config = OpenGuides::Config->new( file => $config_file ); + my $guide = OpenGuides->new( config => $config ); + my $wiki = $guide->wiki; + + my $q = CGI->new; + + my $node_param = OpenGuides::CGI->extract_node_param( + wiki => $wiki, cgi_obj => $q ); + +Returns the title, id, or keywords parameter from the URL. Normally +this will be something like "British_Museum", i.e. with underscores +instead of spaces. However if the URL does contain spaces (encoded as +%20 or +), the return value will be e.g. "British Museum" instead. + +Croaks unless a L<Wiki::Toolkit> object is supplied as C<wiki> and a +L<CGI> object is supplied as C<cgi_obj>. + +=cut + +sub extract_node_param { + my ($class, %args) = @_; + my $wiki = $args{wiki} or croak "No wiki supplied"; + croak "wiki not a Wiki::Toolkit object" + unless UNIVERSAL::isa( $wiki, "Wiki::Toolkit" ); + my $q = $args{cgi_obj} or croak "No cgi_obj supplied"; + croak "cgi_obj not a CGI object" + unless UNIVERSAL::isa( $q, "CGI" ); + + # Note $q->param( "keywords" ) gives you the entire param string. + # We need this to do URLs like foo.com/wiki.cgi?This_Page + my $param = $q->param( "id" ) + || $q->param( "title" ) + || join( " ", $q->param( "keywords" ) ) + || ""; + $param =~ s/%20/ /g; + $param =~ s/\+/ /g; + return $param; +} + +=item B<extract_node_name> + + my $config_file = $ENV{OPENGUIDES_CONFIG_FILE} || "wiki.conf"; + my $config = OpenGuides::Config->new( file => $config_file ); + my $guide = OpenGuides->new( config => $config ); + my $wiki = $guide->wiki; + + my $q = CGI->new; + + my $node_name = OpenGuides::CGI->extract_node_name( + wiki => $wiki, cgi_obj => $q ); + +Returns the name of the node the user wishes to display/manipulate, as +we expect it to be stored in the database. Normally this will be +something like "British Museum", i.e. with spaces in. Croaks unless a +L<Wiki::Toolkit> object is supplied as C<wiki> and a L<CGI> object is +supplied as C<cgi_obj>. + +=cut + +sub extract_node_name { + my ($class, %args) = @_; + # The next call will validate our args for us and croak if necessary. + my $param = $class->extract_node_param( %args ); + + # Sometimes people type spaces instead of underscores. + $param =~ s/ /_/g; + $param =~ s/%20/_/g; + $param =~ s/\+/_/g; + + my $formatter = $args{wiki}->formatter; + return $formatter->node_param_to_node_name( $param ); +} + +=item B<check_spaces_redirect> + + my $config_file = $ENV{OPENGUIDES_CONFIG_FILE} || "wiki.conf"; + my $config = OpenGuides::Config->new( file => $config_file ); + my $guide = OpenGuides->new( config => $config ); + + my $q = CGI->new; + + my $url = OpenGuides::CGI->check_spaces_redirect( + wiki => $wiki, cgi_obj => $q ); + +If the user seems to have typed a URL with spaces in the node param +instead of underscores, this method will return the URL with the +underscores put in. Otherwise, it returns false. + +=cut + +sub check_spaces_redirect { + my ($class, %args) = @_; + my $wiki = $args{wiki}; + my $q = $args{cgi_obj}; + + my $name = $class->extract_node_name( wiki => $wiki, cgi_obj => $q ); + my $param = $class->extract_node_param( wiki => $wiki, cgi_obj => $q ); + + # If we can't figure out the name or param, it's safest to do nothing. + if ( !$name || !$param ) { + return 0; + } + + # If the name has no spaces in, or the name and param differ, we're + # probably OK. + if ( ( $name !~ / / ) || ( $name ne $param ) ) { + return 0; + } + + # Make a new CGI object to manipulate, to avoid action-at-a-distance. + my $new_q = CGI->new( $q ); + my $formatter = $wiki->formatter; + my $real_param = $formatter->node_name_to_node_param( $name ); + + if ( $q->param( "id" ) ) { + $new_q->param( -name => "id", -value => $real_param ); + } elsif ( $q->param( "title" ) ) { + $new_q->param( -name => "title", -value => $real_param ); + } else { + # OK, we have the keywords case; the entire param string is the + # node param. So just delete all existing parameters and stick + # the node param back in. + $new_q->delete_all(); + $new_q->param( -name => "id", -value => $real_param ); + } + + my $url = $new_q->self_url; + + # Escaped commas are ugly. + $url =~ s/%2C/,/g; + return $url; +} + =item B<make_prefs_cookie> my $cookie = OpenGuides::CGI->make_prefs_cookie( Added: trunk/t/92_node_name_from_cgi_obj.t =================================================================== --- trunk/t/92_node_name_from_cgi_obj.t (rev 0) +++ trunk/t/92_node_name_from_cgi_obj.t 2012-03-18 09:48:44 UTC (rev 1315) @@ -0,0 +1,101 @@ +use strict; +use OpenGuides; +use OpenGuides::CGI; +use OpenGuides::Test; +use Test::More; + +eval { require DBD::SQLite; }; +if ( $@ ) { + my ($error) = $@ =~ /^(.*?)\n/; + plan skip_all => + "DBD::SQLite could not be used - no database to test with. ($error)"; +} + +plan tests => 18; + +my $config = OpenGuides::Test->make_basic_config; +my $guide = OpenGuides->new( config => $config ); +my $wiki = $guide->wiki; + +# Clear out the database from any previous runs. +OpenGuides::Test::refresh_db(); + +# Write a node. +OpenGuides::Test->write_data( + guide => $guide, + node => "Ship Of Fools", + return_output => 1, + ); + +my ( $q, $node, $param ); + +# Test we get the right name/param with various CGI objects. Make sure to +# always start with an empty one by passing the empty string as arg. + +$q = CGI->new( "" ); +$q->param( -name => "id", -value => "Ship_Of_Fools" ); +$node = OpenGuides::CGI->extract_node_name( cgi_obj => $q, wiki => $wiki ); +is( $node, "Ship Of Fools", + "extract_node_name gives correct name with id param" ); +$param = OpenGuides::CGI->extract_node_param( cgi_obj => $q, wiki => $wiki ); +is( $param, "Ship_Of_Fools", "...as does extract_node_param" ); + +$q = CGI->new( "" ); +$q->param( -name => "title", -value => "Ship_Of_Fools" ); +$node = OpenGuides::CGI->extract_node_name( cgi_obj => $q, wiki => $wiki ); +is( $node, "Ship Of Fools", "title param works for node name" ); +$param = OpenGuides::CGI->extract_node_param( cgi_obj => $q, wiki => $wiki ); +is( $param, "Ship_Of_Fools", "...and for node param" ); + +$q = CGI->new( "Ship_Of_Fools" ); +$node = OpenGuides::CGI->extract_node_name( cgi_obj => $q, wiki => $wiki ); +is( $node, "Ship Of Fools", "whole-string node param works for node name" ); +$param = OpenGuides::CGI->extract_node_param( cgi_obj => $q, wiki => $wiki ); +is( $param, "Ship_Of_Fools", "...and for node param" ); + +# Now try it with encoded spaces instead of underscores. +$q = CGI->new( "" ); +$q->param( -name => "id", -value => "Ship%20Of%20Fools" ); +$node = OpenGuides::CGI->extract_node_name( cgi_obj => $q, wiki => $wiki ); +is( $node, "Ship Of Fools", + "id param works for node name with encoded spaces" ); +$param = OpenGuides::CGI->extract_node_param( cgi_obj => $q, wiki => $wiki ); +is( $param, "Ship Of Fools", "...as does node param" ); + +$q = CGI->new( "" ); +$q->param( -name => "title", -value => "Ship%20Of%20Fools" ); +$node = OpenGuides::CGI->extract_node_name( cgi_obj => $q, wiki => $wiki ); +is( $node, "Ship Of Fools", + "title param works for node name with encoded spaces" ); +$param = OpenGuides::CGI->extract_node_param( cgi_obj => $q, wiki => $wiki ); +is( $param, "Ship Of Fools", "...as does node param" ); + +$q = CGI->new( "Ship%20Of%20Fools" ); +$node = OpenGuides::CGI->extract_node_name( cgi_obj => $q, wiki => $wiki ); +is( $node, "Ship Of Fools", + "whole-string node param works for node name with encoded spaces" ); +$param = OpenGuides::CGI->extract_node_param( cgi_obj => $q, wiki => $wiki ); +is( $param, "Ship Of Fools", "...as does node param" ); + +# Finally try it with plus signs. +$q = CGI->new( "" ); +$q->param( -name => "id", -value => "Ship+Of+Fools" ); +$node = OpenGuides::CGI->extract_node_name( cgi_obj => $q, wiki => $wiki ); +is( $node, "Ship Of Fools", "id param works for node name with plus signs" ); +$param = OpenGuides::CGI->extract_node_param( cgi_obj => $q, wiki => $wiki ); +is( $param, "Ship Of Fools", "...as does node param" ); + +$q = CGI->new( "" ); +$q->param( -name => "title", -value => "Ship+Of+Fools" ); +$node = OpenGuides::CGI->extract_node_name( cgi_obj => $q, wiki => $wiki ); +is( $node, "Ship Of Fools", + "title param works for node name with plus signs" ); +$param = OpenGuides::CGI->extract_node_param( cgi_obj => $q, wiki => $wiki ); +is( $param, "Ship Of Fools", "...as does node param" ); + +$q = CGI->new( "Ship+Of+Fools" ); +$node = OpenGuides::CGI->extract_node_name( cgi_obj => $q, wiki => $wiki ); +is( $node, "Ship Of Fools", + "whole-string node param works for node name with plus signs" ); +$param = OpenGuides::CGI->extract_node_param( cgi_obj => $q, wiki => $wiki ); +is( $param, "Ship Of Fools", "...as does node param" ); Added: trunk/t/93_redirect_without_spaces.t =================================================================== --- trunk/t/93_redirect_without_spaces.t (rev 0) +++ trunk/t/93_redirect_without_spaces.t 2012-03-18 09:48:44 UTC (rev 1315) @@ -0,0 +1,139 @@ +use strict; +use OpenGuides; +use OpenGuides::CGI; +use OpenGuides::Test; +use Test::More; + +eval { require DBD::SQLite; }; +if ( $@ ) { + my ($error) = $@ =~ /^(.*?)\n/; + plan skip_all => + "DBD::SQLite could not be used - no database to test with. ($error)"; +} + +plan tests => 27; + +my $config = OpenGuides::Test->make_basic_config; +my $guide = OpenGuides->new( config => $config ); +my $wiki = $guide->wiki; + +# Clear out the database from any previous runs. +OpenGuides::Test::refresh_db(); + +# Write a couple of nodes, one with a single-word name, one with multiple. +OpenGuides::Test->write_data( + guide => $guide, + node => "Croydon", + return_output => 1, + ); +OpenGuides::Test->write_data( + guide => $guide, + node => "Ship Of Fools", + return_output => 1, + ); + +my ( $q, $url ); + +# Check we don't get redirects with the single-word node. + +$q = CGI->new( "" ); +$q->param( -name => "id", -value => "Croydon" ); +$url = OpenGuides::CGI->check_spaces_redirect( cgi_obj => $q, wiki => $wiki ); +ok( !$url, "No URL redirect for id param with single-word node" ); + +$q = CGI->new( "" ); +$q->param( -name => "title", -value => "Croydon" ); +$url = OpenGuides::CGI->check_spaces_redirect( cgi_obj => $q, wiki => $wiki ); +ok( !$url, "...nor for title param" ); + +$q = CGI->new( "Croydon" ); +$url = OpenGuides::CGI->check_spaces_redirect( cgi_obj => $q, wiki => $wiki ); +ok( !$url, "...nor for whole-string param" ); + +# Nor with the "proper" URLs with underscores. + +$q = CGI->new( "" ); +$q->param( -name => "id", -value => "Ship_Of_Fools" ); +$url = OpenGuides::CGI->check_spaces_redirect( cgi_obj => $q, wiki => $wiki ); +ok( !$url, "No URL redirect for id param with underscores" ); + +$q = CGI->new( "" ); +$q->param( -name => "title", -value => "Ship_Of_Fools" ); +$url = OpenGuides::CGI->check_spaces_redirect( cgi_obj => $q, wiki => $wiki ); +ok( !$url, "...nor for title param with underscores" ); + +$q = CGI->new( "Ship_Of_Fools" ); +$url = OpenGuides::CGI->check_spaces_redirect( cgi_obj => $q, wiki => $wiki ); +ok( !$url, "...nor for whole-string node param with underscores" ); + +# Now check that we get redirects when supplying CGI objects with spaces +# in the node parameter. + +# First encoded spaces. + +$q = CGI->new( "" ); +$q->param( -name => "id", -value => "Ship%20Of%20Fools" ); +$url = OpenGuides::CGI->check_spaces_redirect( cgi_obj => $q, wiki => $wiki ); +ok( $url, "We do get a redirect for id param with encoded spaces" ); +is( $url, "http://localhost?id=Ship_Of_Fools", "...the right one" ); +$q->param( -name => "action", -value => "edit" ); +$url = OpenGuides::CGI->check_spaces_redirect( cgi_obj => $q, wiki => $wiki ); +ok( $url, "...also get redirect with edit param" ); +is( $url, "http://localhost?id=Ship_Of_Fools;action=edit", + "...the right one" ); + +$q = CGI->new( "" ); +$q->param( -name => "title", -value => "Ship%20Of%20Fools" ); +$url = OpenGuides::CGI->check_spaces_redirect( cgi_obj => $q, wiki => $wiki ); +ok( $url, "...also get redirect for title param with encoded spaces" ); +is( $url, "http://localhost?title=Ship_Of_Fools", "...the right one" ); +$q->param( -name => "action", -value => "edit" ); +$url = OpenGuides::CGI->check_spaces_redirect( cgi_obj => $q, wiki => $wiki ); +ok( $url, "...also get redirect with edit param" ); +is( $url, "http://localhost?title=Ship_Of_Fools;action=edit", + "...the right one" ); + +$q = CGI->new( "Ship%20Of%20Fools" ); +$url = OpenGuides::CGI->check_spaces_redirect( cgi_obj => $q, wiki => $wiki ); +ok( $url, + "...also get redirect for whole-string node param with encoded spaces" ); +is( $url, "http://localhost?id=Ship_Of_Fools", "...the right one" ); + +# Try it with plus signs. + +$q = CGI->new( "" ); +$q->param( -name => "id", -value => "Ship+Of+Fools" ); +$url = OpenGuides::CGI->check_spaces_redirect( cgi_obj => $q, wiki => $wiki ); +ok( $url, "We do get a redirect for id param with plus signs" ); +is( $url, "http://localhost?id=Ship_Of_Fools", "...the right one" ); +$q->param( -name => "action", -value => "edit" ); +$url = OpenGuides::CGI->check_spaces_redirect( cgi_obj => $q, wiki => $wiki ); +ok( $url, "...also get redirect with edit param" ); +is( $url, "http://localhost?id=Ship_Of_Fools;action=edit", + "...the right one" ); + +$q = CGI->new( "" ); +$q->param( -name => "title", -value => "Ship+Of+Fools" ); +$url = OpenGuides::CGI->check_spaces_redirect( cgi_obj => $q, wiki => $wiki ); +ok( $url, "...and for title param with plus signs" ); +is( $url, "http://localhost?title=Ship_Of_Fools", "...the right one" ); +$q->param( -name => "action", -value => "edit" ); +$url = OpenGuides::CGI->check_spaces_redirect( cgi_obj => $q, wiki => $wiki ); +ok( $url, "...also get redirect with edit param" ); +is( $url, "http://localhost?title=Ship_Of_Fools;action=edit", + "...the right one" ); + +$q = CGI->new( "Ship+Of+Fools" ); +$url = OpenGuides::CGI->check_spaces_redirect( cgi_obj => $q, wiki => $wiki ); +ok( $url, "...and for whole-string node param with plus signs" ); +is( $url, "http://localhost?id=Ship_Of_Fools", "...the right one" ); + +# Make sure commas don't get escaped, for it is unnecessary and ugly. +OpenGuides::Test->write_data( + guide => $guide, + node => "Londis, Pitlake", + return_output => 1, + ); +$q = CGI->new( "Londis, Pitlake" ); +$url = OpenGuides::CGI->check_spaces_redirect( cgi_obj => $q, wiki => $wiki ); +is( $url, "http://localhost?id=Londis,_Pitlake", "Commas don't get escaped." ); Modified: trunk/wiki.cgi =================================================================== --- trunk/wiki.cgi 2012-03-16 16:08:13 UTC (rev 1314) +++ trunk/wiki.cgi 2012-03-18 09:48:44 UTC (rev 1315) @@ -30,15 +30,21 @@ $guide = OpenGuides->new( config => $config ); $wiki = $guide->wiki; $formatter = $wiki->formatter; - - # Get CGI object, find out what to do. $q = CGI->new; - # Note $q->param('keywords') gives you the entire param string. - # We need this to do URLs like foo.com/wiki.cgi?This_Page - my $node = $q->param('id') || $q->param('title') || $q->param('keywords') || ''; - $node = $formatter->node_param_to_node_name( $node ); + # See if we need to redirect due to spaces in URL. + my $redirect = OpenGuides::CGI->check_spaces_redirect( + cgi_obj => $q, wiki => $wiki ); + if ( $redirect ) { + print $q->redirect( -uri => $redirect, -status => 303 ); + exit 0; + } + + # No redirect - carry on. + my $node = OpenGuides::CGI->extract_node_name( + cgi_obj => $q, wiki => $wiki ); + # If we did a post, then CGI->param probably hasn't fully de-escaped, # in the same way as a get would've done my $request_method = $q->request_method() || '';

1 0

r1314 - trunk/lib/OpenGuides
by svnadmin＠urchin.earth.li 16 Mar '12

16 Mar '12

Author: kake Date: 2012-03-16 16:08:13 +0000 (Fri, 16 Mar 2012) New Revision: 1314 Modified: trunk/lib/OpenGuides/Template.pm Log: Fixed some line lengths. Modified: trunk/lib/OpenGuides/Template.pm =================================================================== --- trunk/lib/OpenGuides/Template.pm 2012-03-16 15:53:42 UTC (rev 1313) +++ trunk/lib/OpenGuides/Template.pm 2012-03-16 16:08:13 UTC (rev 1314) @@ -124,7 +124,8 @@ my $config = $args{config} or croak "No config supplied"; my $template_path = $config->template_path; my $custom_template_path = $config->custom_template_path || ""; - my $tt = Template->new( { INCLUDE_PATH => "$custom_template_path:$template_path" } ); + my $tt = Template->new( + { INCLUDE_PATH => "$custom_template_path:$template_path" } ); my $script_name = $config->script_name; my $script_url = $config->script_url; @@ -134,9 +135,10 @@ my ($formatting_rules_link, $omit_help_links); my $formatting_rules_node = $config->formatting_rules_node; $formatting_rules_link = $config->formatting_rules_link; - my %cookie_data = OpenGuides::CGI->get_prefs_from_cookie(config=>$config, - cookies => $args{cookies}, - ); + my %cookie_data = OpenGuides::CGI->get_prefs_from_cookie( + config => $config, + cookies => $args{cookies}, + ); if ( $cookie_data{omit_help_links} ) { $omit_help_links = 1; } else { @@ -366,11 +368,13 @@ : $q->param("website"); my $formatted_website_text = ""; if ( $website && $website ne "http://" && is_web_uri( $website ) ) { - my $trunc_website = substr( $website, 0, $config->website_link_max_chars ); + my $trunc_website = substr( $website, 0, + $config->website_link_max_chars ); unless ($website eq $trunc_website ) { $trunc_website .= '...'; } - $formatted_website_text = '<a href="' . $website . '">' . $trunc_website . '</a>'; + $formatted_website_text = '<a href="' . $website . '">' + . $trunc_website . '</a>'; } my $hours_text = $args{metadata} ? $metadata{opening_hours_text}[0] @@ -431,8 +435,10 @@ coord_field_1 => "osie_x", coord_field_2 => "osie_y", dist_field => "osie_dist", - coord_field_1_name =>"Irish National Grid X coordinate", - coord_field_2_name =>"Irish National Grid Y coordinate", + coord_field_1_name + => "Irish National Grid X coordinate", + coord_field_2_name + =>"Irish National Grid Y coordinate", coord_field_1_value => $metadata{osie_x}[0], coord_field_2_value => $metadata{osie_y}[0], ); @@ -451,7 +457,8 @@ ); } } else { - foreach my $var ( qw( phone fax address postcode map_link website summary) ) { + foreach my $var ( qw( phone fax address postcode map_link website + summary) ) { $vars{$var} = $q->param($var); } @@ -471,19 +478,22 @@ $os_y =~ s/\s+//g; # If we were sent x and y, work out lat/long; and vice versa. - if ( defined $os_x && length $os_x && defined $os_y && length $os_y ) { + if ( defined $os_x && length $os_x + && defined $os_y && length $os_y ) { ( $lat, $long ) = Geo::Coordinates::OSGB::grid_to_ll( $os_x, $os_y ); $lat = sprintf( "%.6f", $lat ); $long = sprintf( "%.6f", $long ); - } elsif ( defined $lat && length $lat && defined $long && length $long ) { + } elsif ( defined $lat && length $lat + && defined $long && length $long ) { ( $os_x, $os_y ) = Geo::Coordinates::OSGB::ll_to_grid( $lat, $long ); $os_x = sprintf( "%d", $os_x ); $os_y = sprintf( "%d", $os_y ); } - if ( defined $os_x && length $os_x && defined $os_y && length $os_y ) { + if ( defined $os_x && length $os_x + && defined $os_y && length $os_y ) { %vars = ( %vars, latitude => $lat, @@ -517,18 +527,21 @@ $osie_y =~ s/\s+//g; # If we were sent x and y, work out lat/long; and vice versa. - if ( defined $osie_x && length $osie_x && defined $osie_y && length $osie_y ) { + if ( defined $osie_x && length $osie_x + && defined $osie_y && length $osie_y ) { ( $lat, $long ) = Geo::Coordinates::ITM::grid_to_ll( $osie_x, $osie_y ); $lat = sprintf( "%.6f", $lat ); $long = sprintf( "%.6f", $long ); - } elsif ( defined $lat && length $lat && defined $long && length $long ) { + } elsif ( defined $lat && length $lat && defined $long + && length $long ) { ( $osie_x, $osie_y ) = Geo::Coordinates::ITM::ll_to_grid( $lat, $long ); $osie_x = sprintf( "%d", $osie_x ); $osie_y = sprintf( "%d", $osie_y ); } - if ( defined $osie_x && length $osie_x && defined $osie_y && length $osie_y ) { + if ( defined $osie_x && length $osie_x + && defined $osie_y && length $osie_y ) { %vars = ( %vars, latitude => $lat, @@ -543,8 +556,10 @@ coord_field_1 => "osie_x", coord_field_2 => "osie_y", dist_field => "osie_dist", - coord_field_1_name => "Irish National Grid X coordinate", - coord_field_2_name => "Irish National Grid Y coordinate", + coord_field_1_name + => "Irish National Grid X coordinate", + coord_field_2_name + => "Irish National Grid Y coordinate", coord_field_1_value => $osie_x, coord_field_2_value => $osie_y, ); @@ -554,7 +569,8 @@ my $lat = $q->param("latitude"); my $long = $q->param("longitude"); - if ( defined $lat && length $lat && defined $long && length $long ) { + if ( defined $lat && length $lat + && defined $long && length $long ) { # Trim whitespace. $lat =~ s/\s+//g; $long =~ s/\s+//g;

1 0

r1313 - trunk
by svnadmin＠urchin.earth.li 16 Mar '12

16 Mar '12

Author: kake Date: 2012-03-16 15:53:42 +0000 (Fri, 16 Mar 2012) New Revision: 1313 Modified: trunk/newpage.cgi trunk/preferences.cgi trunk/search.cgi trunk/wiki.cgi Log: Removed trailing whitespace that's been annoying me for ages. Modified: trunk/newpage.cgi =================================================================== --- trunk/newpage.cgi 2012-03-14 17:14:30 UTC (rev 1312) +++ trunk/newpage.cgi 2012-03-16 15:53:42 UTC (rev 1313) @@ -2,8 +2,7 @@ use warnings; use strict; -use sigtrap die => 'normal-signals'; - +use sigtrap die => 'normal-signals'; use CGI; use OpenGuides::Config; use OpenGuides::Template; Modified: trunk/preferences.cgi =================================================================== --- trunk/preferences.cgi 2012-03-14 17:14:30 UTC (rev 1312) +++ trunk/preferences.cgi 2012-03-16 15:53:42 UTC (rev 1313) @@ -2,8 +2,7 @@ use warnings; use strict; -use sigtrap die => 'normal-signals'; - +use sigtrap die => 'normal-signals'; use CGI; use OpenGuides::Config; use OpenGuides::CGI; Modified: trunk/search.cgi =================================================================== --- trunk/search.cgi 2012-03-14 17:14:30 UTC (rev 1312) +++ trunk/search.cgi 2012-03-16 15:53:42 UTC (rev 1313) @@ -2,8 +2,7 @@ use warnings; use strict; -use sigtrap die => 'normal-signals'; - +use sigtrap die => 'normal-signals'; use CGI; use OpenGuides::Config; use OpenGuides::Search; Modified: trunk/wiki.cgi =================================================================== --- trunk/wiki.cgi 2012-03-14 17:14:30 UTC (rev 1312) +++ trunk/wiki.cgi 2012-03-16 15:53:42 UTC (rev 1313) @@ -2,8 +2,7 @@ use strict; use warnings; -use sigtrap die => 'normal-signals'; - +use sigtrap die => 'normal-signals'; use vars qw( $VERSION ); $VERSION = '0.65';

1 0

r1312 - in trunk: . lib/OpenGuides t
by svnadmin＠urchin.earth.li 14 Mar '12

14 Mar '12

Author: kake Date: 2012-03-14 17:14:30 +0000 (Wed, 14 Mar 2012) New Revision: 1312 Added: trunk/t/91_username_in_templates.t Modified: trunk/Changes trunk/MANIFEST trunk/lib/OpenGuides/Template.pm trunk/preferences.cgi Log: Made the 'username' TT variable accessible to all templates. Modified: trunk/Changes =================================================================== --- trunk/Changes 2012-03-13 17:24:05 UTC (rev 1311) +++ trunk/Changes 2012-03-14 17:14:30 UTC (rev 1312) @@ -4,6 +4,7 @@ <http://dev.openguides.org/log/trunk>. 0.66 ? + All templates now have access to the "username" TT variable. Add CSS classes for each category and locale to the "content" div (and hence we now require version 2.24 of Template). Switch to using Geo::Coordinates::OSGB/ITM instead of Modified: trunk/MANIFEST =================================================================== --- trunk/MANIFEST 2012-03-13 17:24:05 UTC (rev 1311) +++ trunk/MANIFEST 2012-03-14 17:14:30 UTC (rev 1312) @@ -155,6 +155,7 @@ t/85_universal_edit_link.t t/86_recent_changes.t t/90_css_category_locale_classes.t +t/91_username_in_templates.t t/templates/15_test.tt wiki.cgi META.json Modified: trunk/lib/OpenGuides/Template.pm =================================================================== --- trunk/lib/OpenGuides/Template.pm 2012-03-13 17:24:05 UTC (rev 1311) +++ trunk/lib/OpenGuides/Template.pm 2012-03-14 17:14:30 UTC (rev 1312) @@ -190,10 +190,20 @@ $tt_vars->{node_param} = CGI->escape($args{wiki}->formatter->node_name_to_node_param($args{node})); } - # Now set further TT variables if explicitly supplied - do this last - # as these override auto-set ones. + # Now set further TT variables if explicitly supplied - do this after the + # above auto-setting as these override auto-set ones. $tt_vars = { %$tt_vars, %{ $args{vars} || {} } }; + # Finally, dig out the username from the cookie if we haven't already + # been sent it in vars. + if ( !$tt_vars->{username} ) { + my %prefs = OpenGuides::CGI->get_prefs_from_cookie(config => $config); + # If there's nothing in there, it defaults to "Anonymous". + if ( $prefs{username} ne "Anonymous" ) { + $tt_vars->{username} = $prefs{username}; + } + } + my $header = ""; unless ( $args{noheaders} ) { Modified: trunk/preferences.cgi =================================================================== --- trunk/preferences.cgi 2012-03-13 17:24:05 UTC (rev 1311) +++ trunk/preferences.cgi 2012-03-14 17:14:30 UTC (rev 1312) @@ -38,6 +38,8 @@ ); push @cookies, $rc_cookie; } + # We have to send the username to OpenGuides::Template because they might + # have changed it, in which case it won't be in the cookie yet. print OpenGuides::Template->output( wiki => $wiki, config => $config, @@ -46,6 +48,7 @@ vars => { not_editable => 1, not_deletable => 1, + username => $prefs{username}, } ); } Added: trunk/t/91_username_in_templates.t =================================================================== --- trunk/t/91_username_in_templates.t (rev 0) +++ trunk/t/91_username_in_templates.t 2012-03-14 17:14:30 UTC (rev 1312) @@ -0,0 +1,64 @@ +use strict; +use Cwd; +use OpenGuides; +use OpenGuides::CGI; +use OpenGuides::Test; +use Test::More; + +eval { require DBD::SQLite; }; +if ( $@ ) { + my ($error) = $@ =~ /^(.*?)\n/; + plan skip_all => + "DBD::SQLite could not be used - no database to test with. ($error)"; +} + +plan tests => 2; + +my $config = OpenGuides::Test->make_basic_config; +$config->custom_template_path( cwd . "/t/templates/tmp/" ); +my $guide = OpenGuides->new( config => $config ); + +# Clear out the database from any previous runs. +OpenGuides::Test::refresh_db(); + +# Write a node. +OpenGuides::Test->write_data( + guide => $guide, + node => "Ship Of Fools", + return_output => 1, + ); + +# Write a custom banner template that includes the username. +eval { + unlink cwd . "/t/templates/tmp/custom_banner.tt"; +}; + +open( my $fh, ">", cwd . "/t/templates/tmp/custom_banner.tt" ) or die $!; +print $fh <<EOF; +<div class="banner_username"> + [% IF username %] + You are logged in as [% username %]. + [% ELSE %] + You are not logged in. + [% END %] +</div> +EOF +close $fh or die $!; + +# Set a username in the cookie. +my $cookie = OpenGuides::CGI->make_prefs_cookie( + config => $config, + username => "Kake", +); +$ENV{HTTP_COOKIE} = $cookie; + +# Check that username appears if cookie is set. +my $output = $guide->display_node( id => "Ship Of Fools", return_output => 1 ); +like( $output, qr/You are logged in as Kake./, + "username sent to templates if set in prefs cookie" ); + +# Check that username doesn't appear if cookie not set. +delete $ENV{HTTP_COOKIE}; +$output = $guide->display_node( id => "Ship Of Fools", return_output => 1 ); +like( $output, qr/You are not logged in./, + "...but not if no username is set." );

1 0

r1311 - in trunk: . t templates
by svnadmin＠urchin.earth.li 13 Mar '12

13 Mar '12

Author: kake Date: 2012-03-13 17:24:05 +0000 (Tue, 13 Mar 2012) New Revision: 1311 Added: trunk/t/90_css_category_locale_classes.t Modified: trunk/Build.PL trunk/Changes trunk/MANIFEST trunk/templates/node.tt Log: Add CSS classes for each category and locale to the "content" div (and hence we now require version 2.24 of Template). Modified: trunk/Build.PL =================================================================== --- trunk/Build.PL 2012-03-06 09:35:12 UTC (rev 1310) +++ trunk/Build.PL 2012-03-13 17:24:05 UTC (rev 1311) @@ -304,7 +304,7 @@ 'Parse::RecDescent' => 0, $search_module => 0, 'POSIX' => 0, - 'Template' => '2.15', # for hash.delete and string.remove vmethods + 'Template' => '2.24', # for .lower vmethod 'Time::Piece' => 0, 'URI::Escape' => 0, 'XML::RSS' => 0, Modified: trunk/Changes =================================================================== --- trunk/Changes 2012-03-06 09:35:12 UTC (rev 1310) +++ trunk/Changes 2012-03-13 17:24:05 UTC (rev 1311) @@ -4,6 +4,8 @@ <http://dev.openguides.org/log/trunk>. 0.66 ? + Add CSS classes for each category and locale to the "content" div + (and hence we now require version 2.24 of Template). Switch to using Geo::Coordinates::OSGB/ITM instead of Geography::NationalGrid (which no longer exists on CPAN). Make sure that whitespace is collapsed in autocreated categories Modified: trunk/MANIFEST =================================================================== --- trunk/MANIFEST 2012-03-06 09:35:12 UTC (rev 1310) +++ trunk/MANIFEST 2012-03-13 17:24:05 UTC (rev 1311) @@ -154,6 +154,7 @@ t/84_navbar_admin.t t/85_universal_edit_link.t t/86_recent_changes.t +t/90_css_category_locale_classes.t t/templates/15_test.tt wiki.cgi META.json Added: trunk/t/90_css_category_locale_classes.t =================================================================== --- trunk/t/90_css_category_locale_classes.t (rev 0) +++ trunk/t/90_css_category_locale_classes.t 2012-03-13 17:24:05 UTC (rev 1311) @@ -0,0 +1,63 @@ +use strict; +use Cwd; +use OpenGuides; +use OpenGuides::Test; +use Test::More; + +eval { require DBD::SQLite; }; +if ( $@ ) { + my ($error) = $@ =~ /^(.*?)\n/; + plan skip_all => + "DBD::SQLite could not be used - no database to test with. ($error)"; +} + +eval { require Test::HTML::Content; }; +if ( $@ ) { + plan skip_all => "Test::HTML::Content not installed"; +} + +plan tests => 3; + +my $config = OpenGuides::Test->make_basic_config; +$config->custom_template_path( cwd . "/t/templates/" ); +my $guide = OpenGuides->new( config => $config ); + +# Clear out the database from any previous runs. +OpenGuides::Test::refresh_db(); + +# Check that a node in one locale and one category has CSS classes for both. +OpenGuides::Test->write_data( + guide => $guide, + node => "Crown", + categories => "Pubs", + locales => "Cornmarket", + return_output => 1, + ); + +my $output = $guide->display_node( id => "Crown", return_output => 1 ); +Test::HTML::Content::tag_ok( $output, "div", + { id => "content", class => "cat_pubs loc_cornmarket" }, + "Node in one locale and one category has CSS classes for both." ); + +# Check that spaces in locale/category names are replaced by underscores. +OpenGuides::Test->write_data( + guide => $guide, + node => "Debenhams", + categories => "Baby Changing", + locales => "Magdalen Street", + return_output => 1, + ); +$output = $guide->display_node( id => "Debenhams", return_output => 1 ); +Test::HTML::Content::tag_ok( $output, "div", + { id => "content", class => "cat_baby_changing loc_magdalen_street" }, + "...and spaces in locale/category names are replaced by underscores." ); + +# Check that nodes with no locales or categories don't have classes added. +OpenGuides::Test->write_data( + guide => $guide, + node => "A Blank Node", + return_output => 1, + ); +$output = $guide->display_node( id => "A Blank Node", return_output => 1 ); +like( $output, qr|<div id="content">|, + "Nodes with no locales or categories don't have classes added." ); Modified: trunk/templates/node.tt =================================================================== --- trunk/templates/node.tt 2012-03-06 09:35:12 UTC (rev 1310) +++ trunk/templates/node.tt 2012-03-13 17:24:05 UTC (rev 1311) @@ -1,7 +1,13 @@ [% USE CGI %] [% INCLUDE header.tt %] [% INCLUDE banner.tt %] -<div id="content"> + +[% IF categories.size OR locales.size %] + <div id="content" class="[% FOREACH cat = categories %]cat_[% cat.name.lower.replace( ' ', '_' ) %][%- " " UNLESS (loop.last AND !locales.size) %][% END %][% FOREACH loc=locales %]loc_[% loc.name.lower.replace( ' ', '_' ) %][%- " " UNLESS loop.last %][% END %]"> +[% ELSE %] + <div id="content"> +[% END %] + [% IF !config.content_above_navbar_in_html %] [% INCLUDE navbar.tt %] [% END %]

1 0

r1310 - trunk
by svnadmin＠urchin.earth.li 06 Mar '12

06 Mar '12

Author: kake Date: 2012-03-06 09:35:12 +0000 (Tue, 06 Mar 2012) New Revision: 1310 Modified: trunk/Changes Log: Documented changes 1306 and 1308, which I forgot to put in the Changes file before. Modified: trunk/Changes =================================================================== --- trunk/Changes 2012-03-06 09:31:54 UTC (rev 1309) +++ trunk/Changes 2012-03-06 09:35:12 UTC (rev 1310) @@ -4,6 +4,10 @@ <http://dev.openguides.org/log/trunk>. 0.66 ? + Switch to using Geo::Coordinates::OSGB/ITM instead of + Geography::NationalGrid (which no longer exists on CPAN). + Make sure that whitespace is collapsed in autocreated categories + and locales, to avoid creating undeletable pages. Add an autocreate_content.tt template to include a map link in content for autocreated categories and locales (#275).

1 0

r1309 - in trunk: . lib t templates
by svnadmin＠urchin.earth.li 06 Mar '12

06 Mar '12

Author: kake Date: 2012-03-06 09:31:54 +0000 (Tue, 06 Mar 2012) New Revision: 1309 Added: trunk/templates/autocreate_content.tt Modified: trunk/Build.PL trunk/Changes trunk/MANIFEST trunk/lib/OpenGuides.pm trunk/t/19_autocreate.t Log: Add an autocreate_content.tt template to include a map link in content for autocreated categories and locales (closes #275). Modified: trunk/Build.PL =================================================================== --- trunk/Build.PL 2012-03-06 08:54:04 UTC (rev 1308) +++ trunk/Build.PL 2012-03-06 09:31:54 UTC (rev 1309) @@ -347,6 +347,7 @@ $build->config_data( __templates => [ "admin_home.tt", "admin_revert_user.tt", + "autocreate_content.tt", "backlink_results.tt", "banner.tt", "blacklisted_host.tt", Modified: trunk/Changes =================================================================== --- trunk/Changes 2012-03-06 08:54:04 UTC (rev 1308) +++ trunk/Changes 2012-03-06 09:31:54 UTC (rev 1309) @@ -3,6 +3,10 @@ More detailed changelogs can be found at <http://dev.openguides.org/log/trunk>. +0.66 ? + Add an autocreate_content.tt template to include a map link in content + for autocreated categories and locales (#275). + 0.65 28 February 2010 Fix some more broken POD and add POD unit test (#268) Don't display revision info for nodes that don't exist (#193) Modified: trunk/MANIFEST =================================================================== --- trunk/MANIFEST 2012-03-06 08:54:04 UTC (rev 1308) +++ trunk/MANIFEST 2012-03-06 09:31:54 UTC (rev 1309) @@ -29,6 +29,7 @@ search.cgi templates/admin_home.tt templates/admin_revert_user.tt +templates/autocreate_content.tt templates/backlink_results.tt templates/banner.tt templates/blacklisted_host.tt @@ -155,3 +156,4 @@ t/86_recent_changes.t t/templates/15_test.tt wiki.cgi +META.json Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2012-03-06 08:54:04 UTC (rev 1308) +++ trunk/lib/OpenGuides.pm 2012-03-06 09:31:54 UTC (rev 1309) @@ -1744,6 +1744,10 @@ my $ok = $tt->process( "custom_autocreate_content.tt", \%tt_vars, \$blurb ); if ( !$ok ) { + $ok = $tt->process( "autocreate_content.tt", + \%tt_vars, \$blurb ); + } + if ( !$ok ) { $blurb = "\@INDEX_LINK [[$node]]"; } $wiki->write_node( Modified: trunk/t/19_autocreate.t =================================================================== --- trunk/t/19_autocreate.t 2012-03-06 08:54:04 UTC (rev 1308) +++ trunk/t/19_autocreate.t 2012-03-06 09:31:54 UTC (rev 1309) @@ -12,7 +12,7 @@ "DBD::SQLite could not be used - no database to test with. ($error)"; } -plan tests => 12; +plan tests => 13; my $config = OpenGuides::Test->make_basic_config; $config->custom_template_path( cwd . "/t/templates/" ); @@ -111,10 +111,19 @@ guide => $guide, node => "Bleeding Heart", categories => "Pubs", + locales => "EC1", return_output => 1, ); $content = $wiki->retrieve_node( "Category Pubs" ); $content =~ s/\s+$//s; -$content =~ s/\s+/ /gs; -is( $content, "\@INDEX_LINK [[Category Pubs]]", +is( $content, "Things in this category " + . "(\@MAP_LINK [[Category Pubs|view them on a map]]):\n" + . "\@INDEX_LIST [[Category Pubs]]", "Default content is picked up if autocreate template doesn't exist" ); + +$content = $wiki->retrieve_node( "Locale EC1" ); +$content =~ s/\s+$//s; +is( $content, "Things in EC1 " + . "(\@MAP_LINK [[Locale EC1|view them on a map]]):\n" + . "\@INDEX_LIST [[Locale EC1]]", + "...and for locales too." ); Added: trunk/templates/autocreate_content.tt =================================================================== --- trunk/templates/autocreate_content.tt (rev 0) +++ trunk/templates/autocreate_content.tt 2012-03-06 09:31:54 UTC (rev 1309) @@ -0,0 +1,2 @@ +Things in [% IF index_type == "Category" %]this category[% ELSE %][% index_value %][% END %] (@MAP_LINK [[[% node_name %]|view them on a map]]): +@INDEX_LIST [[[% node_name %]]]

1 0

r1308 - in trunk: lib/OpenGuides t
by svnadmin＠urchin.earth.li 06 Mar '12

06 Mar '12

Author: kake Date: 2012-03-06 08:54:04 +0000 (Tue, 06 Mar 2012) New Revision: 1308 Modified: trunk/lib/OpenGuides/Template.pm trunk/t/19_autocreate.t Log: Made sure that categories with double spaces or newline in can't be created, as these are then undeletable with the web interface. Modified: trunk/lib/OpenGuides/Template.pm =================================================================== --- trunk/lib/OpenGuides/Template.pm 2012-03-05 02:01:37 UTC (rev 1307) +++ trunk/lib/OpenGuides/Template.pm 2012-03-06 08:54:04 UTC (rev 1308) @@ -312,14 +312,15 @@ my $locales_text = $q->param('locales'); # Basic sanity-checking. Probably lives elsewhere. - $categories_text =~ s/</</g; - $categories_text =~ s/>/>/g; - $locales_text =~ s/</</g; - $locales_text =~ s/>/>/g; + foreach ( $categories_text, $locales_text ) { + s/</</g; + s/>/>/g; + } - @catlist = sort grep { s/^\s+//; s/\s+$//; $_; } # trim lead/trail space + # Trim leading and trailing spaces, collapse internal whitespace. + @catlist = sort grep { s/^\s+//; s/\s+$//; s/\s+/ /g; $_; } split("\r\n", $categories_text); - @loclist = sort grep { s/^\s+//; s/\s+$//; $_; } # trim lead/trail space + @loclist = sort grep { s/^\s+//; s/\s+$//; s/\s+/ /g; $_; } split("\r\n", $locales_text); } Modified: trunk/t/19_autocreate.t =================================================================== --- trunk/t/19_autocreate.t 2012-03-05 02:01:37 UTC (rev 1307) +++ trunk/t/19_autocreate.t 2012-03-06 08:54:04 UTC (rev 1308) @@ -1,5 +1,6 @@ use strict; use Cwd; +use Wiki::Toolkit::Plugin::Categoriser; use OpenGuides; use OpenGuides::Test; use Test::More; @@ -11,16 +12,58 @@ "DBD::SQLite could not be used - no database to test with. ($error)"; } -plan tests => 4; +plan tests => 12; my $config = OpenGuides::Test->make_basic_config; $config->custom_template_path( cwd . "/t/templates/" ); my $guide = OpenGuides->new( config => $config ); my $wiki = $guide->wiki; +my $categoriser = Wiki::Toolkit::Plugin::Categoriser->new; +$wiki->register_plugin( plugin => $categoriser ); # Clear out the database from any previous runs. OpenGuides::Test::refresh_db(); +# Check that unwelcome characters are stripped from autocreated cats/locales. +# Double spaces: +OpenGuides::Test->write_data( + guide => $guide, + node => "Arbat", + categories => "Delicious Russian Food", + return_output => 1, + ); + +ok( !$wiki->node_exists( "Category Delicious Russian Food" ), + "Categories with double spaces in are not auto-created." ); +ok( $wiki->node_exists( "Category Delicious Russian Food" ), + "...but the corresponding category with single spaces is." ); +ok ( !$categoriser->in_category( node => "Arbat", + category => "Delicious Russian Food" ), + "...and the new node is not in the double-spaced category." ); +ok ( $categoriser->in_category( node => "Arbat", + category => "Delicious Russian Food" ), + "...but it is in the single-spaced one." ); + +# Newlines: +OpenGuides::Test->write_data( + guide => $guide, + node => "Liaison", + categories => "Dim\nSum", + return_output => 1, + ); + +ok( !$wiki->node_exists( "Category Dim\nSum" ), + "Categories with newlines in are not auto-created." ); +ok( $wiki->node_exists( "Category Dim Sum" ), + "...but the corresponding category with single spaces is." ); +ok ( !$categoriser->in_category( node => "Liaison", + category => "Dim\nSum" ), + "...and the new node is not in the newlined category." ); +ok ( $categoriser->in_category( node => "Liaison", + category => "Dim Sum" ), + "...but it is in the single-spaced one." ); + + # Write a custom template to autofill content in autocreated nodes. eval { unlink cwd . "/t/templates/custom_autocreate_content.tt"; @@ -40,6 +83,7 @@ node => "Vivat Bacchus", categories => "Restaurants\r\nVegan-friendly", locales => "Farringdon", + return_output => 1, ); ok( $wiki->node_exists( "Category Vegan-Friendly" ), @@ -67,6 +111,7 @@ guide => $guide, node => "Bleeding Heart", categories => "Pubs", + return_output => 1, ); $content = $wiki->retrieve_node( "Category Pubs" ); $content =~ s/\s+$//s;

1 0

r1307 - trunk/t
by svnadmin＠urchin.earth.li 05 Mar '12

05 Mar '12

Author: kake Date: 2012-03-05 02:01:37 +0000 (Mon, 05 Mar 2012) New Revision: 1307 Modified: trunk/t/19_autocreate.t Log: Fixed whitespace/line length. Modified: trunk/t/19_autocreate.t =================================================================== --- trunk/t/19_autocreate.t 2012-03-02 21:06:35 UTC (rev 1306) +++ trunk/t/19_autocreate.t 2012-03-05 02:01:37 UTC (rev 1307) @@ -7,7 +7,8 @@ eval { require DBD::SQLite; }; if ( $@ ) { my ($error) = $@ =~ /^(.*?)\n/; - plan skip_all => "DBD::SQLite could not be used - no database to test with. ($error)"; + plan skip_all => + "DBD::SQLite could not be used - no database to test with. ($error)"; } plan tests => 4; @@ -18,7 +19,7 @@ my $wiki = $guide->wiki; # Clear out the database from any previous runs. - OpenGuides::Test::refresh_db(); +OpenGuides::Test::refresh_db(); # Write a custom template to autofill content in autocreated nodes. eval {

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

openguides-commits March 2012