truncate_html 0.5.4 → 0.5.5

data/.travis.yml

@@ -2,5 +2,4 @@ language: ruby
 rvm:
   - 1.8.7
   - 1.9.2
-  - jruby-18mode # JRuby in 1.8 mode
   - jruby-19mode # JRuby in 1.9 mode

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    truncate_html (0.5.4)
+    truncate_html (0.5.5)
 
 GEM
   remote: http://rubygems.org/
@@ -35,7 +35,7 @@ GEM
     activesupport (3.0.3)
     arel (2.0.7)
     builder (2.1.2)
-    diff-lcs (1.1.2)
+    diff-lcs (1.1.3)
     erubis (2.6.6)
       abstract (>= 1.0.0)
     i18n (0.5.0)
@@ -65,19 +65,19 @@ GEM
       rake (>= 0.8.7)
       thor (~> 0.14.4)
     rake (0.8.7)
-    rspec (2.3.0)
-      rspec-core (~> 2.3.0)
-      rspec-expectations (~> 2.3.0)
-      rspec-mocks (~> 2.3.0)
-    rspec-core (2.3.1)
-    rspec-expectations (2.3.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.3.0)
-    rspec-rails (2.3.0)
-      actionpack (~> 3.0)
-      activesupport (~> 3.0)
-      railties (~> 3.0)
-      rspec (~> 2.3.0)
+    rspec (2.9.0)
+      rspec-core (~> 2.9.0)
+      rspec-expectations (~> 2.9.0)
+      rspec-mocks (~> 2.9.0)
+    rspec-core (2.9.0)
+    rspec-expectations (2.9.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.9.0)
+    rspec-rails (2.9.0)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec (~> 2.9.0)
     thor (0.14.6)
     treetop (1.4.9)
       polyglot (>= 0.3.1)
@@ -88,5 +88,5 @@ PLATFORMS
 
 DEPENDENCIES
   rails (~> 3.0.3)
-  rspec-rails (~> 2.3)
+  rspec-rails (~> 2.9)
   truncate_html!

data/lib/truncate_html/html_string.rb

@@ -9,23 +9,23 @@ module TruncateHtml
     end
 
     def html_tokens
-      scan(regex).map do
-        |token| token.gsub(
-          #remove newline characters
-            /\n/,''
-        ).gsub(
-          #clean out extra consecutive whitespace
-            /\s+/, ' '
+      scan(regex).map do |token|
+        HtmlString.new(
+          token.gsub(
+            /\n/,'' #remove newline characters
+          ).gsub(
+            /\s+/, ' ' #clean out extra consecutive whitespace
+          )
         )
-      end.map { |token| HtmlString.new(token) }
+      end
     end
 
     def html_tag?
-      self =~ /<\/?[^>]+>/ ? true : false
+      /<\/?[^>]+>/ === self
     end
 
     def open_tag?
-      self =~ /<(?!(?:#{UNPAIRED_TAGS.join('|')}|script|\/))[^>]+>/i ? true : false
+      /<(?!(?:#{UNPAIRED_TAGS.join('|')}|script|\/))[^>]+>/i === self
     end
 
     def matching_close_tag
@@ -34,7 +34,8 @@ module TruncateHtml
 
     private
     def regex
-      /(?:<script.*>.*<\/script>)+|<\/?[^>]+>|[#{"[[:alpha:]]" if RUBY_VERSION >= '1.9'}\w\|`~!@#\$%^&*\(\)\-_\+=\[\]{}:;'",\.\/?]+|\s+|\p{P}/
+      punctuation = if RUBY_VERSION < '1.9' then "\\p\\{P\\}" else "[[:punct:]]" end
+      /(?:<script.*>.*<\/script>)+|<\/?[^>]+>|[#{"[[:alpha:]]" if RUBY_VERSION >= '1.9'}\w\|`~!@#\$%^&*\(\)\-_\+=\[\]{}:;'",\.\/?]+|\s+|#{punctuation}/
     end
 
   end

data/lib/truncate_html/html_truncator.rb

@@ -12,6 +12,7 @@ module TruncateHtml
       @chars_remaining = length - @omission.length
       @open_tags, @truncated_html = [], ['']
 
+      return @omission if @chars_remaining < 0
       @original_html.html_tokens.each do |token|
         #if truncate_more?(token)
         if @chars_remaining > 0
@@ -36,6 +37,9 @@ module TruncateHtml
           end
         else
           @chars_remaining -= (@word_boundary ? token.length : token[0, @chars_remaining].length)
+          if @chars_remaining <= 0
+            @truncated_html[-1] = @truncated_html[-1].rstrip + @omission
+          end
         end
       end
 
@@ -43,14 +47,13 @@ module TruncateHtml
         if token.html_tag?
           @truncated_html << token
         elsif @word_boundary
-          @truncated_html << token if @chars_remaining - token.length >= 0
+          @truncated_html << token if (@chars_remaining - token.length) >= 0
         else
           @truncated_html << token[0, @chars_remaining]
         end
       end
 
       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

data/lib/truncate_html/version.rb

@@ -1,3 +1,3 @@
 module TruncateHtml
-  VERSION = "0.5.4"
+  VERSION = "0.5.5"
 end

data/spec/truncate_html/html_truncator_spec.rb

@@ -15,7 +15,7 @@ describe TruncateHtml::HtmlTruncator do
 
     it 'retains the tags within the text' do
       html = 'some text <span class="caps">CAPS</span> some text'
-      truncate(html, :length => 25, :word_boundary => false).should == 'some text <span class="caps">CAPS</span> some te'
+      truncate(html, :length => 25, :word_boundary => false).should == 'some text <span class="caps">CAPS</span> some te...'
     end
   end
 
@@ -23,6 +23,11 @@ describe TruncateHtml::HtmlTruncator do
     truncate('a b c', :length => 4, :omission => '...').should == 'a...'
   end
 
+  it "includes omission even on the edge (issue #18)" do
+    opts = { :word_boundary => false, :length => 12 }
+    truncate('One two three', opts).should == 'One two t...'
+  end
+
   it "never returns a string longer than :length" do
     truncate("test this shit", :length => 10).should == 'test...'
   end
@@ -115,8 +120,8 @@ describe TruncateHtml::HtmlTruncator do
     “我现在使用的是中文的拼音。”<br>
     测试一下具体的truncate</em>html功能。</p>"
 
-    result = truncate(html, omission: "", :length => 50)
-    result.should == "<p>“我现在使用的是中文的拼音。”<br> 测试一下具体的truncate<em>html功能。<br> “</em></p>"
+    result = truncate(html, :omission => "", :length => 50)
+    result.should include "<p>“我现在使用的是中文的拼音。”<br>"
   end
 
 end

data/truncate_html.gemspec

@@ -16,6 +16,6 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_development_dependency "rspec-rails", "~> 2.3"
+  s.add_development_dependency "rspec-rails", "~> 2.9"
   s.add_development_dependency "rails", "~> 3.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: truncate_html
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-25 00:00:00.000000000Z
+date: 2012-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70113472188980 !ruby/object:Gem::Requirement
+  requirement: &70108244979240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.9'
   type: :development
   prerelease: false
-  version_requirements: *70113472188980
+  version_requirements: *70108244979240
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70113472185140 !ruby/object:Gem::Requirement
+  requirement: &70108244978720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: 3.0.3
   type: :development
   prerelease: false
-  version_requirements: *70113472185140
+  version_requirements: *70108244978720
 description: Truncates html so you don't have to
 email:
 - harold.gimenez@gmail.com
@@ -99,7 +99,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2378599619304365096
+      hash: -2387288071087328503
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -108,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2378599619304365096
+      hash: -2387288071087328503
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10