Changeset 3652 for trunk

Timestamp:

04/29/09 07:07:50 (7 months ago)

Author:

fumiakiy

Message:

Upped XML::Atom version to 0.33.

Location:

trunk/extlib/XML

Files:

• Atom.pm (modified) (1 diff)
• Atom/Base.pm (modified) (10 diffs)
• Atom/Client.pm (modified) (5 diffs)
• Atom/Content.pm (modified) (4 diffs)
• Atom/Entry.pm (modified) (2 diffs)
• Atom/ErrorHandler.pm (modified) (1 diff)
• Atom/Feed.pm (modified) (3 diffs)
• Atom/Link.pm (modified) (1 diff)
• Atom/Person.pm (modified) (1 diff)
• Atom/Server.pm (modified) (1 diff)
• Atom/Thing.pm (modified) (2 diffs)
• Atom/Util.pm (modified) (4 diffs)

trunk/extlib/XML/Atom.pm

@@ -1 @@
-# $Id$
+# $Id: Atom.pm 110 2009-01-07 02:01:47Z miyagawa $
 
 package XML::Atom;
 use strict;
 
-our $VERSION = '0.25';
+our $VERSION = '0.33';
 
 BEGIN {

trunk/extlib/XML/Atom/Base.pm

@@ -1 @@
-# $Id: /mirror/code/XML-Atom/trunk/lib/XML/Atom/Base.pm 5342 2006-09-16T06:39:51.745764Z miyagawa  $
+# $Id: Base.pm 106 2008-11-14 22:04:41Z swistow $
 
 package XML::Atom::Base;
@@ -7 +7 @@
 use Encode;
 use XML::Atom;
-use XML::Atom::Util qw( set_ns first nodelist childlist create_element remove_default_ns );
+use XML::Atom::Util qw( set_ns first nodelist childlist create_element );
 
 __PACKAGE__->mk_classdata('__attributes', []);
@@ -29 +29 @@
         if (LIBXML) {
             my $doc = XML::LibXML::Document->createDocument('1.0', 'utf-8');
-            $elem = $doc->createElementNS($obj->ns, $obj->element_name);
+            my $ns = $obj->ns;
+            my ($ns_uri, $ns_prefix);
+            if ( ref $ns and $ns->isa('XML::Atom::Namespace') ) {
+                $ns_uri     = $ns->{uri};
+                $ns_prefix  = $ns->{prefix};
+            } else {
+                $ns_uri = $ns;
+            }
+            if ( $ns_uri and $ns_prefix ) {
+                $elem = $doc->createElement($obj->element_name);
+                $elem->setNamespace( $ns_uri, $ns_prefix, 1 );
+            } else {
+                $elem = $doc->createElementNS($obj->ns, $obj->element_name);
+            }
             $doc->setDocumentElement($elem);
         } else {
@@ -50 +63 @@
     my $atom = shift;
     XML::Atom::Util::ns_to_version($atom->ns);
+}
+
+sub content_type {
+    my $atom = shift;
+    if ($atom->version >= 1.0) {
+        return "application/atom+xml";
+    } else {
+        return "application/x.atom+xml";
+    }
 }
 
@@ -156 +178 @@
     my $obj = shift;
     my($ns, $name, $class) = @_;
-    my @elem = childlist($obj->elem, $ns, $name) or return;
+    my $ns_uri = ref($ns) eq 'XML::Atom::Namespace' ? $ns->{uri} : $ns;
+    my @elem = childlist($obj->elem, $ns_uri, $name) or return;
     my @obj = map { $class->new( Elem => $_, Namespace => $ns ) } @elem;
     return wantarray ? @obj : $obj[0];
@@ -163 +186 @@
 sub mk_elem_accessors {
     my $class = shift;
-    my(@list) = @_;
-    no strict 'refs';
-    for my $elem (@list) {
+    my (@list) = @_;
+    my $override_ns;
+
+    if ( ref $list[-1] ) {
+        my $ns_list = pop @list;
+        if ( ref $ns_list eq 'ARRAY' ) {
+            $ns_list = $ns_list->[0];
+        }
+        if ( ref($ns_list) =~ /Namespace/ ) {
+            $override_ns = $ns_list;
+        } else {
+            if ( ref $ns_list eq 'HASH' ) {
+                $override_ns = XML::Atom::Namespace->new(%$ns_list);
+            }
+            elsif ( not ref $ns_list and $ns_list ) {
+                $override_ns = $ns_list;
+            }
+        } 
+    }
+
+    no strict 'refs';
+    for my $elem ( @list ) {
         (my $meth = $elem) =~ tr/\-/_/;
         *{"${class}::$meth"} = sub {
             my $obj = shift;
             if (@_) {
-                return $obj->set($obj->ns, $elem, $_[0]);
-            } else {
-                return $obj->get($obj->ns, $elem);
+                return $obj->set( $override_ns || $obj->ns, $elem, $_[0]);
+            } else {
+                return $obj->get( $override_ns || $obj->ns, $elem);
             }
         };
@@ -219 +261 @@
                                           $attr, $_[0]);
                 }
-                return $elem->getAttributeNS('http://www.w3.org/XML/1998/namespace', $attr);
+                return $elem->getAttribute("xml:$attr");
             } else {
                 if (@_) {
@@ -294 +336 @@
 
         my $ns_uri = $ext_class->element_ns || $obj->ns;
-        my $elem = ref $stuff eq $ext_class ?
+        my $elem = (ref $stuff && UNIVERSAL::isa($stuff, $ext_class)) ?
             $stuff->elem : create_element($ns_uri, $name);
         $obj->elem->appendChild($elem);
@@ -311 +353 @@
     if (LIBXML) {
         my $doc = XML::LibXML::Document->new('1.0', 'utf-8');
-        $doc->setDocumentElement($obj->elem);
-        remove_default_ns($obj->elem);
+        $doc->setDocumentElement($obj->elem->cloneNode(1));
         return $doc->toString(1);
     } else {
@@ -322 +363 @@
 sub as_xml_utf8 {
     my $obj = shift;
-    Encode::encode_utf8($obj->as_xml);
+    my $xml = $obj->as_xml;
+    if (utf8::is_utf8($xml)) {
+        return Encode::encode_utf8($xml);
+    }
+    return $xml;
 }
 

trunk/extlib/XML/Atom/Client.pm

@@ -1 @@
-# $Id$
+# $Id: Client.pm 109 2009-01-07 01:59:33Z miyagawa $
 
 package XML::Atom::Client;
@@ -72 +72 @@
         unless $uri;
     my $req = HTTP::Request->new(POST => $uri);
-    $req->content_type('application/x.atom+xml');
+    $req->content_type($entry->content_type);
     my $xml = $entry->as_xml;
     _utf8_off($xml);
@@ -87 +87 @@
     my($url, $entry) = @_;
     my $req = HTTP::Request->new(PUT => $url);
-    $req->content_type('application/x.atom+xml');
+    $req->content_type($entry->content_type);
     my $xml = $entry->as_xml;
     _utf8_off($xml);
@@ -136 +136 @@
     my($req) = @_;
     $req->header(
-        Accept => 'application/x.atom+xml, application/xml, text/xml, */*',
+        Accept => 'application/atom+xml, application/x.atom+xml, application/xml, text/xml, */*',
     );
     my $nonce = $client->make_nonce;
@@ -174 +174 @@
         $req->content_type('text/xml');
     } else {
-        $req->header('X-WSSE', sprintf
-          qq(UsernameToken Username="%s", PasswordDigest="%s", Nonce="%s", Created="%s"),
-          $client->username || '', $digest, $nonce_enc, $now);
-        $req->header('Authorization', 'WSSE profile="UsernameToken"');
+        if ($client->username) {
+            $req->header('X-WSSE', sprintf
+              qq(UsernameToken Username="%s", PasswordDigest="%s", Nonce="%s", Created="%s"),
+              $client->username || '', $digest, $nonce_enc, $now);
+            $req->header('Authorization', 'WSSE profile="UsernameToken"');
+        }
     }
 }

trunk/extlib/XML/Atom/Content.pm

@@ -1 @@
-# $Id$
+# $Id: Content.pm 89 2007-10-04 20:28:06Z miyagawa $
 
 package XML::Atom::Content;
@@ -10 +10 @@
 use Encode;
 use XML::Atom;
-use XML::Atom::Util qw( remove_default_ns hack_unicode_entity );
 use MIME::Base64 qw( encode_base64 decode_base64 );
 
@@ -113 +112 @@
                     $content->{__body} = '';
                     for my $n (@children) {
-                        remove_default_ns($n) if LIBXML;
                         $content->{__body} .= $n->toString(LIBXML ? 1 : 0);
                     }
@@ -120 +118 @@
                 }
                 if ($] >= 5.008) {
-                    $content->{__body} = hack_unicode_entity($content->{__body});
+                    Encode::_utf8_off($content->{__body}) unless $XML::Atom::ForceUnicode;
                 }
             } elsif ($mode eq 'base64') {

trunk/extlib/XML/Atom/Entry.pm

@@ -1 @@
-# $Id$
+# $Id: Entry.pm 106 2008-11-14 22:04:41Z swistow $
 
 package XML::Atom::Entry;
@@ -26 +26 @@
 
 __PACKAGE__->mk_elem_accessors(qw( summary source ));
+__PACKAGE__->mk_xml_attr_accessors(qw( lang base ));
 
 __PACKAGE__->_rename_elements('issued' => 'published');

trunk/extlib/XML/Atom/ErrorHandler.pm

@@ -1 @@
-# $Id: ErrorHandler.pm,v 1.1 2003/09/08 00:00:50 btrott Exp $
+# $Id: ErrorHandler.pm 1 2006-08-16 05:19:58Z miyagawa $
 
 package XML::Atom::ErrorHandler;

trunk/extlib/XML/Atom/Feed.pm

@@ -1 @@
-# $Id$
+# $Id: Feed.pm 106 2008-11-14 22:04:41Z swistow $
 
 package XML::Atom::Feed;
@@ -68 +68 @@
 
 sub element_name { 'feed' }
-
-sub language {
-    my $feed = shift;
-    if (LIBXML) {
-        my $elem = $feed->elem;
-        if (@_) {
-            $elem->setAttributeNS('http://www.w3.org/XML/1998/namespace',
-                'lang', $_[0]);
-        }
-        return $elem->getAttributeNS('http://www.w3.org/XML/1998/namespace', 'lang');
-    } else {
-        if (@_) {
-            $feed->elem->setAttribute('xml:lang', $_[0]);
-        }
-        return $feed->elem->getAttribute('xml:lang');
-    }
-}
+*language = \⟨ # legacy
+
 
 sub version {
@@ -153 +138 @@
 
 __PACKAGE__->mk_elem_accessors(qw( generator ));
+__PACKAGE__->mk_xml_attr_accessors(qw( lang base ));
 
 __PACKAGE__->_rename_elements('modified' => 'updated');

trunk/extlib/XML/Atom/Link.pm

@@ -1 @@
-# $Id$
+# $Id: Link.pm 39 2006-08-16 05:34:19Z miyagawa $
 
 package XML::Atom::Link;

trunk/extlib/XML/Atom/Person.pm

@@ -1 @@
-# $Id$
+# $Id: Person.pm 39 2006-08-16 05:34:19Z miyagawa $
 
 package XML::Atom::Person;

trunk/extlib/XML/Atom/Server.pm

@@ -1 @@
-# $Id$
+# $Id: Server.pm 25 2006-08-16 05:30:14Z miyagawa $
 
 package XML::Atom::Server;

trunk/extlib/XML/Atom/Thing.pm

@@ -1 @@
-# $Id$
+# $Id: Thing.pm 89 2007-10-04 20:28:06Z miyagawa $
 
 package XML::Atom::Thing;
@@ -7 +7 @@
 use XML::Atom;
 use base qw( XML::Atom::ErrorHandler );
-use XML::Atom::Util qw( first nodelist childlist remove_default_ns create_element );
+use XML::Atom::Util qw( first nodelist childlist create_element );
 use XML::Atom::Category;
 use XML::Atom::Link;

trunk/extlib/XML/Atom/Util.pm

@@ -1 @@
-# $Id$
+# $Id: Util.pm 89 2007-10-04 20:28:06Z miyagawa $
 
 package XML::Atom::Util;
@@ -8 +8 @@
 use Encode;
 use Exporter;
-@EXPORT_OK = qw( set_ns hack_unicode_entity first nodelist childlist textValue iso2dt encode_xml remove_default_ns create_element );
+@EXPORT_OK = qw( set_ns first nodelist childlist textValue iso2dt encode_xml create_element );
 @ISA = qw( Exporter );
 
@@ -36 +36 @@
     my $ns = shift;
     $NS_VERSION{$ns};
-}
-
-sub hack_unicode_entity {
-    my $data = shift;
-    Encode::_utf8_on($data);
-    $data =~ s/&#x(\w{4});/chr(hex($1))/eg;
-    Encode::_utf8_off($data) unless $XML::Atom::ForceUnicode;
-    $data;
 }
 
@@ -115 +107 @@
 }
 
-sub remove_default_ns {
-    my($node) = @_;
-    if (ref($node) =~ /Element$/ && $node->nodeName =~ /^default\d*:/) {
-       my $ns = $node->getNamespace;
-        if ($ns and my $uri = $ns->getData) {
-            $node->setNamespace($uri, '');
-        }
-    }
-    for my $n ($node->childNodes) {
-        remove_default_ns($n);
-    }
-}
-
 sub create_element {
     my($ns, $name) = @_;