henkei 1.23.0 → 1.25.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f9ebc4be4691020c72328134a33a9ffe6b4fb79a939ddc9ce833c56551abb86d
-  data.tar.gz: 17402ba43e9840b59090a82f1cd39e79e594ca3d36c763b958f9243174990f8e
+  metadata.gz: fd17a3239a6521a21c21ef943bfd476396ea6cca4d69636eaafec2303d2ab11d
+  data.tar.gz: 601055f7fffbf29539a9092ce577814b3f1be75480abd0578b1f4940f1a58ae9
 SHA512:
-  metadata.gz: 74dcf4d6f2ce5f99b77b3c1fdd34a271220c58e8aae167b40cde35eef2166570d3c4de7b94f91d98158fe3cc384ec7a7688cf98812e378607e31f8d24e06420f
-  data.tar.gz: aa210ee582d56592932684216eb93cd3f91ea7ba95e3b1d4bc672ed09bdc9605008e7f6f21472ca291c574cb1050b18eb6bdb47aa5caa03341ae393cbb0b9939
+  metadata.gz: 44bfa5b4d0bec122127f64a3a6ec745d6efcb56b132b48cd9e768e8ed76ab97729d724a44317c631cccc8edf2e8e21d4f3703d7da6dbc611258a100f6fb7fad6
+  data.tar.gz: bb537b0c7d75c3a9de2433b35acda5e25e8b4a8f72ee55ccf880f91ba70a039057c135f367ec08de6ef08cda5cac6ca65bcc4400f4966d6c86cb90df0edc2eb5

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

@@ -1,13 +1,17 @@
 env:
   global:
     - CC_TEST_REPORTER_ID=bb96c1ff9dc66724c38fb4eb54486dd72dc88a7fd6e727c034b9cf8d747d069e
+  jobs:
+    - INCLUDE_RAILS=false
+    - INCLUDE_RAILS=true
 
 language: ruby
 rvm:
-  - 2.3
   - 2.4
   - 2.5
   - 2.6
+  - 2.7
+  - 3.0
 
 before_install:
   - gem update bundler
@@ -22,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,9 +23,10 @@ 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', '< 2'
 
   spec.add_development_dependency 'bundler', '~> 2.0'
+  spec.add_development_dependency 'rails', '~> 5.0'
   spec.add_development_dependency 'rake', '~> 12.3'
   spec.add_development_dependency 'rspec', '~> 3.7'
   spec.add_development_dependency 'rubocop', '~> 0.71'

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'
 
@@ -16,13 +25,25 @@ require 'open3'
 # Read text and metadata from files and documents using Apache Tika toolkit
 class Henkei # rubocop:disable Metrics/ClassLength
   GEM_PATH = File.dirname(File.dirname(__FILE__))
-  JAR_PATH = File.join(Henkei::GEM_PATH, 'jar', 'tika-app-1.23.jar')
+  JAR_PATH = File.join(Henkei::GEM_PATH, 'jar', 'tika-app-1.25.jar')
   CONFIG_PATH = File.join(Henkei::GEM_PATH, 'jar', 'tika-config.xml')
   DEFAULT_SERVER_PORT = 9293 # an arbitrary, but perfectly cromulent, port
 
   @@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).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.0'
+  VERSION = '1.25.1'
 end

data/spec/henkei_spec.rb

@@ -1,8 +1,11 @@
 # 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
+require 'rails' if ENV['INCLUDE_RAILS'] == 'true'
+
 describe Henkei do
   let(:data) { File.read 'spec/samples/sample.docx' }
 
@@ -152,7 +155,7 @@ describe Henkei do
         expect(henkei.html).to include '<meta name="tiff:ImageWidth" content="792"/>'
       end
 
-      it '#mimetype returns an empty result' do
+      it '#mimetype returns `image/png`' do
         expect(henkei.mimetype.content_type).to eq 'image/png'
       end
     end
@@ -184,6 +187,18 @@ describe Henkei do
     end
   end
 
+  context 'when source is a remote PDF' do
+    let(:henkei) { Henkei.new 'https://www.w3.org/WAI/ER/tests/xhtml/testfiles/resources/pdf/dummy.pdf' }
+
+    specify '#text reads text' do
+      expect(henkei.text).to include 'Dummy PDF file'
+    end
+
+    specify '#metadata reads metadata' do
+      expect(henkei.metadata['Content-Type']).to eq 'application/pdf'
+    end
+  end
+
   context 'working as server mode' do
     specify '#starts and kills server' do
       begin

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: henkei
 version: !ruby/object:Gem::Version
-  version: 1.23.0
+  version: 1.25.1
 platform: ruby
 authors:
 - Erol Fornoles
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-26 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: '2'
   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: '2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -65,6 +65,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -141,9 +155,10 @@ files:
 - Rakefile
 - bin/console
 - henkei.gemspec
-- jar/tika-app-1.23.jar
+- jar/tika-app-1.25.jar
 - jar/tika-config.xml
 - lib/henkei.rb
+- lib/henkei/configuration.rb
 - lib/henkei/version.rb
 - lib/henkei/yomu.rb
 - spec/helper.rb
@@ -165,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:
   - - ">="