truncato 0.7.1 → 0.7.2

data/VERSION

@@ -1,2 +1,2 @@
-0.7.1
+0.7.2
 

data/lib/truncato/truncated_sax_document.rb

@@ -2,12 +2,9 @@ class TruncatedSaxDocument < Nokogiri::XML::SAX::Document
   attr_reader :truncated_string, :max_length, :max_length_reached, :tail, :count_tags, :filtered_attributes
 
   def initialize(options)
-    init_from_options(options)
     @html_coder = HTMLEntities.new
-    @truncated_string = ""
-    @closing_tags = []
-    @estimated_length = 0
-    @max_length_reached = false
+    capture_options(options)
+    init_parsing_state
   end
 
   def start_element name, attributes
@@ -35,13 +32,20 @@ class TruncatedSaxDocument < Nokogiri::XML::SAX::Document
 
   private
 
-  def init_from_options(options)
+  def capture_options(options)
     @max_length = options[:max_length]
     @count_tags = options [:count_tags]
     @tail = options[:tail]
     @filtered_attributes = options[:filtered_attributes] || []
   end
 
+  def init_parsing_state
+    @truncated_string = ""
+    @closing_tags = []
+    @estimated_length = 0
+    @max_length_reached = false
+  end
+
   def append_to_truncated_string string, overriden_length=nil
     @truncated_string << string
     increase_estimated_length(overriden_length || string.length)
@@ -54,12 +58,16 @@ class TruncatedSaxDocument < Nokogiri::XML::SAX::Document
 
   def attributes_to_string(attributes)
     return "" if attributes.empty?
-    attributes_string = attributes.inject(' ') do |string, attribute|
+    attributes_string = concatenate_attributes_declaration attributes
+    attributes_string.rstrip
+  end
+
+  def concatenate_attributes_declaration(attributes)
+    attributes.inject(' ') do |string, attribute|
       key, value = attribute
-      next string  if @filtered_attributes.include?(key)
-      string << "#{key}='#{value}' "
+      next string if @filtered_attributes.include?(key)
+      string << "#{key}='#{@html_coder.encode(value)}' "
     end
-    attributes_string.rstrip
   end
 
   def closing_tag name

data/lib/truncato/truncato.rb

@@ -6,12 +6,13 @@ module Truncato
       filtered_attributes: []
   }
 
-  # Truncates the source XML string and returns the result
+  # Truncates the source XML string and returns the truncated XML. It will keep a valid XML structure
+  # and insert a _tail_ text indicating the position where content were removed (...).
   #
   # @param [String] source the XML source to truncate
   # @param [Hash] user_options truncation options
   # @option user_options [Integer] :max_length Maximum length
-  # @option user_options [String] :tail text to append when the truncation occurs
+  # @option user_options [String] :tail text to append when the truncation happens
   # @option user_options [Boolean] :count_tags `true` for counting tags for truncation, `false` for not counting them
   # @option user_options [Array<String>] :filtered_attributes Array of names of attributes that should be excluded in the resulting truncated string. This allows you to make the truncated string shorter by excluding the content of attributes you can discard in some given context, e.g HTML `style` attribute.
   # @return [String] the truncated string

data/spec/truncato/truncato_spec.rb

@@ -46,9 +46,13 @@ describe "Truncato" do
                        source: "<div><p attr1='1'>some text</p></div>",
                        expected: "<div><p attr1='1'>some...</p></div>"
 
-    it_should_truncate "html text with 2 attributes filtering one of them", with: {max_length: 3, count_tags: false, filtered_attributes: ['attr2']},
+    it_should_truncate "html text with attribute containing entities respecting them", with: {max_length: 3, count_tags: false, filtered_attributes: ['attr1', 'attr2']},
+                       source: "<p attr1='&gt;some'>text</p>",
+                       expected: "<p attr1='&gt;some'>text</p>"
+
+    it_should_truncate "html text with 2 attributes filtering one of them", with: {max_length: 30, count_tags: false, filtered_attributes: ['attr2']},
                        source: "<p attr1='1' attr2='2'>some text</p>",
-                       expected: "<p attr1='1'>som...</p>"
+                       expected: "<p>som...</p>"
 
     it_should_truncate "html text with 2 attributes filtering all of them", with: {max_length: 3, count_tags: false, filtered_attributes: ['attr1', 'attr2']},
                        source: "<p attr1='1' attr2='2'>some text</p>",

data/truncato.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "truncato"
-  s.version = "0.7.1"
+  s.version = "0.7.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jorge Manrubia"]
-  s.date = "2012-11-12"
+  s.date = "2012-11-13"
   s.description = "Ruby tool for truncating HTML strings keeping a valid HTML markup"
   s.email = "jorge.manrubia@gmail.com"
   s.extra_rdoc_files = [
@@ -53,6 +53,8 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
       s.add_development_dependency(%q<bundler>, ["~> 1.2.1"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.2.1"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
     else
       s.add_dependency(%q<truncato>, [">= 0"])
       s.add_dependency(%q<nokogiri>, ["~> 1.5.5"])
@@ -63,6 +65,8 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
       s.add_dependency(%q<bundler>, ["~> 1.2.1"])
       s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
+      s.add_dependency(%q<bundler>, ["~> 1.2.1"])
+      s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
     end
   else
     s.add_dependency(%q<truncato>, [">= 0"])
@@ -74,6 +78,8 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
     s.add_dependency(%q<bundler>, ["~> 1.2.1"])
     s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
+    s.add_dependency(%q<bundler>, ["~> 1.2.1"])
+    s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: truncato
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-12 00:00:00.000000000 Z
+date: 2012-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: truncato
@@ -155,6 +155,38 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.8.4
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.1
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.4
 description: Ruby tool for truncating HTML strings keeping a valid HTML markup
 email: jorge.manrubia@gmail.com
 executables: []
@@ -194,7 +226,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4062483884007899469
+      hash: -4126738111465282499
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: