trunction 0.0.1 → 0.0.2

data/lib/trunction/version.rb

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

data/lib/trunction.rb

@@ -16,49 +16,38 @@ module Trunction
     def initialize(doc, max)
       @doc = doc
       @max = max
-      @chars_remaining = max
+      @size = 0
     end
 
     def execute
-      find_the_end
-      remove_everything_else
+      find_the_last_block
+      remove_everything_after(@last_block_element)
     end
 
     private
 
-    def find_the_end
+    def find_the_last_block
       catch(:done) do
         @doc.traverse do |node|
-          accumulate_text(node) if node.text?
-          record(node)
+          if node.text?
+            accumulate_text(node)
+          elsif block?(node)
+            @last_block_element = node
+          end
         end
       end
     end
 
     def accumulate_text(text_node)
-      @chars_remaining -= text_node.text.length
-      throw(:done) if limit_reached?
-    end
-
-    def limit_reached?
-      @chars_remaining <= 0
-    end
-
-    def record(node)
-      @last_block_element = node if block?(node)
-      @last_element = node
-    end
-
-    def last_node
-      @last_block_element || @last_element
+      @size += text_node.text.length
+      throw(:done) if @size >= @max
     end
 
     def block?(node)
       node.description && node.description.block?
     end
 
-    def remove_everything_else
-      node = last_node
+    def remove_everything_after(node)
       while node
         node.next.remove while node.next
         break unless node.respond_to?(:parent)

data/spec/trunction_spec.rb

@@ -55,22 +55,6 @@ describe Trunction do
 
     end
 
-    context "a single paragraph with inline elements" do
-
-      let(:input) { "<p><b>one</b>, <b>two</b>, <b>three</b>, <b>four</b></p>" }
-
-      context "with max-length shorter than input" do
-
-        let(:max_length) { total_length - 1 }
-
-        it "drops the last word" do
-          result.should == "<p><b>one</b>, <b>two</b>, <b>three</b>, </p>"
-        end
-
-      end
-
-    end
-
     context "a final paragraph with inline elements" do
 
       let(:input) { "<p>one</p><p>two</p><p><b>one</b>, <b>two</b>, <b>three</b>, <b>four</b></p>" }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trunction
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   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: &70261283968360 !ruby/object:Gem::Requirement
+  requirement: &70242606069220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70261283968360
+  version_requirements: *70242606069220
 description: Trunction implements intelligent truncation of HTML text.
 email:
 - mdub@dogbiscuit.org