chupa-text-decomposer-libreoffice 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2001a39bf2303c6f3a1621581f69405f0c0c670a
-  data.tar.gz: 427f1a189a7bd80ac61c1789953bc216156f8bf2
+SHA256:
+  metadata.gz: 5a4cebc4c301e01567236b782b186fbb89b0828b229744c46a9bb03e04adf954
+  data.tar.gz: 6220a482e2a218cc46018467ce0ecec4a7efb8669dc30a691076622338378ba6
 SHA512:
-  metadata.gz: 6f9a24668f372493805ca048a6e8f7d0d8da249e9290d5e8c32970bb2d3d86af45af7a19469adfe92e909d095d034493413d471e769d51cdf3dfbe9d0ba716ac
-  data.tar.gz: '079894b7ca1f54757848b75e5037b26e9370834eb576a8ae59c66cfb88b27adc860c979e3f7eee3e15b0270af8a668de188e34e0d4f89702995257f8421e01c8'
+  metadata.gz: a01ff0f8c14b3bff084145b978dfa8fa3cd936eb3aef6bafe61dac0c5127b04446fec9c75722ef2bb5b02ca840cac21e293a98fb8f81ba15ec245d2eb4ad53f1
+  data.tar.gz: 0c001dc26e769a10b8f6f62172bb364cc4e0e58dc5a3e9040be63fbd2a8e99cab0f63c5ff13b54fd46b75e5e285cbbfce3ad4ea6c5c0c1e0a7a6624ec85396dd

data/chupa-text-decomposer-libreoffice.gemspec

@@ -22,7 +22,7 @@ end
 
 Gem::Specification.new do |spec|
   spec.name = "chupa-text-decomposer-libreoffice"
-  spec.version = "1.0.1"
+  spec.version = "1.0.2"
   spec.homepage = "https://github.com/ranguba/chupa-text-decomposer-libreoffice"
   spec.authors = ["Kouhei Sutou"]
   spec.email = ["kou@clear-code.com"]
@@ -41,6 +41,7 @@ Gem::Specification.new do |spec|
 
   spec.requirements << "LibreOffice"
 
+  spec.add_runtime_dependency("chupa-text", ">= 1.0.9")
   spec.add_runtime_dependency("chupa-text-decomposer-pdf")
 
   spec.add_development_dependency("bundler")

data/doc/text/news.md

@@ -1,5 +1,11 @@
 # News
 
+## 1.0.2: 2018-07-18
+
+### Improvements
+
+  * Added support for ChupaText 1.0.9 or later.
+
 ## 1.0.1: 2017-07-06
 
 ### Improvements

data/lib/chupa-text/decomposers/libreoffice.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2014-2017  Kouhei Sutou <kou@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -20,11 +20,20 @@ require "tmpdir"
 module ChupaText
   module Decomposers
     class LibreOffice < Decomposer
+      include Loggable
+
       registry.register("libreoffice", self)
 
       def initialize(options)
         super
         @command = find_command
+        debug do
+          if @command
+            "#{log_tag}[command][found] #{@command.path}"
+          else
+            "#{log_tag}[command][not-found]"
+          end
+        end
       end
 
       TARGET_EXTENSIONS = [
@@ -89,7 +98,7 @@ module ChupaText
       def convert_to_pdf(data)
         Dir.mktmpdir do |temporary_directory|
           output = Tempfile.new("chupa-text-decomposer-libreoffice-output")
-          error = Tempfile.new("chupa-text-decomposer-libreoffice-error")
+          error_output = Tempfile.new("chupa-text-decomposer-libreoffice-error")
           succeeded = @command.run("--headless",
                                    "--nologo",
                                    "--convert-to", "pdf",
@@ -98,35 +107,44 @@ module ChupaText
                                    {
                                      :spawn_options => {
                                        :out => output.path,
-                                       :err => error.path,
+                                       :err => error_output.path,
                                      },
                                    })
           unless succeeded
-            tag = "[decomposer][libreoffice][convert][exited][abnormally]"
-            message = [
-              tag,
-              "output: <#{output.read}>",
-              "error: <#{error.read}>",
-            ].join("\n")
-            ChupaText.logger.error(message)
+            error do
+              tag = "#{log_tag}[convert][exited][abnormally]"
+              [
+                tag,
+                "output: <#{output.read}>",
+                "error: <#{error_output.read}>",
+              ].join("\n")
+            end
             return nil
           end
           pdf_path, = Dir.glob("#{temporary_directory}/*.pdf")
           if pdf_path.nil?
-            tag = "[decomposer][libreoffice][convert][failed]"
-            message = [
-              "#{tag}: LibreOffice may be running",
-              "output: <#{output.read}>",
-              "error: <#{error.read}>",
-            ].join("\n")
-            ChupaText.logger.error(message)
+            error do
+              tag = "#{log_tag}[convert][failed]"
+              message = [
+                "#{tag}: LibreOffice may be running",
+                "output: <#{output.read}>",
+                "error: <#{error_output.read}>",
+              ].join("\n")
+            end
             return nil
           end
+          normalized_pdf_uri = data.uri.to_s.gsub(/\.[^.]+\z/, ".pdf")
           File.open(pdf_path, "rb") do |pdf|
-            ChupaText::VirtualFileData.new(pdf_path, pdf, :source_data => data)
+            ChupaText::VirtualFileData.new(normalized_pdf_uri,
+                                           pdf,
+                                           :source_data => data)
           end
         end
       end
+
+      def log_tag
+        "[decomposer][libreoffice]"
+      end
     end
   end
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: chupa-text-decomposer-libreoffice
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-06 00:00:00.000000000 Z
+date: 2018-07-18 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: chupa-text
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.9
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.9
 - !ruby/object:Gem::Dependency
   name: chupa-text-decomposer-pdf
   requirement: !ruby/object:Gem::Requirement
@@ -177,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - LibreOffice
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: This is a ChupaText decomposer plugin for to extract text and meta-data from