libis-format 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f563ad694fd3d0c9e4a9f0da3309c99ac4b103e6027fcc9cda1606f0f67549c2
-  data.tar.gz: 5cee3f4b3bb1e51db492ee14bf919b0ce0fa69e267292380364c32b4eec40b4e
+  metadata.gz: bfe52fc3216a0da8528941b4232c252880006137cc92fe8d42512840f5b7ab7d
+  data.tar.gz: 349303abd8b4d8748960713933f532bae3ca83d45613a79321269497baa6ae2a
 SHA512:
-  metadata.gz: 409ea1fac8f8be4d2519f189090207b6a550a1b1ce174a71fa1886c69b667001459d4bdccd850dd55373199ae5553ebd02183e15eebc88a73d0ac3f8093f7d12
-  data.tar.gz: d3e4d77ddcaab1f5050aaf4acb02e74a221566abedb94062254efbc24d18703c8fdd739644b1cd5435b54a4497e77c82bdcbcb218d121bfaf135e483662aca06
+  metadata.gz: '0917e66b03e3bf008dd3a86761f9004d93d1fbc3c02c8c692a1f6f312f25c4edc0a1536b73e4a01043b4e03c85125437ae1307c49349bdee7c46d3f5b2503231'
+  data.tar.gz: 29bd68dce1a8f5f2c0216299b29268d3fdcbafaed4282b7076fac4810762fb377a403dbc08dc23672a3eda4bb17cae8c8882bb24d21980396d3c2943935d1437

data/.gitignore

@@ -18,3 +18,5 @@ mkmf.log
 *.pyc
 tools/pdf/
 /test*
+/*~
+/*.pdf

data/lib/libis/format.rb

@@ -18,4 +18,10 @@ module Libis
     TOOL_DIR = File.join(ROOT_DIR, 'tools')
 
   end
-end
+end
+
+class Object
+  def blank?
+    respond_to?(:empty?) ? !!empty? : !self
+  end unless defined? :blank?
+end

data/lib/libis/format/config.rb

@@ -36,6 +36,7 @@ module Libis
         fop: 5 * 60,
         identification_tool: 5 * 60,
         office_to_pdf: 5 * 60,
+        pdf_select: 5 * 60,
         pdf_copy: 5 * 60,
         pdf_merge: 5 * 60,
         pdf_optimizer: 5 * 60,

data/lib/libis/format/converter/base.rb

@@ -4,6 +4,7 @@
 require 'tmpdir'
 require 'libis/tools/logger'
 require 'libis/tools/temp_file'
+require 'libis/tools/extend/string'
 require 'libis/format/library'
 
 require_relative 'repository'

data/lib/libis/format/converter/image_splitter.rb

@@ -33,6 +33,10 @@ module Libis
           [:PDF, :TIFF, :GIF, :PBM, :PGM, :PPM].include?(format)
         end
 
+        def self.category
+          :splitter
+        end
+
         def image_split(_)
           #force usage of this converter
         end

data/lib/libis/format/converter/pdf_converter.rb

@@ -2,10 +2,7 @@
 
 require_relative 'base'
 
-require 'libis/tools/extend/hash'
-require 'libis/format/tool/pdf_copy'
-require 'libis/format/tool/pdf_to_pdfa'
-require 'libis/format/tool/pdf_optimizer'
+require 'libis/format/tool/pdf_metadata'
 
 module Libis
   module Format
@@ -20,84 +17,19 @@ module Libis
 
         def self.output_types(format = nil)
           return [] unless input_types.include?(format) if format
-          [:PDF, :PDFA]
-        end
-
-        def title(v)
-          @options[:title] = v.blank? ? nil : v
-        end
-
-        def author(v)
-          @options[:author] = v.blank? ? nil : v
-        end
-
-        def creator(v)
-          @options[:creator] = v.blank? ? nil : v
-        end
-
-        def keywords(v)
-          @options[:keywords] = v.blank? ? nil : v
-        end
-
-        def subject(v)
-          @options[:subject] = v.blank? ? nil : v
-        end
-
-        # Select a partial list of pages
-        # @param [String] selection as described in com.itextpdf.text.pdf.SequenceList: [!][o][odd][e][even]start-end
-        def range(selection)
-          @options[:ranges] = selection.blank? ? nil : selection
+          [:PDFA]
         end
 
         def convert(source, target, format, opts = {})
           super
 
-          result = nil
-
-          unless @options.empty?
-            result = convert_pdf(source, target)
-            return nil unless result
-            source = result
-          end
-
-          if format == :PDFA and source
-            result = pdf_to_pdfa(source, target)
-          end
+          result = pdf_to_pdfa(source, target)
+          return nil unless result
 
           result
 
         end
 
-        OPTIONS_TABLE = {
-            title: 'md_title',
-            author: 'md_author',
-            creator: 'md_creator',
-            keywords: 'md_keywords',
-            subject: 'md_subject'
-        }
-
-        def convert_pdf(source, target)
-
-          using_temp(target) do |tmpname|
-            result = Libis::Format::Tool::PdfCopy.run(
-                source, tmpname,
-                @options.map {|k, v|
-                  if v.nil?
-                    nil
-                  else
-                    k = OPTIONS_TABLE[k] || k
-                    ["--#{k}", (v.is_a?(Array) ? v : v.to_s)]
-                  end}.compact.flatten
-            )
-            unless result[:err].empty?
-              error("Pdf conversion encountered errors:\n%s", result[:err].join(join("\n")))
-              next nil
-            end
-            tmpname
-          end
-
-        end
-
         def pdf_to_pdfa(source, target)
 
           using_temp(target) do |tmpname|

data/lib/libis/format/converter/pdf_metadata.rb

@@ -0,0 +1,82 @@
+# encoding: utf-8
+
+require_relative 'base'
+
+require 'libis/format/tool/pdf_metadata'
+
+module Libis
+  module Format
+    module Converter
+
+      # noinspection DuplicatedCode
+      class PdfMetadata < Libis::Format::Converter::Base
+
+        def self.input_types
+          [:PDF]
+        end
+
+        def self.output_types(format = nil)
+          return [] unless input_types.include?(format) if format
+          [:PDF]
+        end
+
+        def title(v)
+          @options[:title] = v.blank? ? nil : v
+        end
+
+        def author(v)
+          @options[:author] = v.blank? ? nil : v
+        end
+
+        def creator(v)
+          @options[:creator] = v.blank? ? nil : v
+        end
+
+        def keywords(v)
+          @options[:keywords] = v.blank? ? nil : v
+        end
+
+        def subject(v)
+          @options[:subject] = v.blank? ? nil : v
+        end
+
+        def convert(source, target, format, opts = {})
+          super
+
+          result = nil
+
+          unless @options.empty?
+            result = convert_pdf(source, target)
+            return nil unless result
+          end
+
+          result
+
+        end
+
+        def convert_pdf(source, target)
+
+          using_temp(target) do |tmpname|
+            result = Libis::Format::Tool::PdfMetadata.run(
+                source, tmpname,
+                @options.map {|k, v|
+                  if v.nil?
+                    nil
+                  else
+                    ["--#{k}", v]
+                  end}.compact.flatten
+            )
+            unless result[:err].empty?
+              error("Pdf conversion encountered errors:\n%s", result[:err].join(join("\n")))
+              next nil
+            end
+            tmpname
+          end
+
+        end
+
+      end
+
+    end
+  end
+end

data/lib/libis/format/converter/pdf_optimizer.rb

@@ -2,9 +2,6 @@
 
 require_relative 'base'
 
-require 'libis/tools/extend/hash'
-require 'libis/format/tool/pdf_copy'
-require 'libis/format/tool/pdf_to_pdfa'
 require 'libis/format/tool/pdf_optimizer'
 
 module Libis

data/lib/libis/format/converter/pdf_protecter.rb

@@ -0,0 +1,147 @@
+# encoding: utf-8
+require 'securerandom'
+
+require_relative 'base'
+require 'libis/format/tool/pdf_protect'
+
+module Libis
+  module Format
+    module Converter
+
+      RANDOM_CHARS = [('a'..'z'), ('A'..'Z'), ('0'..'9')].map(&:to_a).flatten
+
+      # noinspection DuplicatedCode
+      class PdfProtecter < Libis::Format::Converter::Base
+
+        def self.input_types
+          [:PDF]
+        end
+
+        def self.output_types(format = nil)
+          return [] unless input_types.include?(format) if format
+          [:PDF, :PDFA]
+        end
+
+        def pdf_protect(_)
+          #force usage of this converter
+        end
+
+        def initialize
+          super
+          @options[:edit_password] = SecureRandom.urlsafe_base64(31)
+        end
+
+        def edit_password(pwd)
+          @options[:edit_password] = pwd
+        end
+
+        def open_password(pwd)
+          @options[:open_password] = pwd
+        end
+
+        def assist(v)
+          @flags[:assist] = !!v
+        end
+
+        def copy(v)
+          @flags[:copy] = !!v
+        end
+
+        def print(v)
+          @flags[:print] = !!v
+        end
+
+        def comments(v)
+          @flags[:comments] = !!v
+        end
+
+        def fillin(v)
+          @flags[:fillin] = !!v
+        end
+
+        def manage(v)
+          @flags[:manage] = !!v
+        end
+
+        def edit(v)
+          @flags[:edit] = !!v
+        end
+
+        def convert(source, target, format, opts = {})
+          super
+
+          result = nil
+
+          unless @options.empty?
+            result = convert_pdf(source, target)
+            return nil unless result
+            source = result
+          end
+
+          if format == :PDFA and source
+            result = pdf_to_pdfa(source, target)
+          end
+
+          result
+
+        end
+
+        OPTIONS_TABLE = {
+          edit_password: 'edit-password',
+          open_password: 'open-password',
+          fillin: 'fill-in',
+        }
+
+        def convert_pdf(source, target)
+
+          using_temp(target) do |tmpname|
+            result = Libis::Format::Tool::PdfProtect.run(
+              source, tmpname,
+              [
+                @options.map { |k, v|
+                  if v.nil?
+                    nil
+                  else
+                    k = OPTIONS_TABLE[k] || k
+                    ["--#{k}", v]
+                  end
+                },
+                @flags.map { |k, v|
+                  if !v
+                    nil
+                  else
+                    k = OPTIONS_TABLE[k] || k
+                    "--#{k}"
+                  end
+                }
+              ].compact.flatten
+            )
+            unless result[:err].empty?
+              error("Pdf conversion encountered errors:\n%s", result[:err].join(join("\n")))
+              next nil
+            end
+            tmpname
+          end
+
+        end
+
+        def pdf_to_pdfa(source, target)
+
+          using_temp(target) do |tmpname|
+            result = Libis::Format::Tool::PdfToPdfa.run source, tmpname
+            if result[:status] != 0
+              error("Pdf/A conversion encountered errors:\n%s", result[:err].join("\n"))
+              next nil
+            else
+              warn("Pdf/A conversion warnings:\n%s", result[:err].join("\n")) unless result[:err].empty?
+            end
+            tmpname
+          end
+
+        end
+
+      end
+
+    end
+  end
+end

data/lib/libis/format/converter/pdf_selecter.rb

@@ -0,0 +1,77 @@
+# encoding: utf-8
+
+require_relative 'base'
+
+require 'libis/format/tool/pdf_select'
+
+module Libis
+  module Format
+    module Converter
+
+      # noinspection DuplicatedCode
+      class PdfSelecter < Libis::Format::Converter::Base
+
+        def self.input_types
+          [:PDF]
+        end
+
+        def self.output_types(format = nil)
+          return [] unless input_types.include?(format) if format
+          [:PDF]
+        end
+
+        def pdf_select(_)
+          #force usage of this converter
+        end
+
+        def initialize
+          super
+          @options[:range] = []
+        end
+
+        # Select a partial list of pages
+        # @param [String] selection as described in com.itextpdf.text.pdf.SequenceList: [!][o][odd][e][even]start-end
+        def range(selection)
+          @options[:range] << selection unless selection.blank?
+        end
+
+        def convert(source, target, format, opts = {})
+          super
+
+          result = nil
+
+          unless @options.empty?
+            result = convert_pdf(source, target)
+            return nil unless result
+          end
+
+          result
+
+        end
+
+        def convert_pdf(source, target)
+
+          using_temp(target) do |tmpname|
+            result = Libis::Format::Tool::PdfSelect.run(
+              source, tmpname,
+              @options.map { |k, v|
+                if v.nil?
+                  nil
+                else
+                  ["--#{k}", v]
+                end }.compact.flatten
+            )
+            unless result[:err].empty?
+              error("Pdf selection encountered errors:\n%s", result[:err].join(join("\n")))
+              next nil
+            end
+            tmpname
+          end
+
+        end
+
+      end
+
+    end
+  end
+end

data/lib/libis/format/converter/pdf_splitter.rb

@@ -17,20 +17,20 @@ module Libis
 
         def self.output_types(format = nil)
           return [] unless input_types.include?(format) if format
-          [:PDF]
-        end
-
-        def pdf_split(_)
-          #force usage of this converter
+          [:PDFA]
         end
 
         def self.category
           :splitter
         end
 
-        # Split at given page. If omitted or nil, the source PDF will be split at every page
+        def initialize
+          super
+        end
+
+        # Split at given page. If omitted, nil or 0, the source PDF will be split at every page
         def page(v)
-          @page = v unless v.blank
+          @options[:page] = v unless v.blank?
         end
 
         def convert(source, target, format, opts = {})
@@ -46,15 +46,20 @@ module Libis
 
         def split(source, target)
 
-          options = @page ? ['--page', @page] : ['--every_page']
-          using_temp(target) do |tmpname|
-            result = Libis::Format::Tool::PdfSplit.run(source, tmpname, *options)
-            unless result[:err].empty?
-              error("Pdf split encountered errors:\n%s", result[:err].join(join("\n")))
-              next nil
-            end
-            tmpname
+          result = Libis::Format::Tool::PdfSplit.run(
+            source, target,
+            @options.map { |k, v|
+              if v.nil?
+                nil
+              else
+                ["--#{k}", v]
+              end }.compact.flatten
+          )
+          unless result[:err].empty?
+            error("Pdf split encountered errors:\n%s", result[:err].join(join("\n")))
+            return nil
           end
+          result[:out]
 
         end
 

data/lib/libis/format/converter/pdf_watermarker_header.rb

@@ -0,0 +1,71 @@
+# encoding: utf-8
+
+require_relative 'base'
+
+require 'libis/format/tool/pdf_watermark'
+
+module Libis
+  module Format
+    module Converter
+
+      class PdfWatermarkerHeader < Libis::Format::Converter::Base
+
+        def self.input_types
+          [:PDF]
+        end
+
+        def self.output_types(format = nil)
+          return [] unless input_types.include?(format) if format
+          [:PDF]
+        end
+
+        def pdf_watermark_header(_)
+          #force usage of this converter
+        end
+
+        def initialize
+          super
+        end
+
+        def text(v)
+          @options[:text] = v.blank? ? nil : v
+        end
+
+        def convert(source, target, format, opts = {})
+          super
+
+          result = convert_pdf(source, target)
+          return nil unless result
+
+          result
+
+        end
+
+        # noinspection DuplicatedCode
+        def convert_pdf(source, target)
+
+          using_temp(target) do |tmpname|
+            result = Libis::Format::Tool::PdfWatermark.run(
+                source, tmpname, 'header',
+                @options.map {|k, v|
+                  if v.nil?
+                    nil
+                  else
+                    ["--#{k}", v]
+                  end
+                  }.compact.flatten
+            )
+            unless result[:err].empty?
+              error("Pdf conversion encountered errors:\n%s", result[:err].join(join("\n")))
+              next nil
+            end
+            tmpname
+          end
+
+        end
+
+      end
+
+    end
+  end
+end

data/lib/libis/format/converter/pdf_watermarker_image.rb

@@ -0,0 +1,76 @@
+# encoding: utf-8
+
+require_relative 'base'
+
+require 'libis/format/tool/pdf_watermark'
+
+module Libis
+  module Format
+    module Converter
+
+      class PdfWatermarkerImage < Libis::Format::Converter::Base
+
+        def self.input_types
+          [:PDF]
+        end
+
+        def self.output_types(format = nil)
+          return [] unless input_types.include?(format) if format
+          [:PDF]
+        end
+
+        def pdf_watermark_image(_)
+          #force usage of this converter
+        end
+
+        def initialize
+          super
+          @options[:opacity] = '0.3'
+        end
+
+        def file(v)
+          @file = v
+        end
+
+        def opacity(v)
+          @options[:opacity] = v unless v.blank?
+        end
+
+        def convert(source, target, format, opts = {})
+          super
+
+          result = convert_pdf(source, target)
+          return nil unless result
+
+          result
+
+        end
+
+        # noinspection DuplicatedCode
+        def convert_pdf(source, target)
+
+          using_temp(target) do |tmpname|
+            result = Libis::Format::Tool::PdfWatermark.run(
+                source, tmpname, 'image',
+                @options.map {|k, v|
+                  if v.nil?
+                    nil
+                  else
+                    ["--#{k}", v]
+                  end
+                  }.compact.flatten + [@file]
+            )
+            unless result[:err].empty?
+              error("Pdf conversion encountered errors:\n%s", result[:err].join(join("\n")))
+              next nil
+            end
+            tmpname
+          end
+
+        end
+
+      end
+
+    end
+  end
+end

data/lib/libis/format/converter/{pdf_watermarker.rb → pdf_watermarker_text.rb}

@@ -2,16 +2,13 @@
 
 require_relative 'base'
 
-require 'libis/tools/extend/hash'
-require 'libis/format/tool/pdf_copy'
-require 'libis/format/tool/pdf_to_pdfa'
-require 'libis/format/tool/pdf_optimizer'
+require 'libis/format/tool/pdf_watermark'
 
 module Libis
   module Format
     module Converter
 
-      class PdfWatermarker < Libis::Format::Converter::Base
+      class PdfWatermarkerText < Libis::Format::Converter::Base
 
         def self.input_types
           [:PDF]
@@ -22,22 +19,18 @@ module Libis
           [:PDF]
         end
 
-        def pdf_watermark(_)
+        def pdf_watermark_text(_)
           #force usage of this converter
         end
 
         def initialize
           super
-          @options[:text] = '© LIBIS'
+          @text = []
           @options[:opacity] = '0.3'
         end
 
-        def file(v)
-          @options[:file] = v.blank? ? nil : v
-        end
-
         def text(v)
-          @options[:text] = v
+          @text += v.split("\n")
         end
 
         def rotation(v)
@@ -52,12 +45,12 @@ module Libis
           @options[:opacity] = v unless v.blank?
         end
 
-        def gap_size(v)
-          @options[:gap_size] = v
+        def gap(v)
+          @options[:gap] = v
         end
 
-        def gap_ratio(v)
-          @options[:gap_ratio] = v
+        def padding(v)
+          @options[:padding] = v
         end
 
         def convert(source, target, format, opts = {})
@@ -70,29 +63,19 @@ module Libis
 
         end
 
-        OPTIONS_TABLE = {
-            file: 'wm_image',
-            text: 'wm_text',
-            rotation: 'wm_text_rotation',
-            size: 'wm_font_size',
-            opacity: 'wm_opacity',
-            gap_size: 'wm_gap_size',
-            gap_ratio: 'wm_gap_ratio'
-        }
         # noinspection DuplicatedCode
         def convert_pdf(source, target)
 
           using_temp(target) do |tmpname|
-            result = Libis::Format::Tool::PdfCopy.run(
-                source, tmpname,
+            result = Libis::Format::Tool::PdfWatermark.run(
+                source, tmpname, 'text',
                 @options.map {|k, v|
                   if v.nil?
                     nil
                   else
-                    v = v.split('\n') unless v.blank? if k == :text
-                    k = OPTIONS_TABLE[k] || k
-                    ["--#{k}", (v.is_a?(Array) ? v : v.to_s)]
-                  end}.compact.flatten
+                    ["--#{k}", v]
+                  end
+                  }.compact.flatten + @text
             )
             unless result[:err].empty?
               error("Pdf conversion encountered errors:\n%s", result[:err].join(join("\n")))

data/lib/libis/format/tool.rb

@@ -12,10 +12,13 @@ module Libis
       autoload :OfficeToPdf, 'libis/format/tool/office_to_pdf'
       autoload :FFMpeg, 'libis/format/tool/ffmpeg'
       autoload :FopPdf, 'libis/format/tool/fop_pdf'
-      autoload :PdfCopy, 'libis/format/tool/pdf_copy'
       autoload :PdfMerge, 'libis/format/tool/pdf_merge'
+      autoload :PdfMetadata, 'libis/format/tool/pdf_metadata'
       autoload :PdfOptimizer, 'libis/format/tool/pdf_optimizer'
+      autoload :PdfProtect, 'libis/format/tool/pdf_protect'
+      autoload :PdfSelect, 'libis/format/tool/pdf_select'
       autoload :PdfSplit, 'libis/format/tool/pdf_split'
+      autoload :PdfWatermark, 'libis/format/tool/pdf_watermark'
       autoload :PdfToPdfa, 'libis/format/tool/pdf_to_pdfa'
       autoload :PdfaValidator, 'libis/format/tool/pdfa_validator'
 

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

@@ -27,9 +27,9 @@ module Libis
           timeout = Libis::Format::Config[:timeouts][:pdf_merge]
           result = Libis::Tools::Command.run(
               Libis::Format::Config[:java_cmd],
-              '-cp', Libis::Format::Config[:pdf_tool],
-              'MergePdf',
-              '--file_output', target,
+              '-jar', Libis::Format::Config[:pdf_tool],
+              'merge',
+              '-o', target,
               *options,
               *source,
               timeout: timeout,

data/lib/libis/format/tool/{pdf_copy.rb → pdf_metadata.rb}

@@ -10,7 +10,7 @@ module Libis
   module Format
     module Tool
 
-      class PdfCopy
+      class PdfMetadata
         include ::Libis::Tools::Logger
 
         def self.run(source, target, options = [])
@@ -26,10 +26,10 @@ module Libis
           timeout = Libis::Format::Config[:timeouts][:pdf_copy]
           result = Libis::Tools::Command.run(
               Libis::Format::Config[:java_cmd],
-              '-cp', Libis::Format::Config[:pdf_tool],
-              'CopyPdf',
-              '--file_input', source,
-              '--file_output', target,
+              '-jar', Libis::Format::Config[:pdf_tool],
+              'metadata',
+              '-i', source,
+              '-o', target,
               *options,
               timeout: timeout,
               kill_after: timeout * 2

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

@@ -0,0 +1,47 @@
+require 'os'
+
+require 'libis/tools/extend/string'
+require 'libis/tools/logger'
+require 'libis/tools/command'
+
+require 'libis/format/config'
+
+module Libis
+  module Format
+    module Tool
+
+      class PdfProtect
+        include ::Libis::Tools::Logger
+
+        def self.run(source, target, options = [])
+          self.new.run source, target, options
+        end
+
+        def run(source, target, options = [])
+
+          if OS.java?
+            # TODO: import library and execute in current VM. For now do exactly as in MRI.
+          end
+
+          timeout = Libis::Format::Config[:timeouts][:pdf_copy]
+          result = Libis::Tools::Command.run(
+              Libis::Format::Config[:java_cmd],
+              '-jar', Libis::Format::Config[:pdf_tool],
+              'protect',
+              '-i', source,
+              '-o', target,
+              *options,
+              timeout: timeout,
+              kill_after: timeout * 2
+          )
+
+          raise RuntimeError, "#{self.class} took too long (> #{timeout} seconds) to complete" if result[:timeout]
+          raise RuntimeError, "#{self.class} errors: #{result[:err].join("\n")}" unless result[:status] == 0 && result[:err].empty?
+
+          result
+        end
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,47 @@
+require 'os'
+
+require 'libis/tools/extend/string'
+require 'libis/tools/logger'
+require 'libis/tools/command'
+
+require 'libis/format/config'
+
+module Libis
+  module Format
+    module Tool
+
+      class PdfSelect
+        include ::Libis::Tools::Logger
+
+        def self.run(source, target, options = [])
+          self.new.run source, target, options
+        end
+
+        def run(source, target, options = [])
+
+          if OS.java?
+            # TODO: import library and execute in current VM. For now do exactly as in MRI.
+          end
+
+          timeout = Libis::Format::Config[:timeouts][:pdf_select]
+          result = Libis::Tools::Command.run(
+              Libis::Format::Config[:java_cmd],
+              '-jar', Libis::Format::Config[:pdf_tool],
+              'select',
+              '-i', source,
+              '-o', target,
+              *options,
+              timeout: timeout,
+              kill_after: timeout * 2
+          )
+
+          raise RuntimeError, "#{self.class} took too long (> #{timeout} seconds) to complete" if result[:timeout]
+          raise RuntimeError, "#{self.class} errors: #{result[:err].join("\n")}" unless result[:status] == 0 && result[:err].empty?
+
+          result
+        end
+      end
+
+    end
+  end
+end

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

@@ -26,10 +26,10 @@ module Libis
           timeout = Libis::Format::Config[:timeouts][:pdf_split]
           result = Libis::Tools::Command.run(
               Libis::Format::Config[:java_cmd],
-              '-cp', Libis::Format::Config[:pdf_tool],
-              'SplitPdf',
-              '--file_input', source,
-              '--file_output', target,
+              '-jar', Libis::Format::Config[:pdf_tool],
+              'split',
+              '-i', source,
+              '-o', target,
               *options,
               timeout: timeout,
               kill_after: timeout * 2

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

@@ -0,0 +1,47 @@
+require 'os'
+
+require 'libis/tools/extend/string'
+require 'libis/tools/logger'
+require 'libis/tools/command'
+
+require 'libis/format/config'
+
+module Libis
+  module Format
+    module Tool
+
+      class PdfWatermark
+        include ::Libis::Tools::Logger
+
+        def self.run(source, target, wm_type, options = [])
+          self.new.run source, target, wm_type, options
+        end
+
+        def run(source, target, wm_type, options = [])
+
+          if OS.java?
+            # TODO: import library and execute in current VM. For now do exactly as in MRI.
+          end
+
+          timeout = Libis::Format::Config[:timeouts][:pdf_watermark]
+          result = Libis::Tools::Command.run(
+              Libis::Format::Config[:java_cmd],
+              '-jar', Libis::Format::Config[:pdf_tool],
+              'watermark', wm_type,
+              '-i', source,
+              '-o', target,
+              *options,
+              timeout: timeout,
+              kill_after: timeout * 2
+          )
+
+          raise RuntimeError, "#{self.class} took too long (> #{timeout} seconds) to complete" if result[:timeout]
+          raise RuntimeError, "#{self.class} errors: #{result[:err].join("\n")}" unless result[:status] == 0 && result[:err].empty?
+
+          result
+        end
+      end
+
+    end
+  end
+end

data/lib/libis/format/version.rb

@@ -1,5 +1,5 @@
 module Libis
   module Format
-    VERSION = '2.0.0'
+    VERSION = '2.0.1'
   end
 end

data/libis-format.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |spec|
     spec.add_development_dependency 'nokogiri'
   end
 
-  spec.add_runtime_dependency 'libis-tools', '~> 1.0'
+  spec.add_runtime_dependency 'libis-tools', '>= 1.0.9'
   spec.add_runtime_dependency 'os', '= 0.9.6'
   spec.add_runtime_dependency 'mini_magick', '~> 4.3'
   spec.add_runtime_dependency 'deep_dive', '~> 0.3'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libis-format
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Kris Dekeyser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-09 00:00:00.000000000 Z
+date: 2021-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -84,16 +84,16 @@ dependencies:
   name: libis-tools
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.0.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.0.9
 - !ruby/object:Gem::Dependency
   name: os
   requirement: !ruby/object:Gem::Requirement
@@ -222,9 +222,14 @@ files:
 - lib/libis/format/converter/office_converter.rb
 - lib/libis/format/converter/pdf_assembler.rb
 - lib/libis/format/converter/pdf_converter.rb
+- lib/libis/format/converter/pdf_metadata.rb
 - lib/libis/format/converter/pdf_optimizer.rb
+- lib/libis/format/converter/pdf_protecter.rb
+- lib/libis/format/converter/pdf_selecter.rb
 - lib/libis/format/converter/pdf_splitter.rb
-- lib/libis/format/converter/pdf_watermarker.rb
+- lib/libis/format/converter/pdf_watermarker_header.rb
+- lib/libis/format/converter/pdf_watermarker_image.rb
+- lib/libis/format/converter/pdf_watermarker_text.rb
 - lib/libis/format/converter/repository.rb
 - lib/libis/format/converter/spreadsheet_converter.rb
 - lib/libis/format/converter/video_converter.rb
@@ -241,19 +246,22 @@ files:
 - lib/libis/format/tool/fop_pdf.rb
 - lib/libis/format/tool/identification_tool.rb
 - lib/libis/format/tool/office_to_pdf.rb
-- lib/libis/format/tool/pdf_copy.rb
 - lib/libis/format/tool/pdf_merge.rb
+- lib/libis/format/tool/pdf_metadata.rb
 - lib/libis/format/tool/pdf_optimizer.rb
+- lib/libis/format/tool/pdf_protect.rb
+- lib/libis/format/tool/pdf_select.rb
 - lib/libis/format/tool/pdf_split.rb
 - lib/libis/format/tool/pdf_to_pdfa.rb
+- lib/libis/format/tool/pdf_watermark.rb
 - lib/libis/format/tool/pdfa_validator.rb
 - lib/libis/format/tool/spreadsheet_to_ods.rb
 - lib/libis/format/version.rb
 - lib/libis/format/yaml_loader.rb
 - libis-format.gemspec
 - tools/PdfTool.jar
-- tools/bcpkix-jdk15on-1.49.jar
-- tools/bcprov-jdk15on-1.49.jar
+- tools/bcpkix-jdk15on-167.jar
+- tools/bcprov-jdk15on-167.jar
 - tools/fop/build/fop.jar
 - tools/fop/conf/fop.xconf
 - tools/fop/fop
@@ -325,7 +333,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: LIBIS File format format services.