Closed a few tickets from the RT queue as an excuse for a new release. Bumped to version 0.46.

Author: davorg

MANIFEST

@@ -62,3 +62,7 @@ Makefile.PL
 META.json
 t/19-double3.t
 t/samples/rss10-double2.xml
+t/20-no-enclosures.t
+t/21-rss2-permalinks.t
+t/samples/rss20-p.xml
+

lib/XML/Feed.pm

@@ -12,7 +12,7 @@ use Module::Pluggable search_path => "XML::Feed::Format",
                       require     => 1,
                       sub_name    => 'formatters';
 
-our $VERSION = '0.45';
+our $VERSION = '0.46';
 our $MULTIPLE_ENCLOSURES = 0;
 our @formatters;
 BEGIN {
@@ -355,13 +355,13 @@ the current format of the I<$feed> object.
 
 =over 4
 
-=item C<$XML::Feed::RSS::PREFERRED_PARSER>
+=item C<$XML::Feed::Format::RSS::PREFERRED_PARSER>
 
 If you want to use another RSS parser class than XML::RSS (default), you can
-change the class by setting C<$PREFERRED_PARSER> variable in XML::Feed::RSS
-package.
+change the class by setting C<$PREFERRED_PARSER> variable in the
+XML::Feed::Format::RSS package.
 
-    $XML::Feed::RSS::PREFERRED_PARSER = "XML::RSS::LibXML";
+    $XML::Feed::Format::RSS::PREFERRED_PARSER = "XML::RSS::LibXML";
 
 B<Note:> this will only work for parsing feeds, not creating feeds.
 

lib/XML/Feed/Format/Atom.pm

@@ -319,7 +319,7 @@ sub enclosure {
         return 1;
     } else {
         my @links = grep { defined $_->rel && $_->rel eq 'enclosure' } $entry->{entry}->link;
-        return undef unless @links;
+        return unless @links;
         my @encs = map { XML::Feed::Enclosure->new({ url => $_->href, length => $_->length, type => $_->type }) } @links ;
         return ($XML::Feed::MULTIPLE_ENCLOSURES)? @encs : $encs[-1];
     }

lib/XML/Feed/Format/RSS.pm

@@ -7,6 +7,7 @@ use base qw( XML::Feed );
 use DateTime::Format::Mail;
 use DateTime::Format::W3CDTF;
 use XML::Atom::Util qw(iso2dt);
+use XML::Feed::Enclosure;
 
 our $PREFERRED_PARSER = "XML::RSS";
 
@@ -190,7 +191,9 @@ sub link {
         ## For RSS 2.0 output from XML::RSS. Sigh.
         $entry->{entry}{permaLink} = $_[0];
     } else {
-        $entry->{entry}{link} || $entry->{entry}{guid};
+        $entry->{entry}{link} ||
+        $entry->{entry}{permaLink} ||
+        $entry->{entry}{guid};
     }
 }
 
@@ -356,8 +359,12 @@ sub enclosure {
         }
     } else {
         my $tmp  = $entry->{entry}->{enclosure};
-        my @encs = map { XML::Feed::Enclosure->new($_) } (ref $tmp eq 'ARRAY')? @$tmp : ($tmp);
-        return ($XML::Feed::MULTIPLE_ENCLOSURES)? @encs : $encs[-1];
+        if (defined $tmp) {
+            my @encs = map { XML::Feed::Enclosure->new($_) }
+              (ref $tmp eq 'ARRAY')? @$tmp : ($tmp);
+            return ($XML::Feed::MULTIPLE_ENCLOSURES)? @encs : $encs[-1];
+        }
+        return;
     }
 }
 

t/20-no-enclosures.t

@@ -0,0 +1,15 @@
+use strict;
+use Test::More;
+
+use XML::Feed;
+
+my @formats = qw/rss20 atom/;
+
+plan tests => 2*@formats;
+
+for my $format (@formats) {
+  ok (my $feed = XML::Feed->parse("t/samples/$format.xml"), "Parsed $format");
+  my ($entry) = $feed->entries;
+  my @enclosure = $entry->enclosure;
+  is(@enclosure, 0);
+}

t/21-rss2-permalinks.t

@@ -0,0 +1,11 @@
+use strict;
+use warnings;
+
+use Test::More tests => 2;
+use XML::Feed;
+
+my $file = 't/samples/rss20-p.xml';
+my $feed = XML::Feed->parse($file);
+isa_ok($feed, 'XML::Feed::Format::RSS');
+my $entry = ($feed->entries)[0];
+is($entry->link, 'http://creograf.ru/post/regexp -js');

t/samples/rss20-p.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<rss version="2.0"
+     xmlns:blogChannel="http://backend.userland.com/blogChannelModule">
+  <channel>
+    <title>Some title</title>
+    <link>http://creograf.ru/blog/4progr ammer</link>
+    <description>Some desc</description>
+    <language>ru-ru</language>
+    <pubDate>Sun, 3 Apr 2011 05:42:15 +0300</pubDate>
+    <lastBuildDate>Sun, 3 Apr 2011 05:42:15 +0300</lastBuildDate>
+
+    <item>
+      <title>Some entry</title>i
+      <description></description>
+      <guid isPermaLink="true">http://creograf.ru/post/regexp -js</guid>
+      <pubDate>Sun, 3 Apr 2011 05:42:12 +0300</pubDate>
+    </item>
+  </channel>
+</rss>