rfeedreader 0.9.10 → 0.9.11

data/History.txt

@@ -1,3 +1,7 @@
+== 0.9.11 2007-09-08
+
+* Add timeout on http request
+
 == 0.9.10 2007-09-05
 
 * Solve picasa problem

data/lib/rfeedreader/version.rb

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

data/lib/rfeedreader.rb

@@ -7,6 +7,8 @@ require 'open-uri'
 require 'rfeedfinder'
 require 'timeout'
 
+require 'rfeedreader/version'
+
 module Rfeedreader
   module_function
   
@@ -294,24 +296,34 @@ module Rfeedreader
   def read_header(uri)
     return read(uri, parse_entries=false)
   end
-  
+
   def open_doc(link)
+    data = nil
     begin
-      data = Hpricot(open(link,
-            "User-Agent" => "Ruby/#{RUBY_VERSION} - Rfeedreader",
-            "From" => "rfeedreader@googlegroups.com",
-            "Referer" => "http://rfeedreader.rubyforge.org/"), :xml => true)
-    rescue Timeout::Error
-      return nil
+      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
-      html = Net::HTTP.get(URI.parse(link))
-      data = Hpricot(html, :xml => true)
+      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
-
-require 'rfeedreader/version'
+end

data/test/test_rfeedreader.rb

@@ -42,26 +42,26 @@ class TestRfeedreader < Test::Unit::TestCase
   end
 
   def test_read_from_feevy
-    # read_first "http://rss.jumpcut.com/rss/user?u_id=17C65AB8A6EF11DBBE093EF340157CF2"
-    # read_first "http://rss.jumpcut.com/rss/user?u_id=db9ec418fdaf11db8198000423cef5f6"
-    # read_first "http://organizandolaesperanza.blogspot.com"
-    # read_first "http://skblackburn.blogspot.com/"
-    # read_first "http://nadapersonal.blogspot.com"
-    # read_first "http://diariodeunadislexica.blogspot.com/"
-    # read_first "http://diputadodelosverdes.blogspot.com/"
-    # read_first "http://cinclin.blogspot.com/"
-    # read_first "http://claudiaramos.blogspot.com/"
-    # read_first "http://lacomunidad.elpais.com/krismontesinos/"
-    # read_first "http://www.becker-posner-blog.com/index.rdf"
-    # read_first "http://rss.slashdot.org/Slashdot/slashdot"
-    # read_first "http://planeta.lamatriz.org/feed/"
-    # read_first "http://edubloggers.blogspot.com/"
-    # read_first "http://www.deugarte.com/feed/"
-    # read_first "http://www.twitter.com/alx/"
-    # read_first "http://alemama.blogspot.com"
-    # read_first "http://seedmagazine.com/news/atom-focus.xml"
-    # read_first "http://bitacora.feevy.com"
-    # read_first "http://www.enriquemeneses.com/"
+    read_first "http://rss.jumpcut.com/rss/user?u_id=17C65AB8A6EF11DBBE093EF340157CF2"
+    read_first "http://rss.jumpcut.com/rss/user?u_id=db9ec418fdaf11db8198000423cef5f6"
+    read_first "http://organizandolaesperanza.blogspot.com"
+    read_first "http://skblackburn.blogspot.com/"
+    read_first "http://nadapersonal.blogspot.com"
+    read_first "http://diariodeunadislexica.blogspot.com/"
+    read_first "http://diputadodelosverdes.blogspot.com/"
+    read_first "http://cinclin.blogspot.com/"
+    read_first "http://claudiaramos.blogspot.com/"
+    read_first "http://lacomunidad.elpais.com/krismontesinos/"
+    read_first "http://www.becker-posner-blog.com/index.rdf"
+    read_first "http://rss.slashdot.org/Slashdot/slashdot"
+    read_first "http://planeta.lamatriz.org/feed/"
+    read_first "http://edubloggers.blogspot.com/"
+    read_first "http://www.deugarte.com/feed/"
+    read_first "http://www.twitter.com/alx/"
+    read_first "http://alemama.blogspot.com"
+    read_first "http://seedmagazine.com/news/atom-focus.xml"
+    read_first "http://bitacora.feevy.com"
+    read_first "http://www.enriquemeneses.com/"
     read_first "http://ianasagasti.blogs.com/"
     read_first "http://www.ecoperiodico.com/"
     read_first "http://bloc.balearweb.net/rss.php?summary=1"
@@ -121,8 +121,9 @@ class TestRfeedreader < Test::Unit::TestCase
     read_first "http://blogs.ya.com/eltikitaka/atom.xml"
   end
   
-  def test_read_nico
-    read_first "http://www.zanorg.com/nicoshark/rss/fil_rss.xml"
+  def test_timeout
+    feed = Rfeedreader.read_first "http://www.zanorg.com/nicoshark/rss/fil_rss.xml"
+    assert_nil feed
   end
   
   def test_read_picasa

data/website/index.html

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

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: rfeedreader
 version: !ruby/object:Gem::Version 
-  version: 0.9.10
-date: 2007-09-05 00:00:00 +02:00
+  version: 0.9.11
+date: 2007-09-08 00:00:00 +02:00
 summary: Feed parser to read feed and return first posts of this feed. Special parsing from sources like Flickr, Jumcut, Google video, ...
 require_paths: 
 - lib