This is an automated email from the git hooks/post-receive script. js pushed a commit to annotated tag debian/0.106-1 in repository librdf-rdfa-generator-perl.
commit fc489b20c40b8dbdc7a2553cdb059da7d5f0409d Author: Toby Inkster <m...@tobyinkster.co.uk> Date: Sat May 8 22:06:42 2010 +0000 Replace all icons with Tango ones. --HG-- branch : RDF-RDFa-Generator extra : convert_revision : svn%3A3fe8e991-6959-4966-b76d-b07eca2b6e37/RDF-RDFa-Generator%40337 --- Changes.ttl | 2 +- example1-out.html | 13 +++++-- example1.pl | 4 +-- lib/RDF/RDFa/Generator.pm | 68 ++++++++++++++++++++++++++++++----- lib/RDF/RDFa/Generator/HTML/Pretty.pm | 18 ++++++---- 5 files changed, 86 insertions(+), 19 deletions(-) diff --git a/Changes.ttl b/Changes.ttl index 7b84e39..a97fd87 100644 --- a/Changes.ttl +++ b/Changes.ttl @@ -23,7 +23,7 @@ my:v_0-01 a :Version ; - dc:issued "2010-06-01"^^xsd:date ; + dc:issued "2010-05-09"^^xsd:date ; :revision "0.01"^^xsd:string ; :file-release <http://backpan.cpan.org/authors/id/T/TO/TOBYINK/RDF-RDFa-Generator-0.01.tar.gz> ; rdfs:comment "Original version"@en . diff --git a/example1-out.html b/example1-out.html index 0b4f5fd..b88208c 100644 --- a/example1-out.html +++ b/example1-out.html @@ -1,3 +1,12 @@ +<?xml version="1.0"?> +<html xmlns="http://www.w3.org/1999/xhtml" version="XHTML+RDFa 1.0"> +<head profile="http://www.w3.org/1999/xhtml/vocab"> +<title>RDFa Document</title> +<meta nane="generator" value="RDF::RDFa::Generator::HTML::Pretty"/> <link rel="stylesheet" type="text/css" href="example1.css"/> - -<div xmlns="http://www.w3.org/1999/xhtml" xmlns:foaf="http://xmlns.com/foaf/0.1/" xmlns:xhv="http://www.w3.org/1999/xhtml/vocab#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"><div about="_:rD88B06CC596111DF9444C19270FD0CE2r0"><h3 class="blank">_:rD88B06CC596111DF9444C19270FD0CE2r0</h3><span class="rdf-type" rel="rdf:type"><img about="http://xmlns.com/foaf/0.1/Person" alt="http://xmlns.com/foaf/0.1/Person" src="data:image/png;charset=binary;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAA [...] +</head> +<body> +<h1>RDFa Document</h1> +<p><small>Generated by RDF::RDFa::Generator::HTML::Pretty.</small></p> +<div xmlns:foaf="http://xmlns.com/foaf/0.1/" xmlns:xhv="http://www.w3.org/1999/xhtml/vocab#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"><div about="[_:r724178C05AEB11DFB1F4D1FFE6B6D6BAr0]"><h3 class="blank">_:r724178C05AEB11DFB1F4D1FFE6B6D6BAr0</h3><span class="rdf-type" rel="rdf:type"><img about="http://xmlns.com/foaf/0.1/Person" alt="http://xmlns.com/foaf/0.1/Person" src="data:image/png;charset=binary;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABHNCSVQICAgIfAhki [...] +</html> diff --git a/example1.pl b/example1.pl index 61860eb..7a30c6e 100644 --- a/example1.pl +++ b/example1.pl @@ -1,7 +1,7 @@ use lib "lib"; use RDF::TrineShortcuts; -use RDF::RDFa::Generator::HTML::Pretty; +use RDF::RDFa::Generator; my $graph = rdf_parse(<<TURTLE, type=>'turtle'); @@ -22,5 +22,5 @@ my $graph = rdf_parse(<<TURTLE, type=>'turtle'); TURTLE -print RDF::RDFa::Generator::HTML::Hidden->create_document($graph)->toString; +print RDF::RDFa::Generator->new(style=>'HTML::Pretty')->create_document($graph)->toString; diff --git a/lib/RDF/RDFa/Generator.pm b/lib/RDF/RDFa/Generator.pm index cda446c..06e29b1 100644 --- a/lib/RDF/RDFa/Generator.pm +++ b/lib/RDF/RDFa/Generator.pm @@ -18,6 +18,16 @@ our $VERSION = '0.01'; use RDF::RDFa::Generator::HTML::Head; use RDF::RDFa::Generator::HTML::Hidden; use RDF::RDFa::Generator::HTML::Pretty; +use RDF::Trine; + +BEGIN +{ + $RDF::Trine::Serializer::serializer_names{ 'rdfa' } = __PACKAGE__; + foreach my $type (qw(application/xhtml+xml text/html)) + { + $RDF::Trine::Serializer::media_types{ $type } = __PACKAGE__; + } +} =head1 DESCRIPTION @@ -25,9 +35,9 @@ use RDF::RDFa::Generator::HTML::Pretty; =over 4 -=item C<< $gen = RDF::RDFa::Generator->new($type, %options) >> +=item C<< $gen = RDF::RDFa::Generator->new(style => $style, %options) >> -Creates a new generator object. Type is one of the following case-sensitive strings: +Creates a new generator object. $style is one of the following case-sensitive strings: 'HTML::Head' (the default), 'HTML::Hidden' or 'HTML::Pretty'. You can also construct an object like this: @@ -57,9 +67,8 @@ Options include: sub new { - my ($class, $implementation, %opts) = @_; - $implementation ||= 'HTML::Head'; - $implementation = sprintf('%s::%s', __PACKAGE__, $implementation); + my ($class, %opts) = @_; + my $implementation = sprintf('%s::%s', __PACKAGE__, $opts{'style'} || 'HTML::Head'); return $implementation->new(%opts); } @@ -132,12 +141,52 @@ sub nodes return $self->nodes(@_); } +=back + +Additionally the methods C<serialize_model_to_file>, C<serialize_model_to_string>, +C<serialize_iterator_to_file> and C<serialize_iterator_to_string> are provided for +compatibility with the L<RDF::Trine::Serializer> interface. + +=cut + +sub serialize_model_to_string +{ + my ($proto, $model) = @_; + return $proto->create_document($model)->toString; +} + +sub serialize_model_to_file +{ + my ($proto, $fh, $model) = @_; + print {$fh} $proto->create_document($model)->toString; +} + +sub serialize_iterator_to_string +{ + my ($proto, $iter) = @_; + my $model = RDF::Trine::Model->temporary_model; + while (my $st = $iter->next) + { + $model->add_statement($st); + } + return $proto->serialize_model_to_string($model); +} + +sub serialize_iterator_to_file +{ + my ($proto, $fh, $iter) = @_; + my $model = RDF::Trine::Model->temporary_model; + while (my $st = $iter->next) + { + $model->add_statement($st); + } + return $proto->serialize_model_to_file($fh, $model); +} + 1; __END__ -=back - =head1 BUGS Please report any bugs to L<http://rt.cpan.org/>. @@ -160,7 +209,10 @@ This library is free software; you can redistribute it and/or modify it under the same terms as Perl itself, either Perl version 5.8 or, at your option, any later version of Perl 5 you may have available. -TODO: check image licences are proper. +=head2 Icons + +The icons in RDF::RDFa::Generator::HTML::Pretty are taken from the +Tango Project. =cut diff --git a/lib/RDF/RDFa/Generator/HTML/Pretty.pm b/lib/RDF/RDFa/Generator/HTML/Pretty.pm index 7eaec85..4083806 100644 --- a/lib/RDF/RDFa/Generator/HTML/Pretty.pm +++ b/lib/RDF/RDFa/Generator/HTML/Pretty.pm @@ -219,20 +219,26 @@ sub _img my ($self, $type) = @_; my $icons = { - 'http://xmlns.com/foaf/0.1/Document' => 'data:image/png;charset=binary;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABHNCSVQICAgIfAhkiAAAAz1JREFUWIXll0FPG0cUx38zuzgmllM7TQhRFFVVghGRkIBYqJz6HfoFyIEb36HXHnPiGIlP0I/QWy6oQkKqBAdXTghxD03BwnaK1zs7OeBZz65n2TVKT32StTPjnfd+83/PM2P4v5tID+zt7f3k+/4+UPU8DyklURShlIo/YRjGT7t90xjQC8Pw1f7+/q92PH+KSIg3Ozs71XGbMAzxfR+tdeI9u1+wXd3d3X0D3AyglKoBtNtthBAopahUKgRBYAARYiKc3Xb1DcjCwgJBENTS300BaK3jIMZZuu16ZgXPsymAKIoSQe1ArVYr/r5IUM/zaDQaicUVAjAqpEGWlpb+ [...] - 'http://xmlns.com/foaf/0.1/Person' => 'data:image/png;charset=binary;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAakSURBVFiFrZZbbBTXGcf/58yZy+7Mrr2brC9rm0tck4CqSoVElUwAG3pRH9oktJVaqVKf+tI8RLRYlqxKqGlj5K4VUbVJFXp56UMTUERV5YFLEnDADWmJCm1MSowNwsaXxWa9u97rnEsfdme9i80S4hzp04xmdr//73zznfM/RCmFhxlDsUEHwPcM3dhDCNnJBY8yxq4LIc9z7o4AONHfN8A/bT7yMABDscG9jOl/jUZbnQ0dG/1NkWYEgw4SiSTu3Imr8Ynx [...] - 'http://xmlns.com/foaf/0.1/Group' => 'data:image/png;charset=binary;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABmJLR0QA/wD/AP+gvaeTAAAAB3RJTUUH1gsKFTktQWg0swAAB8FJREFUWIXlV1tsFNcZ/mbO3HZ2d/bitfGFi7HXDuZaSAqikDYIVUFCabi4BEopD3nrG1JKGlAqiwhh16h+qPrQVkrVh7RVUiyoooBKKJcQATFp7OILF8uG2JBiK7az6/XO5Vz6MLtjY7kEqvapR/o1u2eOzvnO93/n+88A/+9N+roBbW1tcY/n9yiKuplSWgYAiqKMUOqdU+XQHw8cODDxPwPQ0nJ0k6Krb659bq1aX7dEsawYACCbzeDOndv0ascVjzreW6+/fvj8fx3A8ePNG81I5MiObTtD4XAEsgzIsgJZlsE5B8CRzU7i [...] - 'http://www.w3.org/2003/01/geo/wgs84_pos#SpatialThing' => 'data:image/png;charset=binary;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABmJLR0QA/wD/AP+gvaeTAAAAB3RJTUUH1ggCFigiAlzmVAAACOFJREFUWIXNl1mMHNUVhr97q6qre7qnZx/PGC+z2YxNMIY4xg5LBBgTFsdRgEBAWV4iImV5iBSx5MUgBZCQEFFQeIyIgiwZJTJxLLM4RpYMNvFgG8cGj2c8mz3Ts3ePp5fqqntv5aF72h6zZFGk5EhHVVLfqv+v//zn3L7wPw7xry5cum1HVURH77Rt+aCQ8hpM2KyNqbWkzCDFZGjMaaXM677lvTO2Z0f+v0agY9vzKyzk84bwm11trcGGL7VVtzYlRU0iRlUsQr7gM5ctkJq6GPacGprvH0o5ErFbY5 [...] - '?' => 'data:image/png;charset=binary;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAg8SURBVFiFxZZpkFTVFcd/973u9153z0zP0M4is4DsOsoIErZYbiVIQFQUEZcKlAtlkiIRNfFDPlgVKxWTEsWlQpmgMZW4oIIaFQrEpeLIIoLIZHCAYVicGWbvmen1vX7v3XzoxW6GqLFSlVt16t537nL+53/POfcJKSX/z+b5PpsWPi1KDJ9W7Uq3TCpqjz5sdry6Ria+z1niuzCw7DWhmmF9gdDErcKRi0v0cl9lWY0V9FfKoViv0j14SotafX0uzmvSka+8 [...] + 'http://xmlns.com/foaf/0.1/Document' => 'data:image/png;charset=binary;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABHNCSVQICAgIfAhkiAAAAz1JREFUWIXll0FPG0cUx38zuzgmllM7TQhRFFVVghGRkIBYqJz6HfoFyIEb36HXHnPiGIlP0I/QWy6oQkKqBAdXTghxD03BwnaK1zs7OeBZz65n2TVKT32StTPjnfd+83/PM2P4v5tID+zt7f3k+/4+UPU8DyklURShlIo/YRjGT7t90xjQC8Pw1f7+/q92PH+KSIg3Ozs71XGbMAzxfR+tdeI9u1+wXd3d3X0D3AyglKoBtNtthBAopahUKgRBYAARYiKc3Xb1DcjCwgJBENTS300BaK3jIMZZuu16ZgXPsymAKIoSQe1ArVYr/r5IUM/zaD [...] + 'http://xmlns.com/foaf/0.1/Person' => 'data:image/png;charset=binary;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAlDSURBVFiFjZdrjF5Hecd/M+ec97YXr3ft3fU6IXbstY1jO3FcUAlRI1qEUxURhTYKNKpS9UOrSpVACPGBCom2QD+WS0VVCfOtLagFpQpEMZg2pSR2SSlJsE182V3ba3svtnff+3nPmZnn6Yf37HrdJDUjPTqXOTP/3zzPPGdmzNGjR7lbefHFFw1g4CULxDAez829PrD8378Y23Vgx+qWdz/YgdhD1cOZAE/J448/rnftGDB3A1gT// [...] + 'http://xmlns.com/foaf/0.1/Group' => 'data:image/png;charset=binary;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABHNCSVQICAgIfAhkiAAAByRJREFUWIXtl0mMHUcZx39V/brfvszimXmexQuZ2ENIwDaCg3FCglGQkiBFIhHKCRDigAgCLhwSYIAbEgrKIRISNw4gLDgAiuBANkeCJApOLJPEGcZjezbP8uat/fr1UvVxeI8ktsYkDnCCT/pa6q6v6//rqq++qob/dVPvFjD/AF6jlf2q0urLSulZABG7IFZ+VikFT8yfIvqvAXzj7lxVIc8OjQxN7puu5grpNEYszU7A6tpmt9lorArqjp/8sbv+HweYn0e3Xsi9un96au7gzJijbQ/EkCSGMDbE4rK+3TSraxuvlz7e/fD8PPb9ADjXa7 [...] + 'http://www.w3.org/2003/01/geo/wgs84_pos#SpatialThing' => 'data:image/png;charset=binary;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABHNCSVQICAgIfAhkiAAACIJJREFUWIXll1tsHNUdxn9z2V3vrtf2xmtjhzh2nMRNTC5g0wTjJkEJKdcWBA8gnlIqWrUqUqngoQ9FaqWqFx64FKktEklbFVpaoCXiTlICmCTkYpPEITFxnPiS9fq6tnd3LmfOzPRhxyYODipq33qkT6OdOTr/3/m+M2fPwP97U75M59bW78TC4dBNoZLovYqiXONJWeW6TkLVQjlV1cY83+9yhfVXIZy3jh59xvifAdxwww8rHFd5tCSif2/rjS3a9V9bH1qxvIayeIRQSGc0a5AeL9B3foQD73XmTxz5RHOk97tISPnZvn1PTP1XAO3tD9 [...] + 'http://www.w3.org/2006/vcard/ns#Address' => 'data:image/png;charset=binary;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABHNCSVQICAgIfAhkiAAABqVJREFUWIXVl2lsVNcVx393eW82j8dgx3YweAy4yBQIu9oiRwi6OGpQpaIqtGmKhJSoSiJBVAWp39pK+ZRPEVGVLhIEulBWKWkrlQYVNQSJuA2ECJpAYuJiMNhgPNhjz/buvf0wC16GVcqHHulKd94975z/Oed/ztwH/8+yT8qX/yDErb0w52FtiId5aT/4KLWnsaHhiZaamtrTvb39gTHfeBo++cIB7IHGiNbvLJg3b0HbrFnh3NAQI+k0p/v6BvJB8J0fQveD2JMPovw7WBELhU6vWr58cVtbWxgpcUDE91ne2toU9ry//hG++YUA2K/Uj2 [...] + 'http://www.w3.org/2006/vcard/ns#Vcard' => 'data:image/png;charset=binary;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABHNCSVQICAgIfAhkiAAABSVJREFUWIXtl09sVFUUxn/3vZnXYVoKlFL6v8goUJoYqkBQy6KJYJQoYUPSAAlp3BE3uCBKdGNCgCFQaAhRlIVKYtyomEAkFROo0UpKB0K0SK3j0FJogRaGGdqZ985xAR3pXzTauNCTnNyXd+8533e+e+7Ne/Avm5nK5HqLGWT5Q6gzB9EsLEmico2c1CVjSAP4pgz8HuWkg0+hWZUYXwmGLNC7GDdGwhSrDn1rDIkpIaC3mEE6WI0VeA4C1ah/PlaWHx1KQvpnDNO5a1wYPDU1Cjj+xyCrEgJLMCWV2E86aK4FfVlIazVICrRXbzsRH0BjY+ [...] + 'http://www.w3.org/2002/12/cal/ical#Vevent' => 'data:image/png;charset=binary;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABHNCSVQICAgIfAhkiAAABMlJREFUWIXtlktoVFcYx3/n3LkzY5o0mcTExElCGvO0LooiphNfFAJtFhU0dFEVbZoGZ1aBbsSKD6q4sRZr46OgForRWnBhoAu70cigduETROJoAglUkjAkzWNe997TRTKXTDKx2sRFaf8wDHzfvef/u9/3nXsP/K//ukS6oN/vXyeE6FRKZS+EiaZpYcMwPjp9+vTvM3OOOW74zufzZVdVVfHo0SPKysrmBRAKhXIfPnx4DFj7SgBKqYqxsTG6u7sxDINQKDQvgFgshmVZ1elycmbgwIED0rKsDNM0GR8fn5exbSIlwNvpcmlnIBAI3ALqlF [...] + 'http://purl.org/rss/1.0/channel' => 'data:image/png;charset=binary;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABHNCSVQICAgIfAhkiAAACF9JREFUWIXtl1tsHNUZx3/fzN5s765jO77EiZ0EnBLjBCeASBwn5IJCEWojQRSpatOLKm4qtJRCWopaSMVDS0GoKvAAqKUEoT7QgJCaECUiccnFJI5DLo6TECdOTLy+7G12dmd31rszpw+2Ua4o9KV96F86mtF3vnPO73znO+fMwP/1X5Zcq6Ji6UONGtpyXBqVrj5I7H69F5C2tkdXiWhrlVJ3AtMn+hgE9gDvd3ZO3QEb3a8NUN32kyZHc5YL3Ml4mSXIR0Wv/V2j42/GkiU/vVsp9UJbW/OC5cvnMXv2dKqqwmQyWfr6hjlxYoAjR87Q1z [...] + '?' => 'data:image/png;charset=binary;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABHNCSVQICAgIfAhkiAAACG5JREFUWIXFl3twVdUVxn97n3Nubm7euZcghEdeBBICEQUFIgVECqIo1uJMp3WodqyjMzpjZ7TTh20cK31N/2jL2FYdKXaqRcbnDKGpoBFaAY1BHgHMgyRKQkJy87yv3Nyzd/84594k1RlppzPumTXn3Dl3r/Wdb31rrbPhS17iSv+4bl2t2ZFhrRGI7QKxRkMAyHEfjwgYEOgjNnpfcXjiSENDbeL/AqBoW22uGE/7MYL7yubN4MYVpVkrquaKqwJZ+LPTARgcjdIbHKOx+aI+9EH7WGvnZdA8q9PGf9b5eu3w/wygaPPOh6Uhntxcsyj9/q [...] }; my $equiv = { 'http://xmlns.com/foaf/0.1/PersonalProfileDocument' => 'http://xmlns.com/foaf/0.1/Document' , 'http://www.w3.org/2003/01/geo/wgs84_pos#Point' => 'http://www.w3.org/2003/01/geo/wgs84_pos#SpatialThing' , 'http://www.w3.org/2006/vcard/ns#Location' => 'http://www.w3.org/2003/01/geo/wgs84_pos#SpatialThing' , + 'http://purl.org/NET/c4dm/event.owl#Event' => 'http://www.w3.org/2002/12/cal/ical#Vevent', + 'http://purl.org/rss/1.0/item' => 'http://xmlns.com/foaf/0.1/Document' , }; - return $icons->{$type} || $icons->{ $equiv->{$type} } || $icons->{'?'}; + return $icons->{$type} || $icons->{ $equiv->{$type} } || $icons->{'*'}; } 1; -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/librdf-rdfa-generator-perl.git _______________________________________________ Pkg-perl-cvs-commits mailing list Pkg-perl-cvs-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits