libis-format 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3cd5631909a7f886d895de734e4f3ca542dac4b
-  data.tar.gz: 80b1a19961bbbd0f1db1bbcfc06f20674b115417
+  metadata.gz: 52d5e68539643d115a5666c130f68af4951cf2cf
+  data.tar.gz: 231e887b8ef18a2623f7eed16f14ece3ebd304d2
 SHA512:
-  metadata.gz: e7dda44c769f213e908745eba06e65d85252c8fbe9b54dd16b61ea9e4ceea2bbaaecf38c2db12c28e0186331fa36ec0a8303f2a5505610b881c90cc8e5e3ee71
-  data.tar.gz: 2b3df006e9d35f4dc1dd4543790d301a600bb80fabd059bd80b78b1c63f0111430bb3c308f3ef8976a2aa3329b4f1a07bffda79832a5f17a1c8503f989203d28
+  metadata.gz: 838b921e071bdbaa16dc140162af0e192551adbc27eca5ce0f7b35ef5f10e01f5beb6822f62a03995310bb77d180bc9f21da5803f72433707358abbeccf01d9e
+  data.tar.gz: 2ab0af8ffd4bc2c02e42c7086898101b80558046c5fc20155fa9b5b85ae730b4f559f59c880911449ab0b31c1fee775c43090f2057d2a4861ee4907491dea4fa

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

@@ -38,8 +38,9 @@ module Libis
           raise RuntimeError, 'Method #output_types needs to be overridden in converter'
         end
 
+
         def using_temp(target)
-          tempfile = File.join(Dir.tmpdir, Dir::Tmpname.make_tmpname(['convert', File.extname(target)], File.basename(target, '.*')))
+          tempfile = File.join(Dir.tmpdir, Dir::Tmpname.make_tmpname(['convert', File.extname(target)], File.basename(target, '.*').gsub(/\s/, '_')))
           result = yield tempfile
           return nil unless result
           FileUtils.move result, target

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

@@ -4,6 +4,7 @@ require 'fileutils'
 require 'deep_dive'
 
 require 'libis/tools/logger'
+require 'libis/tools/extend/hash'
 require 'libis/format/type_database'
 
 module Libis
@@ -15,9 +16,9 @@ module Libis
         include DeepDive
 
         def initialize(source_format, target_format, operations = {})
-          @source_format = source_format
-          @target_format = target_format
-          @operations = operations
+          @source_format = source_format.to_sym
+          @target_format = target_format.to_sym
+          @operations = operations || {}
           @converter_chain = []
         end
 
@@ -32,8 +33,8 @@ module Libis
 
         def closed?
           !@converter_chain.empty? &&
-              @converter_chain.first[:input] == @source_format &&
-              @converter_chain.last[:output] == @target_format
+              @converter_chain.first[:input].to_sym == @source_format &&
+              @converter_chain.last[:output].to_sym == @target_format
         end
 
         def valid?
@@ -51,21 +52,11 @@ module Libis
         alias_method :length, :size
 
         def to_s
-          # nodes_string = @converter_chain.map do |node|
-          #   node_name = node[:converter].name.gsub(/^.*::/,'')
-          #   node_operations = '(' + node[:operations].map do |operation|
-          #     op = "#{operation[:method]}:#{operation[:argument]}"
-          #     op
-          #   end.join(', ') + ')' rescue ''
-          #   node_string = "#{node_name}#{node_operations}->-#{node[:output]}"
-          #   node_string
-          # end.join('->-')
-          # "#{@source_format}->-#{nodes_string}"
           "#{@source_format}->-#{@converter_chain.map do |node|
-            "#{node[:converter].name.gsub(/^.*::/,'')}#{node[:operations] ?
-                "(#{node[:operations].each { |operation| "#{operation[:method]}:#{operation[:argument]}" }.join(',')})" :
-                ''
-            }->-#{node[:output]}"
+            "#{node[:converter].name.gsub(/^.*::/, '')}#{node[:operations].empty? ? '' :
+                "(#{node[:operations].each do |operation|
+                  "#{operation[:method]}:#{operation[:argument]}"
+                end.join(',')})"}->-#{node[:output]}"
           end.join('->-')}"
         end
 
@@ -87,11 +78,11 @@ module Libis
 
             node[:operations].each do |operation|
               converter.send operation[:method], operation[:argument]
-            end
+            end if node[:operations]
 
             target = target_file
 
-            if i < size
+            if i < size - 1
               target += ".temp.#{TypeDatabase.type_extentions(target_type).first}"
               target += ".#{TypeDatabase.type_extentions(target_type).first}" while File.exist? target
               temp_files << target
@@ -114,7 +105,6 @@ module Libis
         end
 
         def valid_chain_nodes(converter)
-          return [] if closed?
           source_format = @converter_chain.last[:output] rescue @source_format
           nodes = []
           if converter.input_types.include? source_format
@@ -128,7 +118,6 @@ module Libis
         end
 
         def add_chain_node(node = {})
-          return nil if closed?
           last_converter = @converter_chain.last
           source_format = last_converter ? last_converter[:output] : @source_format
           node[:input] ||= source_format
@@ -142,12 +131,11 @@ module Libis
         end
 
         def apply_operations
-          return false unless closed?
           temp_chain = @converter_chain.reverse.ddup
           applied = true
-          operations = @operations.ddup
+          operations = @operations && @operations.ddup || {}
           while (operation = operations.shift)
-            method = operation.first.to_s.downcase.to_sym
+            method = operation.first.to_s.to_sym
             applied &&= :found == temp_chain.each do |node|
               next unless node[:converter].instance_methods.include?(method)
               node[:operations] ||= []

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

@@ -4,6 +4,7 @@ require_relative 'base'
 require 'libis/format/identifier'
 
 require 'mini_magick'
+require 'fileutils'
 
 MiniMagick.configure do |config|
   config.debug = false
@@ -28,7 +29,7 @@ module Libis
           super
         end
 
-        def imaginate(_)
+        def image_convert(_)
           #force usage of this converter
         end
 
@@ -79,10 +80,10 @@ module Libis
         def watermark(options = {})
           text = options[:text] || '© LIBIS'
           image = options[:file] || (Dir::Tmpname.create(%w(wm_image .png)) { |_|})
-          @wm_size = (options[:size] || '4').to_int
-          @wm_opacity = ((options[:opacity] || 0.1).to_f * 100).to_int
+          @wm_size = (options[:size] || '4').to_i
+          @wm_opacity = ((options[:opacity] || 0.1).to_f * 100).to_i
           @wm_composition = options[:composition] || 'modulate'
-          gap = ((options[:gap] || 0.2).to_f * 100).to_int
+          gap = ((options[:gap] || 0.2).to_f * 100).to_i
           rotation = 360 - (options[:rotation] || 30).to_i
           @wm_image = MiniMagick::Image.new(image)
           unless @wm_image.valid?
@@ -116,6 +117,8 @@ module Libis
         def convert(source, target, format, opts = {})
           super
 
+          FileUtils.mkpath(File.dirname(target))
+
           if source.is_a? Array
             sources = source
 

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

@@ -30,6 +30,10 @@ module Libis
           [:PDF]
         end
 
+        def office_convert(_)
+          #force usage of this converter
+        end
+
         def convert(source, target, format, opts = {})
           super
 

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

@@ -2,6 +2,7 @@
 
 require_relative 'base'
 
+require 'libis/tools/extend/hash'
 require 'libis/format/pdf_copy'
 require 'libis/format/pdf_to_pdfa'
 
@@ -19,6 +20,10 @@ module Libis
           [:PDF, :PDFA]
         end
 
+        def pdf_convert(_)
+          #force usage of this converter
+        end
+
         # Set metadata for Pdf file
         #
         # valid metadata keys are):
@@ -30,8 +35,9 @@ module Libis
         #
         # @param [Hash] values list of metadata values to set
         def metadata(values = {})
+          values.key_strings_to_symbols!
           values.each do |k, v|
-            next unless [:title, :author, :creator, :keywords, :subject].include?(k.to_s.to_sym)
+            next unless [:title, :author, :creator, :keywords, :subject].include?(k)
             @options["md_#{k}"] = v
           end
         end
@@ -59,6 +65,7 @@ module Libis
         #
         # @param [Hash] options Hash of options for watermark creation.
         def watermark(options = {})
+          options.key_strings_to_symbols!
           if options[:file] && File.exist?(options[:file])
             @options['wm_image'] = options[:file]
           else
@@ -66,7 +73,7 @@ module Libis
             @options['wm_text_rotation'] = options[:rotation] if options[:rotation]
             @options['wm_font_size'] = options[:size] if options[:size]
           end
-          @options['wm_opacity'] = options[:opacity]
+          @options['wm_opacity'] = options[:opacity] || '0.3'
           @options['wm_gap_ratio'] = options[:gap] if options[:gap].to_s =~ /^\s*(0+\.\d+|1\.0+)\s*$/
           @options['wm_gap_size'] = options[:gap] if options[:gap].to_s =~ /^\s*\d+\s*$/
         end
@@ -77,7 +84,7 @@ module Libis
           result = nil
 
           unless @options.empty?
-            result  = convert_pdf(source, target)
+            result = convert_pdf(source, target)
             return nil unless result
             source = result
           end
@@ -93,13 +100,35 @@ module Libis
 
         def convert_pdf(source, target)
 
-          using_temp(target) { |tmpname| Libis::Format::PdfCopy.run source, tmpname, @options.map { |k, v| ["--#{k}", v.to_s] }.flatten }
+          using_temp(target) do |tmpname|
+            result = Libis::Format::PdfCopy.run(
+                source, tmpname,
+                @options.map { |k, v|
+                  if v.nil?
+                    nil
+                  else
+                    ["--#{k}", (v.is_a?(Array) ? v : v.to_s)]
+                  end }.flatten
+            )
+            result[:err].empty? ? target : begin
+              error("Pdf conversion encountered errors:\n%s", result[:err].join('\n'))
+              nil
+            end
+            tmpname
+          end
 
         end
 
         def pdf_to_pdfa(source, target)
 
-          using_temp(target) { |tmpname| Libis::Format::PdfToPdfa.run source, tmpname }
+          using_temp(target) do |tmpname|
+            result = Libis::Format::PdfToPdfa.run source, tmpname
+            result[:status] == 0 ? target : begin
+              error("Pdf/A conversion encountered errors:\n%s", result[:err].join('\n'))
+              nil
+            end
+            tmpname
+          end
 
         end
 

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

@@ -49,16 +49,16 @@ module Libis
         def get_converter_chain(src_type, tgt_type, operations = {})
           msg = "conversion from #{src_type.to_s} to #{tgt_type.to_s}"
           chain_list = find_chains src_type, tgt_type, operations
-          if chain_list.length > 1
-            warn "Found more than one conversion chain for #{msg}. Picking the first one."
-          end
+          # if chain_list.length > 1
+          #   warn "Found more than one conversion chain for #{msg}. Picking the first one."
+          # end
           if chain_list.empty?
             error "No conversion chain found for #{msg}"
             return nil
           end
-          chain_list.each do |chain|
-            debug "Matched chain: #{chain}"
-          end
+          # chain_list.each do |chain|
+          #   debug "Matched chain: #{chain}"
+          # end
           chain_list[0]
         end
 

data/lib/libis/format/pdf_copy.rb

@@ -19,30 +19,20 @@ module Libis
       def run(source, target, options = [])
         tool_dir = File.absolute_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'tools'))
         jar_file = File.join(tool_dir, 'PdfTool.jar')
+
         if OS.java?
-          # TODO: import library and execute in current VM. For now do exactly as in MRI
-          result = Libis::Tools::Command.run(
-              Libis::Format::Config[:java_path],
-              '-jar', jar_file,
-              'CopyPdf',
-              '--file_input', source,
-              '--file_output', target,
-              *options
-          )
-          warn "PdfCopy errors: #{result[:err].join("\n")}" unless result[:status] == 0
-          result[:out]
-        else
-          result = Libis::Tools::Command.run(
-              Libis::Format::Config[:java_path],
-              '-jar', jar_file,
-              'CopyPdf',
-              '--file_input', source,
-              '--file_output', target,
-              *options
-          )
-          warn "PdfCopy errors: #{result[:err].join("\n")}" unless result[:status] == 0
-          result[:out]
+          # TODO: import library and execute in current VM. For now do exactly as in MRI.
         end
+
+        Libis::Tools::Command.run(
+            Libis::Format::Config[:java_path],
+            '-cp', jar_file,
+            'CopyPdf',
+            '--file_input', source,
+            '--file_output', target,
+            *options
+        )
+
       end
     end
 

data/lib/libis/format/pdf_merge.rb

@@ -0,0 +1,41 @@
+require 'os'
+
+require 'libis/tools/extend/string'
+require 'libis/tools/logger'
+require 'libis/tools/command'
+
+require 'libis/format/config'
+
+module Libis
+  module Format
+
+    class PdfMerge
+      include ::Libis::Tools::Logger
+
+      def self.run(source, target, options = [])
+        self.new.run source, target, options
+      end
+
+      def run(source, target, options = [])
+        tool_dir = File.absolute_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'tools'))
+        jar_file = File.join(tool_dir, 'PdfTool.jar')
+        source = [source] unless source.is_a?(Array)
+
+        if OS.java?
+          # TODO: import library and execute in current VM. For now do exactly as in MRI.
+        end
+
+        Libis::Tools::Command.run(
+            Libis::Format::Config[:java_path],
+            '-cp', jar_file,
+            'MergePdf',
+            '--file_output', target,
+            *options,
+            *source,
+        )
+
+      end
+    end
+
+  end
+end

data/lib/libis/format/pdf_split.rb

@@ -0,0 +1,39 @@
+require 'os'
+
+require 'libis/tools/extend/string'
+require 'libis/tools/logger'
+require 'libis/tools/command'
+
+require 'libis/format/config'
+
+module Libis
+  module Format
+
+    class PdfSplit
+      include ::Libis::Tools::Logger
+
+      def self.run(source, target, options = [])
+        self.new.run source, target, options
+      end
+
+      def run(source, target, options = [])
+        tool_dir = File.absolute_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'tools'))
+        jar_file = File.join(tool_dir, 'PdfTool.jar')
+        if OS.java?
+          # TODO: import library and execute in current VM. For now do exactly as in MRI.
+        end
+
+        Libis::Tools::Command.run(
+            Libis::Format::Config[:java_path],
+            '-cp', jar_file,
+            'SplitPdf',
+            '--file_input', source,
+            '--file_output', target,
+            *options
+        )
+
+      end
+    end
+
+  end
+end

data/lib/libis/format/pdf_to_pdfa.rb

@@ -49,16 +49,13 @@ module Libis
         )
 
         FileUtils.rm [icc_file, def_filename].compact, force: true
-        unless result[:status] == 0
-          warn (['Pdf2PdfA errors:'] + result[:err] + result[:out]).join("\n").gsub('%', '%%')
-        end
 
         unless PdfaValidator.run(target)
-          error "Failed to generate correct PDF/A file from '%s'", source
-          return nil
+          result[:status] = -999
+          result[:err] << 'Failed to validate generated PDF/A file.'
         end
 
-        target
+        result
       end
 
 

data/lib/libis/format/version.rb

@@ -1,5 +1,5 @@
 module Libis
   module Format
-    VERSION = '0.9.3'
+    VERSION = '0.9.4'
   end
 end

data/lib/libis/format.rb

@@ -9,6 +9,8 @@ module Libis
     autoload :Droid, 'libis/format/droid'
     autoload :OfficeToPdf, 'libis/format/office_to_pdf'
     autoload :PdfCopy, 'libis/format/pdf_copy'
+    autoload :PdfMerge, 'libis/format/pdf_merge'
+    autoload :PdfSplit, 'libis/format/pdf_split'
     autoload :PdfToPdfa, 'libis/format/pdf_to_pdfa'
     autoload :PdfaValidator, 'libis/format/pdfa_validator'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libis-format
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors:
 - Kris Dekeyser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-07 00:00:00.000000000 Z
+date: 2015-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -164,6 +164,8 @@ files:
 - lib/libis/format/identifier.rb
 - lib/libis/format/office_to_pdf.rb
 - lib/libis/format/pdf_copy.rb
+- lib/libis/format/pdf_merge.rb
+- lib/libis/format/pdf_split.rb
 - lib/libis/format/pdf_to_pdfa.rb
 - lib/libis/format/pdfa_validator.rb
 - lib/libis/format/type_database.rb
@@ -202,6 +204,8 @@ files:
 - spec/test_types.yml
 - spec/type_database_spec.rb
 - tools/PdfTool.jar
+- tools/bcpkix-jdk15on-1.49.jar
+- tools/bcprov-jdk15on-1.49.jar
 - tools/droid/DROID_SignatureFile_V82.xml
 - tools/droid/container-signature-20150307.xml
 - tools/droid/droid-command-line-6.1.5.jar
@@ -354,7 +358,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: LIBIS File format format services.