feedzirra 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 935a303a640e7d1691deac27f8fa4842890d20f8
-  data.tar.gz: c8fb4c77b662451975749d78c40327bdbd53d819
+  metadata.gz: 6547ea21e91fd542899dbb76260595526c269d70
+  data.tar.gz: 4b34a18d37afb06519846075bedaac411770e084
 SHA512:
-  metadata.gz: a5219f1781ac43e8736032ae7cb9b7d3840394af711a1f2041e7ee71bfba894977d8ed4040077e003977c5af768622284725021c8f3d661ce70c93fdce882eff
-  data.tar.gz: 1f525c241c9c5f7de1351f8941d48a944b225fe71cfee43918cadcabaaabe70bd1a3c9b9028145c24b100e21b29246d03e7011e4c3e680629cc7832a4cfc09f5
+  metadata.gz: 7d45bc2899f40f6e3bbe1ac2173deca01e403522b08e8fd2c468df8ea96624f72c948b2d10f266de08f9dee61a27bec9af8294dac83a4aeac6a142cf42c1533f
+  data.tar.gz: 1813e66fa65f47b612befc1be51aefca816e9cf6a2553790abdd31a515ce5e98d2fc8acdba37e71a656fee8bd090ae3a4afa853b228c42882667176bfd1857fd

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Feedzirra Changelog
 
+## 0.7.0
+
+* General
+  * README update for callback arity [[#202][]]
+
+* Enhancements
+  * Add error info to `on_failure` callback [[#194][]]
+  * On failure callbacks get curl and error as args
+  * Bugfix for parsing dates that are ISO 8601 with milliseconds [[#203][]]
+
+[#194]: https://github.com/pauldix/feedzirra/pull/194
+[#202]: https://github.com/pauldix/feedzirra/pull/202
+[#203]: https://github.com/pauldix/feedzirra/pull/203
+
 ## 0.6.0
 
 * General

data/README.md

@@ -101,8 +101,9 @@ updated_feeds = Feedzirra::Feed.update(feeds.values)
 
 # defining custom behavior on failure or success. note that a return status of 304 (not updated) will call the on_success handler
 feed = Feedzirra::Feed.fetch_and_parse("http://feeds.feedburner.com/PaulDixExplainsNothing",
-  :on_success => lambda [|url, feed| puts feed.title ],
-  :on_failure => lambda [|url, response_code, response_header, response_body| puts response_body ])
+	:on_success => lambda {|url, feed| puts feed.title },
+	:on_failure => lambda {|curl, error| puts error })
+
 # if a collection was passed into fetch_and_parse, the handlers will be called for each one
 
 # the behavior for the handlers when using Feedzirra::Feed.update is slightly different. The feed passed into on_success will be

data/lib/feedzirra/core_ext/time.rb

@@ -17,6 +17,8 @@ class Time
         dt.utc
       when dt.respond_to?(:empty?) && dt.empty?
         nil
+      when dt.respond_to?(:to_datetime)
+        dt.to_datetime.utc
       when dt.to_s =~ /\A\d{14}\z/
         parse("#{dt.to_s}Z", true)
       else

data/lib/feedzirra/feed.rb

@@ -320,10 +320,10 @@ module Feedzirra
               responses[url] = feed
               options[:on_success].call(url, feed) if options.has_key?(:on_success)
             rescue Exception => e
-              options[:on_failure].call(url, c.response_code, c.header_str, c.body_str) if options.has_key?(:on_failure)
+              call_on_failure(c, e, options[:on_failure])
             end
           else
-            options[:on_failure].call(url, c.response_code, c.header_str, c.body_str) if options.has_key?(:on_failure)
+            call_on_failure(c, "Can't determine a parser", options[:on_failure])
           end
         end
 
@@ -343,13 +343,13 @@ module Feedzirra
 
         curl.on_missing do |c|
           if c.response_code == 404 && options.has_key?(:on_failure)
-            options[:on_failure].call(url, c.response_code, c.header_str, c.body_str)
+            call_on_failure(c, 'Server returned a 404', options[:on_failure])
           end
         end
 
         curl.on_failure do |c, err|
           responses[url] = c.response_code
-          options[:on_failure].call(url, c.response_code, c.header_str, c.body_str) if options.has_key?(:on_failure)
+          call_on_failure(c, err, options[:on_failure])
         end
       end
       multi.add(easy)
@@ -387,18 +387,21 @@ module Feedzirra
             responses[feed.feed_url] = feed
             options[:on_success].call(feed) if options.has_key?(:on_success)
           rescue Exception => e
-            options[:on_failure].call(feed, c.response_code, c.header_str, c.body_str) if options.has_key?(:on_failure)
+            call_on_failure(c, e, options[:on_failure])
           end
         end
 
         curl.on_failure do |c, err| # response code 50X
-          responses[feed.url] = c.response_code
-          options[:on_failure].call(feed, c.response_code, c.header_str, c.body_str) if options.has_key?(:on_failure)
+          responses[feed.feed_url] = c.response_code
+          call_on_failure(c, 'Server returned a 404', options[:on_failure])
         end
 
         curl.on_redirect do |c, err| # response code 30X
           if c.response_code == 304
             options[:on_success].call(feed) if options.has_key?(:on_success)
+          else
+            responses[feed.feed_url] = c.response_code
+            call_on_failure(c, err, options[:on_failure])
           end
         end
 
@@ -438,6 +441,19 @@ module Feedzirra
       def on_parser_failure(url)
         Proc.new { |message| raise "Error while parsing [#{url}] #{message}" }
       end
+
+      def call_on_failure(c, error, on_failure)
+        if on_failure
+          if on_failure.arity == 4
+            warn 'on_failure proc with deprecated arity 4 should include a fifth parameter containing the error'
+            on_failure.call(c.url, c.response_code, c.header_str, c.body_str)
+          elsif on_failure.arity == 2
+            on_failure.call(c, error)
+          else
+            warn "on_failure proc with invalid parameters number #{on_failure.arity} instead of 2, ignoring it"
+          end
+        end
+      end
     end
   end
 end

data/lib/feedzirra/version.rb

@@ -1,3 +1,3 @@
 module Feedzirra
-  VERSION = '0.6.0'
+  VERSION = '0.7.0'
 end

data/spec/feedzirra/feed_entry_utilities_spec.rb

@@ -13,6 +13,12 @@ describe Feedzirra::FeedUtilities do
       time.class.should == Time
       time.should == Time.parse_safely("Wed Feb 20 18:05:00 UTC 2008")
     end
+
+    it "should parse a ISO 8601 with milliseconds into Time" do
+      time = @klass.new.parse_datetime("2013-09-17T08:20:13.931-04:00")
+      time.class.should == Time
+      time.should == Time.parse_safely("Tue Sep 17 12:20:13 UTC 2013")
+    end
   end
 
   describe "sanitizing" do

data/spec/feedzirra/feed_spec.rb

@@ -4,7 +4,7 @@ class Hell < StandardError; end
 
 class FailParser
   def self.parse(_, &on_failure)
-    on_failure.call
+    on_failure.call 'this parser always fails.'
   end
 end
 
@@ -57,7 +57,7 @@ describe Feedzirra::Feed do
 
     context 'with a callback block' do
       it 'passes the callback to the parser' do
-        callback = -> { raise Hell }
+        callback = ->(*) { raise Hell }
 
         expect do
           Feedzirra::Feed.parse_with FailParser, xml, &callback
@@ -268,6 +268,7 @@ describe Feedzirra::Feed do
     before(:each) do
       @paul_feed = { :xml => load_sample("PaulDixExplainsNothing.xml"), :url => "http://feeds.feedburner.com/PaulDixExplainsNothing" }
       @trotter_feed = { :xml => load_sample("TrotterCashionHome.xml"), :url => "http://feeds2.feedburner.com/trottercashion" }
+      @invalid_feed = { :xml => 'This feed is invalid', :url => "http://feeds.feedburner.com/InvalidFeed" }
     end
 
     describe "#fetch_raw" do
@@ -456,11 +457,11 @@ describe Feedzirra::Feed do
           end
 
           describe 'when the parser raises an exception' do
-            it 'invokes the on_failure callback' do
-              failure = lambda { |url, feed| }
-              failure.should_receive(:call).with(@paul_feed[:url], 0, nil, nil)
+            it 'invokes the on_failure callback with that exception' do
+              failure = double 'Failure callback', arity: 2
+              failure.should_receive(:call).with(@easy_curl, an_instance_of(Hell))
 
-              Feedzirra::Parser::AtomFeedBurner.should_receive(:parse).and_raise Exception
+              Feedzirra::Parser::AtomFeedBurner.should_receive(:parse).and_raise Hell
               Feedzirra::Feed.add_url_to_multi(@multi, @paul_feed[:url], [], {}, { on_failure: failure })
 
               @easy_curl.on_success.call(@easy_curl)
@@ -473,8 +474,8 @@ describe Feedzirra::Feed do
             end
 
             it 'invokes the on_failure callback' do
-              failure = lambda { |url, feed| }
-              failure.should_receive(:call).with(@paul_feed[:url], 0, nil, nil)
+              failure = double 'Failure callback', arity: 2
+              failure.should_receive(:call).with(@easy_curl, an_instance_of(RuntimeError))
 
               Feedzirra::Feed.add_url_to_multi(@multi, @paul_feed[:url], [], {}, { on_failure: failure })
               @easy_curl.on_success.call(@easy_curl)
@@ -484,8 +485,8 @@ describe Feedzirra::Feed do
 
         describe 'when no compatible xml parser class is found' do
           it 'invokes the on_failure callback' do
-            failure = lambda { |url, feed| }
-            failure.should_receive(:call).with(@paul_feed[:url], 0, nil, nil)
+            failure = double 'Failure callback', arity: 2
+            failure.should_receive(:call).with(@easy_curl, "Can't determine a parser")
 
             Feedzirra::Feed.should_receive(:determine_feed_parser_for_xml).and_return nil
             Feedzirra::Feed.add_url_to_multi(@multi, @paul_feed[:url], [], {}, { on_failure: failure })
@@ -506,8 +507,8 @@ describe Feedzirra::Feed do
         end
 
         it 'should call proc if :on_failure option is passed' do
-          failure = lambda { |url, feed| }
-          failure.should_receive(:call).with(@paul_feed[:url], 500, @headers, @body)
+          failure = double 'Failure callback', arity: 2
+          failure.should_receive(:call).with(@easy_curl, nil)
           Feedzirra::Feed.add_url_to_multi(@multi, @paul_feed[:url], [], {}, { :on_failure => failure })
           @easy_curl.on_failure.call(@easy_curl)
         end
@@ -533,8 +534,8 @@ describe Feedzirra::Feed do
         end
 
         it 'should call proc if :on_failure option is passed' do
-          complete = lambda { |url| }
-          complete.should_receive(:call).with(@paul_feed[:url], 404, @headers, @body)
+          complete = double 'Failure callback', arity: 2
+          complete.should_receive(:call).with(@easy_curl, 'Server returned a 404')
           Feedzirra::Feed.add_url_to_multi(@multi, @paul_feed[:url], [], {}, { :on_failure => complete })
           @easy_curl.on_missing.call(@easy_curl)
         end
@@ -659,7 +660,7 @@ describe Feedzirra::Feed do
           end
 
           it 'invokes the on_failure callback' do
-            failure = lambda { |feed| }
+            failure = double 'Failure callback', arity: 2
             failure.should_receive(:call)
 
             Feedzirra::Feed.add_feed_to_multi(@multi, @feed, [], {}, { on_failure: failure })
@@ -692,7 +693,7 @@ describe Feedzirra::Feed do
           @easy_curl.on_failure.call(@easy_curl)
 
           responses.length.should == 1
-          responses['http://www.pauldix.net/'].should == 404
+          responses[@paul_feed[:url]].should == 404
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: feedzirra
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Paul Dix
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-17 00:00:00.000000000 Z
+date: 2014-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sax-machine