truncate_html 0.2.2 → 0.3.0

data/.gitignore

@@ -1,2 +1,4 @@
 pkg
 coverage
+profiling
+tmp

data/History.txt

@@ -1,5 +1,5 @@
 == 0.2.2 2009-12-23
- * Fix issue #4: Handle case when supplied length is smaller than omission (ghazel)
+ * Fix issue #4: Handle case when supplied length is smaller than omission. (ghazel)
 
 == 0.2.1 2009-12-18
  * Fix issue #3: Handle case when input html contins a script tag.
@@ -10,7 +10,7 @@
    helper's behavior.
 
 == 0.1.2 2009-09-25
- * Fix issue #1: Handle case when input html is nil.
+ * Fix issue #1: Handle case when input html is nil. (bcardarella)
 
 == 0.1.1 2009-08-25
  * Fixed issue with regex which would not recognize <a> tags that contain slashes.

data/README.markdown

@@ -3,25 +3,26 @@ TruncateHtml
 
 truncate_html is a Rails helper plugin that [cuts off](http://www.youtube.com/watch?v=6XG4DIOA7nU) a string of HTML and takes care of closing any lingering open tags. There are many possible solutions to this. This plugin does not have any dependencies, and does all it's work via [regular expressions](http://xkcd.com/208/).
 
-The API is very similar to Rails' own truncate method.
+The API is very similar to Rails' own <code>truncate()</code> method.
 
 
 Example
 -------
 
     some_html = '<ul><li><a href="http://whatever">This is a link</a></li></ul>'
-
-    truncate_html(some_html, :length => 5, :omission => '...(continued)')
-
-      => <ul><li><a href="http://whatever">This is...(continued)</a></li></ul>
-
+    truncate_html(some_html, :length => 15, :omission => '...(continued)')
+      => <ul><li><a href="http://whatever">This...(continued)</a></li></ul>
 
 A few notes:
 
-* It will truncate on a word boundary.
 * The default options are:
   * :length => 100
   * :omission => '...'
+* By default, it will truncate on word boundry. 
+  To truncate the HTML string strictly at the specified length, pass in the `:word_boundry => false` option.
+* If the input HTML is nil, it will return an empty string.
+* The omission text's length does count toward the resulting string's length.
+* `<script>` tags will pass right through - they will not count toward the resulting string's length, or be truncated.
 
 Installation
 ------------
@@ -33,9 +34,9 @@ Add this to your <code>config/environment.rb</code>:
       :source => 'http://gemcutter.org'
 
 Then either
-<code>sudo rake gems:install</code>
+<code>rake gems:install</code>
 or
-<code>sudo gem install truncate_html</code>
+<code>gem install truncate_html</code>
 
 #### As a plugin:
 <code>script/plugin install git://github.com/hgimenez/truncate_html.git</code>
@@ -50,4 +51,13 @@ Testing
 
 The plugin is tested using RSpec. [Install it](http://wiki.github.com/dchelimsky/rspec/rails) on your app if you wish to run the tests.
 
+If you want to hack on this, here's how to set up a development/testing environment:
+
+    $ rails truncate_html_base
+    $ cd truncate_html_base
+    $ git clone git://github.com/hgimenez/truncate_html.git vendor/plugins/truncate_html
+    # install RSpec, follow instructions at http://wiki.github.com/dchelimsky/rspec/rails
+    $ cd vendor/plugins/truncate_html
+    $ rake spec # all green? Go hack
+
 Copyright (c) 2009 Harold A. Giménez, released under the MIT license

data/Rakefile

@@ -1,6 +1,7 @@
 require 'rake'
 require 'spec/rake/spectask'
 
+
 desc 'Default: run specs.'
 task :default => :spec
 
@@ -16,6 +17,24 @@ Spec::Rake::SpecTask.new(:rcov) do |spec|
   spec.rcov = true
 end
 
+begin
+  require 'metric_fu'
+  MetricFu::Configuration.run do |config|
+    config.metrics  = [:saikuro, :flog, :flay, :reek, :roodi, :rcov]
+    config.graphs   = [:flog, :flay, :reek, :roodi, :rcov]
+    config.rcov     = { :environment => 'test',
+                        :test_files => ['spec/**/*_spec.rb'],
+                        :rcov_opts => ["--sort coverage",
+                                       "--text-coverage",
+                                       "--profile",
+                                       "--exclude /gems/,/Library/"]}
+    config.graph_engine = :bluff
+  end
+rescue LoadError
+  puts "Install metric_fu to run code metrics"
+end
+
+
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.3.0

data/init.rb

@@ -1 +1,7 @@
 require 'truncate_html'
+
+TruncateHtml.configure do |config|
+  config.length       = 100
+  config.omission     = '...'
+  config.word_boundry = true
+end

data/lib/app/helpers/truncate_html_helper.rb

@@ -1,7 +1,9 @@
 module TruncateHtmlHelper
 
   def truncate_html(html, options={})
-    TruncateHtml::HtmlTruncator.new(html).truncate(options)
+    return '' if html.nil?
+    html_string = TruncateHtml::HtmlString.new(html)
+    TruncateHtml::HtmlTruncator.new(html_string).truncate(options)
   end
 
 end

data/lib/truncate_html.rb

@@ -1,9 +1,6 @@
-path =  File.join(File.dirname(__FILE__), 'app', 'helpers')  
-$LOAD_PATH << path 
-ActiveSupport::Dependencies.load_paths << path 
-ActiveSupport::Dependencies.load_once_paths.delete(path) 
-
 require File.join(File.dirname(__FILE__), 'truncate_html', 'html_truncator')
+require File.join(File.dirname(__FILE__), 'truncate_html', 'configuration')
+require File.join(File.dirname(__FILE__), 'app', 'helpers', 'truncate_html_helper')
 
 ActionView::Base.class_eval do
   include TruncateHtmlHelper

data/lib/truncate_html/configuration.rb

@@ -0,0 +1,15 @@
+module TruncateHtml
+  class Configuration
+    attr_accessor :length, :omission, :word_boundry
+  end
+
+  class << self
+    attr_accessor :configuration
+  end
+
+  def self.configure
+    self.configuration ||= Configuration.new
+    yield configuration
+  end
+
+end

data/lib/truncate_html/html_string.rb

@@ -0,0 +1,35 @@
+module TruncateHtml
+  class HtmlString < String
+
+    UNPAIRED_TAGS = %w(br hr img)
+
+    def initialize(original_html)
+      super(original_html)
+    end
+
+    def html_tokens
+      scan(/(?:<script.*>.*<\/script>)+|<\/?[^>]+>|[\w\|`~!@#\$%^&*\(\)\-_\+=\[\]{}:;'",\.\/?]+|\s+/).map do
+        |token| token.gsub(
+          #remove newline characters
+            /\n/,''
+        ).gsub(
+          #clean out extra consecutive whitespace
+            /\s+/, ' '
+        )
+      end.map { |token| HtmlString.new(token) }
+    end
+
+    def html_tag?
+      self =~ /<\/?[^>]+>/ ? true : false
+    end
+
+    def open_tag?
+      self =~ /<(?!(?:#{UNPAIRED_TAGS.join('|')}|script|\/))[^>]+>/i ? true : false
+    end
+
+    def matching_close_tag
+      gsub(/<(\w+)\s?.*>/, '</\1>').strip
+    end
+
+  end
+end

data/lib/truncate_html/html_truncator.rb

@@ -1,74 +1,67 @@
 module TruncateHtml
   class HtmlTruncator
 
-    UNPAIRED_TAGS = %w(br hr img)
-
     def initialize(original_html)
-      @original_html = original_html
+      @original_html  = original_html
     end
 
     def truncate(options = {})
-      return '' if @original_html.nil?
-      options[:length] ||= 100
-      options[:omission] ||= '...'
-      @chars_remaining = options[:length] - options[:omission].length
-      @open_tags, result = [], ['']
+      length        = options[:length]       || TruncateHtml.configuration.length
+      @omission     = options[:omission]     || TruncateHtml.configuration.omission
+      @word_boundry = (options.has_key?(:word_boundry) ? options[:word_boundry] : TruncateHtml.configuration.word_boundry)
+      @chars_remaining = length - @omission.length
+      @open_tags, @truncated_html = [], ['']
 
-      html_tokens.each do |str|
+      @original_html.html_tokens.each do |token|
+        #if truncate_more?(token)
         if @chars_remaining > 0
-          if html_tag?(str)
-            if open_tag?(str)
-              @open_tags << str
-            else
-              open_tags = remove_latest_open_tag(str)
-            end
-          else
-            @chars_remaining -= str.length
-          end
-          result << str
+          process_token(token)
         else
-          result[-1] = result[-1].rstrip + options[:omission]
-          @open_tags.reverse_each do |open_tag|
-            result << matching_close_tag(open_tag)
-          end
+          close_open_tags
           break
         end
       end
-      result.join('')
+      @truncated_html.join
     end
 
-    def html_tokens
-      @original_html.scan(/(?:<script.*>.*<\/script>)+|<\/?[^>]+>|[\w\|`~!@#\$%^&*\(\)\-_\+=\[\]{}:;'",\.\/?]+|\s+/).map do
-        |t| t.gsub(
-          #remove newline characters
-            /\n/,''
-        ).gsub(
-          #clean out extra consecutive whitespace
-            /\s+/, ' '
-        )
-      end
-    end
+    private
 
-    def html_tag?(string)
-      string =~ /<\/?[^>]+>/ ? true : false
-    end
+      def process_token(token)
+        append_to_result(token)
+        if token.html_tag?
+          if token.open_tag?
+            @open_tags << token
+          else
+            remove_latest_open_tag(token)
+          end
+        else
+          @chars_remaining -= (@word_boundry ? token.length : token[0, @chars_remaining].length)
+        end
+      end
 
-    def open_tag?(html_tag)
-      html_tag =~ /<(?!(?:#{UNPAIRED_TAGS.join('|')}|script|\/))[^>]+>/i ? true : false
-    end
+      def append_to_result(token)
+        if @word_boundry
+          @truncated_html << token
+        else
+          @truncated_html << token[0, @chars_remaining]
+        end
+      end
 
-    def remove_latest_open_tag(close_tag)
-      (0...@open_tags.length).to_a.reverse.each do |i|
-        if matching_close_tag(@open_tags[i]) == close_tag
-          @open_tags.delete_at(i)
-          break
+      def close_open_tags
+        @truncated_html[-1] = @truncated_html[-1].rstrip + @omission
+        @open_tags.reverse_each do |open_tag|
+          @truncated_html << open_tag.matching_close_tag
         end
       end
-    end
 
-    def matching_close_tag(open_tag)
-      open_tag.gsub(/<(\w+)\s?.*>/, '</\1>').strip
-    end
+      def remove_latest_open_tag(close_tag)
+        (0...@open_tags.length).to_a.reverse.each do |index|
+          if @open_tags[index].matching_close_tag == close_tag
+            @open_tags.delete_at(index)
+            break
+          end
+        end
+      end
 
   end
 end

data/spec/helpers/truncate_html_helper_spec.rb

@@ -2,115 +2,40 @@ require File.join(File.dirname(__FILE__), '..', 'spec_helper')
 
 include TruncateHtmlHelper
 
+class Truncator
+  include TruncateHtmlHelper
+end
+
 describe TruncateHtmlHelper do
 
+  def truncator
+    @truncator ||= Truncator.new
+  end
+
   it 'is included in ActionView::Base' do
     ActionView::Base.included_modules.should include(TruncateHtmlHelper)
   end
 
-  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
-
-    it 'supports omissions longer than the maximum length' do
-      lambda { truncate_html('', :length => 1, :omission => '...') }.should_not raise_error
-    end
-
-    it 'returns the omission when the specified length is smaller than the omission' do
-      truncate_html('a b c', :length => 2, :omission => '...').should == '...'
-    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)
-      end
-    end
-
-    context 'the input html contains a script tag' do
-      before(:each) do
-        @input_html = "<p>I have a script <script type=text/javascript>document.write('lum dee dum');</script> and more text</p>"
-        @expected_out = "<p>I have a script <script type=text/javascript>document.write('lum dee dum');</script> and...</p>"
-      end
-      it 'treats the script tag as lengthless string' do
-        truncate_html(@input_html, :length => 23).should == @expected_out
-      end
-    end
-
-    context 'truncating in the middle of a link' do
-      before(:each) do
-        @html = '<div><ul><li>Look at <a href="foo">this</a> link </li></ul></div>'
-      end
-
-      it 'truncates, and closes the <a>, and closes any remaining open tags' do
-        truncate_html(@html, :length => 14).should == '<div><ul><li>Look at <a href="foo">this...</a></li></ul></div>'
-      end
-    end
-
-    %w(! @ # $ % ^ & * \( \) - _ + = [ ] { } \ | , . / ?).each do |char|
-      context "when the html has a #{char} character after a closing tag" do
-        before(:each) 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 => 19).should == "<p>Look at <strong>this</strong>#{char} More...</p>"
-        end
-      end
-    end
-
-    context 'when the html has a non punctuation character after a closing tag' do
-      before(:each) 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 => 21).should == '<p>Look at <a href="awesomeful.net">this</a> link...</p>'
-      end
-    end
-
-    #unusual, but just covering my ass
-    context 'when the HTML tags are multiline' do 
-      before(:each) do
-        @html = <<-END_HTML
-          <div id="foo"
-                class="bar">
-          This is ugly html.
-          </div>
-        END_HTML
-      end
-
-      it 'recognizes the multiline html properly' do
-        truncate_html(@html, :length => 12).should == ' <div id="foo" class="bar"> This is...</div>'
-      end
-    end
-
-    %w(br hr img).each do |unpaired_tag|
-      context "when the html contains a #{unpaired_tag} tag" do
+  before(:each) do
+    @html_truncator_mock = mock(TruncateHtml::HtmlTruncator)
+  end
 
-        context "and the #{unpaired_tag} does not 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 => 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
+  it 'creates an instance of HtmlTruncator and calls truncate() on it' do
+    @html_truncator_mock.stub!(:truncate)
+    TruncateHtml::HtmlTruncator.should_receive(:new).and_return(@html_truncator_mock)
+    truncator.truncate_html('foo')
+  end
 
-        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 => 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
+  it 'calls truncate() on the HtmlTruncator object' do
+    TruncateHtml::HtmlTruncator.stub!(:new).and_return(@html_truncator_mock)
+    @html_truncator_mock.should_receive(:truncate).with({}).once
+    truncator.truncate_html('foo')
+  end
 
-      end
+  context 'the input html is nil' do
+    it 'returns an empty string' do
+      truncator.truncate_html(nil).should be_empty
+      truncator.truncate_html(nil).should be_kind_of(String)
     end
   end
 

data/spec/spec_helper.rb

@@ -6,4 +6,4 @@ rescue LoadError
 end
 
 plugin_spec_dir = File.dirname(__FILE__)
-require File.join(File.dirname(__FILE__), '..', 'lib', 'app', 'helpers', 'truncate_html_helper')
+require File.join(File.dirname(__FILE__), '..', 'lib', 'truncate_html')

data/spec/truncate_html/configuration_spec.rb

@@ -0,0 +1,17 @@
+require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+
+describe TruncateHtml::Configuration do
+
+  describe 'self.configure' do
+
+    it 'yields the configuration object' do
+      lambda do
+        TruncateHtml.configure do |config|
+          config.should be_kind_of(TruncateHtml::Configuration)
+          throw :yay_it_yielded
+        end
+      end.should throw_symbol(:yay_it_yielded)
+    end
+
+  end
+end

data/spec/truncate_html/html_string_spec.rb

@@ -0,0 +1,76 @@
+require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+
+describe TruncateHtml::HtmlString do
+
+  def html_string(original_string)
+    TruncateHtml::HtmlString.new(original_string)
+  end
+
+  describe '#html_tokens' do
+    before(:each) do
+      @html = '<h1>Hi there</h1> <p>This          is sweet!</p>'
+    end
+
+    it 'returns each token in the string as an array element removing any consecutive whitespace from the string' do
+      html_string(@html).html_tokens.should == ['<h1>', 'Hi', ' ', 'there', '</h1>', ' ', '<p>', 'This', ' ', 'is', ' ', 'sweet!', '</p>']
+    end
+
+  end
+
+  describe '#html_tag?' do
+
+    it 'returns false when the string parameter is not an html tag' do
+      html_string('no tags').html_tag?.should be_false
+    end
+
+    it 'returns true when the string parameter is an html tag' do
+      html_string('<img src="foo">').html_tag?.should be_true
+      html_string('</img>').html_tag?.should be_true
+    end
+
+  end
+
+  describe '#open_tag?' do
+
+    it 'returns true if the tag is an open tag' do
+      html_string('<a>').open_tag?.should be_true
+    end
+
+    context 'the tag is an open tag, and has whitespace and html properties' do
+      it 'returns true if it has single quotes' do
+        html_string(" <a href='http://awesomeful.net' >").open_tag?.should be_true
+      end
+
+      it 'returns true if it has double quotes' do
+        html_string(' <a href="http://awesomeful.net">').open_tag?.should be_true
+      end
+    end
+
+    it 'returns false if the tag is a close tag' do
+      html_string('</a>').open_tag?.should be_false
+    end
+
+    it 'returns false if the string is not an html tag' do
+      html_string('foo bar').open_tag?.should be_false
+    end
+
+    it 'returns false if it is a <script> tag' do
+      html_string('<script>').open_tag?.should be_false
+    end
+  end
+
+  describe '#matching_close_tag' do
+    tag_pairs = { '<a>'             => '</a>',
+                  ' <div>'          => '</div>',
+                  '<h1>'            => '</h1>',
+                  '<a href="foo">'  => '</a>' }
+
+    tag_pairs.each do |open_tag, close_tag|
+      it "closes a #{open_tag} and returns #{close_tag}" do
+        html_string(open_tag).matching_close_tag.should == close_tag
+      end
+    end
+
+  end
+
+end

data/spec/truncate_html/html_truncator_spec.rb

@@ -2,73 +2,113 @@ require File.join(File.dirname(__FILE__), '..', 'spec_helper')
 
 describe TruncateHtml::HtmlTruncator do
 
-  def truncator(html = nil)
-    @truncator ||= TruncateHtml::HtmlTruncator.new(html)
+  def truncate(html, opts = {})
+    html_string = TruncateHtml::HtmlString.new(html)
+    TruncateHtml::HtmlTruncator.new(html_string).truncate(opts)
   end
 
-  describe '#html_tokens' do
-    before(:each) do
-      @html = '<h1>Hi there</h1> <p>This          is sweet!</p>'
-    end
+  describe '#truncate' 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>']
+    context 'when the word_boundry option is set to false' do
+      it 'truncates to the exact length specified' do
+        truncate('<div>123456789</div>', :length => 5, :omission => '', :word_boundry => false).should == '<div>12345</div>'
+      end
     end
 
-  end
-
-  describe '#html_tag?' do
-
-    it 'returns false when the string parameter is not an html tag' do
-      truncator.html_tag?('no tags').should be_false
+    it "includes the omission text's length in the returned truncated html" do
+      truncate('a b c', :length => 4, :omission => '...').should == 'a...'
     end
 
-    it 'returns true when the string parameter is an html tag' do
-      truncator.html_tag?('<img src="foo">').should be_true
-      truncator.html_tag?('</img>').should be_true
+    it 'supports omissions longer than the maximum length' do
+      lambda { truncate('', :length => 1, :omission => '...') }.should_not raise_error
     end
 
-  end
-
-  describe '#open_tag?' do
-
-    it 'returns true if the tag is an open tag' do
-      truncator.open_tag?('<a>').should be_true
+    it 'returns the omission when the specified length is smaller than the omission' do
+      truncate('a b c', :length => 2, :omission => '...').should == '...'
     end
 
-    it 'returns true if the tag is an open tag, and has whitespace and html properties with either single or double quotes' do
-      truncator.open_tag?(' <a href="http://awesomeful.net">').should be_true
-      truncator.open_tag?(" <a href='http://awesomeful.net' >").should be_true
+    context 'the input html contains a script tag' do
+      before(:each) do
+        @input_html = "<p>I have a script <script type=text/javascript>document.write('lum dee dum');</script> and more text</p>"
+        @expected_out = "<p>I have a script <script type=text/javascript>document.write('lum dee dum');</script> and...</p>"
+      end
+      it 'treats the script tag as lengthless string' do
+        truncate(@input_html, :length => 23).should == @expected_out
+      end
     end
 
-    it 'returns false if the tag is a close tag' do
-      truncator.open_tag?('</a>').should be_false
-    end
+    context 'truncating in the middle of a link' do
+      before(:each) do
+        @html = '<div><ul><li>Look at <a href="foo">this</a> link </li></ul></div>'
+      end
 
-    it 'returns false if the string is not an html tag' do
-      truncator.open_tag?('foo bar').should be_false
+      it 'truncates, and closes the <a>, and closes any remaining open tags' do
+        truncate(@html, :length => 14).should == '<div><ul><li>Look at <a href="foo">this...</a></li></ul></div>'
+      end
     end
 
-    it 'returns false if it is a <script> tag' do
-      truncator.open_tag?('<script>').should be_false
+    %w(! @ # $ % ^ & * \( \) - _ + = [ ] { } \ | , . / ?).each do |char|
+      context "when the html has a #{char} character after a closing tag" do
+        before(:each) 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, :length => 19).should == "<p>Look at <strong>this</strong>#{char} More...</p>"
+        end
+      end
     end
-  end
 
-  describe '#matching_close_tag' do
-
-    it 'closes a tag given an open tag' do
-      truncator.matching_close_tag('<a>').should == '</a>'
-      truncator.matching_close_tag(' <div>').should == '</div>'
-      truncator.matching_close_tag('<h1>').should == '</h1>'
-      truncator.matching_close_tag('<a href="foo">').should == '</a>'
+    context 'when the html has a non punctuation character after a closing tag' do
+      before(:each) 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, :length => 21).should == '<p>Look at <a href="awesomeful.net">this</a> link...</p>'
+      end
     end
-  end
 
-  describe 'nil string' do
+    #unusual, but just covering my ass
+    context 'when the HTML tags are multiline' do 
+      before(:each) do
+        @html = <<-END_HTML
+          <div id="foo"
+                class="bar">
+          This is ugly html.
+          </div>
+        END_HTML
+      end
+
+      it 'recognizes the multiline html properly' do
+        truncate(@html, :length => 12).should == ' <div id="foo" class="bar"> This is...</div>'
+      end
+    end
 
-    it 'returns an empty string' do
-      truncator(nil).truncate.should be_empty
-      truncator(nil).truncate.should be_kind_of(String)
+    %w(br hr img).each do |unpaired_tag|
+      context "when the html contains a #{unpaired_tag} tag" do
+
+        context "and the #{unpaired_tag} does not 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, :length => 19).should == "<div>Some before. <#{unpaired_tag}>and...</div>"
+            truncate(@html_caps, :length => 19).should == "<div>Some before. <#{unpaired_tag.capitalize}>and...</div>"
+          end
+        end
+
+        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, :length => 19).should == "<div>Some before. <#{unpaired_tag} />and...</div>"
+            truncate(@html_caps, :length => 19).should == "<div>Some before. <#{unpaired_tag.capitalize} />and...</div>"
+          end
+        end
+
+      end
     end
   end
 

data/truncate_html.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{truncate_html}
-  s.version = "0.2.2"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["hgimenez"]
-  s.date = %q{2009-12-23}
+  s.date = %q{2010-02-02}
   s.description = %q{Truncates html so you don't have to}
   s.email = %q{harold.gimenez@gmail.com}
   s.extra_rdoc_files = [
@@ -25,9 +25,13 @@ Gem::Specification.new do |s|
      "install.rb",
      "lib/app/helpers/truncate_html_helper.rb",
      "lib/truncate_html.rb",
+     "lib/truncate_html/configuration.rb",
+     "lib/truncate_html/html_string.rb",
      "lib/truncate_html/html_truncator.rb",
      "spec/helpers/truncate_html_helper_spec.rb",
      "spec/spec_helper.rb",
+     "spec/truncate_html/configuration_spec.rb",
+     "spec/truncate_html/html_string_spec.rb",
      "spec/truncate_html/html_truncator_spec.rb",
      "tasks/truncate_html_tasks.rake",
      "truncate_html.gemspec",
@@ -41,6 +45,8 @@ Gem::Specification.new do |s|
   s.test_files = [
     "spec/helpers/truncate_html_helper_spec.rb",
      "spec/spec_helper.rb",
+     "spec/truncate_html/configuration_spec.rb",
+     "spec/truncate_html/html_string_spec.rb",
      "spec/truncate_html/html_truncator_spec.rb"
   ]
 
@@ -54,3 +60,4 @@ Gem::Specification.new do |s|
   else
   end
 end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: truncate_html
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors: 
 - hgimenez
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-23 00:00:00 -05:00
+date: 2010-02-02 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -31,9 +31,13 @@ files:
 - install.rb
 - lib/app/helpers/truncate_html_helper.rb
 - lib/truncate_html.rb
+- lib/truncate_html/configuration.rb
+- lib/truncate_html/html_string.rb
 - lib/truncate_html/html_truncator.rb
 - spec/helpers/truncate_html_helper_spec.rb
 - spec/spec_helper.rb
+- spec/truncate_html/configuration_spec.rb
+- spec/truncate_html/html_string_spec.rb
 - spec/truncate_html/html_truncator_spec.rb
 - tasks/truncate_html_tasks.rake
 - truncate_html.gemspec
@@ -69,4 +73,6 @@ summary: Uses an API similar to Rails' truncate helper to truncate HTML and clos
 test_files: 
 - spec/helpers/truncate_html_helper_spec.rb
 - spec/spec_helper.rb
+- spec/truncate_html/configuration_spec.rb
+- spec/truncate_html/html_string_spec.rb
 - spec/truncate_html/html_truncator_spec.rb