feed_parser 0.2.6 → 0.2.7

data/README.md

@@ -32,6 +32,8 @@ Add to Gemfile
     # for available options, check out the OpenURI documentation: http://apidock.com/ruby/OpenURI
     fp = FeedParser.new(:url => "http://example.com/feed/", :http => {:ssl_verify_mode => OpenSSL::SSL::VERIFY_NONE})
 
+If the fetched XML is not a valid RSS or an ATOM feed, a FeedParser::UnknownFeedType is raised in FeedParser#parse.
+
 ## Running tests
 
 Install dependencies by running `bundle install`.

data/lib/feed_parser/feed.rb

@@ -7,7 +7,8 @@ class FeedParser
       raw_feed = open_or_follow_redirect(feed_url)
       @feed = Nokogiri::XML(raw_feed)
       @feed.remove_namespaces!
-      @type = (@feed.search('rss')[0] && :rss || :atom)
+      @type = ((@feed.search('rss')[0] && :rss) || (@feed.search('/feed/title')[0] && :atom))
+      raise FeedParser::UnknownFeedType.new("Feed is not an RSS feed or an ATOM feed") unless @type
       self
     end
 

data/lib/feed_parser.rb

@@ -3,10 +3,12 @@ require 'nokogiri'
 
 class FeedParser
 
-  VERSION = "0.2.6"
+  VERSION = "0.2.7"
 
   USER_AGENT = "Ruby / FeedParser gem"
 
+  class FeedParser::UnknownFeedType < Exception ; end
+
   def initialize(opts)
     @url = opts[:url]
     @http_options = opts[:http] || {}

data/spec/feed_parser_spec.rb

@@ -8,6 +8,10 @@ class NotSaneSanitizer
 end
 
 describe FeedParser do
+  def feed_xml(filename = 'nodeta.rss.xml')
+    File.read(File.join(File.dirname(__FILE__), 'fixtures', filename))
+  end
+
   def http_connection_options
     opts = {"User-Agent" => FeedParser::USER_AGENT}
     opts[:redirect] = true if RUBY_VERSION >= '1.9'
@@ -16,17 +20,13 @@ describe FeedParser do
 
   describe "#new" do
     it "should forward given http options to the OpenURI" do
-      FeedParser::Feed.any_instance.should_receive(:open).with("http://blog.example.com/feed/", http_connection_options.merge(:ssl_verify_mode => OpenSSL::SSL::VERIFY_NONE))
+      FeedParser::Feed.any_instance.should_receive(:open).with("http://blog.example.com/feed/", http_connection_options.merge(:ssl_verify_mode => OpenSSL::SSL::VERIFY_NONE)).and_return(feed_xml)
       fp = FeedParser.new(:url => "http://blog.example.com/feed/", :http => {:ssl_verify_mode => OpenSSL::SSL::VERIFY_NONE})
       fp.parse
     end
   end
 
   describe FeedParser::Feed, "#new" do
-    def feed_xml(filename = 'nodeta.rss.xml')
-      File.read(File.join(File.dirname(__FILE__), 'fixtures', filename))
-    end
-
     it "should fetch a feed by url" do
       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/")
@@ -63,6 +63,13 @@ describe FeedParser do
         feed.url.should == "https://developers.facebook.com/blog/feed"
       }.should_not raise_error
     end
+
+    it "should raise an error unless retrieved XML is not an RSS or an ATOM feed" do
+      FeedParser::Feed.any_instance.should_receive(:open).with("http://example.com/blog/feed/invalid.xml", http_connection_options).and_return("foo bar")
+      lambda {
+        FeedParser::Feed.new("http://example.com/blog/feed/invalid.xml")
+      }.should raise_error(FeedParser::UnknownFeedType, "Feed is not an RSS feed or an ATOM feed")
+    end
   end
 
   describe "#parse" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: feed_parser
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-24 00:00:00.000000000 Z
+date: 2012-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2160499900 !ruby/object:Gem::Requirement
+  requirement: &2152406380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160499900
+  version_requirements: *2152406380
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &2160496620 !ruby/object:Gem::Requirement
+  requirement: &2152404940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *2160496620
+  version_requirements: *2152404940
 description: Rss and Atom feed parser with sanitizer support built on top of Nokogiri.
 email:
 - arttu.tervo@gmail.com