fed 0.0.3 → 0.0.4

data/fed.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'fed'
-  s.version           = '0.0.3'
+  s.version           = '0.0.4'
   s.date              = '2013-04-26'
 
   ## Make sure your summary is short. The description may be as long
@@ -65,6 +65,7 @@ Gem::Specification.new do |s|
     lib/fed/feed/rss2.rb
     lib/fed/http.rb
     lib/fed/http/curb.rb
+    lib/fed/http/errors.rb
   ]
   # = MANIFEST =
 

data/lib/fed.rb

@@ -5,6 +5,7 @@ require 'nokogiri'
 require 'time'
 
 require 'fed/http'
+require 'fed/http/errors'
 require 'fed/http/curb'
 require 'fed/feed/base'
 require 'fed/feed/atom'
@@ -13,7 +14,7 @@ require 'fed/feed/rss2'
 require 'fed/feed/entry'
 
 module Fed
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 
   class <<self
 
@@ -22,7 +23,12 @@ module Fed
     end
 
     def fetch(feed_url)
-      Fed::Http.client.get(feed_url)
+      response = Fed::Http.client.get(feed_url)
+      
+      raise Fed::Http::Errors::NotFound if response == 404
+      raise Fed::Http::Errors::ServerError unless response.is_a?(String)
+
+      response
     end
 
     def parse(xml)
@@ -33,14 +39,14 @@ module Fed
     def parser_for(doc)
       if is_atom?(doc)
         Fed::Feed::Atom.new(doc)
-      elsif is_rss1?(doc)
-        Fed::Feed::Rss1.new(doc)
       elsif is_rss2?(doc)
         Fed::Feed::Rss2.new(doc)
+      elsif is_rss1?(doc)
+        Fed::Feed::Rss1.new(doc)
       elsif (new_url = find_link_in_html(doc))
         parser_for(fetch(new_url))
       else
-        raise "Bad feed."
+        raise Fed::Http::Errors::BadFeed  
       end
     end
 
@@ -49,7 +55,7 @@ module Fed
     end
 
     def is_rss1?(document)
-      document.xpath('/rdf:RDF').any?
+      document.xpath('/rdf:RDF').any? rescue false
     end
 
     def is_rss2?(document)

data/lib/fed/http/curb.rb

@@ -3,10 +3,12 @@ module Fed
   module Http
     class Curb
       def self.get(url)
-        Curl.get(url) do|http|
+        c = Curl.get(url) do|http|
           http.headers['User-Agent'] = Fed::Http.options[:user_agent]
           http.follow_location = true
-        end.body_str
+        end
+
+        c.status == "200 OK" ? c.body_str : c.status.to_i
       end
     end
   end

data/lib/fed/http/errors.rb

@@ -0,0 +1,11 @@
+module Fed
+  module Http
+    module Errors
+      class NotFound < StandardError; end
+
+      class ServerError < StandardError; end
+
+      class BadFeed < StandardError; end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fed
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -96,6 +96,7 @@ files:
 - lib/fed/feed/rss2.rb
 - lib/fed/http.rb
 - lib/fed/http/curb.rb
+- lib/fed/http/errors.rb
 homepage: http://github.com/jm/fed
 licenses: []
 post_install_message: