Author: nick Date: 2008-10-18 14:42:42 +0100 (Sat, 18 Oct 2008) New Revision: 1224

Added: trunk/lib/OpenGuides/JSON.pm Modified: trunk/Build.PL trunk/MANIFEST trunk/lib/OpenGuides.pm trunk/wiki.cgi Log: Finish applying the JSON support from ticket #154

Modified: trunk/Build.PL =================================================================== --- trunk/Build.PL 2008-08-19 18:01:42 UTC (rev 1223) +++ trunk/Build.PL 2008-10-18 13:42:42 UTC (rev 1224) @@ -292,6 +292,7 @@ 'Wiki::Toolkit::Formatter::UseMod' => 0, 'Wiki::Toolkit::Plugin::Categoriser' => 0, 'Wiki::Toolkit::Plugin::Diff' => 0, + 'Wiki::Toolkit::Plugin::JSON' => 0, 'Wiki::Toolkit::Plugin::Locator::Grid'=> 0, 'Wiki::Toolkit::Plugin::RSS::Reader' => 0, 'Class::Accessor' => 0,

Modified: trunk/MANIFEST =================================================================== --- trunk/MANIFEST 2008-08-19 18:01:42 UTC (rev 1223) +++ trunk/MANIFEST 2008-10-18 13:42:42 UTC (rev 1224) @@ -17,6 +17,7 @@ lib/OpenGuides/CGI.pm lib/OpenGuides/Config.pm lib/OpenGuides/Feed.pm +lib/OpenGuides/JSON.pm lib/OpenGuides/RDF.pm lib/OpenGuides/Search.pm lib/OpenGuides/Template.pm

Added: trunk/lib/OpenGuides/JSON.pm =================================================================== --- trunk/lib/OpenGuides/JSON.pm (rev 0) +++ trunk/lib/OpenGuides/JSON.pm 2008-10-18 13:42:42 UTC (rev 1224) @@ -0,0 +1,287 @@ +package OpenGuides::JSON; + +use strict; + +use vars qw( $VERSION ); +$VERSION = '0.01'; + +use Wiki::Toolkit::Plugin::JSON; +use Time::Piece; +use URI::Escape; +use Carp 'croak'; + +sub new { + my ( $class, @args ) = @_; + my $self = {}; + bless $self, $class; + $self->_init(@args); +} + +sub _init { + my ( $self, %args ) = @_; + + my $wiki = $args{wiki}; + + unless ( $wiki && UNIVERSAL::isa( $wiki, "Wiki::Toolkit" ) ) { + croak "No Wiki::Toolkit object supplied."; + } + $self->{wiki} = $wiki; + + my $config = $args{config}; + + unless ( $config && UNIVERSAL::isa( $config, "OpenGuides::Config" ) ) { + croak "No OpenGuides::Config object supplied."; + } + $self->{config} = $config; + + $self->{make_node_url} = sub { + my ( $node_name, $version ) = @_; + + my $config = $self->{config}; + + my $node_url = $config->script_url; + if ( $config->script_name ) { + $node_url .= uri_escape( $config->script_name ) . '?'; + } + $node_url .= 'id=' if defined $version; + $node_url .= + uri_escape( + $self->{wiki}->formatter->node_name_to_node_param($node_name) ); + $node_url .= ';version=' . uri_escape($version) if defined $version; + + $node_url; + }; + $self->{site_name} = $config->site_name; + $self->{default_city} = $config->default_city || ""; + $self->{default_country} = $config->default_country || ""; + $self->{site_description} = $config->site_desc || ""; + $self->{og_version} = $args{og_version}; + + $self; +} + +sub emit_json { + my ( $self, %args ) = @_; + + my $node_name = $args{node}; + my $wiki = $self->{wiki}; + + my %node_data = $wiki->retrieve_node($node_name); + my $data = {}; + $data->{phone} = $node_data{metadata}{phone}[0] || ''; + $data->{fax} = $node_data{metadata}{fax}[0] || ''; + $data->{website} = $node_data{metadata}{website}[0] || ''; + $data->{opening_hours_text} = $node_data{metadata}{opening_hours_text}[0] + || ''; + $data->{address} = $node_data{metadata}{address}[0] || ''; + $data->{postcode} = $node_data{metadata}{postcode}[0] || ''; + $data->{city} = $node_data{metadata}{city}[0] || $self->{default_city}; + $data->{country} = $node_data{metadata}{country}[0] + || $self->{default_country}; + $data->{latitude} = $node_data{metadata}{latitude}[0] || ''; + $data->{longitude} = $node_data{metadata}{longitude}[0] || ''; + $data->{version} = $node_data{version}; + $data->{username} = $node_data{metadata}{username}[0] || ''; + $data->{os_x} = $node_data{metadata}{os_x}[0] || ''; + $data->{os_y} = $node_data{metadata}{os_y}[0] || ''; + $data->{categories} = $node_data{metadata}{category} || []; + $data->{locales} = $node_data{metadata}{locale} || []; + $data->{summary} = $node_data{metadata}{summary}[0] || ''; + + $data->{timestamp} = $node_data{last_modified}; + + # Make a Time::Piece object. + my $timestamp_fmt = $Wiki::Toolkit; + + if ( $data->{timestamp} ) { + my $time = Time::Piece->strptime( $data->{timestamp}, $timestamp_fmt ); + $data->{timestamp} = $time->strftime("%Y-%m-%dT%H:%M:%S"); + } + + $data->{url} = $self->{make_node_url}->( $node_name, $data->{version} ); + $data->{version_indpt_url} = $self->{make_node_url}->($node_name); + return $self->json_maker->make_json($data); +} + +sub json_maker { + my $self = shift; + + # OAOO, please. + unless ( $self->{json_maker} ) { + $self->{json_maker} = Wiki::Toolkit::Plugin::JSON->new( + wiki => $self->{wiki}, + site_name => $self->{site_name}, + site_url => $self->{config}->script_url, + site_description => $self->{site_description}, + make_node_url => $self->{make_node_url}, + recent_changes_link => $self->{config}->script_url . '?action=rc', + software_name => 'OpenGuides', + software_homepage => 'http://openguides.org/', + software_version => $self->{og_version}, + ); + } + + return $self->{json_maker}; +} + +sub make_recentchanges_rss { + my ( $self, %args ) = @_; + + $self->json_maker->recent_changes(%args); +} + +sub rss_timestamp { + my ( $self, %args ) = @_; + + $self->json_maker->rss_timestamp(%args); +} + +=head1 NAME + +OpenGuides::JSON - An OpenGuides plugin to output JSON. + +=head1 DESCRIPTION + +Does all the JSON stuff for OpenGuides. Distributed and installed as +part of the OpenGuides project, not intended for independent +installation. This documentation is probably only useful to OpenGuides +developers. + +=head1 SYNOPSIS + + use Wiki::Toolkit; + use OpenGuides::Config; + use OpenGuides::JSON; + + my $wiki = Wiki::Toolkit->new( ... ); + my $config = OpenGuides::Config->new( file => "wiki.conf" ); + my $rdf_writer = OpenGuides::JSON->new( wiki => $wiki, + config => $config ); + + # JSON version of a node. + print "Content-Type: application/rdf+xml\n\n"; + print $rdf_writer->emit_rdfxml( node => "Masala Zone, N1 0NU" ); + + # Ten most recent changes. + print "Content-Type: application/rdf+xml\n"; + print "Last-Modified: " . $self->rss_timestamp( items => 10 ) . "\n\n"; + print $rdf_writer->make_recentchanges_rss( items => 10 ); + +=head1 METHODS + +=over 4 + +=item B<new> + + my $rdf_writer = OpenGuides::JSON->new( wiki => $wiki, + config => $config ); + +C<wiki> must be a LWiki::Toolkit object and C<config> must be an +LOpenGuides::Config object. Both arguments mandatory. + + +=item B<emit_rdfxml> + + $wiki->write_node( "Masala Zone, N1 0NU", + "Quick and tasty Indian food", + $checksum, + { comment => "New page", + username => "Kake", + locale => "Islington" } + ); + + print "Content-Type: application/rdf+xml\n\n"; + print $rdf_writer->emit_rdfxml( node => "Masala Zone, N1 0NU" ); + +BNote: Some of the fields emitted by the JSON generator are taken +from the node metadata. The form of this metadata is I<not> mandated +by LWiki::Toolkit. Your wiki application should make sure to store some or +all of the following metadata when calling C<write_node>: + +=over 4 + +=item B<postcode> - The postcode or zip code of the place discussed by the node. Defaults to the empty string. + +=item B<city> - The name of the city that the node is in. If not supplied, then the value of C<default_city> in the config object supplied to C<new>, if available, otherwise the empty string. + +=item B<country> - The name of the country that the node is in. If not supplied, then the value of C<default_country> in the config object supplied to C<new> will be used, if available, otherwise the empty string. + +=item B<username> - An identifier for the person who made the latest edit to the node. This person will be listed as a contributor (Dublin Core). Defaults to empty string. + +=item B<locale> - The value of this can be a scalar or an arrayref, since some places have a plausible claim to being in more than one locale. Each of these is put in as a C<Neighbourhood> attribute. + +=item B<phone> - Only one number supported at the moment. No validation. + +=item B<website> - No validation. + +=item B<opening_hours_text> - A freeform text field. + +=back + +=item B<json_maker> + +Returns a raw LWiki::Toolkit::Plugin::JSON object created with the values you +invoked this module with. + +=item B<make_recentchanges_rss> + + # Ten most recent changes. + print "Content-Type: application/rdf+xml\n"; + print "Last-Modified: " . $rdf_writer->rss_timestamp( items => 10 ) . "\n\n"; + print $rdf_writer->make_recentchanges_rss( items => 10 ); + + # All the changes made by bob in the past week, ignoring minor edits. + + my %args = ( + days => 7, + ignore_minor_edits => 1, + filter_on_metadata => { username => "bob" }, + ); + + print "Content-Type: application/rdf+xml\n"; + print "Last-Modified: " . $rdf_writer->rss_timestamp( %args ) . "\n\n"; + print $rdf_writer->make_recentchanges_rss( %args ); + +=item B<rss_timestamp> + + print "Last-Modified: " . $rdf_writer->rss_timestamp( %args ) . "\n\n"; + +Returns the timestamp of the RSS feed in POSIX::strftime style ("Tue, 29 Feb 2000 +12:34:56 GMT"), which is equivalent to the timestamp of the most recent item +in the feed. Takes the same arguments as make_recentchanges_rss(). You will most +likely need this to print a Last-Modified HTTP header so user-agents can determine +whether they need to reload the feed or not. + +=back + +=head1 SEE ALSO + +=over 4 + +=item * LWiki::Toolkit + +=item * Lhttp://openguides.org/ + +=item * Lhttp://chefmoz.org/ + +=back + +=head1 AUTHOR + +The OpenGuides Project (openguides-dev@openguides.org) + +=head1 COPYRIGHT + +Copyright (C) 2003-2005 The OpenGuides Project. All Rights Reserved. + +This module is free software; you can redistribute it and/or modify it +under the same terms as Perl itself. + +=head1 CREDITS + +Code in this module is mostly pirated from OpenGuides::RDF, those authors deserve all the credit. Chris Prather +did the pirating. + +=cut + +1;

Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2008-08-19 18:01:42 UTC (rev 1223) +++ trunk/lib/OpenGuides.pm 2008-10-18 13:42:42 UTC (rev 1224) @@ -945,8 +945,10 @@ if ( $args{format} eq "rdf" ) { $template = "rdf_index.tt"; $conf{content_type} = "application/rdf+xml"; - } - elsif ( $args{format} eq "plain" ) { + } elsif ( $args{format} eq "json" ) { + $template = "json_index.tt"; + $conf{content_type} = "text/javascript"; + } elsif ( $args{format} eq "plain" ) { $template = "plain_index.tt"; $conf{content_type} = "text/plain"; } elsif ( $args{format} eq "map" ) {

Modified: trunk/wiki.cgi =================================================================== --- trunk/wiki.cgi 2008-08-19 18:01:42 UTC (rev 1223) +++ trunk/wiki.cgi 2008-10-18 13:42:42 UTC (rev 1224) @@ -16,6 +16,7 @@ use OpenGuides::CGI; use OpenGuides::Config; use OpenGuides::RDF; +use OpenGuides::JSON; use OpenGuides::Utils; use OpenGuides::Template; use Time::Piece; @@ -187,9 +188,16 @@ print $q->redirect( $redir_target ); } elsif ($action eq 'about') { $guide->display_about(format => $format); + } elsif ($action eq 'metadata' && $q->param("type")) { + $guide->show_metadata( + type => $q->param("type"), + format => $format, + ); } elsif ($action eq 'display') { if ( $format and $format eq "rdf" ) { display_node_rdf( node => $node ); + } elsif ( $format and $format eq "json" ) { + display_node_json( node => $node ); } elsif ( $format and $format eq 'raw' ) { $guide->display_node( id => $node, @@ -291,12 +299,20 @@

sub display_node_rdf { my %args = @_; - my $rdf_writer = OpenGuides::RDF->new( wiki => $wiki, - config => $config ); + my $rdf_writer = OpenGuides::RDF->new( wiki => $wiki, + config => $config ); print "Content-type: application/rdf+xml\n\n"; print $rdf_writer->emit_rdfxml( node => $args{node} ); }

+sub display_node_json { + my %args = @_; + my $json_writer = OpenGuides::JSON->new( wiki => $wiki, + config => $config ); + print "Content-type: text/javascript\n\n"; + print $json_writer->emit_json( node => $args{node} ); +} + sub process_template { my ($template, $node, $vars, $conf, $omit_header) = @_;