simple_text_extract 0.3.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5970667ea2f6f6ac902a474e59a7f90a0a19ea2078ece54ef01b75a391e2325
-  data.tar.gz: '01559ba36c772154566e78b374f0f1d6995ec9f179ed192d6b56afb1cef304f0'
+  metadata.gz: 28beca26a3231ec93af472f0aafdf46c2fcadf33ab79a0925f980f9d8ebfcde3
+  data.tar.gz: 7c1e424163c080ac59bf1414911b10a1dffbdc6d1e34deac4e7a5488f93d09fa
 SHA512:
-  metadata.gz: df13326f81af45c023cac0e059a77fc54d958f9ccaf3c77d62a86d7d4746e71a8acfd7be56eacd2dde1fc29e35f134857b331585c9dd9903db6b479b0a8bcfc4
-  data.tar.gz: 4713fb6e3c52225b38acaa9bee1d4e2bb2bbf582fa943ed16fdc46bfaeb540cfa0056068282a5993206ecdd00fcbaf79796843d4acdc9f21c96edb72b909b7d3
+  metadata.gz: 41d850e3f186c323757964593028fd46efbfe8cae2031cf0c86785ee0395640f21205b053ff6f36bce5df68e711dbb6cd2565a5f0e4e3c5a2f8256c3648b4215
+  data.tar.gz: ecd4b2d7bb87d4e4aab0b36b6bcc06e1e9b04bccfe6caad90d69145a7810f912524e1a2c7fecc6aad8f36ca8b5558f1817d4d18eec4e2fd24e5e8410256399b0

data/.ruby-version

@@ -1 +1 @@
-2.6.1
+2.6.5

data/Gemfile

@@ -4,6 +4,4 @@ source "https://rubygems.org"
 
 git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
-gem "pry"
-
 gemspec

data/Gemfile.lock

@@ -1,31 +1,24 @@
 PATH
   remote: .
   specs:
-    simple_text_extract (0.2.1)
-      roo (~> 2.8)
+    simple_text_extract (1.0.0)
+      roo (~> 2.8.2)
       spreadsheet (~> 1.1.8)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    coderay (1.1.2)
-    metaclass (0.0.4)
-    method_source (0.9.2)
     mini_portile2 (2.4.0)
-    minitest (5.11.3)
-    mocha (1.8.0)
-      metaclass (~> 0.0.1)
-    nokogiri (1.10.3)
+    minitest (5.14.0)
+    mocha (1.11.2)
+    nokogiri (1.10.9)
       mini_portile2 (~> 2.4.0)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    rake (10.5.0)
-    roo (2.8.2)
+    rake (13.0.1)
+    roo (2.8.3)
       nokogiri (~> 1)
-      rubyzip (>= 1.2.1, < 2.0.0)
+      rubyzip (>= 1.3.0, < 3.0.0)
     ruby-ole (1.2.12.2)
-    rubyzip (1.2.3)
+    rubyzip (2.3.0)
     spreadsheet (1.1.9)
       ruby-ole (>= 1.0)
 
@@ -33,12 +26,10 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.17)
   minitest (~> 5.0)
   mocha
-  pry
-  rake (~> 10.0)
+  rake (~> 13.0)
   simple_text_extract!
 
 BUNDLED WITH
-   1.17.2
+   2.0.2

data/README.md

@@ -34,11 +34,13 @@ Or install it yourself as:
 Text can be parsed from raw file content or files in the filesystem t by calling `SimpleTextExtract.extract`:
 
 ```ruby
-# raw file content using ActiveStorage
-SimpleTextExtract.extract(filename: attachment.blob.filename, raw: attachment.download)
+# using ActiveStorage >= 6
+extract = attachment.open { |tmp| SimpleTextExtract.extract(tempfile: tmp) }
+# raw file content or when ActiveStorage < 6
+extract = SimpleTextExtract.extract(filename: attachment.blob.filename, raw: attachment.download)
 
 # filesystem
-SimpleTextExtract.extract(filepath: "path_to_file.pdf")
+extract = SimpleTextExtract.extract(filepath: "path_to_file.pdf")
 ```
 
 ### Usage Dependencies

data/bin/console

@@ -6,8 +6,5 @@ require "simple_text_extract"
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
 
-require "pry"
-Pry.start
-
 require "irb"
 IRB.start(__FILE__)

data/lib/simple_text_extract.rb

@@ -2,8 +2,6 @@
 
 require "simple_text_extract/version"
 require "simple_text_extract/text_extractor"
-require "simple_text_extract/file_extractor"
-require "simple_text_extract/tempfile_extractor"
 require "simple_text_extract/format_extractor_factory"
 
 module SimpleTextExtract
@@ -11,11 +9,11 @@ module SimpleTextExtract
 
   class Error < StandardError; end
 
-  def self.extract(filename: nil, raw: nil, filepath: nil)
-    TextExtractor.call(filename: filename, raw: raw, filepath: filepath).to_s
+  def self.extract(filename: nil, raw: nil, filepath: nil, tempfile: nil)
+    TextExtractor.new(filename: filename, raw: raw, filepath: filepath, tempfile: tempfile).to_s
   end
 
   def self.supports?(filename: nil)
-    SUPPORTED_FILETYPES.include?(filename.split(".")[1])
+    SUPPORTED_FILETYPES.include?(filename.split(".").last)
   end
 end

data/lib/simple_text_extract/format_extractor/xls.rb

@@ -8,7 +8,6 @@ module SimpleTextExtract
 
         spreadsheet = Spreadsheet.open(file)
         text = []
-
         spreadsheet.worksheets.each do |sheet|
           text << sheet.name
           text << sheet.rows

data/lib/simple_text_extract/text_extractor.rb

@@ -2,24 +2,52 @@
 
 module SimpleTextExtract
   class TextExtractor
-    def self.call(filename: nil, raw: nil, filepath: nil)
-      if !filename.nil? && !raw.nil?
-        TempfileExtractor.new(filename: filename.to_s, raw: raw).extract
-      elsif !filepath.nil? && File.exist?(filepath)
-        FileExtractor.new(filepath: filepath).extract
-      end
-    end
+    attr_reader :file
 
-    def extract
-      text = FormatExtractorFactory.call(file).extract
-      cleanup
+    def initialize(filename: nil, raw: nil, filepath: nil, tempfile: nil)
+      @file = get_file(filename: filename, raw: raw, filepath: filepath, tempfile: tempfile)
+    end
 
-      text
+    def to_s
+      @to_s ||= extract.to_s
     end
 
     private
 
+      def get_file(filename:, raw:, filepath:, tempfile:)
+        if tempfile&.class == Tempfile
+          tempfile
+        elsif !filename.nil? && !raw.nil?
+          write_tempfile(filename: filename.to_s, raw: raw)
+        elsif !filepath.nil? && File.exist?(filepath)
+          File.new(filepath)
+        end
+      end
+
+      def extract
+        return unless file
+
+        begin
+          FormatExtractorFactory.call(file).extract
+        ensure
+          cleanup
+        end
+      end
+
       def cleanup
+        return unless file.class == Tempfile
+
+        file.close
+        file.unlink
+      end
+
+      def write_tempfile(filename:, raw:)
+        filename = filename.split(".").yield_self { |parts| [parts[0], ".#{parts[1]}"] }
+        file = Tempfile.new(filename)
+        raw = String.new(raw, encoding: Encoding::UTF_8)
+
+        file.write(raw)
+        file.tap(&:rewind)
       end
   end
 end

data/lib/simple_text_extract/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SimpleTextExtract
-  VERSION = "0.3.0"
+  VERSION = "1.0.1"
 end

data/simple_text_extract.gemspec

@@ -28,11 +28,10 @@ Gem::Specification.new do |spec|
   spec.requirements << "pdftotext/poppler"
   spec.required_ruby_version = ">= 2.5"
 
-  spec.add_runtime_dependency "roo", "~> 2.8"
+  spec.add_runtime_dependency "roo", "~> 2.8.2"
   spec.add_runtime_dependency "spreadsheet", "~> 1.1.8"
 
-  spec.add_development_dependency "bundler", "~> 1.17"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "minitest", "~> 5.0"
   spec.add_development_dependency "mocha"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_text_extract
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Nick Weiland
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-24 00:00:00.000000000 Z
+date: 2020-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: roo
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: 2.8.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: 2.8.2
 - !ruby/object:Gem::Dependency
   name: spreadsheet
   requirement: !ruby/object:Gem::Requirement
@@ -38,34 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.8
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.17'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.17'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +100,6 @@ files:
 - bin/console
 - bin/setup
 - lib/simple_text_extract.rb
-- lib/simple_text_extract/file_extractor.rb
 - lib/simple_text_extract/format_extractor/base.rb
 - lib/simple_text_extract/format_extractor/doc.rb
 - lib/simple_text_extract/format_extractor/doc_x.rb
@@ -123,7 +108,6 @@ files:
 - lib/simple_text_extract/format_extractor/xls.rb
 - lib/simple_text_extract/format_extractor/xls_x.rb
 - lib/simple_text_extract/format_extractor_factory.rb
-- lib/simple_text_extract/tempfile_extractor.rb
 - lib/simple_text_extract/text_extractor.rb
 - lib/simple_text_extract/version.rb
 - simple_text_extract.gemspec
@@ -149,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - antiword
 - pdftotext/poppler
-rubygems_version: 3.0.1
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Attempts to quickly extract text from various file types before resorting

data/lib/simple_text_extract/file_extractor.rb

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-module SimpleTextExtract
-  class FileExtractor < TextExtractor
-    attr_reader :filepath
-
-    def initialize(filepath:)
-      @filepath = filepath
-    end
-
-    private
-
-      def file
-        @file ||= File.new(filepath)
-      end
-  end
-end

data/lib/simple_text_extract/tempfile_extractor.rb

@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-
-module SimpleTextExtract
-  class TempfileExtractor < TextExtractor
-    attr_reader :filename, :raw
-
-    def initialize(filename:, raw:)
-      @filename = filename
-      @raw = String.new(raw, encoding: Encoding::UTF_8)
-
-      write_raw
-    end
-
-    private
-
-      def file
-        @file ||= Tempfile.new(filepath)
-      end
-
-      def write_raw
-        file.write(raw)
-        file.rewind
-      end
-
-      def cleanup
-        file.close
-        file.unlink
-      end
-
-      def filepath
-        @filepath ||= filename.split(".").yield_self { |parts| [parts[0], ".#{parts[1]}"] }
-      end
-  end
-end