openguides-commits June 2007

openguides-commits@lists.openguides.org

1 participants
59 discussions

r1070 - in trunk: . lib lib/OpenGuides t templates
by svnadmin＠urchin.earth.li 12 Jun '07

12 Jun '07

Author: dom Date: 2007-06-12 22:47:03 +0100 (Tue, 12 Jun 2007) New Revision: 1070 Modified: trunk/Changes trunk/lib/OpenGuides.pm trunk/lib/OpenGuides/Utils.pm trunk/t/17_commit_node.t trunk/templates/edit_form.tt Log: Add general validation framework, and add test for lat/long and os_x/os_y (closes #22) Modified: trunk/Changes =================================================================== --- trunk/Changes 2007-06-11 22:26:47 UTC (rev 1069) +++ trunk/Changes 2007-06-12 21:47:03 UTC (rev 1070) @@ -18,6 +18,7 @@ action=display (partial fix for #102) Added new div#nonexistent_node_message for displaying message when someone tries to view a nonexistent node. + Validate input geodata (#22) 0.60 13 May 2007 Removed footer search from edit page (shouldn't have been there). Modified: trunk/lib/OpenGuides/Utils.pm =================================================================== --- trunk/lib/OpenGuides/Utils.pm 2007-06-11 22:26:47 UTC (rev 1069) +++ trunk/lib/OpenGuides/Utils.pm 2007-06-12 21:47:03 UTC (rev 1070) @@ -355,6 +355,43 @@ } } +=item B<validate_edit> + + my $fails = OpenGuides::Utils->validate_edit( + id => $node, + cgi_obj => $q + ); + +Checks supplied content for general validity. If anything is invalid, +returns an array ref of errors to report to the user. + +=cut + +sub validate_edit { + my ( $self, %args ) = @_; + my $q = $args{cgi_obj}; + my @fails; + push @fails, "Content missing" unless $q; + return \@fails if @fails; + + # Now do our real validation + # Numeric tests + foreach my $var (qw(os_x os_y)) { + if ($q->param($var) and $q->param($var) !~ /^-?\d+$/) { + push @fails, "$var must be integer, was: " . $q->param($var); + } + } + + foreach my $var (qw(latitude longitude)) { + if ($q->param($var) and $q->param($var) !~ /^-?\d+\.?(\d+)?$/) { + push @fails, "$var must be numeric, was: " . $q->param($var); + } + } + + return \@fails; + +}; + =back =head1 AUTHOR Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2007-06-11 22:26:47 UTC (rev 1069) +++ trunk/lib/OpenGuides.pm 2007-06-12 21:47:03 UTC (rev 1070) @@ -459,12 +459,21 @@ $guide->display_edit_form( id => "Vivat Bacchus", + vars => \%vars, + content => $content, + metadata => \%metadata, + checksum => $checksum ); Display an edit form for the specified node. As with other methods, the C<return_output> parameter can be used to return the output instead of printing it to STDOUT. +If this is to redisplay an existing edit, the content, metadata +and checksum may be supplied in those arguments + +Extra template variables may be supplied in the vars argument + =cut sub display_edit_form { @@ -500,6 +509,22 @@ deter_robots => 1, ); + # Override some things if we were supplied with them + $tt_vars{content} = $args{content} if $args{content}; + $tt_vars{checksum} = $args{checksum} if $args{checksum}; + if (defined $args{vars}) { + my %supplied_vars = %{$args{vars}}; + foreach my $key ( keys %supplied_vars ) { + $tt_vars{$key} = $supplied_vars{$key}; + } + } + if (defined $args{metadata}) { + my %supplied_metadata = %{$args{metadata}}; + foreach my $key ( keys %supplied_metadata ) { + $tt_vars{$key} = $supplied_metadata{$key}; + } + } + my $output = $self->process_template( id => $node, template => "edit_form.tt", @@ -1340,6 +1365,30 @@ ? 1 : 0; + # General validation + my $fails = OpenGuides::Utils->validate_edit( + cgi_obj => $q + ); + + if ( scalar @{$fails} ) { + my %vars = ( + validate_failed => $fails + ); + + my $output = $self->display_edit_form( + id => $node, + content => CGI->escapeHTML($content), + metadata => \%new_metadata, + vars => \%vars, + checksum => CGI->escapeHTML($checksum), + return_output => 1 + ); + + return $output if $return_output; + print $output; + return; + } + # If we can, check to see if this edit looks like spam. my $spam_detector = $config->spam_detector_module; my $is_spam; Modified: trunk/t/17_commit_node.t =================================================================== --- trunk/t/17_commit_node.t 2007-06-11 22:26:47 UTC (rev 1069) +++ trunk/t/17_commit_node.t 2007-06-12 21:47:03 UTC (rev 1070) @@ -18,7 +18,7 @@ } -plan tests => 5; +plan tests => 7; # Clear out the database from any previous runs. unlink "t/node.db"; @@ -97,3 +97,34 @@ %node = $wiki->retrieve_node("Wombats"); is( $node{version}, 2, "First version" ); is( $node{metadata}->{edit_type}[0], "Normal edit", "Right edit type" ); + +# Now try to commit some invalid data, and make sure we get an edit form back +$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 => "fooooo" ); +$q->param( -name => "os_y", -value => "" ); +$q->param( -name => "username", -value => "bob" ); +$q->param( -name => "comment", -value => "foo" ); +$q->param( -name => "node_image", -value => "image" ); +$q->param( -name => "edit_type", -value => "Minor tidying" ); + +$output = $guide->commit_node( + return_output => 1, + id => "Wombats again", + cgi_obj => $q, + ); + +like( $output, qr/Your input was invalid/, + "Edit form displayed and invalid input message shown if invalid input" ); + +like( $output, qr/os_x must be integer/, + "Edit form displayed and os_x integer message displayed" ); Modified: trunk/templates/edit_form.tt =================================================================== --- trunk/templates/edit_form.tt 2007-06-11 22:26:47 UTC (rev 1069) +++ trunk/templates/edit_form.tt 2007-06-12 21:47:03 UTC (rev 1070) @@ -11,6 +11,21 @@ </div> [% END %] + [% IF validate_failed %] + <div class="warning_text"> + <p> + Your input was invalid: + </p> + <ul> + [% FOREACH error = validate_failed %] + <li>[% error %]</li> + [% END %] + </ul> + <p> + Please correct your input data and try again. + </p> + [% END %] + [% IF preview_html AND preview_above_edit_box %] <div id="maincontent"> <h2>Preview</h2>

1 0

r1069 - in trunk/lib: . OpenGuides
by svnadmin＠urchin.earth.li 11 Jun '07

11 Jun '07

Author: dom Date: 2007-06-11 23:26:47 +0100 (Mon, 11 Jun 2007) New Revision: 1069 Modified: trunk/lib/OpenGuides.pm trunk/lib/OpenGuides/Utils.pm Log: Undo incomplete change from previous commit; sorry for the noise Modified: trunk/lib/OpenGuides/Utils.pm =================================================================== --- trunk/lib/OpenGuides/Utils.pm 2007-06-11 20:37:06 UTC (rev 1068) +++ trunk/lib/OpenGuides/Utils.pm 2007-06-11 22:26:47 UTC (rev 1069) @@ -355,26 +355,6 @@ } } -=item B<validate_edit> - - eval { OpenGuides::Utils->validate_edit( - id => $node, - content => $content - metadata => \%new_metadata - ) }; - -Checks supplied content for general validity. If anything is invalid, -dies with an error string suitable for reporting to the user. - -=cut - -sub validate_edit { - my ( $self, %args ) = @_; - die "Content missing\n" unless $args{content}; - die "Metadata missing\n" unless $args{metadata}; - -}; - =back =head1 AUTHOR Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2007-06-11 20:37:06 UTC (rev 1068) +++ trunk/lib/OpenGuides.pm 2007-06-11 22:26:47 UTC (rev 1069) @@ -1335,26 +1335,6 @@ } $new_metadata{host} = $ENV{REMOTE_ADDR}; - # General validation - eval { OpenGuides::Utils->validate_edit( - content => $content, - metadata => \%new_metadata - ) }; - - if ( $@ ) { - my $output = OpenGuides::Template->output( - wiki => $self->wiki, - config => $config, - template => "validate_edit_failed.tt", - vars => { - message => $@ - } - ); - return $output if $return_output; - print $output; - return; - } - # Wiki::Toolkit::Plugin::RSS::ModWiki wants "major_change" to be set. $new_metadata{major_change} = ( $new_metadata{edit_type} eq "Normal edit" ) ? 1

1 0

r1068 - in trunk/lib: . OpenGuides
by svnadmin＠urchin.earth.li 11 Jun '07

11 Jun '07

Author: dom Date: 2007-06-11 21:37:06 +0100 (Mon, 11 Jun 2007) New Revision: 1068 Modified: trunk/lib/OpenGuides.pm trunk/lib/OpenGuides/Utils.pm Log: Add framework for generic content/metadata validation into commit_node Modified: trunk/lib/OpenGuides/Utils.pm =================================================================== --- trunk/lib/OpenGuides/Utils.pm 2007-06-11 03:24:22 UTC (rev 1067) +++ trunk/lib/OpenGuides/Utils.pm 2007-06-11 20:37:06 UTC (rev 1068) @@ -355,6 +355,26 @@ } } +=item B<validate_edit> + + eval { OpenGuides::Utils->validate_edit( + id => $node, + content => $content + metadata => \%new_metadata + ) }; + +Checks supplied content for general validity. If anything is invalid, +dies with an error string suitable for reporting to the user. + +=cut + +sub validate_edit { + my ( $self, %args ) = @_; + die "Content missing\n" unless $args{content}; + die "Metadata missing\n" unless $args{metadata}; + +}; + =back =head1 AUTHOR Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2007-06-11 03:24:22 UTC (rev 1067) +++ trunk/lib/OpenGuides.pm 2007-06-11 20:37:06 UTC (rev 1068) @@ -1335,6 +1335,26 @@ } $new_metadata{host} = $ENV{REMOTE_ADDR}; + # General validation + eval { OpenGuides::Utils->validate_edit( + content => $content, + metadata => \%new_metadata + ) }; + + if ( $@ ) { + my $output = OpenGuides::Template->output( + wiki => $self->wiki, + config => $config, + template => "validate_edit_failed.tt", + vars => { + message => $@ + } + ); + return $output if $return_output; + print $output; + return; + } + # Wiki::Toolkit::Plugin::RSS::ModWiki wants "major_change" to be set. $new_metadata{major_change} = ( $new_metadata{edit_type} eq "Normal edit" ) ? 1

1 0

r1067 - trunk/lib
by svnadmin＠urchin.earth.li 11 Jun '07

11 Jun '07

Author: kake Date: 2007-06-11 04:24:22 +0100 (Mon, 11 Jun 2007) New Revision: 1067 Modified: trunk/lib/OpenGuides.pm Log: Make sure all TT vars are returned if return_tt_vars is passed to OpenGuides->display_node Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2007-06-11 03:06:21 UTC (rev 1066) +++ trunk/lib/OpenGuides.pm 2007-06-11 03:24:22 UTC (rev 1067) @@ -274,8 +274,8 @@ if ( $redirect ) { # Don't redirect if the parameter "redirect" is given as 0. if ($do_redirect == 0) { + $tt_vars{current} = 1; return %tt_vars if $args{return_tt_vars}; - $tt_vars{current} = 1; my $output = $self->process_template( id => $id, template => "node.tt",

1 0

r1066 - in trunk: lib lib/OpenGuides t
by svnadmin＠urchin.earth.li 11 Jun '07

11 Jun '07

Author: kake Date: 2007-06-11 04:06:21 +0100 (Mon, 11 Jun 2007) New Revision: 1066 Modified: trunk/lib/OpenGuides.pm trunk/lib/OpenGuides/RDF.pm trunk/lib/OpenGuides/Utils.pm trunk/t/11_utils.t Log: Refactor redirect detection into OpenGuides::Utils->detect_redirect Modified: trunk/lib/OpenGuides/RDF.pm =================================================================== --- trunk/lib/OpenGuides/RDF.pm 2007-06-11 02:26:08 UTC (rev 1065) +++ trunk/lib/OpenGuides/RDF.pm 2007-06-11 03:06:21 UTC (rev 1066) @@ -2,6 +2,8 @@ use strict; +use OpenGuides::Utils; + use vars qw( $VERSION ); $VERSION = '0.09'; @@ -139,9 +141,9 @@ = $self->{make_node_url}->( $node_name, $tt_vars{version} ); - # Should probably be moved into OpenGuides::Utils. - if ($node_data{content} =~ /^\#REDIRECT \[\[(.*?)]\]$/) { - my $redirect = $1; + my $redirect = OpenGuides::Utils->detect_redirect( content => + $node_data{content} ); + if ( $redirect ) { $tt_vars{redirect} = $config->script_url . $config->script_name . "?id=" . $formatter->node_name_to_node_param( $redirect ) Modified: trunk/lib/OpenGuides/Utils.pm =================================================================== --- trunk/lib/OpenGuides/Utils.pm 2007-06-11 02:26:08 UTC (rev 1065) +++ trunk/lib/OpenGuides/Utils.pm 2007-06-11 03:06:21 UTC (rev 1066) @@ -328,6 +328,33 @@ } } +=item B<detect_redirect> + + $redir = OpenGuides::Utils->detect_redirect( content => "foo" ); + +Checks the content of a node to see if the node is a redirect to another +node. If so, returns the name of the node that this one redirects to. If +not, returns false. + +(Also returns false if no content is provided.) + +=cut + +sub detect_redirect { + my ( $self, %args ) = @_; + return unless $args{content}; + + if ( $args{content} =~ /^#REDIRECT\s+(.+?)\s*$/ ) { + my $redirect = $1; + + # Strip off enclosing [[ ]] in case this is an extended link. + $redirect =~ s/^\[\[//; + $redirect =~ s/\]\]\s*$//; + + return $redirect; + } +} + =back =head1 AUTHOR Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2007-06-11 02:26:08 UTC (rev 1065) +++ trunk/lib/OpenGuides.pm 2007-06-11 03:06:21 UTC (rev 1066) @@ -268,13 +268,10 @@ $tt_vars{catloc_link} = $config->script_url . $config->script_name . "?id="; } - - if ( $node_data{content} && $node_data{content} =~ /^#REDIRECT\s+(.+?)\s*$/ ) { - my $redirect = $1; - # Strip off enclosing [[ ]] in case this is an extended link. - $redirect =~ s/^\[\[//; - $redirect =~ s/\]\]\s*$//; + my $redirect = OpenGuides::Utils->detect_redirect( + content => $node_data{content} ); + if ( $redirect ) { # Don't redirect if the parameter "redirect" is given as 0. if ($do_redirect == 0) { return %tt_vars if $args{return_tt_vars}; Modified: trunk/t/11_utils.t =================================================================== --- trunk/t/11_utils.t 2007-06-11 02:26:08 UTC (rev 1065) +++ trunk/t/11_utils.t 2007-06-11 03:06:21 UTC (rev 1066) @@ -2,7 +2,7 @@ use Wiki::Toolkit::Setup::SQLite; use OpenGuides::Config; use OpenGuides::Utils; -use Test::More tests => 8; +use Test::More tests => 10; eval { my $wiki = OpenGuides::Utils->make_wiki_object; }; ok( $@, "->make_wiki_object croaks if no config param supplied" ); @@ -28,7 +28,8 @@ } SKIP: { - skip "DBD::SQLite could not be used - no database to test with. ($sqlite_error)", 5 + skip "DBD::SQLite could not be used - no database to test with. " + . "($sqlite_error)", 7 unless $have_sqlite; # Clear out the database from any previous runs. @@ -59,4 +60,11 @@ ok( $wiki->store, "...and store defined" ); ok( $wiki->search_obj, "...and search defined" ); ok( $wiki->formatter, "...and formatter defined" ); + + # Now test ->detect_redirect + is( OpenGuides::Utils->detect_redirect( content => "#REDIRECT [[Foo]]" ), + "Foo", + "->detect_redirect successfully detects redirect content" ); + ok( !OpenGuides::Utils->detect_redirect( content => "Mmmm, tea." ), + "...and successfully detects non-redirect content" ); }

1 0

r1065 - in trunk: . templates
by svnadmin＠urchin.earth.li 11 Jun '07

11 Jun '07

Author: kake Date: 2007-06-11 03:26:08 +0100 (Mon, 11 Jun 2007) New Revision: 1065 Modified: trunk/Changes trunk/README.CSS trunk/templates/node.tt Log: Added new div#nonexistent_node_message for displaying message when someone tries to view a nonexistent node. Modified: trunk/Changes =================================================================== --- trunk/Changes 2007-06-11 02:23:11 UTC (rev 1064) +++ trunk/Changes 2007-06-11 02:26:08 UTC (rev 1065) @@ -16,6 +16,8 @@ Respect redirect=0 (#104). If an unknown action is supplied to wiki.cgi, redirect to action=display (partial fix for #102) + Added new div#nonexistent_node_message for displaying message when + someone tries to view a nonexistent node. 0.60 13 May 2007 Removed footer search from edit page (shouldn't have been there). Modified: trunk/README.CSS =================================================================== --- trunk/README.CSS 2007-06-11 02:23:11 UTC (rev 1064) +++ trunk/README.CSS 2007-06-11 02:26:08 UTC (rev 1065) @@ -284,6 +284,10 @@ Used in: node.tt Purpose: Display the node name and an "edit this page" link. +div#nonexistent_node_message + Used in: node.tt + Purpose: Display message when someone tries to view a nonexistent node. + div#rdf_link Used in: node.tt Purpose: Link to an RDF version of the node Modified: trunk/templates/node.tt =================================================================== --- trunk/templates/node.tt 2007-06-11 02:23:11 UTC (rev 1064) +++ trunk/templates/node.tt 2007-06-11 02:26:08 UTC (rev 1065) @@ -49,7 +49,7 @@ [% END %] [% IF not (content || coord_field_1_value || coord_field_2_value || wgs84_lat || wgs84_long) %] </div> -We don't have a node called "[% node_param %]". Would you like to <a href="[% full_cgi_url %]?action=edit;id=[% node_param %]">create it</a>? +<div id="nonexistent_node_message">We don't have a node called "[% node_param %]". Would you like to <a href="[% full_cgi_url %]?action=edit;id=[% node_param %]">create it</a>?</div> [% ELSE %] <div id="title_edit_link"> <a href="[% full_cgi_url %]?action=edit;id=[% node_param %]">Edit this page</a>

1 0

r1064 - in trunk: lib t
by svnadmin＠urchin.earth.li 11 Jun '07

11 Jun '07

Author: kake Date: 2007-06-11 03:23:11 +0100 (Mon, 11 Jun 2007) New Revision: 1064 Modified: trunk/lib/OpenGuides.pm trunk/t/51_display_node.t trunk/t/54_redirect.t Log: Add intercept_redirect parameter to Openguides->display_node - used with the return_output parameter for testing. Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2007-06-10 17:31:17 UTC (rev 1063) +++ trunk/lib/OpenGuides.pm 2007-06-11 02:23:11 UTC (rev 1064) @@ -163,13 +163,25 @@ return_tt_vars => 1, ); -If C<version> is omitted then the latest version will be displayed. +If C<version> is omitted then it will assume you want the latest version. +Note that if you pass the C<return_output> parameter, and your node is a +redirecting node, this method will fake the redirect and return the output +that will actually end up in the user's browser. If instead you want to see +the HTTP headers that will be printed in order to perform the redirect, pass +the C<intercept_redirect> parameter as well. The C<intercept_redirect> +parameter has no effect if the node isn't a redirect, or if the +C<return_output> parameter is omitted. + +(At the moment, C<return_tt_vars> acts as if the C<intercept_redirect> +parameter was passed.) + =cut sub display_node { my ($self, %args) = @_; my $return_output = $args{return_output} || 0; + my $intercept_redirect = $args{intercept_redirect}; my $version = $args{version}; my $id = $args{id} || $self->config->home_name; my $wiki = $self->wiki; @@ -276,9 +288,17 @@ print $output; } elsif ( $wiki->node_exists($redirect) && $redirect ne $id && $redirect ne $oldid ) { # Avoid loops by not generating redirects to the same node or the previous node. - my $output = $self->redirect_to_node($redirect, $id); - return $output if $return_output; - print $output; + if ( $return_output ) { + if ( $intercept_redirect ) { + return $self->redirect_to_node( $redirect, $id ); + } else { + return $self->display_node( id => $redirect, + oldid => $id, + return_output => 1, + ); + } + } + print $self->redirect_to_node( $redirect, $id ); return 0; } } Modified: trunk/t/51_display_node.t =================================================================== --- trunk/t/51_display_node.t 2007-06-10 17:31:17 UTC (rev 1063) +++ trunk/t/51_display_node.t 2007-06-11 02:23:11 UTC (rev 1064) @@ -50,7 +50,9 @@ $wiki->write_node( 'Redirect Test', '#REDIRECT Test Page', undef ); -$output = $guide->display_node( id => 'Redirect Test', return_output => 1 ); +$output = $guide->display_node( id => 'Redirect Test', + return_output => 1, + intercept_redirect => 1 ); like( $output, qr{^\QLocation: http://example.com/wiki.cgi?id=Test_Page;oldid=Redirect_Test}ms, '#REDIRECT redirects correctly' ); Modified: trunk/t/54_redirect.t =================================================================== --- trunk/t/54_redirect.t 2007-06-10 17:31:17 UTC (rev 1063) +++ trunk/t/54_redirect.t 2007-06-11 02:23:11 UTC (rev 1064) @@ -41,7 +41,9 @@ $wiki->write_node( "Test Page 2", "foo" ) or die "Can't write node"; my $output = eval { - $guide->display_node( id => "Test Page", return_output => 1 ); + $guide->display_node( id => "Test Page", + return_output => 1, + intercept_redirect => 1 ); }; is( $@, "", "->display_node doesn't die when page is a redirect" );

1 0

r1063 - in trunk: lib/OpenGuides t
by svnadmin＠urchin.earth.li 10 Jun '07

10 Jun '07

Author: ilmari Date: 2007-06-10 18:31:17 +0100 (Sun, 10 Jun 2007) New Revision: 1063 Modified: trunk/lib/OpenGuides/Test.pm trunk/t/21_rdf.t Log: Convert t/21_rdf.t to use OpenGuides::Test->write_data and extend this as needed Modified: trunk/lib/OpenGuides/Test.pm =================================================================== --- trunk/lib/OpenGuides/Test.pm 2007-06-10 17:13:36 UTC (rev 1062) +++ trunk/lib/OpenGuides/Test.pm 2007-06-10 17:31:17 UTC (rev 1063) @@ -165,12 +165,14 @@ my $q = OpenGuides::Test->make_cgi_object; -You can supply values for the following keys: C<content>, -C<categories>, C<locales>, C<os_x>, C<os_y>, C<osie_x>, C<osie_y>, -C<latitude>, C<longitude>, C<summary>, C<node_image>, C<node_image_licence>, -C<node_image_copyright>, C<node_image_url>, C<username>, C<comment>, -C<edit_type>. You should supply them exactly as they would come from a CGI -form, eg lines in a textarea are separated by C<\r\n>. +You can supply values for the following keys: C<content>, C<categories>, +C<locales>, C<node_image>, C<node_image_licence>, +C<node_image_copyright>, C<node_image_url>, C<phone>, C<fax>, +C<website>, C<hours_text>, C<address>, C<postcode>, C<map_link>, +C<os_x>, C<os_y>, C<osie_x>, C<osie_y>, C<latitude>, C<longitude>, +C<summary>, C<username>, C<comment>, C<edit_type>. You should supply +them exactly as they would come from a CGI form, eg lines in a textarea +are separated by C<\r\n>. =cut @@ -180,34 +182,16 @@ # 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 => $args{content} || "foo" ); - $q->param( -name => "categories", -value => $args{categories} || "" ); - $q->param( -name => "locales", -value => $args{locales} || "" ); - $q->param( -name => "node_image", -value => $args{node_image} || "" ); - $q->param( -name => "node_image_licence", - -value => $args{node_image_licence} || "" ); - $q->param( -name => "node_image_copyright", - -value => $args{node_image_copyright} || "" ); - $q->param( -name => "node_image_url", - -value => $args{node_image_url} || "" ); - $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 => $args{os_x} || "" ); - $q->param( -name => "os_y", -value => $args{os_y} || "" ); - $q->param( -name => "osie_x", -value => $args{osie_x} || "" ); - $q->param( -name => "osie_y", -value => $args{osie_y} || "" ); - $q->param( -name => "latitude", -value => $args{latitude} || "" ); - $q->param( -name => "longitude", -value => $args{longitude} || "" ); - $q->param( -name => "summary", -value => $args{summary} || "" ); - $q->param( -name => "username", -value => $args{username} || "TestUser" ); - $q->param( -name => "comment", -value => $args{comment} || "A comment." ); - $q->param( -name => "edit_type", - -value => $args{edit_type} || "Normal edit" ); + $args{content} ||= "foo"; + $args{edit_type} ||= "Normal edit"; + for my $param ( qw( content categories locales node_image node_image_licence + node_image_copyright node_image_url phone fax website + hours_text address postcode map_link os_x os_y osie_x osie_y + latitude longitude summary username comment edit_type + ) + ) { + $q->param( -name => $param, -value => $args{$param} || "" ); + } $ENV{REMOTE_ADDR} = "127.0.0.1"; return $q; Modified: trunk/t/21_rdf.t =================================================================== --- trunk/t/21_rdf.t 2007-06-10 17:13:36 UTC (rev 1062) +++ trunk/t/21_rdf.t 2007-06-10 17:31:17 UTC (rev 1063) @@ -29,7 +29,8 @@ if ( $@ ) { $config->use_plucene ( 0 ) }; -my $wiki = OpenGuides::Utils->make_wiki_object( config => $config ); +my $guide = OpenGuides->new( config => $config ); +my $wiki = $guide->wiki; # Clear out the database from any previous runs. foreach my $del_node ( $wiki->list_all_nodes ) { @@ -43,21 +44,20 @@ isa_ok( $rdf_writer, "OpenGuides::RDF" ); # Test the data for a node that exists. -$wiki->write_node( "Calthorpe Arms", - "CAMRA-approved pub near King's Cross", - undef, - { +OpenGuides::Test->write_data( + guide => $guide, + node => "Calthorpe Arms", + content => "CAMRA-approved pub near King's Cross", comment => "Stub page, please update!", username => "Kake", postcode => "WC1X 8JR", - locale => [ "Bloomsbury", "St Pancras" ], + locales => "Bloomsbury\r\nSt Pancras", phone => "test phone number", website => "test website", - opening_hours_text => "test hours", + hours_text => "test hours", latitude => "51.524193", longitude => "-0.114436", summary => "a nice pub", - } ); my $rdfxml = $rdf_writer->emit_rdfxml( node => "Calthorpe Arms" ); @@ -105,7 +105,7 @@ $config = OpenGuides::Test->make_basic_config; $config->default_city( "" ); $config->default_country( "" ); -my $guide = OpenGuides->new( config => $config ); +$guide = OpenGuides->new( config => $config ); OpenGuides::Test->write_data( guide => $guide, node => "Star Tavern",

1 0

r1062 - trunk/t
by svnadmin＠urchin.earth.li 10 Jun '07

10 Jun '07

Author: kake Date: 2007-06-10 18:13:36 +0100 (Sun, 10 Jun 2007) New Revision: 1062 Modified: trunk/t/70_admin_home.t Log: Apply Andrew's patch, fixes #212 (uninitialised value warnings in test 70). Incidental change: use OpenGuides::Test->write_data instead of Wiki::Toolkit->write_node, hence change in number at line 59, since OpenGuides::Test autocreates categories and locales and Wiki::Toolkit doesn't. Modified: trunk/t/70_admin_home.t =================================================================== --- trunk/t/70_admin_home.t 2007-06-10 16:29:52 UTC (rev 1061) +++ trunk/t/70_admin_home.t 2007-06-10 17:13:36 UTC (rev 1062) @@ -29,19 +29,26 @@ # Add 3 different pages, one of which with two versions -$wiki->write_node( "Test Page", "foo", undef, - { category => "Alpha" } ) - or die "Couldn't write node"; -$wiki->write_node( "Test Page 2", "foo", undef, - { category => "Alpha" } ) - or die "Couldn't write node"; -$wiki->write_node( "Locale Bar", "foo", undef, - { category => "Locales" } ) - or die "Couldn't write locale"; -my %data = $wiki->retrieve_node( "Locale Bar" ); -$wiki->write_node( "Locale Bar", "foo version 2", $data{checksum}, - { category => "Locales" } ) - or die "Couldn't write locale for the 2nd time"; +OpenGuides::Test->write_data( + guide => $guide, + node => "Test Page", + categories => "Alpha", + return_output => 1 ); +OpenGuides::Test->write_data( + guide => $guide, + node => "Test Page 2", + categories => "Alpha", + return_output => 1 ); +OpenGuides::Test->write_data( + guide => $guide, + node => "Locale Bar", + categories => "Locales", + return_output => 1 ); +OpenGuides::Test->write_data( + guide => $guide, + node => "Locale Bar", + categories => "Locales", + return_output => 1 ); # Test the tt vars @@ -52,7 +59,7 @@ is( scalar @{$ttvars{'nodes'}}, 2, "Right number of nodes" ); is( scalar @{$ttvars{'locales'}}, 1, "Right number of locales" ); -is( scalar @{$ttvars{'categories'}}, 0, "Right number of categories" ); +is( scalar @{$ttvars{'categories'}}, 2, "Right number of categories" ); my @node_names = map { $_->{name}; } @{$ttvars{nodes}}; is_deeply( [ sort @node_names ], [ "Test Page", "Test Page 2" ], @@ -67,4 +74,4 @@ like( $output, qr|Site Administration|, "Right page" ); like( $output, qr|Test Page|, "Has nodes" ); -like( $output, qr|Bar|, "Has locales" ); \ No newline at end of file +like( $output, qr|Bar|, "Has locales" );

1 0

r1061 - trunk/templates
by svnadmin＠urchin.earth.li 10 Jun '07

10 Jun '07

Author: ilmari Date: 2007-06-10 17:29:52 +0100 (Sun, 10 Jun 2007) New Revision: 1061 Modified: trunk/templates/node_rdf.tt Log: Fix OS namespace URI. Modified: trunk/templates/node_rdf.tt =================================================================== --- trunk/templates/node_rdf.tt 2007-06-10 16:02:07 UTC (rev 1060) +++ trunk/templates/node_rdf.tt 2007-06-10 16:29:52 UTC (rev 1061) @@ -8,7 +8,7 @@ xmlns:chefmoz="http://chefmoz.org/rdf/elements/1.0/" xmlns:wn="http://xmlns.com/wordnet/1.6/" xmlns:geo="http://www.w3.org/2003/01/geo/wgs84_pos#" - xmlns:os="http://downlode.org/rdf/os/0.1/" + xmlns:os="http://downlode.org/Code/RDF/Ordnance_Survey/schema/1#" xmlns:owl="http://www.w3.org/2002/07/owl#" xmlns="http://www.w3.org/2000/10/swap/pim/contact#" >

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 2007