rfeedreader 1.0.1 → 1.0.2

data/History.txt

@@ -1,3 +1,9 @@
+== 1.0.2 2007-11-14
+
+* Add Rfeedreader.set_truncate_length(title = 45, description = 200) to manage tuncation size. No truncation: -1
+* Correct text size truncation, taking care of html entity size
+* Correct html entity truncation
+
 == 1.0.1 2007-11-14
 
 * Change user-agent signature

data/lib/rfeedreader/version.rb

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

data/lib/rfeedreader.rb

@@ -13,7 +13,7 @@ module Rfeedreader
   module_function
   
   class TextyHelper
-    def TextyHelper.clean(text, length = 45)
+    def TextyHelper.clean(text, length)
       return text if text.empty?
       
       if text.index("<")
@@ -27,15 +27,16 @@ module Rfeedreader
       truncate(HTMLEntities.encode_entities(text, :named, :decimal), length) 
     end
 
-    def TextyHelper.truncate(text="", length = 45, truncate_string = "...")
-      return if text.empty?
+    def TextyHelper.truncate(text="", length = 0, truncate_string = "...")
+      return text if text.empty? or length < 1
       
-      l = length - truncate_string.length
+      # Remove size of truncate string
+      # and add space added by html entities
+      l = length - truncate_string.length + (text.size - text.gsub(/(?:&.[^;]*;)/, " ").size)
       truncated_text = text[0...l]
       
       # Avoid html entity truncation
-      truncated_text.gsub!(/(&\S+[^;])$/,  '')
-      
+      truncated_text.gsub!(/(&\S[^;]+)$/,  '')
       truncated_text << truncate_string if text.length > length
       
       return truncated_text
@@ -230,7 +231,9 @@ module Rfeedreader
         preformatted_title.gsub!(/<\!\[CDATA\[/, '')
         preformatted_title.gsub!(/\]\]>/, '')
       end
-      @title = TextyHelper.convertEncoding(TextyHelper.clean(preformatted_title), @charset)
+      truncate_length = 45
+      truncate_length = Rfeedreader::TITLE_LENGTH if Rfeedreader.const_defined? "TITLE_LENGTH"
+      @title = TextyHelper.convertEncoding(TextyHelper.clean(preformatted_title, truncate_length), @charset)
     end
     
     def read_description
@@ -245,7 +248,9 @@ module Rfeedreader
       end
       
       unless @description.empty?
-        @description = TextyHelper.clean(@description, 200)
+        truncate_length = 200
+        truncate_length = Rfeedreader::DESCRIPTION_LENGTH if Rfeedreader.const_defined? "DESCRIPTION_LENGTH"
+        @description = TextyHelper.clean(@description, truncate_length)
         @description = TextyHelper.convertEncoding(@description, @charset)
         
         @description.gsub!("&#10;", "")
@@ -338,6 +343,11 @@ module Rfeedreader
   def read_feed_header(uri)
     return read_feed(uri, parse_entries=false)
   end
+  
+  def set_truncate_length(title = -1, description = -1)
+    const_set("TITLE_LENGTH", title)
+    const_set("DESCRIPTION_LENGTH", description)
+  end
 
   def open_doc(link)
     data = nil

data/test/test_rfeedreader.rb

@@ -206,6 +206,12 @@ class TestRfeedreader < Test::Unit::TestCase
   
   def test_title_truncate
     read_first "http://corankeando.zoomblog.com/rss.xml"
+    #Rfeedreader.set_truncate_length(-1, 45)
+    #Rfeedreader.read_first("http://corankeando.zoomblog.com/rss.xml").display_entries
+  end
+  
+  def test_binema
+    read_first "http://binema.com/?feed=rss2"
   end
   
   def test_bad_title_encoding

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">1.0.1</a>
+      <a href="http://rubyforge.org/projects/rfeedreader" class="numbers">1.0.2</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: 1.0.1
-date: 2007-11-14 00:00:00 +01:00
+  version: 1.0.2
+date: 2007-11-20 00:00:00 +01: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