rfeedfinder 0.9.5 → 0.9.6

data/History.txt

@@ -1,3 +1,7 @@
+== 0.9.6 2007-09-08
+
+* Add timeout on http request
+
 == 0.9.5 2007-09-05
 
 * Decode html entities in input uri

data/lib/rfeedfinder.rb

@@ -5,6 +5,8 @@ require 'open-uri'
 require 'hpricot'
 require 'timeout'
 
+require 'rfeedfinder/version'
+
 module Rfeedfinder
 
   module_function
@@ -127,24 +129,6 @@ module Rfeedfinder
     return feeds
   end
   
-  def open_doc(link)
-    begin
-      data = Hpricot(open(link,
-            "User-Agent" => "Ruby/#{RUBY_VERSION} - Rfeedfinder",
-            "From" => "rfeedfinder@googlegroups.com",
-            "Referer" => "http://rfeedfinder.rubyforge.org/"), :xml => true)
-    rescue Timeout::Error
-      return nil
-    rescue OpenURI::HTTPError
-      html = Net::HTTP.get(URI.parse(link))
-      data = Hpricot(html, :xml => true)
-    rescue => err
-      puts "Error while opening #{link} with Hpricot: #{err.class} " << $!
-      return nil
-    end
-    return data
-  end
-  
   def feeds(uri, all=false, querySyndic8=false, _recurs=nil)
     uri = HTMLEntities.decode_entities(uri)
     _recurs = [uri] if _recurs.nil?
@@ -261,6 +245,34 @@ module Rfeedfinder
       return nil
     end
   end
-end
-
-require 'rfeedfinder/version'
+  
+  def open_doc(link)
+    data = nil
+    begin
+      Timeout::timeout(20) {
+        data = Hpricot(open(link,
+               "User-Agent" => "Ruby/#{RUBY_VERSION} - Rfeedfinder",
+               "From" => "rfeedfinder@googlegroups.com",
+               "Referer" => "http://rfeedfinder.rubyforge.org/"), :xml => true)
+      }
+    rescue OpenURI::HTTPError
+      begin
+        Timeout::timeout(20) {
+          html = Net::HTTP.get(URI.parse(link))
+          data = Hpricot(html, :xml => true) if html.to_s !~ /404 Not Found/
+        }
+      rescue Timeout::Error
+        return nil
+      rescue => err
+        puts "Error while opening #{link} with Hpricot: #{err.class} " << $!
+        return nil
+      end
+    rescue Timeout::Error 
+      return nil
+    rescue => err
+      puts "Error while opening #{link} with Hpricot: #{err.class} " << $!
+      return nil
+    end
+    return data
+  end
+end

data/lib/rfeedfinder/version.rb

@@ -2,7 +2,7 @@ module Rfeedfinder #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 9
-    TINY  = 5
+    TINY  = 6
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/website/index.html

@@ -33,7 +33,7 @@
     <h1>rfeedfinder</h1>
     <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/rfeedfinder"; return false'>
       <p>Get Version</p>
-      <a href="http://rubyforge.org/projects/rfeedfinder" class="numbers">0.9.5</a>
+      <a href="http://rubyforge.org/projects/rfeedfinder" class="numbers">0.9.6</a>
     </div>
     <h2>What</h2>
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: rfeedfinder
 version: !ruby/object:Gem::Version 
-  version: 0.9.5
-date: 2007-09-04 00:00:00 +02:00
+  version: 0.9.6
+date: 2007-09-08 00:00:00 +02:00
 summary: rFeedFinder uses RSS autodiscovery, Atom autodiscovery, spidering, URL correction, and Web service queries -- whatever it takes -- to find the feed.
 require_paths: 
 - lib