feed_parser 0.2.3 → 0.2.4

data/lib/feed_parser.rb

@@ -3,7 +3,7 @@ require 'nokogiri'
 
 class FeedParser
 
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 
   USER_AGENT = "Ruby / FeedParser gem"
 

data/lib/feed_parser/feed.rb

@@ -3,17 +3,7 @@ class FeedParser
     attr_reader :type
 
     def initialize(feed_url)
-      parsed_url = parse_url(feed_url)
-
-      connection_options = {"User-Agent" => FeedParser::USER_AGENT}
-      connection_options[:http_basic_authentication] = parsed_url[:basic_auth] if parsed_url[:basic_auth]
-
-      raw_feed = if parsed_url[:protocol]
-        open(parsed_url[:url], connection_options)
-      else
-        open(parsed_url[:url])
-      end
-
+      raw_feed = open_or_follow_redirect(feed_url)
       @feed = Nokogiri::XML(raw_feed)
       @feed.remove_namespaces!
       @type = (@feed.search('rss')[0] && :rss || :atom)
@@ -53,6 +43,30 @@ class FeedParser
     end
 
     private
+
+    # Some feeds
+    def open_or_follow_redirect(feed_url)
+      parsed_url = parse_url(feed_url)
+
+      connection_options = {"User-Agent" => FeedParser::USER_AGENT}
+      connection_options[:http_basic_authentication] = parsed_url[:basic_auth] if parsed_url[:basic_auth]
+
+      connection_options[:redirect] = true if RUBY_VERSION >= '1.9'
+
+      if parsed_url[:protocol]
+        open(parsed_url[:url], connection_options)
+      else
+        open(parsed_url[:url])
+      end
+    rescue RuntimeError => ex
+      redirect_url = ex.to_s.split(" ").last
+      if URI.split(feed_url).first == "http" && URI.split(redirect_url).first == "https"
+        open_or_follow_redirect(redirect_url)
+      else
+        raise ex
+      end
+    end
+
     def parse_url(feed_url)
       protocol, auth, *the_rest = URI.split(feed_url)
       # insert a question mark in the beginning of query part of the uri

data/spec/feed_parser_spec.rb

@@ -12,20 +12,40 @@ describe FeedParser do
       File.read(File.join(File.dirname(__FILE__), 'fixtures', 'nodeta.rss.xml'))
     end
 
+    def http_connection_options
+      opts = {"User-Agent" => FeedParser::USER_AGENT}
+      opts[:redirect] = true if RUBY_VERSION >= '1.9'
+      opts
+    end
+
     it "should fetch a feed by url" do
-      FeedParser::Feed.any_instance.should_receive(:open).with("http://blog.example.com/feed/", "User-Agent" => FeedParser::USER_AGENT).and_return(feed_xml)
+      FeedParser::Feed.any_instance.should_receive(:open).with("http://blog.example.com/feed/", http_connection_options).and_return(feed_xml)
       FeedParser::Feed.new("http://blog.example.com/feed/")
     end
 
     it "should fetch a feed using basic auth if auth embedded to the url" do
-      FeedParser::Feed.any_instance.should_receive(:open).with("http://blog.example.com/feed/", "User-Agent" => FeedParser::USER_AGENT, :http_basic_authentication => ["user", "pass"]).and_return(feed_xml)
+      FeedParser::Feed.any_instance.should_receive(:open).with("http://blog.example.com/feed/", http_connection_options.merge(:http_basic_authentication => ["user", "pass"])).and_return(feed_xml)
       FeedParser::Feed.new("http://user:pass@blog.example.com/feed/")
     end
 
     it "should fetch a feed with only a user name embedded to the url" do
-      FeedParser::Feed.any_instance.should_receive(:open).with("http://blog.example.com/feed/", "User-Agent" => FeedParser::USER_AGENT, :http_basic_authentication => ["user"]).and_return(feed_xml)
+      FeedParser::Feed.any_instance.should_receive(:open).with("http://blog.example.com/feed/", http_connection_options.merge(:http_basic_authentication => ["user"])).and_return(feed_xml)
       FeedParser::Feed.new("http://user@blog.example.com/feed/")
     end
+
+    it "should follow redirect based on the exception message" do
+      FeedParser::Feed.any_instance.should_receive(:open).with("http://example.com/feed", http_connection_options).and_raise(RuntimeError.new("redirection forbidden: http://example.com/feed -> https://example.com/feed"))
+      FeedParser::Feed.any_instance.should_receive(:open).with("https://example.com/feed", http_connection_options).and_return(feed_xml)
+      FeedParser::Feed.new("http://example.com/feed")
+    end
+
+    it "should not follow redirect from secure connection to non-secure one" do
+      FeedParser::Feed.any_instance.should_receive(:open).with("https://example.com/feed", http_connection_options).and_raise(RuntimeError.new("redirection forbidden: https://example.com/feed -> http://example.com/feed"))
+      FeedParser::Feed.any_instance.should_not_receive(:open).with("http://example.com/feed", http_connection_options)
+      lambda {
+        FeedParser::Feed.new("https://example.com/feed")
+      }.should raise_error(RuntimeError, "redirection forbidden: https://example.com/feed -> http://example.com/feed")
+    end
   end
 
   describe "#parse" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: feed_parser
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - Arttu Tervo