truncate_html 0.2.0 → 0.2.1

data/Rakefile

@@ -26,8 +26,8 @@ begin
     gem.homepage = "http://github.com/hgimenez/truncate_html"
     gem.authors = ["hgimenez"]
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  Jeweler::GemcutterTasks.new
   end
+  Jeweler::GemcutterTasks.new
 
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/lib/truncate_html/html_truncator.rb

@@ -27,7 +27,6 @@ module TruncateHtml
           end
           result << str
         else
-          #result[-1] += options[:omission]
           result[-1] = result[-1].rstrip + options[:omission]
           @open_tags.reverse_each do |open_tag|
             result << matching_close_tag(open_tag)
@@ -39,7 +38,7 @@ module TruncateHtml
     end
 
     def html_tokens
-      @original_html.scan(/<\/?[^>]+>|[\w\|`~!@#\$%^&*\(\)\-_\+=\[\]{}:;'",\.\/?]+|\s+/).map do
+      @original_html.scan(/(?:<script.*>.*<\/script>)+|<\/?[^>]+>|[\w\|`~!@#\$%^&*\(\)\-_\+=\[\]{}:;'",\.\/?]+|\s+/).map do
         |t| t.gsub(
           #remove newline characters
             /\n/,''
@@ -47,7 +46,7 @@ module TruncateHtml
           #clean out extra consecutive whitespace
             /\s+/, ' '
         )
-      end 
+      end
     end
 
     def html_tag?(string)
@@ -55,7 +54,7 @@ module TruncateHtml
     end
 
     def open_tag?(html_tag)
-      html_tag =~ /<(?!(?:#{UNPAIRED_TAGS.join('|')}|\/))[^>]+>/i ? true : false
+      html_tag =~ /<(?!(?:#{UNPAIRED_TAGS.join('|')}|script|\/))[^>]+>/i ? true : false
     end
 
     def remove_latest_open_tag(close_tag)

data/spec/helpers/truncate_html_helper_spec.rb

@@ -21,6 +21,16 @@ describe TruncateHtmlHelper do
       end
     end
 
+    context 'the input html contains a script tag' do
+      before(:each) do
+        @input_html = "<p>I have a script <script type=text/javascript>document.write('lum dee dum');</script> and more text</p>"
+        @expected_out = "<p>I have a script <script type=text/javascript>document.write('lum dee dum');</script> and...</p>"
+      end
+      it 'treats the script tag as lengthless string' do
+        truncate_html(@input_html, :length => 23).should == @expected_out
+      end
+    end
+
     context 'truncating in the middle of a link' do
       before(:each) do
         @html = '<div><ul><li>Look at <a href="foo">this</a> link </li></ul></div>'

data/spec/truncate_html/html_truncator_spec.rb

@@ -48,6 +48,10 @@ describe TruncateHtml::HtmlTruncator do
     it 'returns false if the string is not an html tag' do
       truncator.open_tag?('foo bar').should be_false
     end
+
+    it 'returns false if it is a <script> tag' do
+      truncator.open_tag?('<script>').should be_false
+    end
   end
 
   describe '#matching_close_tag' do

data/truncate_html.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{truncate_html}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["hgimenez"]
-  s.date = %q{2009-11-23}
+  s.date = %q{2009-12-18}
   s.description = %q{Truncates html so you don't have to}
   s.email = %q{harold.gimenez@gmail.com}
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: truncate_html
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - hgimenez
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-23 00:00:00 -05:00
+date: 2009-12-18 00:00:00 -05:00
 default_executable: 
 dependencies: []