libis-format 0.9.25 → 0.9.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3fd8793200e3cb32f5a45fcae74e20e2894b770d
-  data.tar.gz: 75723f33d4d2f3bbca14d8a2f7c39061a267907d
+  metadata.gz: cadc47b943e364c4c6434923afbfb3dc27e54d78
+  data.tar.gz: c84123018a48a1b2397ad7e7e4fc3b7d759a38b0
 SHA512:
-  metadata.gz: 74deb6b251df7739c4102e523a596cfcf4fc1b677e15c7c006375ced4d808487268e27c49909fa57cb0309422e50508bd5cafa35a91098283dff06b94472e919
-  data.tar.gz: cbda0fac457af285cf3a6d393388295fce204e5868312c8ea29a39a61d48b2e305376f0d4b00d1882864f3d0361b765ffd7f770269c911cb6ad5e383178c3f6d
+  metadata.gz: 41c4d4af2379031e1e01437403a31e441aae602789ca3c28ef74ebd4da5a66ac419669b0924e2cacfaf6ee24b1a7edd631c113aebcd1ae02d0680d3a7767d5ea
+  data.tar.gz: f2d028224f694e701749b1421b23c29dd49f173be140b65cf9a55587ad3d872f057116f9844235b9f18d2daf37fe505dced601466b943875245ea7c5de4ad9d4

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

@@ -86,14 +86,14 @@ module Libis
         # @param [Hash] options Hash of options for watermark creation.
         def watermark(options = {})
           text = options[:text] || '© LIBIS'
-          image = options[:file] || (Dir::Tmpname.create(%w(wm_image .png)) { |_|})
           @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_i
           rotation = 360 - (options[:rotation] || 30).to_i
-          @wm_image = MiniMagick::Image.new(image)
-          unless @wm_image.valid?
+          @wm_image = MiniMagick::Image.new(options[:file]) if options[:file]
+          unless @wm_image && @wm_image.valid?
+            image = options[:file] || (Dir::Tmpname.create(%w(wm_image .png)) { |_|})
             # noinspection RubyResolve
             MiniMagick::Tool::Convert.new do |convert|
               # noinspection RubyLiteralArrayInspection
@@ -182,13 +182,13 @@ module Libis
 
         def convert_image(source, target, format)
 
-          image = MiniMagick::Image.new(source)
+          image_info = MiniMagick::Image.Info.new(source)
 
           MiniMagick::Tool::Convert.new do |convert|
             if @wm_image
               convert << @wm_image.path
               convert.filter('Lagrange')
-              convert.resize("#{image.width / @wm_size}x#{image.height / @wm_size}").write('mpr:watermark').delete.+
+              convert.resize("#{image_info['width'] / @wm_size}x#{image_info['height'] / @wm_size}").write('mpr:watermark').delete.+
             end
 
             convert << source
@@ -196,10 +196,10 @@ module Libis
             if @wm_image
               # noinspection RubyResolve
               convert.stack do |stack|
-                stack.size("#{image.width}x#{image.height}")
+                stack.size("#{image_info['width']}x#{image_info['height']}")
                 stack << 'xc:transparent'
                 stack.tile('mpr:watermark')
-                stack.draw "rectangle 0,0,#{image.width},#{image.height}"
+                stack.draw "rectangle 0,0,#{image_info['width']},#{image_info['height']}"
               end
               convert.compose(@wm_composition).define("compose:args=#{@wm_opacity}").composite
             end

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

@@ -103,14 +103,13 @@ module Libis
 
           result = nil
 
-          unless @options.empty?
-
-            if (quality = @options.delete('optimize'))
-              result = optimize_pdf(source, target, quality)
-              return nil unless result
-              source = result
-            end
+          if (quality = @options.delete('optimize'))
+            result = optimize_pdf(source, target, quality)
+            return nil unless result
+            source = result
+          end
 
+          unless @options.empty?
             result = convert_pdf(source, target)
             return nil unless result
             source = result

data/lib/libis/format/version.rb

@@ -1,5 +1,5 @@
 module Libis
   module Format
-    VERSION = '0.9.25'
+    VERSION = '0.9.27'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: libis-format
 version: !ruby/object:Gem::Version
-  version: 0.9.25
+  version: 0.9.27
 platform: ruby
 authors:
 - Kris Dekeyser