r31433 - in /branches/upstream/libwebservice-solr-perl/current: Changes META.yml lib/WebService/Solr.pm lib/WebService/Solr/Document.pm lib/WebService/Solr/Field.pm t/field.t

antonio-guest at users.alioth.debian.org antonio-guest at users.alioth.debian.org
Wed Mar 4 23:46:51 UTC 2009 

Author: antonio-guest
Date: Wed Mar  4 23:46:48 2009
New Revision: 31433

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=31433
Log:
[svn-upgrade] Integrating new upstream version, libwebservice-solr-perl (0.04)

Modified:
    branches/upstream/libwebservice-solr-perl/current/Changes
    branches/upstream/libwebservice-solr-perl/current/META.yml
    branches/upstream/libwebservice-solr-perl/current/lib/WebService/Solr.pm
    branches/upstream/libwebservice-solr-perl/current/lib/WebService/Solr/Document.pm
    branches/upstream/libwebservice-solr-perl/current/lib/WebService/Solr/Field.pm
    branches/upstream/libwebservice-solr-perl/current/t/field.t

Modified: branches/upstream/libwebservice-solr-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libwebservice-solr-perl/current/Changes?rev=31433&op=diff
==============================================================================
--- branches/upstream/libwebservice-solr-perl/current/Changes (original)
+++ branches/upstream/libwebservice-solr-perl/current/Changes Wed Mar  4 23:46:48 2009
@@ -1,4 +1,8 @@
 Revision history for Perl extension WebService::Solr.
+
+0.04  Mon Mar 02 2009
+    - add make_immutable to Solr.pm
+    - be paranoid about XML escaping (Gert Brinkmann)
 
 0.03  Thu Jan 15 2009
     - fix typo (Thanks cog)

Modified: branches/upstream/libwebservice-solr-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libwebservice-solr-perl/current/META.yml?rev=31433&op=diff
==============================================================================
--- branches/upstream/libwebservice-solr-perl/current/META.yml (original)
+++ branches/upstream/libwebservice-solr-perl/current/META.yml Wed Mar  4 23:46:48 2009
@@ -27,4 +27,4 @@
   perl: 5.8.0
 resources:
   license: http://dev.perl.org/licenses/
-version: 0.03
+version: 0.04

Modified: branches/upstream/libwebservice-solr-perl/current/lib/WebService/Solr.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libwebservice-solr-perl/current/lib/WebService/Solr.pm?rev=31433&op=diff
==============================================================================
--- branches/upstream/libwebservice-solr-perl/current/lib/WebService/Solr.pm (original)
+++ branches/upstream/libwebservice-solr-perl/current/lib/WebService/Solr.pm Wed Mar  4 23:46:48 2009
@@ -27,7 +27,7 @@
     default    => sub { { wt => 'json' } }
 );
 
-our $VERSION = '0.03';
+our $VERSION = '0.04';
 
 sub BUILDARGS {
     my ( $self, $url, $options ) = @_;
@@ -52,7 +52,7 @@
     my @docs = ref $doc eq 'ARRAY' ? @$doc : ( $doc );
 
     $params ||= {};
-    my $gen = XML::Generator->new( ':std' );
+    my $gen = XML::Generator->new( ':std', escape => 'always,even-entities' );
 
     my $xml = $gen->add(
         $params,
@@ -76,7 +76,7 @@
 sub commit {
     my ( $self, $params ) = @_;
     $params ||= {};
-    my $gen = XML::Generator->new( ':std' );
+    my $gen = XML::Generator->new( ':std', escape => 'always,even-entities' );
     my $response = $self->_send_update( $gen->commit( $params ), {}, 0 );
     return $response->ok;
 }
@@ -84,7 +84,7 @@
 sub optimize {
     my ( $self, $params ) = @_;
     $params ||= {};
-    my $gen = XML::Generator->new( ':std' );
+    my $gen = XML::Generator->new( ':std', escape => 'always,even-entities' );
     my $response = $self->_send_update( $gen->optimize( $params ), {}, 0 );
     return $response->ok;
 }
@@ -97,8 +97,9 @@
 
 sub delete_by_query {
     my ( $self, $query ) = @_;
+    my $gen = XML::Generator->new( ':std', escape => 'always,even-entities' );
     my $response
-        = $self->_send_update( "<delete><query>$query</query></delete>" );
+        = $self->_send_update( $gen->delete( $gen->query( $query ) ) );
     return $response->ok;
 }
 
@@ -149,6 +150,10 @@
     return $res;
 }
 
+no Moose;
+
+__PACKAGE__->meta->make_immutable;
+
 1;
 
 __END__

Modified: branches/upstream/libwebservice-solr-perl/current/lib/WebService/Solr/Document.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libwebservice-solr-perl/current/lib/WebService/Solr/Document.pm?rev=31433&op=diff
==============================================================================
--- branches/upstream/libwebservice-solr-perl/current/lib/WebService/Solr/Document.pm (original)
+++ branches/upstream/libwebservice-solr-perl/current/lib/WebService/Solr/Document.pm Wed Mar  4 23:46:48 2009
@@ -60,7 +60,7 @@
 
 sub to_xml {
     my $self = shift;
-    my $gen  = XML::Generator->new( ':std' );
+    my $gen  = XML::Generator->new( ':std', escape => 'always,even-entities' );
     my %attr = ( $self->boost ? ( boost => $self->boost ) : () );
 
     return $gen->doc( \%attr, map { $_->to_xml } $self->fields );

Modified: branches/upstream/libwebservice-solr-perl/current/lib/WebService/Solr/Field.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libwebservice-solr-perl/current/lib/WebService/Solr/Field.pm?rev=31433&op=diff
==============================================================================
--- branches/upstream/libwebservice-solr-perl/current/lib/WebService/Solr/Field.pm (original)
+++ branches/upstream/libwebservice-solr-perl/current/lib/WebService/Solr/Field.pm Wed Mar  4 23:46:48 2009
@@ -19,7 +19,7 @@
 
 sub to_xml {
     my $self = shift;
-    my $gen  = XML::Generator->new( ':std' );
+    my $gen  = XML::Generator->new( ':std', escape => 'always,even-entities' );
     my %attr = ( $self->boost ? ( boost => $self->boost ) : () );
 
     return $gen->field( { name => $self->name, %attr }, $self->value );

Modified: branches/upstream/libwebservice-solr-perl/current/t/field.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libwebservice-solr-perl/current/t/field.t?rev=31433&op=diff
==============================================================================
--- branches/upstream/libwebservice-solr-perl/current/t/field.t (original)
+++ branches/upstream/libwebservice-solr-perl/current/t/field.t Wed Mar  4 23:46:48 2009
@@ -1,4 +1,4 @@
-use Test::More tests => 8;
+use Test::More tests => 10;
 
 use strict;
 use warnings;
@@ -34,3 +34,18 @@
     ok( !defined $f, 'value required' );
     ok( $@,          'value required' );
 }
+
+# XML escaping
+
+{
+    my $f = WebService::Solr::Field->new( foo => 'This & That' );
+    my $expected = '<field name="foo">This &amp; That</field>';
+    is( $f->to_xml, $expected, 'to_xml(), escaped (1)' );
+}
+
+{
+    my $f = WebService::Solr::Field->new( foo => 'This &amp; That' );
+    my $expected = '<field name="foo">This &amp;amp; That</field>';
+    is( $f->to_xml, $expected, 'to_xml(), escaped (2)' );
+}
+

More information about the Pkg-perl-cvs-commits mailing list