truncate_html 0.1.2 → 0.2.0

data/.gitignore

@@ -1 +1,2 @@
 pkg
+coverage

data/Rakefile

@@ -26,6 +26,7 @@ begin
     gem.homepage = "http://github.com/hgimenez/truncate_html"
     gem.authors = ["hgimenez"]
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
+  Jeweler::GemcutterTasks.new
   end
 
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.2.0

data/lib/truncate_html/html_truncator.rb

@@ -11,14 +11,14 @@ module TruncateHtml
       return '' if @original_html.nil?
       options[:length] ||= 100
       options[:omission] ||= '...'
-      @chars_remaining = options[:length]
+      @chars_remaining = options[:length] - options[:omission].length
       @open_tags, result = [], []
 
       html_tokens.each do |str|
         if @chars_remaining > 0
           if html_tag?(str)
             if open_tag?(str)
-              @open_tags << str 
+              @open_tags << str
             else
               open_tags = remove_latest_open_tag(str)
             end
@@ -27,7 +27,8 @@ module TruncateHtml
           end
           result << str
         else
-          result[-1] += options[:omission] unless options[:omission].nil?
+          #result[-1] += options[:omission]
+          result[-1] = result[-1].rstrip + options[:omission]
           @open_tags.reverse_each do |open_tag|
             result << matching_close_tag(open_tag)
           end

data/spec/helpers/truncate_html_helper_spec.rb

@@ -10,10 +10,14 @@ describe TruncateHtmlHelper do
 
   describe '#truncate_html' do
 
+    it "includes the omission text's length in the returned truncated html" do
+      truncate_html('a b c', :length => 4, :omission => '...').should == 'a...'
+    end
+
     context 'the input html is nil' do
       it 'returns an empty string' do
         truncate_html(nil).should be_empty
-        truncate_html(nil).should be_kind_of String
+        truncate_html(nil).should be_kind_of(String)
       end
     end
 
@@ -23,7 +27,7 @@ describe TruncateHtmlHelper do
       end
 
       it 'truncates, and closes the <a>, and closes any remaining open tags' do
-        truncate_html(@html, :length => 10).should == '<div><ul><li>Look at <a href="foo">this...</a></li></ul></div>'
+        truncate_html(@html, :length => 14).should == '<div><ul><li>Look at <a href="foo">this...</a></li></ul></div>'
       end
     end
 
@@ -33,7 +37,7 @@ describe TruncateHtmlHelper do
           @html = "<p>Look at <strong>this</strong>#{char} More words here</p>"
         end
         it 'places the punctuation after the tag without any whitespace' do
-          truncate_html(@html, :length => 16).should == "<p>Look at <strong>this</strong>#{char} More...</p>"
+          truncate_html(@html, :length => 19).should == "<p>Look at <strong>this</strong>#{char} More...</p>"
         end
       end
     end
@@ -43,7 +47,7 @@ describe TruncateHtmlHelper do
         @html = '<p>Look at <a href="awesomeful.net">this</a> link for randomness</p>'
       end
       it 'leaves a whitespace between the closing tag and the following word character' do
-        truncate_html(@html, :length => 17).should == '<p>Look at <a href="awesomeful.net">this</a> link...</p>'
+        truncate_html(@html, :length => 21).should == '<p>Look at <a href="awesomeful.net">this</a> link...</p>'
       end
     end
 
@@ -59,7 +63,7 @@ describe TruncateHtmlHelper do
       end
 
       it 'recognizes the multiline html properly' do
-        truncate_html(@html, :length => 8).should == ' <div id="foo" class="bar"> This is...</div>'
+        truncate_html(@html, :length => 12).should == ' <div id="foo" class="bar"> This is...</div>'
       end
     end
 
@@ -72,19 +76,19 @@ describe TruncateHtmlHelper do
             @html_caps = "<div>Some before. <#{unpaired_tag.capitalize}>and some after</div>"
           end
           it "does not close the #{unpaired_tag} tag" do
-            truncate_html(@html, :length => 15).should == "<div>Some before. <#{unpaired_tag}>and...</div>"
-            truncate_html(@html_caps, :length => 15).should == "<div>Some before. <#{unpaired_tag.capitalize}>and...</div>"
+            truncate_html(@html, :length => 19).should == "<div>Some before. <#{unpaired_tag}>and...</div>"
+            truncate_html(@html_caps, :length => 19).should == "<div>Some before. <#{unpaired_tag.capitalize}>and...</div>"
           end
         end
 
-        context "and the #{unpaired_tag} does not have the closing slash" do
+        context "and the #{unpaired_tag} does have the closing slash" do
           before(:each) do
             @html = "<div>Some before. <#{unpaired_tag} />and some after</div>"
             @html_caps = "<div>Some before. <#{unpaired_tag.capitalize} />and some after</div>"
           end
           it "does not close the #{unpaired_tag} tag" do
-            truncate_html(@html, :length => 15).should == "<div>Some before. <#{unpaired_tag} />and...</div>"
-            truncate_html(@html_caps, :length => 15).should == "<div>Some before. <#{unpaired_tag.capitalize} />and...</div>"
+            truncate_html(@html, :length => 19).should == "<div>Some before. <#{unpaired_tag} />and...</div>"
+            truncate_html(@html_caps, :length => 19).should == "<div>Some before. <#{unpaired_tag.capitalize} />and...</div>"
           end
         end
 

data/spec/truncate_html/html_truncator_spec.rb

@@ -8,12 +8,13 @@ describe TruncateHtml::HtmlTruncator do
 
   describe '#html_tokens' do
     before(:each) do
-      @html = '<h1>Hi there</h1> <p>This is sweet!</p>'
+      @html = '<h1>Hi there</h1> <p>This          is sweet!</p>'
     end
 
-    it 'returns each token in the string as an array element' do
+    it 'returns each token in the string as an array element removing any consecutive whitespace from the string' do
       truncator(@html).html_tokens.should == ['<h1>', 'Hi', ' ', 'there', '</h1>', ' ', '<p>', 'This', ' ', 'is', ' ', 'sweet!', '</p>']
     end
+
   end
 
   describe '#html_tag?' do
@@ -63,7 +64,7 @@ describe TruncateHtml::HtmlTruncator do
 
     it 'returns an empty string' do
       truncator(nil).truncate.should be_empty
-      truncator(nil).truncate.should be_kind_of String
+      truncator(nil).truncate.should be_kind_of(String)
     end
   end
 

data/truncate_html.gemspec

@@ -1,12 +1,15 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE
+# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{truncate_html}
-  s.version = "0.1.2"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["hgimenez"]
-  s.date = %q{2009-09-25}
+  s.date = %q{2009-11-23}
   s.description = %q{Truncates html so you don't have to}
   s.email = %q{harold.gimenez@gmail.com}
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: truncate_html
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors: 
 - hgimenez
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-25 00:00:00 -04:00
+date: 2009-11-23 00:00:00 -05:00
 default_executable: 
 dependencies: []