plaintext 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 857600eeedad2b6b305655743d6dd4768faa5e5d
-  data.tar.gz: 17c78e4c90da3f07f5637c92a0891feb54b25b5b
+SHA256:
+  metadata.gz: '048b008deb0b8bb0ff130916081610a36a130db002171c96c1243f79055127c0'
+  data.tar.gz: 7972e2a4aab310d79211fb1ffe302973c37601aefcdcc69825b713f1e12cccc4
 SHA512:
-  metadata.gz: 436883566c3f9e1598a3f482c9146195646aa4e5d123aaedfe15876bb2876e93dd4c5bc964c515ece9b5f4e93b25974745bc176bd1aafb51aa4c64084221c7d5
-  data.tar.gz: 92969693830e20b3a1fb842bb9e60a5ed63a93f87903da8c7c88466df7a62e14dec0bb03f457ba7b28e3ce47bf82da3c9cc1a22fae4555a6cba6dce9ebc48405
+  metadata.gz: 815b42f1d693c14e724e4d71d9bae7aef677d3afbd2a3c6a1eee02405299735ec70ac555537ac8d6e862889237f6f98e06ab92159ebfaf0a8027eada00a18b57
+  data.tar.gz: 1a2e6b0dd527678b0612b608834a9c682cf14787b81bd097c0fb86cd47e8786e983ca08efdfad9184066f9ef3d91d3c908d1715f591b228deab87b7bcbab89a9

data/.travis.yml

@@ -1,7 +1,7 @@
 language: ruby
 rvm:
-  - 2.2.3
+  - 2.6.4
 before_install:
   - sudo apt-get -qq update
   - sudo apt-get install -y catdoc unrtf poppler-utils tesseract-ocr
-  - gem install bundler -v 1.10.6
+  - gem install bundler -v 2.0.1

data/CHANGELOG

@@ -6,6 +6,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.3.2] - 2019-09-02
+- Set minimum Nokogiri version to 1.10.4. See CVE-2019-5477.
+- Fix encoding issues for PDFs.
+- Bump development dependencies to bundler version 2 and
+  rake version 12
+- Update travis file to use ruby 2.6.4 and bundler 2.0.1
+
 ## [0.3.1] - 2019-01-16
 
 ### Added

data/lib/plaintext/file_handler/external_command_handler.rb

@@ -11,21 +11,23 @@ module Plaintext
     # Due to how popen works the command will be executed directly without
     # involving the shell if cmd is an array.
     require 'fileutils'
+
+    FILE_PLACEHOLDER = '__FILE__'.freeze
+    DEFAULT_STREAM_ENCODING = 'ASCII-8BIT'.freeze
+
     def shellout(cmd, options = {}, &block)
       mode = "r+"
       IO.popen(cmd, mode) do |io|
-        io.set_encoding("ASCII-8BIT") if io.respond_to?(:set_encoding)
+        set_stream_encoding(io)
         io.close_write unless options[:write_stdin]
         block.call(io) if block_given?
       end
     end
 
-    FILE_PLACEHOLDER = '__FILE__'.freeze
-
     def text(file, options = {})
       cmd = @command.dup
       cmd[cmd.index(FILE_PLACEHOLDER)] = Pathname(file).to_s
-      shellout(cmd){ |io| read io, options[:max_size] }.to_s
+      shellout(cmd) { |io| read io, options[:max_size] }.to_s
     end
 
 
@@ -41,10 +43,32 @@ module Plaintext
       new.available?
     end
 
+    protected
+
+    def utf8_stream?
+      false
+    end
+
     private
 
+    def set_stream_encoding(io)
+      return unless io.respond_to?(:set_encoding)
+
+      if utf8_stream?
+        io.set_encoding('UTF-8'.freeze)
+      else
+        io.set_encoding(DEFAULT_STREAM_ENCODING)
+      end
+    end
+
     def read(io, max_size = nil)
-      Plaintext::CodesetUtil.to_utf8 io.read(max_size), "ASCII-8BIT"
+      piece = io.read(max_size)
+
+      if utf8_stream?
+        piece
+      else
+        Plaintext::CodesetUtil.to_utf8 piece, DEFAULT_STREAM_ENCODING
+      end
     end
   end
 end

data/lib/plaintext/file_handler/external_command_handler/pdf_handler.rb

@@ -5,9 +5,16 @@ module Plaintext
     DEFAULT = [
         '/usr/bin/pdftotext', '-enc', 'UTF-8', '__FILE__', '-'
     ].freeze
+
     def initialize
       @content_type = 'application/pdf'
       @command = Plaintext::Configuration['pdftotext'] || DEFAULT
     end
+
+    protected
+
+    def utf8_stream?
+      true
+    end
   end
 end

data/lib/plaintext/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Plaintext
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/plaintext.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'plaintext/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "plaintext"
+  spec.name          = 'plaintext'
   spec.version       = Plaintext::VERSION
   spec.authors       = ['Jens Krämer', 'Planio GmbH', 'OpenProject GmbH']
   spec.email         = ['info@openproject.com']
@@ -12,17 +12,18 @@ Gem::Specification.new do |spec|
   spec.summary       = 'Extract plain text from most common office documents.'
   spec.description   = "Extract text from common office files. Based on the file's content type a command line tool is selected to do the job."
   spec.homepage      = 'https://github.com/planio-gmbh/plaintext'
-  
+  spec.license       = 'GPL-2.0'
+
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = "exe"
+  spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_dependency 'rubyzip', '~> 1.2.1'
-  spec.add_dependency 'nokogiri', '~> 1.8'
   spec.add_dependency 'activesupport', '>2.2.1 '
+  spec.add_dependency 'nokogiri', '~> 1.10', '>= 1.10.4'
+  spec.add_dependency 'rubyzip', '~> 1.2.1'
 
-  spec.add_development_dependency "bundler", "~> 1.10"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec"
+  spec.add_development_dependency 'bundler', '~> 2.0'
+  spec.add_development_dependency 'rake', '~> 12.0'
+  spec.add_development_dependency 'rspec'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: plaintext
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Jens Krämer
@@ -10,78 +10,84 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-16 00:00:00.000000000 Z
+date: 2019-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rubyzip
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 2.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 2.2.1
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.10'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.10.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.10'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.10.4
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -137,7 +143,8 @@ files:
 - plaintext.gemspec
 - plaintext.yml.example
 homepage: https://github.com/planio-gmbh/plaintext
-licenses: []
+licenses:
+- GPL-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -154,8 +161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.5
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Extract plain text from most common office documents.