henkei 1.17.2 → 1.17.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78f85d586c1195625f6bbf0906a2b0f8f64319ce
-  data.tar.gz: dc676d8e29199dd6659606c7ef5ec2965c456591
+  metadata.gz: 5d629bcc0d435522497e749752307e6c33844d29
+  data.tar.gz: 490b5e0c89b43f4ec83434e3861c85d69de7a8bd
 SHA512:
-  metadata.gz: 714aa3686c0d584fbbed017442cc46a14b232ddb194260048864ba5b4265751456239cc2a396b50530af10fe6dcda4a5e38178d71a2a196d36a13bd5fc78192e
-  data.tar.gz: ddceb92fbb74cecb0400c8d2eadba4ff236e27018e63fdba5d97562be8a6a07d336663832c2f76de46124b7e5ace27c4264b129fd92280b71dfd88bd9be0abb0
+  metadata.gz: 6f4e76efb3cf67bca58db9e6dc074511af3e8661b5c03800bbf28cce9939b01774c33aaa65ae24df5e46a5346cda97347e17add23e934cbaf0cbaf7c48e73246
+  data.tar.gz: 21cf99d84f4428f3db892aabc5827f02c848e70bb693080ac33789f4ea66d64de03f88856af7e89c14a4b783a038e33c5fba7ad6229e316f99be2cc2c0ab5fa1

data/henkei.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.version       = Henkei::VERSION
   spec.authors       = ['Erol Fornoles', 'Andrew Bromwich']
   spec.email         = %w[erol.fornoles@gmail.com a.bromwich@gmail.com]
-  spec.description   = %q{Read text and metadata from files and documents (.doc, .docx, .pages, .odt, .rtf, .pdf) using Apache Tika toolkit}
-  spec.summary       = spec.description
+  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.license       = 'MIT'
 
@@ -18,11 +18,11 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'mime-types', '>= 1.23'
-  spec.add_runtime_dependency 'json', '>= 1.8'
+  spec.add_runtime_dependency 'mime-types', '>= 1.23', '< 4'
+  spec.add_runtime_dependency 'json', '>= 1.8', '< 3'
 
   spec.add_development_dependency 'bundler', '~> 1.3'
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec', '~> 3.5'
-  spec.add_development_dependency 'simplecov'
+  spec.add_development_dependency 'rake', '~> 12.3'
+  spec.add_development_dependency 'rspec', '~> 3.7'
+  spec.add_development_dependency 'simplecov', '~> 0.15'
 end

data/jar/tika-config.xml

@@ -0,0 +1,3 @@
+<properties>
+  <service-loader initializableProblemHandler="ignore"/>
+</properties>

data/lib/henkei.rb

@@ -10,8 +10,9 @@ require 'socket'
 require 'stringio'
 
 class Henkei
-  GEMPATH = File.dirname(File.dirname(__FILE__))
-  JARPATH = File.join(Henkei::GEMPATH, 'jar', 'tika-app-1.17.jar')
+  GEM_PATH = File.dirname(File.dirname(__FILE__))
+  JAR_PATH = File.join(Henkei::GEM_PATH, 'jar', 'tika-app-1.17.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
@@ -185,21 +186,9 @@ class Henkei
   #  Henkei.server(:text, 9294)
   #
   def self.server(type, custom_port=nil)
-    switch =
-      case type
-      when :text
-        '-t'
-      when :html
-        '-h'
-      when :metadata
-        '-m -j'
-      when :mimetype
-        '-m -j'
-      end
-
     @@server_port = custom_port || DEFAULT_SERVER_PORT
     
-    @@server_pid = Process.spawn("#{java} -Djava.awt.headless=true -jar #{Henkei::JARPATH} --server --port #{@@server_port} #{switch}")
+    @@server_pid = Process.spawn tika_command(type, true)
     sleep(2) # Give the server 2 seconds to spin up.
     @@server_pid
   end
@@ -213,7 +202,7 @@ class Henkei
   #  Henkei.server(:text)
   #  reports = ["report1.docx", "report2.doc", "report3.pdf"]
   #  begin
-  #    my_texts = reports.map{|report_path| Henkei.new(report_path).text }
+  #    my_texts = reports.map{ |report_path| Henkei.new(report_path).text }
   #  rescue
   #  ensure
   #    Henkei.kill_server!
@@ -231,27 +220,15 @@ class Henkei
 
   # Provide the path to the Java binary
   #
-  def self.java
+  def self.java_path
     ENV['JAVA_HOME'] ? ENV['JAVA_HOME'] + '/bin/java' : 'java'
   end
-  private_class_method :java
+  private_class_method :java_path
 
   # Internal helper for calling to Tika library directly
   #
   def self.client_read(type, data)
-    switch =
-      case type
-        when :text
-          '-t'
-        when :html
-          '-h'
-        when :metadata
-          '-m -j'
-        when :mimetype
-          '-m -j'
-      end
-
-    IO.popen "#{java} -Djava.awt.headless=true -jar #{Henkei::JARPATH} #{switch}", 'r+' do |io|
+    IO.popen tika_command(type), 'r+' do |io|
       io.write data
       io.close_write
       io.read
@@ -283,4 +260,25 @@ class Henkei
     resp
   end
   private_class_method :server_read
+
+  # 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 ' '
+  end
+
+  # 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
+  end
+  private_class_method :switch_for_type
 end

data/lib/henkei/version.rb

@@ -1,3 +1,3 @@
 class Henkei
-  VERSION = '1.17.2'
+  VERSION = '1.17.3'
 end

data/spec/henkei_spec.rb

@@ -104,13 +104,13 @@ describe Henkei do
 
   describe '.java' do
     specify 'with no specified JAVA_HOME' do
-      expect( Henkei.send(:java) ).to eql 'java'
+      expect( Henkei.send(:java_path) ).to eql 'java'
     end
 
     specify 'with a specified JAVA_HOME' do
       ENV['JAVA_HOME'] = '/path/to/java/home'
 
-      expect( Henkei.send(:java) ).to eql '/path/to/java/home/bin/java'
+      expect( Henkei.send(:java_path) ).to eql '/path/to/java/home/bin/java'
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: henkei
 version: !ruby/object:Gem::Version
-  version: 1.17.2
+  version: 1.17.3
 platform: ruby
 authors:
 - Erol Fornoles
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-08 00:00:00.000000000 Z
+date: 2018-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
@@ -18,6 +18,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.23'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -25,6 +28,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.23'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -32,6 +38,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.8'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -39,6 +48,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.8'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -57,46 +69,45 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.7'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-description: Read text and metadata from files and documents (.doc, .docx, .pages,
-  .odt, .rtf, .pdf) using Apache Tika toolkit
+        version: '0.15'
+description: Read text and metadata from files and documents using Apache Tika toolkit
 email:
 - erol.fornoles@gmail.com
 - a.bromwich@gmail.com
@@ -114,6 +125,7 @@ files:
 - Rakefile
 - henkei.gemspec
 - jar/tika-app-1.17.jar
+- jar/tika-config.xml
 - lib/henkei.rb
 - lib/henkei/version.rb
 - lib/henkei/yomu.rb