r28158 - in /trunk/libxml-feed-perl: ./ debian/ lib/XML/ lib/XML/Feed/ lib/XML/Feed/Format/ t/ t/samples/

gregoa at users.alioth.debian.org gregoa at users.alioth.debian.org
Sat Dec 13 01:58:01 UTC 2008 

Author: gregoa
Date: Sat Dec 13 01:57:49 2008
New Revision: 28158

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=28158
Log:
New upstream release.

Added:
    trunk/libxml-feed-perl/t/12-multi-categories-atom.t
      - copied unchanged from r28157, branches/upstream/libxml-feed-perl/current/t/12-multi-categories-atom.t
    trunk/libxml-feed-perl/t/12-multi-categories-rss.t
      - copied unchanged from r28157, branches/upstream/libxml-feed-perl/current/t/12-multi-categories-rss.t
    trunk/libxml-feed-perl/t/12-multi-categories.base
      - copied unchanged from r28157, branches/upstream/libxml-feed-perl/current/t/12-multi-categories.base
    trunk/libxml-feed-perl/t/12-multi-subjects-rss.t
      - copied unchanged from r28157, branches/upstream/libxml-feed-perl/current/t/12-multi-subjects-rss.t
    trunk/libxml-feed-perl/t/samples/atom-multiple-categories.xml
      - copied unchanged from r28157, branches/upstream/libxml-feed-perl/current/t/samples/atom-multiple-categories.xml
    trunk/libxml-feed-perl/t/samples/rss-multiple-categories.xml
      - copied unchanged from r28157, branches/upstream/libxml-feed-perl/current/t/samples/rss-multiple-categories.xml
    trunk/libxml-feed-perl/t/samples/rss-multiple-subjects.xml
      - copied unchanged from r28157, branches/upstream/libxml-feed-perl/current/t/samples/rss-multiple-subjects.xml
Removed:
    trunk/libxml-feed-perl/Build.PL
Modified:
    trunk/libxml-feed-perl/Changes
    trunk/libxml-feed-perl/MANIFEST
    trunk/libxml-feed-perl/MANIFEST.SKIP
    trunk/libxml-feed-perl/META.yml
    trunk/libxml-feed-perl/Makefile.PL
    trunk/libxml-feed-perl/README
    trunk/libxml-feed-perl/debian/changelog
    trunk/libxml-feed-perl/lib/XML/Feed.pm
    trunk/libxml-feed-perl/lib/XML/Feed/Content.pm
    trunk/libxml-feed-perl/lib/XML/Feed/Entry.pm
    trunk/libxml-feed-perl/lib/XML/Feed/Format/Atom.pm
    trunk/libxml-feed-perl/lib/XML/Feed/Format/RSS.pm
    trunk/libxml-feed-perl/t/00-compile.t
    trunk/libxml-feed-perl/t/01-parse.t
    trunk/libxml-feed-perl/t/02-create.t
    trunk/libxml-feed-perl/t/04-splice-atom.t
    trunk/libxml-feed-perl/t/04-splice-rss.t
    trunk/libxml-feed-perl/t/08-convert-summary-bug.t
    trunk/libxml-feed-perl/t/10-mix-and-match.t
    trunk/libxml-feed-perl/t/11-xml-base-atom.t
    trunk/libxml-feed-perl/t/11-xml-base-rss.t

Modified: trunk/libxml-feed-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-feed-perl/Changes?rev=28158&op=diff
==============================================================================
--- trunk/libxml-feed-perl/Changes (original)
+++ trunk/libxml-feed-perl/Changes Sat Dec 13 01:57:49 2008
@@ -1,6 +1,12 @@
-# $Id: Changes 109 2008-11-21 20:41:06Z swistow $
+# $Id: Changes 118 2008-12-10 20:15:44Z swistow $
 
 Revision history for XML::Feed
+
+0.41
+    - Add handling for multiple categories/tags, including
+      patch from Shlomi Fish (SHLOMIF)
+      http://rt.cpan.org/Ticket/Display.html?id=41396
+    - Force v1.40 of XML::RSS to get proper multiple category support
 
 0.40 
     - Force v1.37 of XML::RSS to get proper xml:base support

Modified: trunk/libxml-feed-perl/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-feed-perl/MANIFEST?rev=28158&op=diff
==============================================================================
--- trunk/libxml-feed-perl/MANIFEST (original)
+++ trunk/libxml-feed-perl/MANIFEST Sat Dec 13 01:57:49 2008
@@ -1,11 +1,9 @@
-Build.PL
 Changes
 lib/XML/Feed.pm
 lib/XML/Feed/Content.pm
 lib/XML/Feed/Entry.pm
 lib/XML/Feed/Format/Atom.pm
 lib/XML/Feed/Format/RSS.pm
-Makefile.PL
 MANIFEST			This list of files
 MANIFEST.SKIP
 META.yml
@@ -23,14 +21,22 @@
 t/10-mix-and-match.t
 t/11-xml-base-atom.t
 t/11-xml-base-rss.t
+t/12-multi-categories-atom.t
+t/12-multi-categories-rss.t
+t/12-multi-categories.base
+t/12-multi-subjects-rss.t
+t/pod-coverage.t
+t/pod.t
 t/samples/atom-10-example.xml
 t/samples/atom-full.xml
+t/samples/atom-multiple-categories.xml
 t/samples/atom.xml
 t/samples/base_atom.xml
 t/samples/base_rss.xml
+t/samples/rss-multiple-categories.xml
+t/samples/rss-multiple-subjects.xml
 t/samples/rss10-invalid-date.xml
 t/samples/rss10.xml
 t/samples/rss20-no-summary.xml
 t/samples/rss20.xml
-t/pod.t
-t/pod-coverage.t
+Makefile.PL

Modified: trunk/libxml-feed-perl/MANIFEST.SKIP
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-feed-perl/MANIFEST.SKIP?rev=28158&op=diff
==============================================================================
--- trunk/libxml-feed-perl/MANIFEST.SKIP (original)
+++ trunk/libxml-feed-perl/MANIFEST.SKIP Sat Dec 13 01:57:49 2008
@@ -3,3 +3,4 @@
 _build
 Build
 blib
+Makefile

Modified: trunk/libxml-feed-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-feed-perl/META.yml?rev=28158&op=diff
==============================================================================
--- trunk/libxml-feed-perl/META.yml (original)
+++ trunk/libxml-feed-perl/META.yml Sat Dec 13 01:57:49 2008
@@ -1,6 +1,6 @@
 ---
 name: XML-Feed
-version: 0.40
+version: 0.41
 author: []
 abstract: XML Syndication Feed Support
 license: perl
@@ -20,11 +20,11 @@
   URI::Fetch: 0
   XML::Atom: 0.32
   XML::LibXML: 1.66
-  XML::RSS: 1.37
+  XML::RSS: 1.40
 provides:
   XML::Feed:
     file: lib/XML/Feed.pm
-    version: 0.40
+    version: 0.41
   XML::Feed::Content:
     file: lib/XML/Feed/Content.pm
   XML::Feed::Entry:

Modified: trunk/libxml-feed-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-feed-perl/Makefile.PL?rev=28158&op=diff
==============================================================================
--- trunk/libxml-feed-perl/Makefile.PL (original)
+++ trunk/libxml-feed-perl/Makefile.PL Sat Dec 13 01:57:49 2008
@@ -18,7 +18,7 @@
                            'URI::Fetch' => '0',
                            'XML::Atom' => '0.32',
                            'XML::LibXML' => '1.66',
-                           'XML::RSS' => '1.37'
+                           'XML::RSS' => '1.40'
                          },
           'INSTALLDIRS' => 'site',
           'EXE_FILES' => [],

Modified: trunk/libxml-feed-perl/README
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-feed-perl/README?rev=28158&op=diff
==============================================================================
--- trunk/libxml-feed-perl/README (original)
+++ trunk/libxml-feed-perl/README Sat Dec 13 01:57:49 2008
@@ -1,4 +1,4 @@
-$Id: README 1925 2006-03-03 17:37:50Z btrott $
+$Id: README 115 2008-12-01 21:17:51Z swistow $
 
 This is XML::Feed, an abstraction above the RSS and Atom syndication
 feed formats. It supports both parsing and autodiscovery of feeds.

Modified: trunk/libxml-feed-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-feed-perl/debian/changelog?rev=28158&op=diff
==============================================================================
--- trunk/libxml-feed-perl/debian/changelog (original)
+++ trunk/libxml-feed-perl/debian/changelog Sat Dec 13 01:57:49 2008
@@ -1,3 +1,9 @@
+libxml-feed-perl (0.41-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- gregor herrmann <gregoa at debian.org>  Sat, 13 Dec 2008 02:56:13 +0100
+
 libxml-feed-perl (0.40-1) unstable; urgency=low
 
   * debian/control: Changed: Switched Vcs-Browser field to ViewSVN

Modified: trunk/libxml-feed-perl/lib/XML/Feed.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-feed-perl/lib/XML/Feed.pm?rev=28158&op=diff
==============================================================================
--- trunk/libxml-feed-perl/lib/XML/Feed.pm (original)
+++ trunk/libxml-feed-perl/lib/XML/Feed.pm Sat Dec 13 01:57:49 2008
@@ -1,4 +1,4 @@
-# $Id: Feed.pm 1958 2006-08-14 05:31:27Z btrott $
+# $Id: Feed.pm 118 2008-12-10 20:15:44Z swistow $
 
 package XML::Feed;
 use strict;
@@ -12,7 +12,7 @@
                       require     => 1,
                       sub_name    => 'formatters';
 
-our $VERSION = '0.40';
+our $VERSION = '0.41';
 our @formatters;
 BEGIN {
 	@formatters = __PACKAGE__->formatters;

Modified: trunk/libxml-feed-perl/lib/XML/Feed/Content.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-feed-perl/lib/XML/Feed/Content.pm?rev=28158&op=diff
==============================================================================
--- trunk/libxml-feed-perl/lib/XML/Feed/Content.pm (original)
+++ trunk/libxml-feed-perl/lib/XML/Feed/Content.pm Sat Dec 13 01:57:49 2008
@@ -1,4 +1,4 @@
-# $Id: Content.pm 1862 2005-06-20 17:26:11Z btrott $
+# $Id: Content.pm 115 2008-12-01 21:17:51Z swistow $
 
 package XML::Feed::Content;
 use strict;

Modified: trunk/libxml-feed-perl/lib/XML/Feed/Entry.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-feed-perl/lib/XML/Feed/Entry.pm?rev=28158&op=diff
==============================================================================
--- trunk/libxml-feed-perl/lib/XML/Feed/Entry.pm (original)
+++ trunk/libxml-feed-perl/lib/XML/Feed/Entry.pm Sat Dec 13 01:57:49 2008
@@ -1,4 +1,4 @@
-# $Id: Entry.pm 1872 2005-08-12 04:28:42Z btrott $
+# $Id: Entry.pm 118 2008-12-10 20:15:44Z swistow $
 
 package XML::Feed::Entry;
 use strict;
@@ -55,6 +55,7 @@
 sub lat;
 sub long;
 sub format;
+sub tags { shift->category(@_) }
 
 1;
 __END__
@@ -127,6 +128,16 @@
 
 The category in which the entry was posted.
 
+Returns a list of categories if called in array context or the first
+category if called in scalar context.
+
+B<WARNING> It's possible this API might change to have an 
+I<add_category> instead.
+
+=head2 $entry->tags([ $tag ])
+
+A synonym for I<category>;
+
 =head2 $entry->author([ $author ])
 
 The name or email address of the person who posted the entry.

Modified: trunk/libxml-feed-perl/lib/XML/Feed/Format/Atom.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-feed-perl/lib/XML/Feed/Format/Atom.pm?rev=28158&op=diff
==============================================================================
--- trunk/libxml-feed-perl/lib/XML/Feed/Format/Atom.pm (original)
+++ trunk/libxml-feed-perl/lib/XML/Feed/Format/Atom.pm Sat Dec 13 01:57:49 2008
@@ -1,4 +1,4 @@
-# $Id: Atom.pm 1958 2006-08-14 05:31:27Z btrott $
+# $Id: Atom.pm 116 2008-12-09 23:39:29Z swistow $
 
 package XML::Feed::Format::Atom;
 use strict;
@@ -228,10 +228,16 @@
     my $entry = shift;
     my $ns = XML::Atom::Namespace->new(dc => 'http://purl.org/dc/elements/1.1/');
     if (@_) {
-        $entry->{entry}->add_category({ term => $_[0] });
-    } else {
-        my $category = $entry->{entry}->category;
-        my @return = $category ? ($category->label || $category->term) : $entry->{entry}->getlist($ns, 'subject');
+        $entry->{entry}->add_category({ term => $_ }) for @_;
+        return 1
+    } else {
+
+
+        my @category = ($entry->{entry}->can('categories')) ? $entry->{entry}->categories : $entry->{entry}->category;
+        my @return = @category
+            ? (map { $_->label || $_->term } @category)
+            : $entry->{entry}->getlist($ns, 'subject');
+
         return wantarray? @return : $return[0];
     }
 }

Modified: trunk/libxml-feed-perl/lib/XML/Feed/Format/RSS.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-feed-perl/lib/XML/Feed/Format/RSS.pm?rev=28158&op=diff
==============================================================================
--- trunk/libxml-feed-perl/lib/XML/Feed/Format/RSS.pm (original)
+++ trunk/libxml-feed-perl/lib/XML/Feed/Format/RSS.pm Sat Dec 13 01:57:49 2008
@@ -1,4 +1,4 @@
-# $Id: RSS.pm 1934 2006-04-22 05:13:55Z btrott $
+# $Id: RSS.pm 117 2008-12-09 23:48:16Z swistow $
 
 package XML::Feed::Format::RSS;
 use strict;
@@ -245,11 +245,16 @@
 }
 
 sub category {
-    my $item = shift->{entry};
-    if (@_) {
-        $item->{category} = $item->{dc}{subject} = $_[0];
-    } else {
-        $item->{category} || $item->{dc}{subject};
+    my $entry = shift;
+    my $item  = $entry->{entry};
+    if (@_) {
+        my @tmp = ($entry->category, @_);
+        $item->{category}    = [@tmp];
+        $item->{dc}{subject} = [@tmp];
+    } else {
+        my $r = $item->{category} || $item->{dc}{subject};
+        my @r = ref($r)? @$r : defined $r? ($r) : ();
+        return wantarray? @r : $r[0];
     }
 }
 

Modified: trunk/libxml-feed-perl/t/00-compile.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-feed-perl/t/00-compile.t?rev=28158&op=diff
==============================================================================
--- trunk/libxml-feed-perl/t/00-compile.t (original)
+++ trunk/libxml-feed-perl/t/00-compile.t Sat Dec 13 01:57:49 2008
@@ -1,4 +1,4 @@
-# $Id: 00-compile.t 1867 2005-08-09 20:41:15Z btrott $
+# $Id: 00-compile.t 115 2008-12-01 21:17:51Z swistow $
 
 use strict;
 use Test::More tests => 4;

Modified: trunk/libxml-feed-perl/t/01-parse.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-feed-perl/t/01-parse.t?rev=28158&op=diff
==============================================================================
--- trunk/libxml-feed-perl/t/01-parse.t (original)
+++ trunk/libxml-feed-perl/t/01-parse.t Sat Dec 13 01:57:49 2008
@@ -1,4 +1,4 @@
-# $Id: 01-parse.t 1921 2006-02-28 02:50:52Z btrott $
+# $Id: 01-parse.t 115 2008-12-01 21:17:51Z swistow $
 
 use strict;
 use Test::More tests => 75;

Modified: trunk/libxml-feed-perl/t/02-create.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-feed-perl/t/02-create.t?rev=28158&op=diff
==============================================================================
--- trunk/libxml-feed-perl/t/02-create.t (original)
+++ trunk/libxml-feed-perl/t/02-create.t Sat Dec 13 01:57:49 2008
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: 02-create.t 115 2008-12-01 21:17:51Z swistow $
 
 use strict;
 use Test::More tests => 72;

Modified: trunk/libxml-feed-perl/t/04-splice-atom.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-feed-perl/t/04-splice-atom.t?rev=28158&op=diff
==============================================================================
--- trunk/libxml-feed-perl/t/04-splice-atom.t (original)
+++ trunk/libxml-feed-perl/t/04-splice-atom.t Sat Dec 13 01:57:49 2008
@@ -1,4 +1,4 @@
-# $Id: 04-splice.t 1958 2006-08-14 05:31:27Z btrott $
+# $Id: 04-splice-atom.t 115 2008-12-01 21:17:51Z swistow $
 
 use strict;
 use Test::More tests => 3;

Modified: trunk/libxml-feed-perl/t/04-splice-rss.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-feed-perl/t/04-splice-rss.t?rev=28158&op=diff
==============================================================================
--- trunk/libxml-feed-perl/t/04-splice-rss.t (original)
+++ trunk/libxml-feed-perl/t/04-splice-rss.t Sat Dec 13 01:57:49 2008
@@ -1,4 +1,4 @@
-# $Id: 04-splice.t 1958 2006-08-14 05:31:27Z btrott $
+# $Id: 04-splice-rss.t 115 2008-12-01 21:17:51Z swistow $
 
 use strict;
 use Test::More tests => 3;

Modified: trunk/libxml-feed-perl/t/08-convert-summary-bug.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-feed-perl/t/08-convert-summary-bug.t?rev=28158&op=diff
==============================================================================
--- trunk/libxml-feed-perl/t/08-convert-summary-bug.t (original)
+++ trunk/libxml-feed-perl/t/08-convert-summary-bug.t Sat Dec 13 01:57:49 2008
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: 08-convert-summary-bug.t 115 2008-12-01 21:17:51Z swistow $
 
 use strict;
 use Test::More tests => 1;

Modified: trunk/libxml-feed-perl/t/10-mix-and-match.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-feed-perl/t/10-mix-and-match.t?rev=28158&op=diff
==============================================================================
--- trunk/libxml-feed-perl/t/10-mix-and-match.t (original)
+++ trunk/libxml-feed-perl/t/10-mix-and-match.t Sat Dec 13 01:57:49 2008
@@ -1,4 +1,4 @@
-# $Id: $
+# $Id: 10-mix-and-match.t 115 2008-12-01 21:17:51Z swistow $
 
 use strict;
 use Test::More tests => 6;

Modified: trunk/libxml-feed-perl/t/11-xml-base-atom.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-feed-perl/t/11-xml-base-atom.t?rev=28158&op=diff
==============================================================================
--- trunk/libxml-feed-perl/t/11-xml-base-atom.t (original)
+++ trunk/libxml-feed-perl/t/11-xml-base-atom.t Sat Dec 13 01:57:49 2008
@@ -1,4 +1,4 @@
-# $Id: $
+# $Id: 11-xml-base-atom.t 115 2008-12-01 21:17:51Z swistow $
 
 use strict;
 use Test::More tests => 13;

Modified: trunk/libxml-feed-perl/t/11-xml-base-rss.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-feed-perl/t/11-xml-base-rss.t?rev=28158&op=diff
==============================================================================
--- trunk/libxml-feed-perl/t/11-xml-base-rss.t (original)
+++ trunk/libxml-feed-perl/t/11-xml-base-rss.t Sat Dec 13 01:57:49 2008
@@ -1,4 +1,4 @@
-# $Id: $
+# $Id: 11-xml-base-rss.t 115 2008-12-01 21:17:51Z swistow $
 
 use strict;
 use Test::More;

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