libis-format 0.9.22 → 0.9.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed9452c366ebd64b7c1816bd64cdf0db34d8da79
-  data.tar.gz: db6860f1a4d4448ba6b4355a3b6e84f75238648d
+  metadata.gz: 6da0d346cc0447e615991fd72637a58dad86c4fa
+  data.tar.gz: dc22da7ae4018757274d2b0531af680438c26498
 SHA512:
-  metadata.gz: b50c3e2d3e33fab8274de6717ddde01112a99a7487b282b9a5be3178460532a3ec4bb004d883ec498f3b7315a8df104fe57c1242741049e80097bb2c9324805c
-  data.tar.gz: 9e73029ba7b308fc34d599ceb85554b2110581959118b15e6329013b501d06a0d02a75aeabbbd73cbd2aa4821c2c61499cc5bbfb2e0cc9de6ce796aa62501de4
+  metadata.gz: 2006e623d07fca05eccb2eed9e2223c4c44bd202053231227f26b5564f308c41ff0810796556eeb32e9f3804e5798be93bb123b7f67db02837bf1f2ded468ff9
+  data.tar.gz: 29d8ab43eb47664695ab6c705768529ba53eff4df1a06bf86a695f7aabe58c691f3724dd679203aabdf340c3bf576749d45f9d9663e98269acdc4e153a24a2a1

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

@@ -30,16 +30,19 @@ module Libis
           @flags.merge!(opts[:flags]) if opts[:flags]
         end
 
-        def self.input_types(_ = nil)
+        def self.input_types
           raise RuntimeError, 'Method #input_types needs to be overridden in converter'
         end
 
-        def self.output_types(_ = nil)
+        def self.output_types(_format = nil)
           raise RuntimeError, 'Method #output_types needs to be overridden in converter'
         end
 
+        def using_temp(target, &block)
+          self.class.using_temp(target, &block)
+        end
 
-        def using_temp(target)
+        def Base.using_temp(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

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

@@ -14,19 +14,13 @@ module Libis
 
       class ImageConverter < Libis::Format::Converter::Base
 
-        def self.input_types(_ = nil)
+        def self.input_types
           [:TIFF, :JPG, :PNG, :BMP, :GIF, :JP2, :PDF]
         end
 
-        def self.output_types(input_format = nil)
-          case input_format
-            when :JP2
-              [:JP2]
-            when *(input_types - [:JP2])
-              input_types - [:JP2]
-            else
-              []
-          end
+        def self.output_types(format = nil)
+          return [] unless input_types.include?(format)
+          [:TIFF, :JPG, :PNG, :BMP, :GIF, :JP2, :PDF]
         end
 
         def initialize

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

@@ -10,11 +10,12 @@ module Libis
 
       class Jp2Converter < Libis::Format::Converter::Base
 
-        def self.input_types(_ = nil)
+        def self.input_types
           [:TIFF, :JPG, :PNG, :BMP, :GIF, :PDF]
         end
 
-        def self.output_types(_ = nil)
+        def self.output_types(format = nil)
+          return [] unless input_types.include?(format)
           [:JP2]
         end
 
@@ -68,7 +69,7 @@ module Libis
           @options.each do |key, value|
             case key
               when :color_xform
-                options << '--set-output-j2k-color-xform' << value ? 'YES' : 'NO'
+                options << '--set-output-j2k-color-xform' << (value ? 'YES' : 'NO')
               when :error_resilience
                 options << '--set-output-j2k-error-resilience' << value.to_s
               when :lossless
@@ -92,9 +93,10 @@ module Libis
           Libis::Tools::Command.run(
               Libis::Format::Config[:j2kdriver],
               '--input-file-name', source,
-              '--output-file-name', target,
               '--set-output-type', 'JP2',
-              *options
+              *options,
+              '--output-file-name', target,
+
           )
 
           target

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

@@ -11,7 +11,7 @@ module Libis
 
       class OfficeConverter < Libis::Format::Converter::Base
 
-        def self.input_types(_ = nil)
+        def self.input_types
           [
               :TXT,
               :RTF,
@@ -26,7 +26,8 @@ module Libis
           ]
         end
 
-        def self.output_types(_ = nil)
+        def self.output_types(format = nil)
+          return [] unless input_types.include?(format)
           [:PDF]
         end
 

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

@@ -13,11 +13,12 @@ module Libis
 
       class PdfConverter < Libis::Format::Converter::Base
 
-        def self.input_types(_ = nil)
+        def self.input_types
           [:PDF]
         end
 
-        def self.output_types(_ = nil)
+        def self.output_types(format = nil)
+          return [] unless input_types.include?(format)
           [:PDF, :PDFA]
         end
 

data/lib/libis/format/version.rb

@@ -1,5 +1,5 @@
 module Libis
   module Format
-    VERSION = '0.9.22'
+    VERSION = '0.9.23'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libis-format
 version: !ruby/object:Gem::Version
-  version: 0.9.22
+  version: 0.9.23
 platform: ruby
 authors:
 - Kris Dekeyser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-27 00:00:00.000000000 Z
+date: 2016-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler