html_truncator 0.2.1 → 0.2.2

data/README.md

@@ -14,7 +14,7 @@ It's very simple. Install it with rubygems:
 
 Or, if you use bundler, add it to your `Gemfile`:
 
-    gem "html_truncator", :version => "~>0.2"
+    gem "html_truncator", "~>0.2"
 
 Then you can use it in your code:
 

data/init.rb

@@ -0,0 +1,2 @@
+# encoding: utf-8
+require "html_truncator"

data/lib/html_truncator.rb

@@ -22,7 +22,6 @@ class HTML_Truncator
   self.ellipsable_tags = Set.new(%w(p ol ul li div header article nav section footer aside dd dt dl))
 end
 
-
 class Nokogiri::HTML::DocumentFragment
   def ellipsable?
     true
@@ -33,6 +32,7 @@ class Nokogiri::XML::Node
   def truncate(max, opts)
     return ["", 1, opts] if max == 0 && !ellipsable?
     inner, remaining, opts = inner_truncate(max, opts)
+    return ["", max - remaining, opts] if inner.empty?
     children.remove
     add_child Nokogiri::HTML::DocumentFragment.parse(inner)
     [to_html(:indent => 0), max - remaining, opts]
@@ -46,7 +46,7 @@ class Nokogiri::XML::Node
       inner += txt
       next if remaining >= 0
       if ellipsable?
-        inner += opts[:ellipsis]
+        inner = inner.rstrip + opts[:ellipsis]
         opts[:ellipsis] = ""
         opts[:was_truncated] = true
       end
@@ -61,16 +61,22 @@ class Nokogiri::XML::Node
 end
 
 class Nokogiri::XML::Text
-   def truncate(max, opts)
-     if opts[:length_in_chars]
-       count = to_xhtml.length
-       return [to_xhtml, count, opts] if count <= max && max > 0
-       [content.slice(0, max), count, opts]
-     else
-       words = to_xhtml.scan(/\s*\S+/)
-       count = words.length
-       return [to_xhtml, count, opts] if count <= max && max > 0
-       [words.slice(0, max).join, count, opts]
-     end
+  def truncate(max, opts)
+    words = to_xhtml.scan(/\s*\S+/)
+    if opts[:length_in_chars]
+      count = to_xhtml.length
+      return [to_xhtml, count, opts] if count <= max && max > 0
+      if words.size > 1
+        words.inject('') do |string, word|
+          return [string, count, opts] if string.length + word.length > max
+          string + word
+        end
+      end
+      [content.slice(0, max), count, opts]
+    else
+      count = words.length
+      return [to_xhtml, count, opts] if count <= max && max > 0
+      [words.slice(0, max).join, count, opts]
+    end
   end
 end

metadata

@@ -1,73 +1,100 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: html_truncator
-version: !ruby/object:Gem::Version
-  version: 0.2.1
+version: !ruby/object:Gem::Version 
+  hash: 19
   prerelease: 
+  segments: 
+  - 0
+  - 2
+  - 2
+  version: 0.2.2
 platform: ruby
-authors:
+authors: 
 - Bruno Michel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-02-23 00:00:00.000000000 +01:00
+
+date: 2011-04-19 00:00:00 +02:00
 default_executable: 
-dependencies:
-- !ruby/object:Gem::Dependency
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: nokogiri
-  requirement: &79281530 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.4'
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 1
+        - 4
+        version: "1.4"
   type: :runtime
-  prerelease: false
-  version_requirements: *79281530
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &79281290 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.4'
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 2
+        - 4
+        version: "2.4"
   type: :development
-  prerelease: false
-  version_requirements: *79281290
+  version_requirements: *id002
 description: Wants to truncate an HTML string properly? This gem is for you.
 email: bmichel@menfin.info
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - README.md
-files:
+files: 
 - MIT-LICENSE
 - README.md
 - Gemfile
 - lib/html_truncator.rb
+- init.rb
 has_rdoc: true
 homepage: http://github.com/nono/HTML-Truncator
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
 rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Wants to truncate an HTML string properly? This gem is for you.
 test_files: []
+