libis-format 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b999bbcddc6828684dce5503042653689ac740ea
-  data.tar.gz: 973b1c2637e537ed6e34b2d737077c1af6993e58
+  metadata.gz: 21f527308cef3b9865c24c956f5a76cf67973400
+  data.tar.gz: 19c867aef5d28da24a3354025b11fc718b885a7f
 SHA512:
-  metadata.gz: 8b27e038a62221f9c9ff9242a7f0d5fdaf3d9727d117a5d2c06f62edff50936b5ee8ff02590e57e22d535fdf7682d6f0647e5922890272f7288f9eb1fbb7a2ee
-  data.tar.gz: a86e75825e8dad808ee3434f6daf567bc21edc8cdbb4494e59fc10645f9742219d0dd3bbd96f0b7cc55593671e1328183e3828f8064a7bfc8745ae773b11da47
+  metadata.gz: 3af22a3b301bc89a0839215a96a571d729478c61f3d414ee144e7f011d16443f4e604efd8f6afb0b40d2dd02dc77ca65878dfba7b29a6f4bc186beec8373b437
+  data.tar.gz: 81bebc7836625f251e9365100bfdb4a13d3ec4424a26a536521bb1776a11d96472645af1e360077ff64d5ef4e6f08671e0c87330d8fa32f5230b390509a016ce

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

@@ -29,6 +29,10 @@ module Libis
           [:TIFF, :JPG, :PNG, :BMP, :GIF, :PDF, :JP2]
         end
 
+        def self.multipage?(format)
+          [:PDF, :TIFF, :GIF, :PBM, :PGM, :PPM].include?(format)
+        end
+
         def initialize
           @wm_image = nil
           super
@@ -142,24 +146,13 @@ module Libis
           FileUtils.mkpath(File.dirname(target))
 
           if source.is_a? Array
-            sources = source
-
-            unless [:PDF, :TIFF, :GIF, :PBM, :PGM, :PPM].include? format
-              error 'Can ony assemble multiple images into multi-page/layer format'
-              return nil
-            end
 
-            assemble_and_convert(sources, target, format)
+            assemble_and_convert(source, target, format)
 
           elsif File.directory?(source)
-            sources = Dir[File.join(source, '**', '*')].reject { |p| File.directory? p }
+            source_list = Dir[File.join(source, '**', '*')].reject { |p| File.directory? p }
 
-            unless [:TIFF, :PDF].include? format
-              error 'Can ony assemble multiple images into multi-page/layer format'
-              return nil
-            end
-
-            assemble_and_convert(sources, target, format)
+            assemble_and_convert(source_list, target, format)
 
           else
 
@@ -181,12 +174,15 @@ module Libis
         end
 
         def assemble_and_convert(sources, target, format)
+
+          warn 'Received multiple images as input and single page format as target.' unless self.class.multipage?(format)
           converted_pages = sources.inject([]) do |list, path|
             converted = Tempfile.new(['page-', ".#{Libis::Format::TypeDatabase.type_extentions(format).first}"])
             convert_image(path, converted.path, format)
             list << converted
           end
           MiniMagick::Tool::Convert.new do |b|
+            b.append unless self.class.multipage?(format)
             converted_pages.each { |page| b << page.path }
             b << target
           end
@@ -200,7 +196,8 @@ module Libis
 
         def convert_image(source, target, format)
 
-          image_info = MiniMagick::Image::Info.new(source)
+          image_info = nil
+          image_info = MiniMagick::Image::Info.new(source) if @wm_image
 
           MiniMagick::Tool::Convert.new do |convert|
             if @wm_image

data/lib/libis/format/version.rb

@@ -1,5 +1,5 @@
 module Libis
   module Format
-    VERSION = '1.0.1'
+    VERSION = '1.0.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libis-format
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Kris Dekeyser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-02 00:00:00.000000000 Z
+date: 2018-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler