trunction 0.0.2 → 0.0.3

data/lib/trunction.rb

@@ -6,22 +6,22 @@ module Trunction
   extend self
 
   def truncate_html(html, max)
-    doc = Nokogiri::HTML::DocumentFragment.parse(html)
-    Truncation.new(doc, max).execute
-    doc.to_html
+    Truncation.new(html, max).execute
   end
 
   class Truncation
 
-    def initialize(doc, max)
-      @doc = doc
+    def initialize(html, max)
+      @doc = Nokogiri::HTML::DocumentFragment.parse(html)
       @max = max
-      @size = 0
+      @word_count = 0
     end
 
     def execute
       find_the_last_block
+      return "" if @last_block_element.nil?
       remove_everything_after(@last_block_element)
+      @doc.to_html
     end
 
     private
@@ -39,8 +39,8 @@ module Trunction
     end
 
     def accumulate_text(text_node)
-      @size += text_node.text.length
-      throw(:done) if @size >= @max
+      @word_count += text_node.text.split.length
+      throw(:done) if @word_count >= @max
     end
 
     def block?(node)

data/lib/trunction/version.rb

@@ -1,3 +1,3 @@
 module Trunction
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/trunction_spec.rb

@@ -1,25 +1,28 @@
+# encoding: utf-8
+
 require 'trunction'
 
 describe Trunction do
 
-  let(:total_length) { Nokogiri::HTML::DocumentFragment.parse(input).text.length }
+  let(:full_text) { Nokogiri::HTML::DocumentFragment.parse(input).text }
+  let(:total_words) { full_text.split.length }
   let(:ellipsis) { "…" }
 
   include Trunction
 
   let(:result) do
-    truncate_html(input, max_length).gsub("\n", '')
+    truncate_html(input, max_words).gsub("\n", '')
   end
 
   describe "#truncate_html" do
 
     context "given multiple paragraphs" do
 
-      let(:input) { "<p>one</p><p>two</p><p>three</p>" }
+      let(:input) { "<p>One two three.</p> <p>Four five six.</p>" }
 
       context "with max-length longer than input" do
 
-        let(:max_length) { total_length + 1 }
+        let(:max_words) { total_words + 1 }
 
         it "returns input intact" do
           result.should == input
@@ -29,42 +32,36 @@ describe Trunction do
 
       context "with max-length shorter than input" do
 
-        let(:max_length) { total_length - 1 }
+        let(:max_words) { total_words - 1 }
 
-        it "drops elements until beneath max-length" do
-          result.should == "<p>one</p><p>two</p>"
+        it "drops block elements until beneath max-length" do
+          result.should == "<p>One two three.</p>"
         end
 
       end
 
-    end
-
-    context "given multiple paragraphs, wrapped in a div" do
+      context "with max-length shorter than first paragraph" do
 
-      let(:input) { "<div><p>one</p><p>two</p><p>three</p></div>" }
+        let(:max_words) { 1 }
 
-      context "with max-length shorter than input" do
-
-        let(:max_length) { total_length - 1 }
-
-        it "drops elements until beneath max-length" do
-          result.should == "<div><p>one</p><p>two</p></div>"
+        it "returns empty String" do
+          result.should == ""
         end
 
       end
 
     end
 
-    context "a final paragraph with inline elements" do
+    context "given multiple paragraphs, wrapped in a div" do
 
-      let(:input) { "<p>one</p><p>two</p><p><b>one</b>, <b>two</b>, <b>three</b>, <b>four</b></p>" }
+      let(:input) { "<div><p>One two three.</p> <p>Four five six.</p></div>" }
 
       context "with max-length shorter than input" do
 
-        let(:max_length) { total_length - 1 }
+        let(:max_words) { total_words - 1 }
 
-        it "drops the entire final paragraph" do
-          result.should == "<p>one</p><p>two</p>"
+        it "drops elements until beneath max-length" do
+          result.should == "<div><p>One two three.</p></div>"
         end
 
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trunction
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70242606069220 !ruby/object:Gem::Requirement
+  requirement: &70116915083800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70242606069220
+  version_requirements: *70116915083800
 description: Trunction implements intelligent truncation of HTML text.
 email:
 - mdub@dogbiscuit.org