feed_parser 0.2.2 → 0.2.3

data/lib/feed_parser/feed.rb

@@ -4,11 +4,16 @@ class FeedParser
 
     def initialize(feed_url)
       parsed_url = parse_url(feed_url)
-      raw_feed = if parsed_url[:basic_auth]
-        open(parsed_url[:url], :http_basic_authentication => parsed_url[:basic_auth])
+
+      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
+
       @feed = Nokogiri::XML(raw_feed)
       @feed.remove_namespaces!
       @type = (@feed.search('rss')[0] && :rss || :atom)
@@ -54,7 +59,7 @@ class FeedParser
       the_rest[-2].insert(0, '?') if the_rest[-2].is_a?(String)
       url = (protocol && [protocol, the_rest.join].join('://') || the_rest.join)
       basic_auth = auth.split(':') if auth
-      {:url => url, :basic_auth => basic_auth}
+      {:protocol => protocol, :url => url, :basic_auth => basic_auth}
     end
   end
 end

data/lib/feed_parser.rb

@@ -3,7 +3,9 @@ require 'nokogiri'
 
 class FeedParser
 
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
+
+  USER_AGENT = "Ruby / FeedParser gem"
 
   def initialize(opts)
     @url = opts[:url]

data/spec/feed_parser_spec.rb

@@ -13,17 +13,17 @@ describe FeedParser do
     end
 
     it "should fetch a feed by url" do
-      FeedParser::Feed.any_instance.should_receive(:open).with("http://blog.example.com/feed/").and_return(feed_xml)
+      FeedParser::Feed.any_instance.should_receive(:open).with("http://blog.example.com/feed/", "User-Agent" => FeedParser::USER_AGENT).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/", :http_basic_authentication => ["user", "pass"]).and_return(feed_xml)
+      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.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/", :http_basic_authentication => ["user"]).and_return(feed_xml)
+      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.new("http://user@blog.example.com/feed/")
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: feed_parser
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Arttu Tervo
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-07 00:00:00 +02:00
+date: 2011-12-08 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency