henkei 1.27.1 → 1.28.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f17479851871389aaeaa73798025c62d10cabc40a6ac703c2b25385258ae179
-  data.tar.gz: 3e1ff327a0ff55ca55b8ce2d44ffce9bd493dcf2894129ecfc143b965d765e84
+  metadata.gz: 9e77d196ca581d7e2d12b1045710115fd9ab6ef903b4a8142d473591956f526f
+  data.tar.gz: fb66905068f383d12a104c128b0ae7458964ab89e3076f497c6b5d0855d2c532
 SHA512:
-  metadata.gz: ab3a4254edd84f35c990013f684b1f3fbfb98f19c8d6e74aa3f27ffd4e3280c8e84b1679508b751af5178f3cd827cc5fb717d5d8819819fcc1cf77057272bae5
-  data.tar.gz: 8c6d9fcc938653550877fdce23de4a15d0427e41de023a113fd27c3e0bf213765df445b9d14e45496302148a1dc8a7120591505ed68e55b50f4927bdcafb940b
+  metadata.gz: ab2f691265c8b721608da07c47cf185838e969a60d631e0bd2a8a50b201caaa71743c0b30d2252f1fd08e0d7f0ef3a2e6cbfedeeeba74c6c869bf4a0ac0292dd
+  data.tar.gz: ac5bb11ebe786907c207ff1fe8115486deba3f361f42b179104cf119a714c6d778746f412a670df96e9ef7a6cf897fc15f1ddea1690d33a8646a42dcb0d375a2

data/.github/workflows/test.yml

@@ -0,0 +1,37 @@
+name: Test Henkei Ruby gem
+
+on:
+  push:
+    branches: [1.x]
+  pull_request:
+    branches: [1.x]
+
+env:
+  CI: true
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ['2.6', '2.7', '3.0', '3.1']
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true
+
+      - name: Lint code - Rubocop
+        run: bundle exec rubocop
+
+      - name: Run tests
+        run: bundle exec rspec
+
+      - name: Test & publish code coverage
+        uses: paambaati/codeclimate-action@v3.0.0
+        env:
+          CC_TEST_REPORTER_ID: bb96c1ff9dc66724c38fb4eb54486dd72dc88a7fd6e727c034b9cf8d747d069e

data/.rubocop.yml

@@ -1,5 +1,6 @@
 AllCops:
   NewCops: enable
+  TargetRubyVersion: 2.6
 
 Layout/EmptyLinesAroundAttributeAccessor:
   Enabled: true

data/README.md

@@ -1,4 +1,4 @@
-[![Travis Build Status](http://img.shields.io/travis/abrom/henkei.svg?style=flat)](https://travis-ci.org/abrom/henkei)
+[![Github Build Status](https://github.com/abrom/henkei/actions/workflows/test.yml/badge.svg)](https://github.com/abrom/henkei/actions/workflows/test.yml)
 [![Maintainability](https://api.codeclimate.com/v1/badges/d06e8c917cf7d8c07234/maintainability)](https://codeclimate.com/github/abrom/henkei/maintainability)
 [![Test Coverage](https://api.codeclimate.com/v1/badges/d06e8c917cf7d8c07234/test_coverage)](https://codeclimate.com/github/abrom/henkei/test_coverage)
 [![Gem Version](http://img.shields.io/gem/v/henkei.svg?style=flat)](#)

data/henkei.gemspec

@@ -5,7 +5,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 require 'henkei/version'
 
-Gem::Specification.new do |spec|
+Gem::Specification.new do |spec| # rubocop:disable Metrics/BlockLength
   spec.name          = 'henkei'
   spec.version       = Henkei::VERSION
   spec.authors       = ['Erol Fornoles', 'Andrew Bromwich']
@@ -13,13 +13,19 @@ Gem::Specification.new do |spec|
   spec.description   = 'Read text and metadata from files and documents using Apache Tika toolkit'
   spec.summary       = 'Read text and metadata from files and documents ' \
                        '(.doc, .docx, .pages, .odt, .rtf, .pdf) using Apache Tika toolkit'
-  spec.homepage      = 'http://github.com/abrom/henkei'
+  spec.homepage      = 'https://github.com/abrom/henkei'
   spec.license       = 'MIT'
-  spec.required_ruby_version = ['>= 2.4.0', '< 3.1.0']
+  spec.required_ruby_version = ['>= 2.6.0', '< 3.2.0']
+
+  # Prevent pushing this gem to RubyGems.org by setting 'allowed_push_host', or
+  # delete this section to allow pushing this gem to any host.
+  raise 'RubyGems 2.0 or newer is required to protect against public gem pushes.' unless spec.respond_to?(:metadata)
+
+  spec.metadata['allowed_push_host'] = 'https://rubygems.org'
+  spec.metadata['rubygems_mfa_required'] = 'true'
 
   spec.files         = `git ls-files`.split("\n")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'json', '>= 1.8', '< 3'
@@ -29,6 +35,10 @@ Gem::Specification.new do |spec|
   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'
-  spec.add_development_dependency 'simplecov', '~> 0.15'
+  spec.add_development_dependency 'rubocop', '~> 1.26'
+  spec.add_development_dependency 'rubocop-performance', '~> 1.13'
+  spec.add_development_dependency 'rubocop-rails', '~> 2.14'
+  spec.add_development_dependency 'rubocop-rake', '~> 0.6'
+  spec.add_development_dependency 'rubocop-rspec', '~> 2.9'
+  spec.add_development_dependency 'simplecov', '~> 0.15', '< 0.18'
 end

data/jar/tika-config.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <properties>
   <service-loader initializableProblemHandler="ignore"/>
 </properties>

data/lib/henkei/version.rb

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

data/lib/henkei.rb

@@ -25,7 +25,7 @@ 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.27.jar')
+  JAR_PATH = File.join(Henkei::GEM_PATH, 'jar', 'tika-app-1.28.jar')
   CONFIG_PATH = File.join(Henkei::GEM_PATH, 'jar', 'tika-config.xml')
   DEFAULT_SERVER_PORT = 9293 # an arbitrary, but perfectly cromulent, port
 
@@ -35,7 +35,7 @@ class Henkei # rubocop:disable Metrics/ClassLength
   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`.'
+           ' 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|
@@ -54,8 +54,7 @@ class Henkei # rubocop:disable Metrics/ClassLength
     result = @@server_pid ? server_read(data) : client_read(type, data)
 
     case type
-    when :text then result
-    when :html then result
+    when :text, :html then result
     when :metadata then JSON.parse(result)
     when :mimetype then Henkei.mimetype(JSON.parse(result)['Content-Type'])
     end
@@ -246,7 +245,7 @@ class Henkei # rubocop:disable Metrics/ClassLength
   # 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
+    filter_response Open3.capture2(*tika_command(type), stdin_data: data, binmode: true).first
   end
   private_class_method :client_read
 
@@ -273,7 +272,7 @@ class Henkei # rubocop:disable Metrics/ClassLength
 
       resp << chunk
     end
-    resp
+    filter_response resp
   end
   private_class_method :server_read
 
@@ -297,4 +296,14 @@ class Henkei # rubocop:disable Metrics/ClassLength
     }[type]
   end
   private_class_method :switch_for_type
+
+  # Internal helper to remove erroneous output
+  #
+  def self.filter_response(response)
+    response.gsub(
+      /\AWARNING: sun\.reflect\.Reflection\.getCallerClass is not supported\. This will impact performance\.\n/,
+      ''
+    )
+  end
+  private_class_method :filter_response
 end

data/spec/henkei_spec.rb

@@ -201,37 +201,33 @@ describe Henkei do
 
   context 'working as server mode' do
     specify '#starts and kills server' do
-      begin
-        Henkei.server(:text)
-        expect(Henkei.class_variable_get(:@@server_pid)).not_to be_nil
-        expect(Henkei.class_variable_get(:@@server_port)).not_to be_nil
-
-        s = TCPSocket.new('localhost', Henkei.class_variable_get(:@@server_port))
-        expect(s).to be_a TCPSocket
-        s.close
-      ensure
-        port = Henkei.class_variable_get(:@@server_port)
-        Henkei.kill_server!
-        sleep 2
-        expect { TCPSocket.new('localhost', port) }.to raise_error Errno::ECONNREFUSED
-      end
+      Henkei.server(:text)
+      expect(Henkei.class_variable_get(:@@server_pid)).not_to be_nil
+      expect(Henkei.class_variable_get(:@@server_port)).not_to be_nil
+
+      s = TCPSocket.new('localhost', Henkei.class_variable_get(:@@server_port))
+      expect(s).to be_a TCPSocket
+      s.close
+    ensure
+      port = Henkei.class_variable_get(:@@server_port)
+      Henkei.kill_server!
+      sleep 2
+      expect { TCPSocket.new('localhost', port) }.to raise_error Errno::ECONNREFUSED
     end
 
     specify '#runs samples through server mode' do
-      begin
-        Henkei.server(:text)
-        expect(Henkei.new('spec/samples/sample.pages').text).to(
-          include 'The quick brown fox jumped over the lazy cat.'
-        )
-        expect(Henkei.new('spec/samples/sample filename with spaces.pages').text).to(
-          include 'The quick brown fox jumped over the lazy cat.'
-        )
-        expect(Henkei.new('spec/samples/sample.docx').text).to(
-          include 'The quick brown fox jumped over the lazy cat.'
-        )
-      ensure
-        Henkei.kill_server!
-      end
+      Henkei.server(:text)
+      expect(Henkei.new('spec/samples/sample.pages').text).to(
+        include 'The quick brown fox jumped over the lazy cat.'
+      )
+      expect(Henkei.new('spec/samples/sample filename with spaces.pages').text).to(
+        include 'The quick brown fox jumped over the lazy cat.'
+      )
+      expect(Henkei.new('spec/samples/sample.docx').text).to(
+        include 'The quick brown fox jumped over the lazy cat.'
+      )
+    ensure
+      Henkei.kill_server!
     end
   end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: henkei
 version: !ruby/object:Gem::Version
-  version: 1.27.1
+  version: 1.28.1
 platform: ruby
 authors:
 - Erol Fornoles
 - Andrew Bromwich
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-19 00:00:00.000000000 Z
+date: 2022-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -113,14 +113,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.71'
+        version: '1.26'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.71'
+        version: '1.26'
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.13'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.13'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.14'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.14'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.9'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -128,6 +184,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.15'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.18'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -135,6 +194,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.15'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.18'
 description: Read text and metadata from files and documents using Apache Tika toolkit
 email:
 - erol.fornoles@gmail.com
@@ -144,10 +206,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
 - Gemfile
 - LICENSE
 - NOTICE.txt
@@ -155,7 +217,7 @@ files:
 - Rakefile
 - bin/console
 - henkei.gemspec
-- jar/tika-app-1.27.jar
+- jar/tika-app-1.28.jar
 - jar/tika-config.xml
 - lib/henkei.rb
 - lib/henkei/configuration.rb
@@ -168,11 +230,13 @@ files:
 - spec/samples/sample-metadata-values-with-colons.doc
 - spec/samples/sample.docx
 - spec/samples/sample.pages
-homepage: http://github.com/abrom/henkei
+homepage: https://github.com/abrom/henkei
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  allowed_push_host: https://rubygems.org
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -180,26 +244,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.6.0
   - - "<"
     - !ruby/object:Gem::Version
-      version: 3.1.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Read text and metadata from files and documents (.doc, .docx, .pages, .odt,
   .rtf, .pdf) using Apache Tika toolkit
-test_files:
-- spec/helper.rb
-- spec/henkei_spec.rb
-- spec/samples/pipe-error.png
-- spec/samples/sample filename with spaces.pages
-- spec/samples/sample-metadata-values-with-colons.doc
-- spec/samples/sample.docx
-- spec/samples/sample.pages
+test_files: []

data/.travis.yml

@@ -1,32 +0,0 @@
-env:
-  global:
-    - CC_TEST_REPORTER_ID=bb96c1ff9dc66724c38fb4eb54486dd72dc88a7fd6e727c034b9cf8d747d069e
-  jobs:
-    - INCLUDE_RAILS=false
-    - INCLUDE_RAILS=true
-
-language: ruby
-rvm:
-  - 2.5
-  - 2.6
-  - 2.7
-  - 3.0
-
-before_install:
-  - gem update bundler
-
-install:
-  - bundle install --jobs=3 --retry=3
-  - gem install rubocop
-
-before_script:
-  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
-  - chmod +x ./cc-test-reporter
-  - ./cc-test-reporter before-build
-
-script:
-  - bundle exec rubocop
-  - bundle exec rspec
-
-after_script:
-  - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT