nokogiri_truncate_html 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ccfb47fb48ccba5a0b7667ce4564161fbdc5ea6
-  data.tar.gz: 0193fcd8aa25a3a63e389413e873b73d00e2c331
+  metadata.gz: ad6a7de52fb5b441032153acfaf0651a695e0d64
+  data.tar.gz: 958fe6a59782c75791dc2af20a89c34e20056739
 SHA512:
-  metadata.gz: 5382c4ea20e670694ae5f143109f21e56515ab39aac9b5b8843b7dc0de94fb32fcff1763ba87625be6991ca1b248921bc4c692f86b58c3cc3eccb21c943861f6
-  data.tar.gz: e8017017d4b5485943e7ac387395e7d3069a5dfae2fefebb99b3fea84d1f84ab574f63055d8826afe3e26d3e60dd3bc3be7e33acf77dbc200aec9fdfa8f88200
+  metadata.gz: d49c7a295c0f314e9288c09f10d06fc820fa9b849a89b0c3acffa61a9d57ca2f07f6adeb9eb56d6d801c13b9c1f86477ed864e137df2e7d895b5d6868b55245d
+  data.tar.gz: ffac697365c2b1d14c3e95a795817836f2a151ef8a66c754602a551a6e1f15279fc01f5563b1d063d7579bd9625cbf498f6aa9349e356222321639d30dff9b8f

data/lib/nokogiri_truncate_html/truncate_document.rb

@@ -1,27 +1,15 @@
+# frozen_string_literal: true
+
 require 'nokogiri'
 require 'cgi'
 
 module NokogiriTruncateHtml
-  class TruncateFinished < Exception
-  end
-
   class TruncateDocument < Nokogiri::XML::SAX::Document
-
     def initialize
-      # We use the xhtml "flavour" so that we can decode
-      # apostrophes. That is the only difference between
-      # xhtml1 and html4.
-      @encoder = HTMLEntities.new('xhtml1')
       @discard_first_element = false
     end
 
-    def length=(length)
-      @length = length
-    end
-
-    def omission=(omission)
-      @omission = omission
-    end
+    attr_writer :length, :omission
 
     def output
       while @tags.size > 0
@@ -31,12 +19,11 @@ module NokogiriTruncateHtml
     end
 
     def start_document
-      @output, @chars_remaining, @tags = '', @length, []
+      @output, @chars_remaining, @tags = String.new, @length, []
       @discard_first_element = false
     end
 
-    def characters(string)
-      text = @encoder.decode(string)
+    def characters(text)
       @output << CGI.escapeHTML(text[0, @chars_remaining])
       @chars_remaining -= text.length
       if @chars_remaining < 0
@@ -45,16 +32,33 @@ module NokogiriTruncateHtml
       end
     end
 
+    HTML_TAG = 'html'.freeze
+    BODY_TAG = 'body'.freeze
+    BR_TAG = 'br'.freeze
+    EMBED_TAG = 'embed'.freeze
+    HR_TAG = 'hr'.freeze
+    IMG_TAG = 'img'.freeze
+    INPUT_TAG = 'input'.freeze
+    PARAM_TAG = 'param'.freeze
+
     def start_element(name, attrs = [])
       unless @discard_first_element
-        return if %w(html body).include? name
+        return if name == HTML_TAG || name == BODY_TAG
         return @discard_first_element = true
       end
 
-      if %w(br embed hr img input param).include? name
-        @output << "<#{name}#{' ' if attrs.size > 0 }#{attrs.map { |attr,val| "#{attr}=\"#{val}\"" }.join(' ')} />"
+      @output << "<#{name}"
+      unless attrs.empty?
+        attrs.each do |attr, val|
+          @output << " #{attr}=\"#{val}\""
+        end
+      end
+
+      if name == BR_TAG || name == EMBED_TAG || name == HR_TAG ||
+          name == IMG_TAG || name == INPUT_TAG || name == PARAM_TAG
+        @output << ' />'
       else
-        @output << "<#{name}#{' ' if attrs.size > 0 }#{attrs.map { |attr,val| "#{attr}=\"#{val}\"" }.join(' ')}>"
+        @output << '>'
         @tags.push name
       end
     end

data/lib/nokogiri_truncate_html/truncate_html_helper.rb

@@ -4,9 +4,6 @@ require 'nokogiri_truncate_html/truncate_document'
 
 module NokogiriTruncateHtml
   module TruncateHtmlHelper
-    mattr_accessor :parser
-    mattr_accessor :document
-
     # Truncates html respecting tags and html entities.
     #
     # The API is the same as ActionView::Helpers::TextHelper#truncate. It uses Nokogiri and HtmlEntities for entity awareness.
@@ -15,8 +12,8 @@ module NokogiriTruncateHtml
     #  truncate_html '<p>Hello <strong>World</strong></p>', :length => 7 # => '<p>Hello <strong>W&hellip;</strong></p>'
     #  truncate_html '<p>Hello &amp; Goodbye</p>', :length => 7          # => '<p>Hello &amp;&hellip;</p>'
     def truncate_html(input, *args)
-      self.document ||= TruncateDocument.new#(TruncateHtmlHelper.flavor) #, length, omission)
-      self.parser ||= Nokogiri::HTML::SAX::Parser.new(document)
+      document = truncate_html_document
+      parser = truncate_html_parser
 
       # support both 2.2 & earlier APIs
       options = args.extract_options!
@@ -25,12 +22,22 @@ module NokogiriTruncateHtml
 
       # Adding div around the input is a hack. It gets removed in TruncateDocument.
       input = "<div>#{input}</div>"
-      self.document.length = length
-      self.document.omission = omission
+      document.length = length
+      document.omission = omission
       catch(:truncate_finished) do
-        self.parser.parse_memory(input)
+        parser.parse_memory(input)
       end
-      self.document.output.html_safe
+      document.output.html_safe
+    end
+
+    private
+
+    def truncate_html_document
+      Thread.current[:truncate_html_document] ||= TruncateDocument.new
+    end
+
+    def truncate_html_parser
+      Thread.current[:truncate_html_parser] ||= Nokogiri::HTML::SAX::Parser.new(truncate_html_document)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nokogiri_truncate_html
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Ian White
@@ -9,62 +9,48 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-18 00:00:00.000000000 Z
+date: 2017-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.8
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.13
-- !ruby/object:Gem::Dependency
-  name: htmlentities
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 4.3.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 4.3.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: '2'
 description: truncate_html helper that is html and html entities friendly
@@ -86,17 +72,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.4
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: truncate_html helper that is html and html entities friendly