truncate_html 0.9 → 0.9.1

data/Gemfile.lock

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

data/{README.markdown → README.md}

@@ -27,9 +27,9 @@ A few notes:
 * `<script>` tags will pass right through - they will not count toward the resulting string's length, or be truncated.
 
 * The default options are:
-  * :length => 100
-  * :omission => '...'
-  * :word_boundary => true
+  * `:length`: 100
+  * `:omission`: '...'
+  * `:word_boundary`: /\S/
 
 You may also set global configuration options.
 For example, place the following on application boot,
@@ -39,8 +39,6 @@ something like `config/initializers/truncate_html.rb`
 TruncateHtml.configure do |config|
   config.length        = 50
   config.omission      = '...(continued)'
-  config.word_boundary = false
-  config.break_token   = '<!-- break -->'
 end
 ```
 
@@ -49,8 +47,6 @@ For example, to truncate at the end of the nearest sentence:
 
 ```ruby
 TruncateHtml.configure do |config|
-  config.length        = 50
-  config.omission      = ''
   config.word_boundary = /\S[\.\?\!]/
 end
 ```
@@ -65,7 +61,7 @@ If the `:break_token` is in your content after the specified :length,
 
 ```ruby
 TruncateHtml.configure do |config|
-  config.break_token = '<!-- truncate -->
+  config.break_token = '<!-- truncate -->'
 end
 ```
 Installation

data/lib/app/helpers/truncate_html_helper.rb

@@ -3,7 +3,7 @@ module TruncateHtmlHelper
   def truncate_html(html, options={})
     return '' if html.nil?
     html_string = TruncateHtml::HtmlString.new(html)
-    TruncateHtml::HtmlTruncator.new(html_string).truncate(options).html_safe
+    TruncateHtml::HtmlTruncator.new(html_string, options).truncate.html_safe
   end
 
 end

data/lib/truncate_html/html_truncator.rb

@@ -1,18 +1,17 @@
 module TruncateHtml
   class HtmlTruncator
 
-    def initialize(original_html)
-      @original_html  = original_html
-    end
-
-    def truncate(options = {})
+    def initialize(original_html, options = {})
+      @original_html   = original_html
       length           = options[:length]       || TruncateHtml.configuration.length
       @omission        = options[:omission]     || TruncateHtml.configuration.omission
       @word_boundary   = (options.has_key?(:word_boundary) ? options[:word_boundary] : TruncateHtml.configuration.word_boundary)
       @break_token     = options[:break_token] || TruncateHtml.configuration.break_token || nil
       @chars_remaining = length - @omission.length
       @open_tags, @truncated_html = [], ['']
+    end
 
+    def truncate
       return @omission if @chars_remaining < 0
       @original_html.html_tokens.each do |token|
         if @chars_remaining <= 0 || truncate_token?(token)
@@ -25,8 +24,8 @@ module TruncateHtml
 
       out = @truncated_html.join
 
-      if @word_boundary
-        term_regexp = Regexp.new("^.*#{@word_boundary.source}")
+      if word_boundary
+        term_regexp = Regexp.new("^.*#{word_boundary.source}")
         match = out.match(term_regexp)
         match ? match[0] : out
       else
@@ -36,6 +35,14 @@ module TruncateHtml
 
     private
 
+    def word_boundary
+      if @word_boundary == true
+        TruncateHtml.configuration.word_boundary
+      else
+        @word_boundary
+      end
+    end
+
     def process_token(token)
       append_to_result(token)
       if token.html_tag?

data/lib/truncate_html/version.rb

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

data/spec/helpers/truncate_html_helper_spec.rb

@@ -17,20 +17,20 @@ describe TruncateHtmlHelper do
   end
 
   before(:each) do
-    @html_truncator_mock = mock(TruncateHtml::HtmlTruncator)
     @original_html = '<p>foo</p>'
     @original_html.stub!(:html_safe).and_return(@original_html)
   end
 
-  it 'creates an instance of HtmlTruncator and calls truncate() on it' do
-    @html_truncator_mock.stub!(:truncate).and_return(@original_html)
-    TruncateHtml::HtmlTruncator.should_receive(:new).and_return(@html_truncator_mock)
+  it 'creates an instance of HtmlTruncator and calls truncate on it' do
+    truncator = double(truncate: @original_html)
+    TruncateHtml::HtmlTruncator.should_receive(:new).and_return(truncator)
     truncator.truncate_html(@original_html)
   end
 
-  it 'calls truncate() on the HtmlTruncator object' do
-    TruncateHtml::HtmlTruncator.stub!(:new).and_return(@html_truncator_mock)
-    @html_truncator_mock.should_receive(:truncate).with({}).once.and_return(@original_html)
+  it 'calls truncate on the HtmlTruncator object' do
+    truncator = double(truncate: @original_html)
+    TruncateHtml::HtmlTruncator.stub!(:new).and_return(truncator)
+    truncator.should_receive(:truncate).and_return(@original_html)
     truncator.truncate_html('foo')
   end
 

data/spec/truncate_html/html_truncator_spec.rb

@@ -5,7 +5,7 @@ describe TruncateHtml::HtmlTruncator do
 
   def truncate(html, opts = {})
     html_string = TruncateHtml::HtmlString.new(html)
-    TruncateHtml::HtmlTruncator.new(html_string).truncate(opts)
+    TruncateHtml::HtmlTruncator.new(html_string, opts).truncate
   end
 
   context 'when the word_boundary option is set to false' do
@@ -20,18 +20,24 @@ describe TruncateHtml::HtmlTruncator do
 
     context 'and a custom omission value is passed' do
       it 'retains the omission text' do
-        truncate_html("testtest", :length => 10, :omission => '..', :word_boundary => false).should == 'testtest..'
+        truncate("testtest", :length => 10, :omission => '..', :word_boundary => false).should == 'testtest..'
       end
 
       it 'handles multibyte characters' do
-        truncate_html("prüfenprüfen", :length => 8, :omission => '..', :word_boundary => false). should == 'prüfen..'
+        truncate("prüfenprüfen", :length => 8, :omission => '..', :word_boundary => false). should == 'prüfen..'
       end
     end
   end
 
+  context 'when the word_boundary option is set to true' do
+    it 'truncates using the default word_boundary option' do
+      truncate('hello there. or maybe not?', :length => 16, :omission => '', :word_boundary => true).should == 'hello there. or'
+    end
+  end
+
   context 'when the word_boundary option is a custom value (for splitting on sentences)' do
     it 'truncates to the end of the nearest sentence' do
-      truncate_html('hello there. or maybe not?', :length => 16, :omission => '', :word_boundary => /\S[\.\?\!]/).should == 'hello there.'
+      truncate('hello there. or maybe not?', :length => 16, :omission => '', :word_boundary => /\S[\.\?\!]/).should == 'hello there.'
     end
   end
 

data/truncate_html.gemspec

@@ -16,6 +16,8 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
+  s.required_ruby_version = '>= 1.9'
+
   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.9'
+  version: 0.9.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-03 00:00:00.000000000 Z
+date: 2013-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70117859351640 !ruby/object:Gem::Requirement
+  requirement: &70114780358240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '2.9'
   type: :development
   prerelease: false
-  version_requirements: *70117859351640
+  version_requirements: *70114780358240
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70117859350560 !ruby/object:Gem::Requirement
+  requirement: &70114780357540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: 3.0.3
   type: :development
   prerelease: false
-  version_requirements: *70117859350560
+  version_requirements: *70114780357540
 description: Truncates html so you don't have to
 email:
 - harold.gimenez@gmail.com
@@ -46,7 +46,7 @@ files:
 - Gemfile.lock
 - History.txt
 - LICENSE
-- README.markdown
+- README.md
 - Rakefile
 - VERSION
 - init.rb
@@ -96,10 +96,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: 2344297215831564369
+      version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -108,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2344297215831564369
+      hash: -1260152275599267568
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10