truncate_html 0.9.1 → 0.9.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    truncate_html (0.9.1)
+    truncate_html (0.9.2)
 
 GEM
   remote: http://rubygems.org/

data/README.md

@@ -4,10 +4,9 @@ TruncateHtml
 [![Build Status](https://secure.travis-ci.org/hgmnz/truncate_html.png?branch=master)](http://travis-ci.org/hgmnz/truncate_html)
 [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/hgmnz/truncate_html)
 
-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 <code>truncate()</code> method.
+truncate_html cuts off a string of HTML and takes care of closing any lingering open tags. There are many ways to solve this. This library does not have any dependencies, and [parses HTML using regular expressions](http://stackoverflow.com/questions/1732348/regex-match-open-tags-except-xhtml-self-contained-tags/1732454#1732454).
 
+It can be used with or without Rails.
 
 Example
 -------

data/lib/truncate_html/html_string.rb

@@ -21,13 +21,17 @@ module TruncateHtml
     end
 
     def html_tag?
-      /<\/?[^>]+>/ === self
+      /<\/?[^>]+>/ === self && !html_comment?
     end
 
     def open_tag?
       /<(?!(?:#{UNPAIRED_TAGS.join('|')}|script|\/))[^>]+>/i === self
     end
 
+    def html_comment?
+      /<\s?!--.*-->/ === self
+    end
+
     def matching_close_tag
       gsub(/<(\w+)\s?.*>/, '</\1>').strip
     end

data/lib/truncate_html/html_truncator.rb

@@ -51,7 +51,7 @@ module TruncateHtml
         else
           remove_latest_open_tag(token)
         end
-      else
+      elsif !token.html_comment?
         @chars_remaining -= (@word_boundary ? token.length : token[0, @chars_remaining].length)
         if @chars_remaining <= 0
           @truncated_html[-1] = @truncated_html[-1].rstrip + @omission
@@ -60,7 +60,7 @@ module TruncateHtml
     end
 
     def append_to_result(token)
-      if token.html_tag?
+      if token.html_tag? || token.html_comment?
         @truncated_html << token
       elsif @word_boundary
         @truncated_html << token if (@chars_remaining - token.length) >= 0

data/lib/truncate_html/version.rb

@@ -1,3 +1,3 @@
 module TruncateHtml
-  VERSION = "0.9.1"
+  VERSION = "0.9.2"
 end

data/spec/truncate_html/html_string_spec.rb

@@ -22,6 +22,10 @@ describe TruncateHtml::HtmlString do
       html_string('<img src="foo">').should be_html_tag
       html_string('</img>').should be_html_tag
     end
+
+    it 'is false for html comments' do
+      html_string('<!-- hi -->').should_not be_html_tag
+    end
   end
 
   describe '#open_tag?' do
@@ -64,4 +68,13 @@ describe TruncateHtml::HtmlString do
       end
     end
   end
+
+  describe '#html_comment?' do
+    it 'is true for HTML comments' do
+      html_string('<!-- hi -->').should be_html_comment
+      html_string('<a>').should_not be_html_comment
+      html_string('</a>').should_not be_html_comment
+      html_string('foo').should_not be_html_comment
+    end
+  end
 end

data/spec/truncate_html/html_truncator_spec.rb

@@ -194,4 +194,10 @@ describe TruncateHtml::HtmlTruncator do
     end
   end
 
+  context 'a string with comments' do
+    it 'does not duplicate comments (issue #32)' do
+      truncate('<h1>hello <!-- stuff --> and <!-- la --> goodbye</h1>', length: 15).should ==
+        '<h1>hello <!-- stuff --> and <!-- la -->...</h1>'
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: truncate_html
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-05 00:00:00.000000000 Z
+date: 2013-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70114780358240 !ruby/object:Gem::Requirement
+  requirement: &70161209065700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '2.9'
   type: :development
   prerelease: false
-  version_requirements: *70114780358240
+  version_requirements: *70161209065700
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70114780357540 !ruby/object:Gem::Requirement
+  requirement: &70161209065240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: 3.0.3
   type: :development
   prerelease: false
-  version_requirements: *70114780357540
+  version_requirements: *70161209065240
 description: Truncates html so you don't have to
 email:
 - harold.gimenez@gmail.com
@@ -105,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1260152275599267568
+      hash: -2711224977886415095
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10