rfeedfinder 0.9.2 → 0.9.3

data/History.txt

@@ -1,3 +1,7 @@
+== 0.9.3 2007-09-01
+
+* correct case problem on isFeed? method
+
 == 0.9.2 2007-08-27
 
 * Verify HTTP::302 redirection, really useful for fotolog feeds

data/lib/rfeedfinder.rb

@@ -92,7 +92,7 @@ module Rfeedfinder
 
   def isFeedData?(data)
     # if no html tag and rss, rdf or feed tag, it's a feed
-    return ((data/:html).empty? and (!(data/:rss).nil? or !(data/:rdf).nil? or !(data/:feed).nil?))
+    return ((data/"html|HTML").empty? and (!(data/:rss).nil? or !(data/:rdf).nil? or !(data/:feed).nil?))
   end
 
   def isFeed?(uri)
@@ -104,16 +104,9 @@ module Rfeedfinder
       # URI error
       return false
     end
-    begin
-      data = Hpricot(open(uri), :xml => true)
-    rescue OpenURI::HTTPError
-      html = Net::HTTP.get(URI.parse(uri))
-      data = Hpricot(html, :xml => true)
-    rescue Timeout::Error
-      return false
-    rescue
-      return false
-    end  
+    
+    data = open_doc(uri)
+    return false if data.nil?
     
     return isFeedData?(data)
   end
@@ -133,21 +126,30 @@ module Rfeedfinder
     return feeds
   end
   
-  def feeds(uri, all=false, querySyndic8=false, _recurs=nil)
-    _recurs = [uri] if _recurs.nil?
-    fulluri = makeFullURI(uri)
-    
+  def open_doc(link)
     begin
-      data = Hpricot(open(fulluri), :xml => true)
+      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 []
+      return nil
     rescue OpenURI::HTTPError
-      html = Net::HTTP.get(URI.parse(fulluri))
+      html = Net::HTTP.get(URI.parse(link))
       data = Hpricot(html, :xml => true)
     rescue => err
-      puts "Error while opening #{fulluri} with Hpricot: #{err.class} " << $!
-      return []
+      puts "Error while opening #{link} with Hpricot: #{err.class} " << $!
+      return nil
     end
+    return data
+  end
+  
+  def feeds(uri, all=false, querySyndic8=false, _recurs=nil)
+    _recurs = [uri] if _recurs.nil?
+    fulluri = makeFullURI(uri)
+    
+    data = open_doc(fulluri)
+    return [] if data.nil?
 
     # is this already a feed?
     if isFeedData?(data)
@@ -212,7 +214,7 @@ module Rfeedfinder
       outfeeds << selected_feeds unless selected_feeds.empty?
       # outfeeds.each{|link| puts "4 #{link}"}
     end
-
+    
     if outfeeds.empty?
       # no A tags, guessing
       # filenames used by popular software:

data/lib/rfeedfinder/version.rb

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

data/test/test_rfeedfinder.rb

@@ -94,7 +94,7 @@ class TestRfeedfinder < Test::Unit::TestCase
   
   def test_fotolog
     feed_finder "http://www.fotolog.com/darth_fonsu/"
-    feed_finder "http://www.fotolog.com/darth_fonsu/feed/main/rss20"
+    feed_finder "http://www0.fotolog.com/darth_fonsu/feed/main/rss20"
     feed_finder "http://www1.fotolog.com/mad_lux", "http://www0.fotolog.com/mad_lux/feed/main/rss20"
     feed_finder "http://www1.fotolog.com/kel_06/"
   end
@@ -107,12 +107,12 @@ class TestRfeedfinder < Test::Unit::TestCase
     feed_finder "http://voxd.blogsome.com/"
   end
   
-  def test_bloger_hr
-    feed_finder "http://andreja666.bloger.hr/"
-  end
-  
   def test_not_fulluri_link
     # Meta link is only giving /feed/atom.xml
     feed_finder "http://blog.zvents.com/", "http://blog.zvents.com/feed/atom.xml"
   end
+  
+  def test_412_error
+    feed_finder "http://www.arteleku.net/4.1/blog/laburrak/?feed=rss2", "http://www.arteleku.net/4.1/blog/laburrak/?feed=rss2"
+  end
 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.2</a>
+      <a href="http://rubyforge.org/projects/rfeedfinder" class="numbers">0.9.3</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.2
-date: 2007-08-29 00:00:00 +02:00
+  version: 0.9.3
+date: 2007-09-01 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