chupa-text 1.2.9 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a96f66fb14ab05d80ef7d53494ee20d2aae298397d3b787591efd3ebfb30d5ab
-  data.tar.gz: 7dcaeb98ff526ea31b52871b492211d624b607957146aa6986eb5b6d41eba2e4
+  metadata.gz: 97113be234e69a94d3710448d9468f4138fc7aa686275201c9f2441ed6fd217b
+  data.tar.gz: be11f97456e1511bb91fed287485a456c9a8db7fafc4357d8cf0784dfb444a0e
 SHA512:
-  metadata.gz: 8c07878c8308483eebecc3e683c74dbc4ce00ee1841ac588c82ba173bd1644bde026703934e34f66ebaf8ca369091cbff3940025953992bf572d5c038718b746
-  data.tar.gz: b8989bb876e8cafe5097bf5667a9e8fd796c7a8e9331254b4f5afef54774584a21ea0de20ea892745a9227275c21577f94d7399a76fb27963e3f0a09ca53e58f
+  metadata.gz: 4f4ebd3d6fdb67b2f70e73841325586e80b2a5ff94178d4f25066072890af613571939d2bfb0f12ff1465a4c4cacbcccc6a0a50bda0a5514ca247709f0b45d09
+  data.tar.gz: 3ae71d85db976f28f731df669fe2eddfc93d5cb94a176e01ef2298b5a4a5eaf5848fc33a1c10a70c286f00ca41773b00f3962bef0cf635399fa315b58bba4937

data/.yardopts

@@ -1,5 +1,5 @@
 --output-dir doc/reference/en
 --markup markdown
---markup-provider redcarpet
+--markup-provider kramdown
 -
 doc/text/*

data/chupa-text.gemspec

@@ -1,6 +1,6 @@
 # -*- ruby -*-
 #
-# Copyright (C) 2013-2017  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2013-2020  Sutou Kouhei <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
@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.name = "chupa-text"
   spec.version = ChupaText::VERSION
   spec.homepage = "http://ranguba.org/#about-chupa-text"
-  spec.authors = ["Kouhei Sutou"]
+  spec.authors = ["Sutou Kouhei"]
   spec.email = ["kou@clear-code.com"]
   readme = File.read("README.md", :encoding => "UTF-8")
   entries = readme.split(/^\#\#\s(.*)$/)
@@ -52,11 +52,12 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency("archive-zip", ">= 0.12.0")
   spec.add_runtime_dependency("csv", ">= 3.0.4")
+  spec.add_runtime_dependency("rexml")
 
   spec.add_development_dependency("bundler")
+  spec.add_development_dependency("kramdown")
   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,29 @@
 # News
 
+## 1.3.3: 2022-02-01
+
+### Improvements
+
+  * `xlsx`: Added support for inline string.
+
+## 1.3.2: 2020-05-01
+
+### Improvements
+
+  * Added support for Ruby 2.8.
+
+## 1.3.1: 2019-06-18
+
+### Fixes
+
+  * `http-server`: Added support for `need_screenshot` parameter.
+
+## 1.3.0: 2019-06-14
+
+### Fixes
+
+  * Added support for timeout as string again.
+
 ## 1.2.9: 2019-06-13
 
 ### Improvements

data/lib/chupa-text/decomposers/http-server.rb

@@ -144,6 +144,7 @@ module ChupaText
           ["limit_as",
            data.limit_as || ChupaText::ExternalCommand.default_limit_as],
           ["max_body_size", data.max_body_size],
+          ["need_screenshot", data.need_screenshot?],
         ].each do |key, value|
           next if value.nil?
           parameters << [key, StringIO.new(value.to_s)]

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

@@ -1,4 +1,4 @@
-# Copyright (C) 2019  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2019-2022  Sutou Kouhei <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
@@ -119,7 +119,8 @@ module ChupaText
         def initialize(sheet)
           @sheet = sheet
           @cell_type = nil
-          @in_v = false
+          @in_is = false # inline string
+          @in_v = false # value
         end
 
         def start_element(uri, local_name, qname, attributes)
@@ -129,7 +130,8 @@ module ChupaText
             @sheet << []
           when "c"
             @cell_type = parse_cell_type(attributes["t"])
-          # when "is" # TODO
+          when "is"
+            @in_is = true
           when "v"
             @in_v = true
           end
@@ -140,6 +142,8 @@ module ChupaText
           case local_name
           when "c"
             @cell_type = nil
+          when "is"
+            @in_is = false
           when "v"
             @in_v = false
           end
@@ -174,8 +178,14 @@ module ChupaText
           end
         end
 
+        def have_text?
+          return true if @in_is
+          return true if @in_v
+          false
+        end
+
         def add_column(text)
-          return unless @in_v
+          return unless have_text?
           case @cell_type
           when :shared_string
             @sheet.last << Integer(text, 10)

data/lib/chupa-text/external-command.rb

@@ -255,20 +255,21 @@ module ChupaText
     end
 
     def log_invalid_value(tag, value, type)
-      warn("#{log_tag}#{tag}[invalid] <#{value}>(#{type})")
+      super("#{log_tag}#{tag}", value, type)
     end
 
     def wait_process(pid, timeout, soft_timeout)
       tag = "[timeout]"
-      timeout = parse_time(tag, timeout || self.class.default_timeout)
-      soft_timeout = parse_time(tag, soft_timeout)
+      timeout = TimeoutValue.new(tag, timeout || self.class.default_timeout).raw
+      soft_timeout = TimeoutValue.new(tag, soft_timeout).raw
       if timeout
         timeout = soft_timeout if soft_timeout and soft_timeout < timeout
       else
         timeout = soft_timeout
       end
       if timeout
-        info("#{log_tag}#{tag}[use] <#{timeout}s>: <#{pid}>")
+        info("#{log_tag}#{tag}[use] " +
+             "<#{TimeoutValue.new(tag, timeout)}>: <#{pid}>")
         status = wait_process_timeout(pid, timeout)
         return status if status
         info("#{log_tag}#{tag}[terminate] <#{pid}>")

data/lib/chupa-text/extractor.rb

@@ -123,7 +123,7 @@ module ChupaText
     end
 
     def with_timeout(data, &block)
-      timeout = data.timeout
+      timeout = TimeoutValue.new("#{log_tag}[timeout]", data.timeout).raw
       if timeout
         begin
           Timeout.timeout(timeout, &block)

data/lib/chupa-text/loggable.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2013-2019  Sutou Kouhei <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
@@ -45,5 +45,9 @@ module ChupaText
     def unknown(*arguments, &block)
       logger.unknown(*arguments, &block)
     end
+
+    def log_invalid_value(tag, value, type)
+      warn("#{tag}[invalid] <#{value}>(#{type})")
+    end
   end
 end

data/lib/chupa-text/timeout-value.rb

@@ -0,0 +1,76 @@
+# Copyright (C) 2019  Sutou Kouhei <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 "English"
+
+module ChupaText
+  class TimeoutValue
+    include Comparable
+    include Loggable
+
+    attr_reader :raw
+    def initialize(tag, value)
+      value = parse(value) if value.is_a?(String)
+      @raw = value
+    end
+
+    def to_s
+      return "" if @raw.nil?
+
+      if @raw < 1
+        "%.2fms" % (@raw * 1000.0)
+      elsif @raw < 60
+        "%.2fs" % @raw
+      elsif @raw < (60 * 60)
+        "%.2fm" % (@raw / 60.0)
+      else
+        "%.2fh" % (@raw / 60.0 / 60.0)
+      end
+    end
+
+    private
+    def parse(value)
+      case value
+      when nil
+        nil
+      when Numeric
+        value
+      else
+        return nil if value.empty?
+        scale = 1
+        case value
+        when /h\z/i
+          scale = 60 * 60
+          number = $PREMATCH
+        when /m\z/i
+          scale = 60
+          number = $PREMATCH
+        when /s\z/i
+          number = $PREMATCH
+        else
+          number = value
+        end
+        begin
+          number = Float(number)
+        rescue ArgumentError
+          log_invalid_value(@tag, value, "time")
+          return nil
+        end
+        (number * scale).to_f
+      end
+    end
+  end
+end

data/lib/chupa-text/version.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2019  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2013-2020  Sutou Kouhei <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.2.9"
+  VERSION = "1.3.3"
 end

data/lib/chupa-text.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2013-2019  Sutou Kouhei <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
@@ -26,6 +26,8 @@ require "chupa-text/logger"
 require "chupa-text/loggable"
 require "chupa-text/unzippable"
 
+require "chupa-text/timeout-value"
+
 require "chupa-text/configuration"
 require "chupa-text/configuration-loader"
 require "chupa-text/mime-type"

data/test/helper.rb

@@ -45,4 +45,8 @@ module Helper
   def ruby
     RbConfig.ruby
   end
+
+  def omit_on_windows(message)
+    omit("Omit on Windows: #{message}") if Gem.win_platform?
+  end
 end

data/test/run-test.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #
-# Copyright (C) 2013  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2013-2020  Sutou Kouhei <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
@@ -24,6 +24,8 @@ require "test-unit"
 
 base_dir = Pathname(__FILE__).dirname.parent
 lib_dir = base_dir + "lib"
+test_dir = base_dir + "test"
+
 $LOAD_PATH.unshift(lib_dir.to_s)
 
 require "chupa-text"
@@ -32,4 +34,4 @@ ChupaText::Decomposers.load
 
 require_relative "helper"
 
-exit(Test::Unit::AutoRunner.run(true))
+exit(Test::Unit::AutoRunner.run(true, test_dir.to_s))

data/test/test-external-command.rb

@@ -102,7 +102,7 @@ class TestExternalCommand < Test::Unit::TestCase
       assert_equal([
                      [
                        :info,
-                       "[external-command][timeout][use] <60.0s>: <#{pid}>",
+                       "[external-command][timeout][use] <1.00m>: <#{pid}>",
                      ]
                    ],
                    messages)
@@ -117,7 +117,7 @@ class TestExternalCommand < Test::Unit::TestCase
       assert_equal([
                      [
                        :info,
-                       "[external-command][timeout][use] <60.0s>: <#{pid}>",
+                       "[external-command][timeout][use] <1.00m>: <#{pid}>",
                      ]
                    ],
                    messages)
@@ -132,7 +132,7 @@ class TestExternalCommand < Test::Unit::TestCase
       assert_equal([
                      [
                        :info,
-                       "[external-command][timeout][use] <30.0s>: <#{pid}>",
+                       "[external-command][timeout][use] <30.00s>: <#{pid}>",
                      ]
                    ],
                    messages)
@@ -147,7 +147,7 @@ class TestExternalCommand < Test::Unit::TestCase
       assert_equal([
                      [
                        :info,
-                       "[external-command][timeout][use] <30.0s>: <#{pid}>",
+                       "[external-command][timeout][use] <30.00s>: <#{pid}>",
                      ]
                    ],
                    messages)
@@ -162,7 +162,7 @@ class TestExternalCommand < Test::Unit::TestCase
       assert_equal([
                      [
                        :info,
-                       "[external-command][timeout][use] <60.0s>: <#{pid}>",
+                       "[external-command][timeout][use] <1.00m>: <#{pid}>",
                      ]
                    ],
                    messages)
@@ -178,7 +178,7 @@ class TestExternalCommand < Test::Unit::TestCase
       assert_equal([
                      [
                        :info,
-                       "[external-command][timeout][use] <60.0s>: <#{pid}>",
+                       "[external-command][timeout][use] <1.00m>: <#{pid}>",
                      ]
                    ],
                    messages)
@@ -194,7 +194,7 @@ class TestExternalCommand < Test::Unit::TestCase
       assert_equal([
                      [
                        :info,
-                       "[external-command][timeout][use] <30.0s>: <#{pid}>",
+                       "[external-command][timeout][use] <30.00s>: <#{pid}>",
                      ]
                    ],
                    messages)
@@ -209,7 +209,7 @@ class TestExternalCommand < Test::Unit::TestCase
       assert_equal([
                      [
                        :info,
-                       "[external-command][timeout][use] <30.0s>: <#{pid}>",
+                       "[external-command][timeout][use] <30.00s>: <#{pid}>",
                      ]
                    ],
                    messages)
@@ -218,6 +218,7 @@ class TestExternalCommand < Test::Unit::TestCase
 
   class TestLimitCPU < self
     def setup
+      omit_on_windows("RLIMIT_CPU doesn't exist")
       @data = ChupaText::TextData.new("Hello")
       limit_cpu = ChupaText::ExternalCommand.default_limit_cpu
       begin
@@ -303,6 +304,7 @@ class TestExternalCommand < Test::Unit::TestCase
 
   class TestLimitAS < self
     def setup
+      omit_on_windows("RLIMIT_AS doesn't exist")
       @data = ChupaText::TextData.new("Hello")
       limit_as = ChupaText::ExternalCommand.default_limit_as
       begin

data/test/test-extractor.rb

@@ -76,7 +76,7 @@ class TestExtractor < Test::Unit::TestCase
           extracted = ChupaText::Data.new
           extracted.mime_type = "text/plain"
           extracted.body = data.body.gsub(/<.+?>/, "")
-          sleep(data.timeout * 2) if data.timeout
+          sleep(data.timeout * 10) if data.timeout
           yield(extracted)
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chupa-text
 version: !ruby/object:Gem::Version
-  version: 1.2.9
+  version: 1.3.3
 platform: ruby
 authors:
-- Kouhei Sutou
+- Sutou Kouhei
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-13 00:00:00.000000000 Z
+date: 2022-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: archive-zip
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.4
+- !ruby/object:Gem::Dependency
+  name: rexml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -53,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: kramdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: packnga
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: packnga
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: redcarpet
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -126,8 +140,8 @@ description: ''
 email:
 - kou@clear-code.com
 executables:
-- chupa-text-generate-decomposer
 - chupa-text
+- chupa-text-generate-decomposer
 extensions: []
 extra_rdoc_files: []
 files:
@@ -191,6 +205,7 @@ files:
 - lib/chupa-text/screenshot.rb
 - lib/chupa-text/size-parser.rb
 - lib/chupa-text/text-data.rb
+- lib/chupa-text/timeout-value.rb
 - lib/chupa-text/unzippable.rb
 - lib/chupa-text/utf8-converter.rb
 - lib/chupa-text/version.rb
@@ -289,8 +304,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.4.0.dev
 signing_key: 
 specification_version: 4
 summary: ChupaText is an extensible text extractor. You can plug your custom text