chupa-text 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce1def40525d7278aa45cdbe3af69cd95656fa58d1d02e6ddb3e2677940ed7d6
-  data.tar.gz: 4ec184c4bd0f61508d4b1908e7c89abd8aeb01026c8b3590b404ca672887c6a1
+  metadata.gz: 65f2eb5be135f3db4a0cbb81bc4a268bcb752934da6d9aa32740842bb4cc674f
+  data.tar.gz: 72f8487dc57b67293e001621f6b63ece4680cf1069d9f98e3daa89708571766b
 SHA512:
-  metadata.gz: ae43e4354761a953f61cda5348524f44346996133e4f77a310bfbfd07295b4548d41847f8132387ec9ade30c44a9c2bdd7936c7633085534ce03bb5db6f9061f
-  data.tar.gz: f9174e01e21a2dbbc1647d191084969e9fd0cf4dc6f24a469ac7c6c4f2378d7a11946e6b2350e8df86ad5d007c6f048c804d4c1c2b79e95628511383c76c6061
+  metadata.gz: 32149617d9c921de856aa9fb3856a8a29fde5e9e1872a16241235499b1b8e014941928fb040ad60d52c15cbc4b69d84a9860bd432074964865e7f1e85d673a1e
+  data.tar.gz: 85c2820468547c9b34fef27faa2db0fc9d8208a266949177b2e4f2269bfadcd8f5b534c0cdb4aff9e28360c1509dd6b2d06ef72c7d1e268f399e97595a133a2c

data/chupa-text.gemspec

@@ -53,8 +53,9 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency("archive-zip")
 
   spec.add_development_dependency("bundler")
-  spec.add_development_dependency("rake")
-  spec.add_development_dependency("test-unit")
+  spec.add_development_dependency("nokogiri")
   spec.add_development_dependency("packnga")
+  spec.add_development_dependency("rake")
   spec.add_development_dependency("redcarpet")
+  spec.add_development_dependency("test-unit")
 end

data/doc/text/news.md

@@ -1,5 +1,11 @@
 # News
 
+## 1.1.5: 2019-02-28
+
+### Improvements
+
+  * Added support for Nokogiri as an alternative SAX parser.
+
 ## 1.1.4: 2019-02-26
 
 ### Improvements

data/lib/chupa-text/decomposers/office-open-xml-workbook.rb

@@ -71,9 +71,7 @@ module ChupaText
         sheet_texts.join("\n")
       end
 
-      class SheetListener
-        include REXML::SAX2Listener
-
+      class SheetListener < SAXListener
         URI = "http://schemas.openxmlformats.org/spreadsheetml/2006/main"
 
         def initialize(sheet)

data/lib/chupa-text/decomposers/office-open-xml.rb

@@ -14,12 +14,10 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
-require "cgi/util"
-require "rexml/parsers/sax2parser"
-require "rexml/sax2listener"
-
 require "archive/zip"
 
+require "chupa-text/sax-parser"
+
 module ChupaText
   module Decomposers
     class OfficeOpenXML < Decomposer
@@ -67,10 +65,8 @@ module ChupaText
       end
 
       private
-      def parse(io, listener)
-        source = REXML::Source.new(io.read)
-        parser = REXML::Parsers::SAX2Parser.new(source)
-        parser.listen(listener)
+      def parse(input, listener)
+        parser = SAXParser.new(input, listener)
         parser.parse
       end
 
@@ -83,9 +79,7 @@ module ChupaText
         context[:text]
       end
 
-      class TextListener
-        include REXML::SAX2Listener
-
+      class TextListener < SAXListener
         def initialize(output, target_uri)
           @output = output
           @target_uri = target_uri
@@ -121,13 +115,11 @@ module ChupaText
         private
         def add_text(text)
           return unless @in_target
-          @output << CGI.unescapeHTML(text)
+          @output << text
         end
       end
 
-      class AttributesListener
-        include REXML::SAX2Listener
-
+      class AttributesListener < SAXListener
         CORE_PROPERTIES_URI =
           "http://schemas.openxmlformats.org/package/2006/metadata/core-properties"
         EXTENDED_PROPERTIES_URI =

data/lib/chupa-text/decomposers/opendocument-presentation.rb

@@ -49,9 +49,7 @@ module ChupaText
         end
       end
 
-      class SlidesListener
-        include REXML::SAX2Listener
-
+      class SlidesListener < SAXListener
         TEXT_URI = "urn:oasis:names:tc:opendocument:xmlns:text:1.0"
         DRAW_URI = "urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
 
@@ -97,7 +95,7 @@ module ChupaText
         private
         def add_text(text)
           return unless @in_p
-          @slides.last[:text] << CGI.unescapeHTML(text)
+          @slides.last[:text] << text
         end
       end
     end

data/lib/chupa-text/decomposers/opendocument-spreadsheet.rb

@@ -51,9 +51,7 @@ module ChupaText
         end
       end
 
-      class SheetsListener
-        include REXML::SAX2Listener
-
+      class SheetsListener < SAXListener
         TEXT_URI = "urn:oasis:names:tc:opendocument:xmlns:text:1.0"
         TABLE_URI = "urn:oasis:names:tc:opendocument:xmlns:table:1.0"
 
@@ -126,7 +124,7 @@ module ChupaText
         private
         def add_text(text)
           return unless @in_p
-          @sheets.last[:rows].last.last[:text] << CGI.unescapeHTML(text)
+          @sheets.last[:rows].last.last[:text] << text
         end
       end
     end

data/lib/chupa-text/decomposers/opendocument-text.rb

@@ -43,9 +43,7 @@ module ChupaText
         yield(text_data)
       end
 
-      class TextListener
-        include REXML::SAX2Listener
-
+      class TextListener < SAXListener
         TEXT_URI = "urn:oasis:names:tc:opendocument:xmlns:text:1.0"
         def initialize(output)
           @output = output
@@ -81,7 +79,7 @@ module ChupaText
         private
         def add_text(text)
           return unless @in_p
-          @output << CGI.unescapeHTML(text)
+          @output << text
         end
       end
     end

data/lib/chupa-text/decomposers/opendocument.rb

@@ -14,12 +14,10 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
-require "cgi/util"
-require "rexml/parsers/sax2parser"
-require "rexml/sax2listener"
-
 require "archive/zip"
 
+require "chupa-text/sax-parser"
+
 module ChupaText
   module Decomposers
     class OpenDocument < Decomposer
@@ -58,10 +56,8 @@ module ChupaText
       end
 
       private
-      def parse(io, listener)
-        source = REXML::Source.new(io.read)
-        parser = REXML::Parsers::SAX2Parser.new(source)
-        parser.listen(listener)
+      def parse(input, listener)
+        parser = SAXParser.new(input, listener)
         parser.parse
       end
 
@@ -70,9 +66,7 @@ module ChupaText
         parse(entry.file_data, listener)
       end
 
-      class AttributesListener
-        include REXML::SAX2Listener
-
+      class AttributesListener < SAXListener
         META_URI = "urn:oasis:names:tc:opendocument:xmlns:meta:1.0"
         DUBLIN_CORE_URI = "http://purl.org/dc/elements/1.1/"
 
@@ -122,7 +116,6 @@ module ChupaText
         def set_attribute(value)
           return if @name.nil?
 
-          value = CGI.unescapeHTML(value)
           case @type
           when :w3cdtf
             value = Time.xmlschema(value)

data/lib/chupa-text/sax-parser.rb

@@ -0,0 +1,151 @@
+# Copyright (C) 2019  Kouhei Sutou <kou@clear-code.com>
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+require "cgi/util"
+require "rexml/parsers/sax2parser"
+require "rexml/sax2listener"
+
+begin
+  require "nokogiri"
+rescue LoadError
+end
+
+module ChupaText
+  class SAXParser
+    class << self
+      def backend
+        case ENV["CHUPA_TEXT_SAX_PARSER_BACKEND"]
+        when "rexml"
+          :rexml
+        else
+          if Object.const_defined?(:Nokogiri)
+            :nokogiri
+          else
+            :rexml
+          end
+        end
+      end
+    end
+
+    def initialize(input, listener)
+      @input = input
+      @listener = listener
+    end
+
+    if backend == :nokogiri
+      def parse
+        document = Document.new(@listener)
+        parser = Nokogiri::XML::SAX::Parser.new(document)
+        parser.parse(@input)
+      end
+
+      class Document < Nokogiri::XML::SAX::Document
+        def initialize(listener)
+          @listener = listener
+          @namespaces_stack = []
+        end
+
+        def start_element_namespace(name,
+                                    attributes=[],
+                                    prefix=nil,
+                                    uri=nil,
+                                    namespaces=[])
+          namespaces.each do |namespace_prefix, namespace_uri|
+            @listener.start_prefix_mapping(namespace_prefix, namespace_uri)
+          end
+          attributes_hash = {}
+          attributes.each do |attribute|
+            attribute_qname = build_qname(attribute.prefix, attribute.localname)
+            attributes_hash[attribute_qname] = attribute.value
+          end
+          @namespaces_stack.push(namespaces)
+          @listener.start_element(uri,
+                                  name,
+                                  build_qname(prefix, name),
+                                  attributes_hash)
+        end
+
+        def end_element_namespace(name, prefix=nil, uri=nil)
+          @listener.end_element(uri, name, build_qname(prefix, name))
+          namespaces = @namespaces_stack.pop
+          namespaces.each do |namespace_prefix, _|
+            @listener.end_prefix_mapping(namespace_prefix)
+          end
+        end
+
+        def characters(text)
+          @listener.characters(text)
+        end
+
+        def cdata_block(content)
+          @listener.cdata(content)
+        end
+
+        private
+        def build_qname(prefix, local_name)
+          if prefix
+            "#{prefix}:#{local_name}"
+          else
+            local_name
+          end
+        end
+      end
+    else
+      def parse
+        source = REXML::Source.new(@input.read)
+        parser = REXML::Parsers::SAX2Parser.new(source)
+        parser.listen(Listener.new(@listener))
+        parser.parse
+      end
+
+      class Listener
+        include REXML::SAX2Listener
+
+        def initialize(listener)
+          @listener = listener
+        end
+
+        def start_prefix_mapping(*args)
+          @listener.start_prefix_mapping(*args)
+        end
+
+        def end_prefix_mapping(*args)
+          @listener.end_prefix_mapping(*args)
+        end
+
+        def start_element(*args)
+          @listener.start_element(*args)
+        end
+
+        def end_element(*args)
+          @listener.end_element(*args)
+        end
+
+        def characters(text)
+          @listener.characters(CGI.unescapeHTML(text))
+        end
+
+        def cdata(content)
+          @listener.cdata(CGI.unescapeHTML(content))
+        end
+      end
+    end
+  end
+
+  class SAXListener
+    include REXML::SAX2Listener
+  end
+end

data/lib/chupa-text/version.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2018  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2013-2019  Kouhei Sutou <kou@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -15,5 +15,5 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 module ChupaText
-  VERSION = "1.1.4"
+  VERSION = "1.1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chupa-text
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-26 00:00:00.000000000 Z
+date: 2019-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: archive-zip
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: test-unit
+  name: packnga
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: packnga
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ''
 email:
 - kou@clear-code.com
@@ -156,6 +170,7 @@ files:
 - lib/chupa-text/logger.rb
 - lib/chupa-text/mime-type-registry.rb
 - lib/chupa-text/mime-type.rb
+- lib/chupa-text/sax-parser.rb
 - lib/chupa-text/screenshot.rb
 - lib/chupa-text/size-parser.rb
 - lib/chupa-text/text-data.rb