simianarmy-feedzirra 0.0.16 → 0.0.17

data/lib/feedzirra.rb

@@ -30,5 +30,5 @@ require 'feedzirra/parser/atom'
 require 'feedzirra/parser/atom_feed_burner'
 
 module Feedzirra
-  VERSION = "0.0.13"
+  VERSION = "0.0.16"
 end

data/lib/feedzirra/feed.rb

@@ -96,7 +96,7 @@ module Feedzirra
           curl.on_success do |c|
             responses[url] = decode_content(c)
           end
-          curl.on_failure do |c|
+          curl.on_failure do |c, err|
             responses[url] = c.response_code
           end
         end

data/lib/feedzirra/parser/atom.rb

@@ -15,11 +15,20 @@ module Feedzirra
       element :title
       element :link, :as => :url, :value => :href, :with => {:type => "text/html"}
       element :link, :as => :feed_url, :value => :href, :with => {:type => "application/atom+xml"}
+      elements :link, :as => :links, :value => :href
       elements :entry, :as => :entries, :class => AtomEntry
 
       def self.able_to_parse?(xml) #:nodoc:
         xml =~ /(Atom)|(#{Regexp.escape("http://purl.org/atom")})/
       end
+      
+      def url
+        @url || links.last
+      end
+      
+      def feed_url
+        @feed_url || links.first
+      end
     end
   end
   

data/lib/feedzirra/parser/atom_entry.rb

@@ -27,6 +27,11 @@ module Feedzirra
       element :updated
       element :modified, :as => :updated
       elements :category, :as => :categories, :value => :term
+      elements :link, :as => :links, :value => :href
+      
+      def url
+        @url || links.first
+      end
     end
 
   end

data/lib/feedzirra/parser/rss_entry.rb

@@ -19,10 +19,12 @@ module Feedzirra
       element :link, :as => :url
 
       element :"dc:creator", :as => :author
+      element :author, :as => :author
       element :"content:encoded", :as => :content
       element :description, :as => :summary
 
       element :pubDate, :as => :published
+      element :pubdate, :as => :published
       element :"dc:date", :as => :published
       element :"dc:Date", :as => :published
       element :"dcterms:created", :as => :published

data/spec/feedzirra/parser/atom_entry_spec.rb

@@ -15,6 +15,10 @@ describe Feedzirra::Parser::AtomEntry do
     @entry.url.should == "http://aws.typepad.com/aws/2009/01/aws-job-architect-designer-position-in-turkey.html"
   end
   
+  it "should parse the url even when" do
+    Feedzirra::Parser::Atom.parse(load_sample("atom_with_link_tag_for_url_unmarked.xml")).entries.first.url.should == "http://www.innoq.com/blog/phaus/2009/07/ja.html"
+  end
+  
   it "should parse the author" do
     @entry.author.should == "AWS Editor"
   end

data/spec/feedzirra/parser/atom_spec.rb

@@ -24,6 +24,14 @@ describe Feedzirra::Parser::Atom do
       @feed.url.should == "http://aws.typepad.com/aws/"
     end
     
+    it "should parse the url even when it doesn't have the type='text/html' attribute" do
+      Feedzirra::Parser::Atom.parse(load_sample("atom_with_link_tag_for_url_unmarked.xml")).url.should == "http://www.innoq.com/planet/"
+    end
+    
+    it "should parse the feed_url even when it doesn't have the type='application/atom+xml' attribute" do
+      Feedzirra::Parser::Atom.parse(load_sample("atom_with_link_tag_for_url_unmarked.xml")).feed_url.should == "http://www.innoq.com/planet/atom.xml"
+    end
+    
     it "should parse the feed_url" do
       @feed.feed_url.should == "http://aws.typepad.com/aws/atom.xml"
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: simianarmy-feedzirra
 version: !ruby/object:Gem::Version 
-  version: 0.0.16
+  version: 0.0.17
 platform: ruby
 authors: 
 - Marc Mauger