chupa-text 1.3.3 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97113be234e69a94d3710448d9468f4138fc7aa686275201c9f2441ed6fd217b
-  data.tar.gz: be11f97456e1511bb91fed287485a456c9a8db7fafc4357d8cf0784dfb444a0e
+  metadata.gz: d81031d80654a357700972d1443aea5994ba4e3f4a1684e670a19b7041b12073
+  data.tar.gz: 17d66e6f6660066fd8c4fd83baf01eee8c2296a2a7a777ab7c0db3bbf9917d56
 SHA512:
-  metadata.gz: 4f4ebd3d6fdb67b2f70e73841325586e80b2a5ff94178d4f25066072890af613571939d2bfb0f12ff1465a4c4cacbcccc6a0a50bda0a5514ca247709f0b45d09
-  data.tar.gz: 3ae71d85db976f28f731df669fe2eddfc93d5cb94a176e01ef2298b5a4a5eaf5848fc33a1c10a70c286f00ca41773b00f3962bef0cf635399fa315b58bba4937
+  metadata.gz: e3ab55e7923da653b4c277491712e6564db633b664830ad2153b60b0ada7d09de69576074a0a3592406b03041f09990fa7a0daf0fd3f99d798543d22d5416a2c
+  data.tar.gz: ab8e04142b49119e51c9d7da40776efc674e75034148670c7f921a06320896426f7aba99a42ff467a97d07bd89c776bc4e04ddfa788ce826d51481baf8890470

data/Gemfile

@@ -1,6 +1,6 @@
-# -*- mode: ruby; coding: utf-8 -*-
+# -*- mode: ruby -*-
 #
-# Copyright (C) 2013  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2013-2024  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
@@ -19,3 +19,11 @@
 source "https://rubygems.org/"
 
 gemspec
+
+gem "bundler"
+gem "kramdown"
+gem "nokogiri"
+gem "packnga"
+gem "rake"
+gem "test-unit"
+gem "webrick"

data/chupa-text.gemspec

@@ -1,6 +1,6 @@
 # -*- ruby -*-
 #
-# Copyright (C) 2013-2020  Sutou Kouhei <kou@clear-code.com>
+# Copyright (C) 2013-2024  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
@@ -52,12 +52,6 @@ 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("logger")
   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("test-unit")
 end

data/doc/text/news.md

@@ -1,5 +1,23 @@
 # News
 
+## 1.3.4: 2024-09-22
+
+### Improvements
+
+  * Windows: Fixed file URI.
+    * GH-7
+    * Patch by Abe Tomoaki
+
+  * `ChupaText::TextData`: Fixed path generation.
+    * GH-13
+    * Patch by Abe Tomoaki
+
+  * Added `logger` dependency explicitly for Ruby 3.4.
+
+### Thanks
+
+  * Abe Tomoaki
+
 ## 1.3.3: 2022-02-01
 
 ### Improvements

data/lib/chupa-text/data.rb

@@ -136,14 +136,7 @@ module ChupaText
     def uri=(uri)
       case uri
       when Pathname
-        file_uri = ""
-        target = uri.expand_path
-        loop do
-          target, base = target.split
-          file_uri = "/#{CGI.escape(base.to_s)}#{file_uri}"
-          break if target.root?
-        end
-        file_uri = "file://#{file_uri}"
+        file_uri = convert_pathname_to_file_uri(uri)
         @uri = URI.parse(file_uri)
         self.path = uri
       when NilClass
@@ -244,6 +237,21 @@ module ChupaText
     end
 
     private
+    def convert_pathname_to_file_uri(path)
+      components = []
+      escaped_path = nil
+      target = path.expand_path
+      loop do
+        target, base = target.split
+        components.unshift(CGI.escape(base.to_s))
+        if target.root?
+          escaped_path = target + components.join("/")
+          break
+        end
+      end
+      "file://#{escaped_path}"
+    end
+
     def guess_mime_type
       guess_mime_type_from_uri or
         guess_mime_type_from_body

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

@@ -18,8 +18,7 @@ module ChupaText
   class TextData < Data
     def initialize(text, options={})
       super(options)
-      self.uri = uri.to_s.gsub(/\.[a-z\d]+\z/i, ".txt")
-      self.path = path.to_s.gsub(/\.[a-z\d]+\z/i, ".txt")
+      self.uri = Pathname(path.to_s.gsub(/\.[a-z\d]+\z/i, ".txt"))
       self.mime_type = "text/plain"
       self.body = text
       self.size = text.bytesize

data/lib/chupa-text/version.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2020  Sutou Kouhei <kou@clear-code.com>
+# Copyright (C) 2013-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
@@ -15,5 +15,5 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 module ChupaText
-  VERSION = "1.3.3"
+  VERSION = "1.3.4"
 end

data/test/decomposers/test-csv.rb

@@ -39,7 +39,7 @@ Ruby,ChupaText
                      [
                        :error,
                        "[decomposer][csv] Failed to parse CSV: " +
-                       "CSV::MalformedCSVError: " +
+                       "CSV::InvalidEncodingError: " +
                        "Invalid byte sequence in UTF-8 in line 1.",
                      ],
                    ],

data/test/helper.rb

@@ -49,4 +49,8 @@ module Helper
   def omit_on_windows(message)
     omit("Omit on Windows: #{message}") if Gem.win_platform?
   end
+
+  def omit_on_macos(message)
+    omit("Omit on macOS: #{message}") if RUBY_PLATFORM.include?("darwin")
+  end
 end

data/test/run-test.rb

@@ -34,4 +34,5 @@ ChupaText::Decomposers.load
 
 require_relative "helper"
 
+ENV["TEST_UNIT_MAX_DIFF_TARGET_STRING_SIZE"] = "1_000_000"
 exit(Test::Unit::AutoRunner.run(true, test_dir.to_s))

data/test/test-default-logger.rb

@@ -52,8 +52,11 @@ class TestDefaultLogger < Test::Unit::TestCase
     end
 
     def test_string
-      file = Tempfile.new("chupa-text-default-logger-output")
-      assert_equal(file.path, output(file.path).path)
+      Tempfile.create("chupa-text-default-logger-output") do |file|
+        device = output(file.path)
+        device.close
+        assert_equal(file.path, device.path)
+      end
     end
 
     def test_default
@@ -63,12 +66,14 @@ class TestDefaultLogger < Test::Unit::TestCase
 
   sub_test_case("rotation period") do
     def rotation_period(value)
-      file = Tempfile.new("chupa-text-default-logger-output")
-      ENV["CHUPA_TEXT_LOG_OUTPUT"] = file.path
-      ENV["CHUPA_TEXT_LOG_ROTATION_PERIOD"] = value
-      logger = ChupaText::DefaultLogger.new
-      device = logger.instance_variable_get(:@logdev)
-      device.instance_variable_get(:@shift_age)
+      Tempfile.create("chupa-text-default-logger-output") do |file|
+        ENV["CHUPA_TEXT_LOG_OUTPUT"] = file.path
+        ENV["CHUPA_TEXT_LOG_ROTATION_PERIOD"] = value
+        logger = ChupaText::DefaultLogger.new
+        logger.close
+        device = logger.instance_variable_get(:@logdev)
+        device.instance_variable_get(:@shift_age)
+      end
     end
 
     def test_daily
@@ -94,12 +99,14 @@ class TestDefaultLogger < Test::Unit::TestCase
 
   sub_test_case("N generation") do
     def n_generations(value)
-      file = Tempfile.new("chupa-text-default-logger-output")
-      ENV["CHUPA_TEXT_LOG_OUTPUT"] = file.path
-      ENV["CHUPA_TEXT_LOG_N_GENERATIONS"] = value
-      logger = ChupaText::DefaultLogger.new
-      device = logger.instance_variable_get(:@logdev)
-      device.instance_variable_get(:@shift_age)
+      Tempfile.create("chupa-text-default-logger-output") do |file|
+        ENV["CHUPA_TEXT_LOG_OUTPUT"] = file.path
+        ENV["CHUPA_TEXT_LOG_N_GENERATIONS"] = value
+        logger = ChupaText::DefaultLogger.new
+        logger.close
+        device = logger.instance_variable_get(:@logdev)
+        device.instance_variable_get(:@shift_age)
+      end
     end
 
     def test_integer
@@ -117,12 +124,14 @@ class TestDefaultLogger < Test::Unit::TestCase
 
   sub_test_case("max size") do
     def max_size(value)
-      file = Tempfile.new("chupa-text-default-logger-output")
-      ENV["CHUPA_TEXT_LOG_OUTPUT"] = file.path
-      ENV["CHUPA_TEXT_LOG_MAX_SIZE"] = value
-      logger = ChupaText::DefaultLogger.new
-      device = logger.instance_variable_get(:@logdev)
-      device.instance_variable_get(:@shift_size)
+      Tempfile.create("chupa-text-default-logger-output") do |file|
+        ENV["CHUPA_TEXT_LOG_OUTPUT"] = file.path
+        ENV["CHUPA_TEXT_LOG_MAX_SIZE"] = value
+        logger = ChupaText::DefaultLogger.new
+        logger.close
+        device = logger.instance_variable_get(:@logdev)
+        device.instance_variable_get(:@shift_size)
+      end
     end
 
     def test_unit

data/test/test-external-command.rb

@@ -305,6 +305,7 @@ class TestExternalCommand < Test::Unit::TestCase
   class TestLimitAS < self
     def setup
       omit_on_windows("RLIMIT_AS doesn't exist")
+      omit_on_macos("RLIMIT_AS doesn't exist")
       @data = ChupaText::TextData.new("Hello")
       limit_as = ChupaText::ExternalCommand.default_limit_as
       begin

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: chupa-text
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.3.4
 platform: ruby
 authors:
 - Sutou Kouhei
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-01 00:00:00.000000000 Z
+date: 2024-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: archive-zip
@@ -39,7 +38,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.0.4
 - !ruby/object:Gem::Dependency
-  name: rexml
+  name: logger
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,83 +52,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
-  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'
-- !ruby/object:Gem::Dependency
-  name: kramdown
-  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'
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  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'
-- !ruby/object:Gem::Dependency
-  name: packnga
-  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'
-- !ruby/object:Gem::Dependency
-  name: rake
-  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'
-- !ruby/object:Gem::Dependency
-  name: test-unit
+  name: rexml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -289,7 +218,6 @@ homepage: http://ranguba.org/#about-chupa-text
 licenses:
 - LGPL-2.1+
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -304,8 +232,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.0.dev
-signing_key: 
+rubygems_version: 3.6.0.dev
 specification_version: 4
 summary: ChupaText is an extensible text extractor. You can plug your custom text
   extractor in ChupaText. You can write your plugin by Ruby.