henkei 1.23.1 → 1.23.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7cecb124ea7a00d6a004491e8ab4a335ec5fbc465f5b55216b918257bd5f8759
-  data.tar.gz: 80861060efee0b5cabb8523dd578be9c67e20a6b55c2d5cab88c63a423123226
+  metadata.gz: 97b9b37da4e96281569a16e469d23a00c41cd35bbd15e5a7c1d1025ea2862f46
+  data.tar.gz: 45a7c3ae645fc417ae6064a7237d87ae7e56c3c20392f83cad42f9fdafd569e8
 SHA512:
-  metadata.gz: e6018c46475c3e5bef9f4c2482c05dffd6151d5fbb288f05d4bccd0a1503a26ffeba22784ebf5e731e23120da53f170edb37f310260e9d708bc2e70c79d438e1
-  data.tar.gz: 7a8d21850552eda6b27f85dacdc9e360c0962ee08e8ed4bd45a704002f6837142953a47333642ec56ee842e0ee406b56d7f3f3b48dacbad4c4935455b1521bd8
+  metadata.gz: c323d5f5c2056bedce26e05b40d70eecd4f4fff6f8ae24362dfc80952e788f33454b8a7be6a375c54001694e6a2fbe2d7dfb60392dc7324b865d056e99637d78
+  data.tar.gz: fe9c6ee2a7033d55d8ccc36a3d3a1cc78fd459654314096fa087c8373544deaa291952b0303db11f362a7f758028acf11692f7b25ca132d7cb4c6603a10a5a9d

data/.rubocop.yml

@@ -1,6 +1,27 @@
+AllCops:
+  NewCops: enable
+
+Layout/EmptyLinesAroundAttributeAccessor:
+  Enabled: true
+
 Layout/LineLength:
   Max: 120
 
+Layout/SpaceAroundMethodCallOperator:
+  Enabled: true
+
+Lint/DeprecatedOpenSSLConstant:
+  Enabled: true
+
+Lint/MixedRegexpCaptureTypes:
+  Enabled: true
+
+Lint/RaiseException:
+  Enabled: true
+
+Lint/StructNewOverride:
+  Enabled: true
+
 Metrics/BlockLength:
   Exclude:
     - 'spec/**/*'
@@ -13,3 +34,24 @@ Style/ClassVars:
 
 Style/DoubleNegation:
   Enabled: false
+
+Style/ExponentialNotation:
+  Enabled: true
+
+Style/HashEachMethods:
+  Enabled: true
+
+Style/HashTransformKeys:
+  Enabled: true
+
+Style/HashTransformValues:
+  Enabled: true
+
+Style/RedundantRegexpCharacterClass:
+  Enabled: true
+
+Style/RedundantRegexpEscape:
+  Enabled: true
+
+Style/SlicingWithRange:
+  Enabled: true

data/.travis.yml

@@ -7,10 +7,11 @@ env:
 
 language: ruby
 rvm:
-  - 2.3
   - 2.4
   - 2.5
   - 2.6
+  - 2.7
+  - 3.0
 
 before_install:
   - gem update bundler
@@ -25,7 +26,7 @@ before_script:
   - ./cc-test-reporter before-build
 
 script:
-  - rubocop
+  - bundle exec rubocop
   - bundle exec rspec
 
 after_script:

data/henkei.gemspec

@@ -15,6 +15,7 @@ Gem::Specification.new do |spec|
                        '(.doc, .docx, .pages, .odt, .rtf, .pdf) using Apache Tika toolkit'
   spec.homepage      = 'http://github.com/abrom/henkei'
   spec.license       = 'MIT'
+  spec.required_ruby_version = ['>= 2.4.0', '< 3.1.0']
 
   spec.files         = `git ls-files`.split("\n")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
@@ -22,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'json', '>= 1.8', '< 3'
-  spec.add_runtime_dependency 'mime-types', '>= 1.23', '< 4'
+  spec.add_runtime_dependency 'mini_mime', '>= 0.1.1', '< 1'
 
   spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'rails', '~> 5.0'

data/lib/henkei.rb

@@ -2,9 +2,18 @@
 
 require 'henkei/version'
 require 'henkei/yomu'
+require 'henkei/configuration'
 
 require 'net/http'
-require 'mime/types'
+require 'mini_mime'
+
+# require 'mime/types' if available
+begin
+  require 'mime/types'
+rescue LoadError
+  nil
+end
+
 require 'time'
 require 'json'
 
@@ -23,6 +32,18 @@ class Henkei # rubocop:disable Metrics/ClassLength
   @@server_port = nil
   @@server_pid = nil
 
+  def self.mimetype(content_type)
+    if Henkei.configuration.mime_library == 'mime/types' && defined?(MIME::Types)
+      warn '[DEPRECATION] `mime/types` is deprecated. Please use `mini_mime` instead.'\
+        ' Use Henkei.configure and assign "mini_mime" to `mime_library`.'
+      MIME::Types[content_type].first
+    else
+      MiniMime.lookup_by_content_type(content_type).tap do |object|
+        object.define_singleton_method(:extensions) { [extension] }
+      end
+    end
+  end
+
   # Read text or metadata from a data buffer.
   #
   #   data = File.read 'sample.pages'
@@ -36,7 +57,7 @@ class Henkei # rubocop:disable Metrics/ClassLength
     when :text then result
     when :html then result
     when :metadata then JSON.parse(result)
-    when :mimetype then MIME::Types[JSON.parse(result)['Content-Type']].first
+    when :mimetype then Henkei.mimetype(JSON.parse(result)['Content-Type'])
     end
   end
 
@@ -112,9 +133,8 @@ class Henkei # rubocop:disable Metrics/ClassLength
   def mimetype
     return @mimetype if defined? @mimetype
 
-    type = metadata['Content-Type'].is_a?(Array) ? metadata['Content-Type'].first : metadata['Content-Type']
-
-    @mimetype = MIME::Types[type].first
+    content_type = metadata['Content-Type'].is_a?(Array) ? metadata['Content-Type'].first : metadata['Content-Type']
+    @mimetype = Henkei.mimetype(content_type)
   end
 
   # Returns +true+ if the Henkei document was specified using a file path.
@@ -186,7 +206,7 @@ class Henkei # rubocop:disable Metrics/ClassLength
   def self.server(type, custom_port = nil)
     @@server_port = custom_port || DEFAULT_SERVER_PORT
 
-    @@server_pid = Process.spawn tika_command(type, true)
+    @@server_pid = Process.spawn(*tika_command(type, server: true))
     sleep(2) # Give the server 2 seconds to spin up.
     @@server_pid
   end
@@ -219,14 +239,14 @@ class Henkei # rubocop:disable Metrics/ClassLength
   # Provide the path to the Java binary
   #
   def self.java_path
-    ENV['JAVA_HOME'] ? ENV['JAVA_HOME'] + '/bin/java' : 'java'
+    ENV['JAVA_HOME'] ? "#{ENV['JAVA_HOME']}/bin/java" : 'java'
   end
   private_class_method :java_path
 
   # Internal helper for calling to Tika library directly
   #
   def self.client_read(type, data)
-    Open3.capture2(tika_command(type), stdin_data: data, binmode: true).first
+    Open3.capture2(*tika_command(type), stdin_data: data, binmode: true).first
   end
   private_class_method :client_read
 
@@ -259,23 +279,22 @@ class Henkei # rubocop:disable Metrics/ClassLength
 
   # Internal helper for building the Java command to call Tika
   #
-  def self.tika_command(type, server = false)
-    command = ["#{java_path} -Djava.awt.headless=true -jar #{Henkei::JAR_PATH} --config=#{Henkei::CONFIG_PATH}"]
-    command << "--server --port #{@@server_port}" if server
-    command << switch_for_type(type)
-    command.join ' '
+  def self.tika_command(type, server: false)
+    command = [java_path, '-Djava.awt.headless=true', '-jar', Henkei::JAR_PATH, "--config=#{Henkei::CONFIG_PATH}"]
+    command += ['--server', '--port', @@server_port.to_s] if server
+    command + switch_for_type(type)
   end
   private_class_method :tika_command
 
   # Internal helper for building the Java command to call Tika
   #
   def self.switch_for_type(type)
-    case type
-    when :text then '-t'
-    when :html then '-h'
-    when :metadata then '-m -j'
-    when :mimetype then '-m -j'
-    end
+    {
+      text: ['-t'],
+      html: ['-h'],
+      metadata: %w[-m -j],
+      mimetype: %w[-m -j]
+    }[type]
   end
   private_class_method :switch_for_type
 end

data/lib/henkei/configuration.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+# Henkei monkey patch for configuration support
+class Henkei
+  def self.configuration
+    @configuration ||= Configuration.new
+  end
+
+  def self.configure
+    yield(configuration)
+  end
+
+  # Handle Henkei configuration
+  class Configuration
+    attr_accessor :mime_library
+
+    def initialize
+      @mime_library = 'mime/types'
+    end
+  end
+end

data/lib/henkei/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class Henkei
-  VERSION = '1.23.1'
+  VERSION = '1.23.2'
 end

data/spec/henkei_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'helper.rb'
+require 'helper'
 require 'henkei'
 
 # Some of the tests have been known to fail in weird and wonderful ways when `rails` is included

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: henkei
 version: !ruby/object:Gem::Version
-  version: 1.23.1
+  version: 1.23.2
 platform: ruby
 authors:
 - Erol Fornoles
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-25 00:00:00.000000000 Z
+date: 2021-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -32,25 +32,25 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
-  name: mime-types
+  name: mini_mime
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.23'
+        version: 0.1.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.23'
+        version: 0.1.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -158,6 +158,7 @@ files:
 - jar/tika-app-1.23.jar
 - jar/tika-config.xml
 - lib/henkei.rb
+- lib/henkei/configuration.rb
 - lib/henkei/version.rb
 - lib/henkei/yomu.rb
 - spec/helper.rb
@@ -179,7 +180,10 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.4.0
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="