libis-format 1.2.7 → 1.2.9

data/lib/libis/format/tool/pdf_to_pdfa.rb

@@ -1,14 +1,16 @@
-require "tempfile"
-require "csv"
-require "fileutils"
+# frozen_string_literal: true
+
+require 'tempfile'
+require 'csv'
+require 'fileutils'
 require 'pdfinfo'
 
-require "libis/tools/extend/string"
-require "libis/tools/logger"
-require "libis/tools/command"
-require "libis/tools/temp_file"
+require 'libis/tools/extend/string'
+require 'libis/tools/logger'
+require 'libis/tools/command'
+require 'libis/tools/temp_file'
 
-require "libis/format"
+require 'libis/format'
 
 module Libis
   module Format
@@ -18,47 +20,47 @@ module Libis
 
         def self.installed?
           result = Libis::Tools::Command.run(Libis::Format::Config[:ghostscript_cmd])
-          result == 0
+          result.zero?
         end
 
-        def self.run(source, target = nil, options = {})
-          new.run source, target, options
+        def self.run(source, target = nil, **options)
+          new.run source, target, **options
         end
 
-        def run(source, target = nil, options = nil)
-          tmp_target = Tools::TempFile.name(File.basename(source, ".*"), ".pdf")
+        def run(source, target = nil, **options)
+          tmp_target = Tools::TempFile.name(File.basename(source, '.*'), '.pdf')
           target ||= tmp_target
 
           metadata = get_metadata(source)
 
           icc_info = icc_options(options[:colorspace])
 
-          icc_file = Tools::TempFile.name(icc_info[:icc_name], ".icc")
+          icc_file = Tools::TempFile.name(icc_info[:icc_name], '.icc')
           FileUtils.cp(File.join(Libis::Format::DATA_DIR, "#{icc_info[:icc_name]}.icc"), icc_file)
 
-          def_filename = Tools::TempFile.name("PDFA_def", ".ps")
-          File.open(def_filename, "w") do |f|
-            f.puts File.read(File.join(Libis::Format::DATA_DIR, "PDFA_def.ps"))
-              .gsub("[**ICC profile**]", icc_file)
-              .gsub("[**ICC reference**]", icc_info[:icc_ref])
-              .gsub("[**METADATA**]", metadata)
+          def_filename = Tools::TempFile.name('PDFA_def', '.ps')
+          File.open(def_filename, 'w') do |f|
+            f.puts File.read(File.join(Libis::Format::DATA_DIR, 'PDFA_def.ps'))
+                       .gsub('[**ICC profile**]', icc_file)
+                       .gsub('[**ICC reference**]', icc_info[:icc_ref])
+                       .gsub('[**METADATA**]', metadata)
           end
 
           timeout = Libis::Format::Config[:timeouts][:pdf_to_pdfa]
           result = Libis::Tools::Command.run(
             Libis::Format::Config[:ghostscript_cmd],
-            "-q",
-            "-dBATCH", "-dNOPAUSE", "-dNOOUTERSAVE", "-dNOSAFER",
+            '-q',
+            '-dBATCH', '-dNOPAUSE', '-dNOOUTERSAVE', '-dNOSAFER',
             # "-dNOPLATFONTS", "-dUseCIEColor=true",
             # "-sColorConversionStrategy=/UseDeviceIndependentColor",
             "-sProcessColorModel=#{icc_info[:device]}",
             "-sOutputICCProfile=#{icc_file}",
-            "-dCompatibilityLevel=1.4",
-            "-sDEVICE=pdfwrite", "-dPDFA=1", "-dPDFACompatibilityPolicy=1",
-            "-o", File.absolute_path(target),
+            '-dCompatibilityLevel=1.4',
+            '-sDEVICE=pdfwrite', '-dPDFA=1', '-dPDFACompatibilityPolicy=1',
+            '-o', File.absolute_path(target),
             def_filename,
             source,
-            timeout: timeout,
+            timeout:,
             kill_after: timeout * 2
           )
 
@@ -84,13 +86,13 @@ module Libis
           metadata += "\n  /Creator (#{info.creator})" if info.creator
           metadata
         end
-        
+
         def icc_options(colorspace)
           case colorspace.to_s.downcase
-          when "cmyk"
-            {icc_name: "ISOcoated_v2_eci", icc_ref: "FOGRA39L", device: "DeviceCMYK"}
+          when 'cmyk'
+            { icc_name: 'ISOcoated_v2_eci', icc_ref: 'FOGRA39L', device: 'DeviceCMYK' }
           else
-            {icc_name: "AdobeRGB1998", icc_ref: "sRGB", device: "DeviceRGB"}
+            { icc_name: 'AdobeRGB1998', icc_ref: 'sRGB', device: 'DeviceRGB' }
           end
         end
       end

data/lib/libis/format/tool/pdfa_validator.rb

@@ -1,10 +1,12 @@
-require "fileutils"
+# frozen_string_literal: true
 
-require "libis/tools/extend/string"
-require "libis/tools/logger"
-require "libis/tools/command"
+require 'fileutils'
 
-require "libis/format/config"
+require 'libis/tools/extend/string'
+require 'libis/tools/logger'
+require 'libis/tools/command'
+
+require 'libis/format/config'
 
 module Libis
   module Format
@@ -20,6 +22,7 @@ module Libis
           src_file = File.absolute_path(source)
 
           timeout = Libis::Format::Config[:timeouts][:pdfa_validator]
+          result = nil
           if (pdfa = Libis::Format::Config[:pdfa_cmd])
             # Keep it clean: tool generates fontconfig/ cache dir in current working dir
             previous_wd = Dir.getwd
@@ -27,16 +30,16 @@ module Libis
 
             result = Libis::Tools::Command.run(
               pdfa,
-              "--noxml",
-              "--level", "B",
-              "--verb", "0",
+              '--noxml',
+              '--level', 'B',
+              '--verb', '0',
               src_file,
-              timeout: timeout,
+              timeout:,
               kill_after: timeout * 2
             )
 
             raise "#{self.class} took too long (> #{timeout} seconds) to complete" if result[:timeout]
-            raise "#{self.class} errors: #{result[:err].join("\n")}" unless result[:status] == 0 && result[:err].empty?
+            raise "#{self.class} errors: #{result[:err].join("\n")}" unless (result[:status]).zero? && result[:err].empty?
 
             Dir.chdir(previous_wd)
 
@@ -44,21 +47,20 @@ module Libis
             result[:out] = out
             result[:err] += err
 
-            result
           else
             jar = Libis::Format::Config[:preflight_jar]
             result = Libis::Tools::Command.run(
               Libis::Format::Config[:java_cmd],
-              "-jar", jar,
+              '-jar', jar,
               src_file,
-              timeout: timeout,
+              timeout:,
               kill_after: timeout * 2
             )
 
             raise "#{self.class} took too long (> #{timeout} seconds) to complete" if result[:timeout]
 
-            result
           end
+          result
         end
       end
     end

data/lib/libis/format/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Libis
   module Format
-    VERSION = '1.2.7'
+    VERSION = '1.2.9'
   end
 end

data/libis-format.gemspec

@@ -1,6 +1,6 @@
-# coding: utf-8
+# frozen_string_literal: true
 
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 require 'libis/format/version'
@@ -11,37 +11,38 @@ Gem::Specification.new do |spec|
   spec.version       = Libis::Format::VERSION
   spec.authors       = ['Kris Dekeyser']
   spec.email         = ['kris.dekeyser@libis.be']
-  spec.summary       = %q{LIBIS File format format services.}
-  spec.description   = %q{Collection of tools and classes that help to identify formats of binary files and create derivative copies (e.g. PDF from Word).}
+  spec.summary       = 'LIBIS File format format services.'
+  spec.description   = 'Collection of tools and classes that help to identify file formats and create derivative copies.'
   spec.homepage      = ''
   spec.license       = 'MIT'
 
   spec.platform      = Gem::Platform::JAVA if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
+  spec.required_ruby_version = '>= 3.2'
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.files = `git ls-files -z`.split("\x0").select do |f|
+    f.match(%r{^(bin/|lib/|data/|tools/|Gemfile|libis-format.gemspec|LICENSE\.txt|README\.md)})
+  end
   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_development_dependency 'rake', '~> 10.3'
-  spec.add_development_dependency 'rspec', '~> 3.1'
+  spec.add_runtime_dependency 'chromaprint', '~> 0.0.2'
+  spec.add_runtime_dependency 'deep_dive', '~> 0.3'
+  spec.add_runtime_dependency 'libis-mapi', '~> 0.3'
+  spec.add_runtime_dependency 'libis-tools', '~> 1.1'
+  spec.add_runtime_dependency 'mini_magick', '~> 4.12'
+  spec.add_runtime_dependency 'naturally', '~> 2.2'
+  spec.add_runtime_dependency 'new_rfc_2047', '~> 1.0'
+  spec.add_runtime_dependency 'os', '~> 1.1'
+  spec.add_runtime_dependency 'pdfinfo', '~> 1.4'
+  spec.add_runtime_dependency 'pdfkit', '~> 0.8'
+
   spec.add_development_dependency 'awesome_print'
-  spec.add_development_dependency 'equivalent-xml', '~> 0.5'
+  spec.add_development_dependency 'equivalent-xml'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec'
   if Gem::Platform::JAVA && spec.platform == Gem::Platform::JAVA
     spec.add_development_dependency 'saxon-xslt'
   else
     spec.add_development_dependency 'nokogiri'
   end
-
-  spec.add_runtime_dependency 'libis-tools', '~> 1.0'
-  spec.add_runtime_dependency 'os', '= 0.9.6'
-  spec.add_runtime_dependency 'mini_magick', '~> 4.3'
-  spec.add_runtime_dependency 'deep_dive', '~> 0.3'
-  spec.add_runtime_dependency 'chromaprint', '~> 0.0.2'
-  spec.add_runtime_dependency 'naturally', '~> 2.1'
-  spec.add_runtime_dependency 'pdfinfo', '~> 1.4'
-  spec.add_runtime_dependency 'libis-mapi', '~> 0.3'
-  spec.add_runtime_dependency 'new_rfc_2047'
-  spec.add_runtime_dependency 'pdfkit'
-
-end
+end

data/tools/fop/fop.bat

@@ -1,75 +1,75 @@
-@ECHO OFF
-REM  Licensed to the Apache Software Foundation (ASF) under one or more
-REM  contributor license agreements.  See the NOTICE file distributed with
-REM  this work for additional information regarding copyright ownership.
-REM  The ASF licenses this file to You under the Apache License, Version 2.0
-REM  (the "License"); you may not use this file except in compliance with
-REM  the License.  You may obtain a copy of the License at
-REM
-REM      http://www.apache.org/licenses/LICENSE-2.0
-REM
-REM  Unless required by applicable law or agreed to in writing, software
-REM  distributed under the License is distributed on an "AS IS" BASIS,
-REM  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-REM  See the License for the specific language governing permissions and
-REM  limitations under the License.
-REM  $Id: fop.bat 1736993 2016-03-29 09:19:30Z ssteiner $
-
-SETLOCAL ENABLEDELAYEDEXPANSION
-
-rem %~dp0 is the expanded pathname of the current script under NT
-set LOCAL_FOP_HOME=
-if "%OS%"=="Windows_NT" set LOCAL_FOP_HOME="%~dp0"
-
-rem Code from Apache Ant project
-rem Slurp the command line arguments. This loop allows for an unlimited number
-rem of arguments (up to the command line limit, anyway).
-rem Could also do a "shift" and "%*" for all params, but apparently doesn't work 
-rem with Win9x.
-set FOP_CMD_LINE_ARGS=%1
-if ""%1""=="""" goto doneStart
-shift
-:setupArgs
-if ""%1""=="""" goto doneStart
-set FOP_CMD_LINE_ARGS=%FOP_CMD_LINE_ARGS% %1
-shift
-goto setupArgs
-rem This label provides a place for the argument list loop to break out 
-rem and for NT handling to skip to.
-:doneStart
-
-set LOGCHOICE=
-rem The default commons logger for JDK1.4 is JDK1.4Logger.
-rem To use a different logger, uncomment the one desired below
-rem set LOGCHOICE=-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.NoOpLog
-rem set LOGCHOICE=-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog
-rem set LOGCHOICE=-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.Log4JLogger
-
-set LOGLEVEL=
-rem Logging levels
-rem Below option is only if you are using SimpleLog instead of the default JDK1.4 Logger.
-rem To set logging levels for JDK 1.4 Logger, edit the %JAVA_HOME%\JRE\LIB\logging.properties 
-rem file instead.
-rem Possible SimpleLog values:  "trace", "debug", "info" (default), "warn", "error", or "fatal".
-rem set LOGLEVEL=-Dorg.apache.commons.logging.simplelog.defaultlog=INFO
-
-set LIBDIR=%LOCAL_FOP_HOME%lib
-
-set LOCALCLASSPATH=%FOP_HYPHENATION_PATH%
-for %%l in (%LOCAL_FOP_HOME%build\*.jar %LIBDIR%\*.jar %LOCAL_FOP_HOME%target\*.jar) do set LOCALCLASSPATH=!LOCALCLASSPATH!;%%l
-
-set JAVAOPTS=-Denv.windir=%WINDIR%
-
-if "%JAVA_HOME%" == "" goto noJavaHome
-if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome
-if "%JAVACMD%" == "" set JAVACMD=%JAVA_HOME%\bin\java
-goto runFop
-
-:noJavaHome
-if "%JAVACMD%" == "" set JAVACMD=java
-
-:runFop
-rem echo "%JAVACMD%" %LOGCHOICE% %LOGLEVEL% -cp "%LOCALCLASSPATH%" org.apache.fop.cli.Main %FOP_CMD_LINE_ARGS%
-"%JAVACMD%" %JAVAOPTS% %LOGCHOICE% %LOGLEVEL% -cp "%LOCALCLASSPATH%" %FOP_OPTS% org.apache.fop.cli.Main %FOP_CMD_LINE_ARGS%
-
-ENDLOCAL
+@ECHO OFF
+REM  Licensed to the Apache Software Foundation (ASF) under one or more
+REM  contributor license agreements.  See the NOTICE file distributed with
+REM  this work for additional information regarding copyright ownership.
+REM  The ASF licenses this file to You under the Apache License, Version 2.0
+REM  (the "License"); you may not use this file except in compliance with
+REM  the License.  You may obtain a copy of the License at
+REM
+REM      http://www.apache.org/licenses/LICENSE-2.0
+REM
+REM  Unless required by applicable law or agreed to in writing, software
+REM  distributed under the License is distributed on an "AS IS" BASIS,
+REM  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+REM  See the License for the specific language governing permissions and
+REM  limitations under the License.
+REM  $Id: fop.bat 1736993 2016-03-29 09:19:30Z ssteiner $
+
+SETLOCAL ENABLEDELAYEDEXPANSION
+
+rem %~dp0 is the expanded pathname of the current script under NT
+set LOCAL_FOP_HOME=
+if "%OS%"=="Windows_NT" set LOCAL_FOP_HOME="%~dp0"
+
+rem Code from Apache Ant project
+rem Slurp the command line arguments. This loop allows for an unlimited number
+rem of arguments (up to the command line limit, anyway).
+rem Could also do a "shift" and "%*" for all params, but apparently doesn't work 
+rem with Win9x.
+set FOP_CMD_LINE_ARGS=%1
+if ""%1""=="""" goto doneStart
+shift
+:setupArgs
+if ""%1""=="""" goto doneStart
+set FOP_CMD_LINE_ARGS=%FOP_CMD_LINE_ARGS% %1
+shift
+goto setupArgs
+rem This label provides a place for the argument list loop to break out 
+rem and for NT handling to skip to.
+:doneStart
+
+set LOGCHOICE=
+rem The default commons logger for JDK1.4 is JDK1.4Logger.
+rem To use a different logger, uncomment the one desired below
+rem set LOGCHOICE=-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.NoOpLog
+rem set LOGCHOICE=-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog
+rem set LOGCHOICE=-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.Log4JLogger
+
+set LOGLEVEL=
+rem Logging levels
+rem Below option is only if you are using SimpleLog instead of the default JDK1.4 Logger.
+rem To set logging levels for JDK 1.4 Logger, edit the %JAVA_HOME%\JRE\LIB\logging.properties 
+rem file instead.
+rem Possible SimpleLog values:  "trace", "debug", "info" (default), "warn", "error", or "fatal".
+rem set LOGLEVEL=-Dorg.apache.commons.logging.simplelog.defaultlog=INFO
+
+set LIBDIR=%LOCAL_FOP_HOME%lib
+
+set LOCALCLASSPATH=%FOP_HYPHENATION_PATH%
+for %%l in (%LOCAL_FOP_HOME%build\*.jar %LIBDIR%\*.jar %LOCAL_FOP_HOME%target\*.jar) do set LOCALCLASSPATH=!LOCALCLASSPATH!;%%l
+
+set JAVAOPTS=-Denv.windir=%WINDIR%
+
+if "%JAVA_HOME%" == "" goto noJavaHome
+if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome
+if "%JAVACMD%" == "" set JAVACMD=%JAVA_HOME%\bin\java
+goto runFop
+
+:noJavaHome
+if "%JAVACMD%" == "" set JAVACMD=java
+
+:runFop
+rem echo "%JAVACMD%" %LOGCHOICE% %LOGLEVEL% -cp "%LOCALCLASSPATH%" org.apache.fop.cli.Main %FOP_CMD_LINE_ARGS%
+"%JAVACMD%" %JAVAOPTS% %LOGCHOICE% %LOGLEVEL% -cp "%LOCALCLASSPATH%" %FOP_OPTS% org.apache.fop.cli.Main %FOP_CMD_LINE_ARGS%
+
+ENDLOCAL

data/tools/fop/fop.cmd

@@ -1,31 +1,31 @@
-@ECHO OFF
-REM  Licensed to the Apache Software Foundation (ASF) under one or more
-REM  contributor license agreements.  See the NOTICE file distributed with
-REM  this work for additional information regarding copyright ownership.
-REM  The ASF licenses this file to You under the Apache License, Version 2.0
-REM  (the "License"); you may not use this file except in compliance with
-REM  the License.  You may obtain a copy of the License at
-REM
-REM      http://www.apache.org/licenses/LICENSE-2.0
-REM
-REM  Unless required by applicable law or agreed to in writing, software
-REM  distributed under the License is distributed on an "AS IS" BASIS,
-REM  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-REM  See the License for the specific language governing permissions and
-REM  limitations under the License.
-REM  $Id: fop.cmd 1734671 2016-03-12 05:39:53Z gadams $
-
-set LOCAL_FOP_HOME=%~dp0
-set FOP_CMD_LINE_ARGS=%1
-if ""%1""=="""" goto doneStart
-shift
-:setupArgs
-if ""%1""=="""" goto doneStart
-set FOP_CMD_LINE_ARGS=%FOP_CMD_LINE_ARGS% %1
-shift
-goto setupArgs
-rem This label provides a place for the argument list loop to break out 
-:doneStart
-
-call "%LOCAL_FOP_HOME%\fop.bat" %FOP_CMD_LINE_ARGS%
-
+@ECHO OFF
+REM  Licensed to the Apache Software Foundation (ASF) under one or more
+REM  contributor license agreements.  See the NOTICE file distributed with
+REM  this work for additional information regarding copyright ownership.
+REM  The ASF licenses this file to You under the Apache License, Version 2.0
+REM  (the "License"); you may not use this file except in compliance with
+REM  the License.  You may obtain a copy of the License at
+REM
+REM      http://www.apache.org/licenses/LICENSE-2.0
+REM
+REM  Unless required by applicable law or agreed to in writing, software
+REM  distributed under the License is distributed on an "AS IS" BASIS,
+REM  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+REM  See the License for the specific language governing permissions and
+REM  limitations under the License.
+REM  $Id: fop.cmd 1734671 2016-03-12 05:39:53Z gadams $
+
+set LOCAL_FOP_HOME=%~dp0
+set FOP_CMD_LINE_ARGS=%1
+if ""%1""=="""" goto doneStart
+shift
+:setupArgs
+if ""%1""=="""" goto doneStart
+set FOP_CMD_LINE_ARGS=%FOP_CMD_LINE_ARGS% %1
+shift
+goto setupArgs
+rem This label provides a place for the argument list loop to break out 
+:doneStart
+
+call "%LOCAL_FOP_HOME%\fop.bat" %FOP_CMD_LINE_ARGS%
+