mwilliams-feedzirra 0.0.15 → 0.0.16

data/lib/feedzirra.rb

@@ -7,7 +7,7 @@ module Feedzirra
   def self.use_curb?
     @use_curb
   end
-  VERSION = "0.0.15"
+  VERSION = "0.0.16"
 end
 
 gem 'activesupport'
@@ -21,7 +21,7 @@ rescue LoadError
   Feedzirra.use_curb = false
 end
 
-require 'open-uri'
+require 'net/http'
 require 'sax-machine'
 require 'dryopteris'
 require 'uri'

data/lib/feedzirra/feed.rb

@@ -140,18 +140,33 @@ module Feedzirra
       else
         responses = {}
         url_queue.each do |url|
-          headers = {}
-          headers['if-modified-since'] = options[:if_modified_since] if options[:if_modified_since]
-          headers['if-none-match'] = options[:if_none_match] if options[:if_none_match]
-          
-          open(url, headers) do |f|
-            responses[url] = try_parse(url, f.status[0], f.meta, f.read)
-          end
+          res = fetch_url(url)
+          responses[url] = try_parse(url, res.code, res, res.body)
         end
       end
       return urls.is_a?(String) ? responses.values.first : responses
     end
     
+    def self.fetch_url(url, limit=10, options={})
+      raise RuntimeError, "HTTP redirect too deep" if limit == 0
+      
+      uri = URI.parse(url)
+      req = Net::HTTP::Get.new(uri.path)
+      req['if-modified-since'] = options[:if_modified_since] if options[:if_modified_since]
+      req['if-none-match'] = options[:if_none_match] if options[:if_none_match]
+      res = Net::HTTP.start(uri.host, uri.port) do |http|
+        http.request(req)
+      end
+      
+      # Handle HTTP redirect
+      case res
+      when Net::HTTPSuccess then res
+      when Net::HTTPRedirection then fetch_url(res['location'], limit - 1)
+      else
+        response.error!
+      end
+    end
+    
     def self.try_parse(url, response_code, headers, body)
       xml = decode_content2(headers, body)
       klass = determine_feed_parser_for_xml(xml)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mwilliams-feedzirra
 version: !ruby/object:Gem::Version 
-  version: 0.0.15
+  version: 0.0.16
 platform: ruby
 authors: 
 - Paul Dix