feed.rb in pauldix-feedzirra-0.0.9

- old
+ new

@@ -44,11 +44,11 @@
     # Provides a list of registered feed parsing classes.
     #
     # === Returns
     # A array of class names.
     def self.feed_classes
-      @feed_classes ||= [ITunesRSS, RSS, AtomFeedBurner, Atom]
+      @feed_classes ||= [RSS, AtomFeedBurner, Atom]
     end
     
     # Makes all entry types look for the passed in element to parse. This is actually just a call to 
     # element (a SAXMachine call) in the class
     #
@@ -56,11 +56,11 @@
     # [element_tag<String>]
     # [options<Hash>] Valid keys are same as with SAXMachine
     def self.add_common_feed_entry_element(element_tag, options = {})
       # need to think of a better way to do this. will break for people who want this behavior
       # across their added classes
-      [RSSEntry, AtomFeedBurnerEntry, AtomEntry].each do |klass|
+      feed_classes.each do |klass|
         klass.send(:element, element_tag, options)
       end
     end
     
     # Makes all entry types look for the passed in elements to parse. This is actually just a call to 
@@ -98,11 +98,11 @@
       url_queue.each do |url|
         easy = Curl::Easy.new(url) do |curl|
           curl.headers["User-Agent"]        = (options[:user_agent] || USER_AGENT)
           curl.headers["If-Modified-Since"] = options[:if_modified_since].httpdate if options.has_key?(:if_modified_since)
           curl.headers["If-None-Match"]     = options[:if_none_match] if options.has_key?(:if_none_match)
-          curl.headers["Accept-encoding"]   = 'gzip, deflate'
+#          curl.headers["Accept-encoding"]   = 'gzip, deflate'
           curl.follow_location = true
           curl.userpwd = options[:http_authentication].join(':') if options.has_key?(:http_authentication)
 
           curl.on_success do |c|
             responses[url] = decode_content(c)
@@ -214,26 +214,30 @@
     def self.add_url_to_multi(multi, url, url_queue, responses, options)
       easy = Curl::Easy.new(url) do |curl|
         curl.headers["User-Agent"]        = (options[:user_agent] || USER_AGENT)
         curl.headers["If-Modified-Since"] = options[:if_modified_since].httpdate if options.has_key?(:if_modified_since)
         curl.headers["If-None-Match"]     = options[:if_none_match] if options.has_key?(:if_none_match)
-        curl.headers["Accept-encoding"]   = 'gzip, deflate'
+#        curl.headers["Accept-encoding"]   = 'gzip, deflate'
         curl.follow_location = true
         curl.userpwd = options[:http_authentication].join(':') if options.has_key?(:http_authentication)
         
         curl.on_success do |c|
           add_url_to_multi(multi, url_queue.shift, url_queue, responses, options) unless url_queue.empty?
           xml = decode_content(c)
           klass = determine_feed_parser_for_xml(xml)
           
           if klass
-            feed = klass.parse(xml)
-            feed.feed_url = c.last_effective_url
-            feed.etag = etag_from_header(c.header_str)
-            feed.last_modified = last_modified_from_header(c.header_str)
-            responses[url] = feed
-            options[:on_success].call(url, feed) if options.has_key?(:on_success)
+            begin
+              feed = klass.parse(xml)
+              feed.feed_url = c.last_effective_url
+              feed.etag = etag_from_header(c.header_str)
+              feed.last_modified = last_modified_from_header(c.header_str)
+              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)
+            end
           else
             # puts "Error determining parser for #{url} - #{c.last_effective_url}"
             # raise NoParserAvailable.new("no valid parser for content.") (this would unfirtunately fail the whole 'multi', so it's not really useable)
             options[:on_failure].call(url, c.response_code, c.header_str, c.body_str) if options.has_key?(:on_failure)
           end
@@ -269,17 +273,21 @@
         curl.headers["If-None-Match"]     = feed.etag if feed.etag
         curl.userpwd = options[:http_authentication].join(':') if options.has_key?(:http_authentication)
         curl.follow_location = true
 
         curl.on_success do |c|
-          add_feed_to_multi(multi, feed_queue.shift, feed_queue, responses, options) unless feed_queue.empty?
-          updated_feed = Feed.parse(c.body_str)
-          updated_feed.feed_url = c.last_effective_url
-          updated_feed.etag = etag_from_header(c.header_str)
-          updated_feed.last_modified = last_modified_from_header(c.header_str)
-          feed.update_from_feed(updated_feed)
-          responses[feed.feed_url] = feed
-          options[:on_success].call(feed) if options.has_key?(:on_success)
+          begin
+            add_feed_to_multi(multi, feed_queue.shift, feed_queue, responses, options) unless feed_queue.empty?
+            updated_feed = Feed.parse(c.body_str)
+            updated_feed.feed_url = c.last_effective_url
+            updated_feed.etag = etag_from_header(c.header_str)
+            updated_feed.last_modified = last_modified_from_header(c.header_str)
+            feed.update_from_feed(updated_feed)
+            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)
+          end
         end
 
         curl.on_failure do |c|
           add_feed_to_multi(multi, feed_queue.shift, feed_queue, responses, options) unless feed_queue.empty?
           response_code = c.response_code
\ No newline at end of file