rfeedreader 0.9.11 → 0.9.13

data/History.txt

@@ -1,3 +1,12 @@
+== 0.9.13 2007-09-14
+
+* Add new Youtube entry with thumbnail displayed
+
+== 0.9.12 2007-09-08
+
+* Add method to request page with knowing it's a feed
+* change timeout delays
+
 == 0.9.11 2007-09-08
 
 * Add timeout on http request

data/lib/rfeedreader.rb

@@ -131,6 +131,8 @@ module Rfeedreader
             @entries<<Entry_Jumpcut.new(item, self.charset)
           when "source_picasa"
             @entries<<Entry_Picasa.new(item, self.charset)
+          when "source_youtube"
+            @entries<<Entry_Youtube.new(item, self.charset)
           else
             @entries<<Entry.new(item, self.charset)
         end
@@ -182,6 +184,7 @@ module Rfeedreader
       return "source_google_video" if @feed_url =~ /http:\/\/video\.google\.com/
       return "source_jumpcut" if @feed_url =~ /http:\/\/rss\.jumpcut\.com/
       return "source_picasa" if @feed_url =~ /http:\/\/picasaweb\.google\.com/
+      return "source_youtube" if @feed_url =~ /http:\/\/www\.youtube\.com\/rss\//
       return ""
     end
   end
@@ -217,7 +220,6 @@ module Rfeedreader
       @description = (@hpricot_item/"description|summary|[@type='text']").text if @description.empty?
       
       unless @description.empty?
-      
         @description = TextyHelper.clean(@description, 200)
         
         @description = HTMLEntities.encode_entities(@description, :named, :decimal)
@@ -275,14 +277,24 @@ module Rfeedreader
     end
   end
   
+  class Entry_Youtube<Entry
+    def read_description
+      image = @hpricot_item.search("media:thumbnail").to_s.scan(/url=['"]?([^'"]*)['" ]/).to_s
+      @description = "<a href='#{@link}' class='image_link'><img src='#{image}' class='youtube_image'/></a>"
+    end
+  end
+  
   def read(uri, nb_posts=10, parse_entries=true)
-    uri = HTMLEntities.decode_entities(uri)
-    link = Rfeedfinder::feed(uri)
-    unless link.nil?
-      doc = open_doc(link)
-    
+    link = Rfeedfinder::feed(HTMLEntities.decode_entities(uri))
+    read_feed(link, nb_posts, parse_entries)
+  end
+
+  def read_feed(uri, nb_posts=10, parse_entries=true)
+    unless uri.nil?
+      doc = open_doc(uri)
+  
       unless doc.nil?
-        feed = Feed.new(link, doc)
+        feed = Feed.new(uri, doc)
         feed.parse_entries(doc, nb_posts) if parse_entries == true
       end
     end
@@ -293,14 +305,23 @@ module Rfeedreader
     return read(uri, nb_post=1)
   end
   
+  def read_feed_first(uri)
+    return read(uri, nb_post=1, is_feed=true)
+  end
+  
   def read_header(uri)
     return read(uri, parse_entries=false)
   end
+  
+  def read_feed_header(uri)
+    return read_feed(uri, parse_entries=false)
+  end
 
   def open_doc(link)
     data = nil
+    delay = 30
     begin
-      Timeout::timeout(20) {
+      Timeout::timeout(delay) {
         data = Hpricot(open(link,
                "User-Agent" => "Ruby/#{RUBY_VERSION} - Rfeedfinder",
                "From" => "rfeedfinder@googlegroups.com",
@@ -308,7 +329,7 @@ module Rfeedreader
       }
     rescue OpenURI::HTTPError
       begin
-        Timeout::timeout(20) {
+        Timeout::timeout(delay) {
           html = Net::HTTP.get(URI.parse(link))
           data = Hpricot(html, :xml => true) if html.to_s !~ /404 Not Found/
         }

data/lib/rfeedreader/version.rb

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

data/test/test_rfeedreader.rb

@@ -56,7 +56,6 @@ class TestRfeedreader < Test::Unit::TestCase
     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"
@@ -129,4 +128,21 @@ class TestRfeedreader < Test::Unit::TestCase
   def test_read_picasa
     read_first "http://picasaweb.google.com/data/feed/base/user/christine.klassen?category=album&alt=rss&hl=en_GB&access=public"
   end
+  
+  def test_read_youtube
+    read_first "http://www.youtube.com/rss/user/bideoakinfo/videos.rss"
+  end
+  
+  def test_read_deugarte
+    read_first "http://www.deugarte.com/feed"
+  end
+  
+  def test_read_feed
+    feed_url = "http://www.ambidextrousmag.org/blog/?feed=rss2"
+    puts "Read first from #{feed_url}"
+    feed = Rfeedreader.read_feed_first feed_url
+    assert_not_nil feed
+    assert_equal 1, feed.entries.size
+    feed.display_entries
+  end
 end

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.11</a>
+      <a href="http://rubyforge.org/projects/rfeedreader" class="numbers">0.9.13</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.11
-date: 2007-09-08 00:00:00 +02:00
+  version: 0.9.13
+date: 2007-09-14 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