mork 0.18.1 → 0.18.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c871eb798a14173c833892d6cb6030e266158239058f9ef0fbb2ff359c1073f
-  data.tar.gz: 8e2ac94ee3e806455d617f959459eebe6964521c9711064e5f0c86facf9fda8f
+  metadata.gz: 8cdb6af94ff682ccad23d669fb624d263ea4fb28d5911e3ada2ceeb200c8fd4a
+  data.tar.gz: 956342c055f892ee7e4c44187711b3660eefd8fcee68723bfd1cb2fb245d0a75
 SHA512:
-  metadata.gz: 464bb64cfe62e30bba0037b154d527a00d165b1bd71b4ffa4534bc28cace42fd86aa8455d927d6d660c218d25be92cca4292f60aa66b787af8ce9ed7bea82ba9
-  data.tar.gz: 37ab32c16c165c6c120a8addca74a6bafbe44a02d494ab80968a499dd5d44bad1b6402031c3ff8703a94b8ffbcdd8fc6afd093369b9535883aa49aa2ff2dd0e3
+  metadata.gz: 0c75eaac5ad245b5c86dde97f7e68c43a08486c248014e27963c8c1f763b2cc14fbe545d13f1d75675f1367daaf11df05f8109fdf88d752324cf7972a560e9e4
+  data.tar.gz: 8864848f8f6a4a9cada44dd6f74183928fcdbf15986c97a27eb4d95ba6f60f2c9f0dd6a95ec8029fe961df0f4289da21703e8b9472c4ba6ad3f70929c043ffeb

data/lib/mork/magicko.rb

@@ -18,7 +18,11 @@ module Mork
       # a default of 150 dpi seems sensible. It should not affect bitmaps.
       density = 150
       # inspect the source file
-      s1, s2, s3 = Open3.capture3 "identify -density #{density} -format '%w %h %m' #{path}"
+      identify = MiniMagick.identify
+      identify.density density
+      identify.format '%w %h %m'
+      identify << path
+      s1, s2, s3 = Open3.capture3(*identify.command)
       if s3.success?
         # parse the identify command output
         w, h, @type = s1.split(' ')
@@ -54,16 +58,17 @@ module Mork
     # (i.e. the centers of the four registration marks)
     # pp: a hash in the form of pp[:tl][:x], pp[:tl][:y], etc.
     def registered_bytes(pp)
-      read_bytes "-distort Perspective '#{pps pp}'"
+      read_bytes '-distort', 'Perspective', pps(pp)
     end
 
     # Reading from the image file the bytes from one of the four corner
     # squares encompassing each registration mark; the blur and dilation
     # manipulations may prevent registration misalignments due to stray dark pixels
     def rm_patch(c, blr=0, dlt=0)
-      b = blr==0 ? '' : " -blur #{blr*3}x#{blr}"
-      d = dlt==0 ? '' : " -morphology Dilate Octagon:#{dlt}"
-      read_bytes "-crop #{c.cropper}#{b}#{d}"
+      params = ['-crop', c.cropper]
+      params.concat ['-blur', "#{blr*3}x#{blr}"] unless blr == 0
+      params.concat ['-morphology', 'Dilate', "Octagon:#{dlt}"] unless dlt == 0
+      read_bytes(*params)
     end
 
     ##################################
@@ -171,10 +176,18 @@ module Mork
 
     # calling imagemagick and capturing the converted image
     # into an array of bytes
-    def read_bytes(params=nil)
-      d = @density ? "-density #{@density}" : nil
-      cmd = "magick -depth 8 #{d} #{@path} #{params} gray:-"
-      stdout, stderr, status = Open3.capture3(cmd)
+    def read_bytes(*params)
+      # MiniMagick selects `convert` on ImageMagick 6 and `magick` on
+      # ImageMagick 7. Execute its argv directly to preserve binary stdout
+      # (MiniMagick::Tool#call strips a trailing newline) and avoid a shell.
+      command = MiniMagick.convert
+      command.depth 8
+      command.density @density if @density
+      command << @path
+      command.merge!(params)
+      command << 'gray:-'
+
+      stdout, stderr, status = Open3.capture3(*command.command)
       if status.success?
         stdout.unpack('C*')
       else

data/lib/mork/version.rb

@@ -1,3 +1,3 @@
 module Mork
-  VERSION = '0.18.1'
+  VERSION = '0.18.2'
 end

data/spec/mork/magicko_spec.rb

@@ -39,6 +39,30 @@ module Mork
       end
     end
 
+    describe 'ImageMagick command selection' do
+      let(:status) { instance_double(Process::Status, success?: true) }
+
+      it 'uses ImageMagick 6 convert through MiniMagick and preserves raw bytes' do
+        magicko = ma
+        allow(MiniMagick).to receive(:imagemagick7?).and_return(false)
+        expect(Open3).to receive(:capture3).with(
+          'convert', '-depth', '8', sh.image_path, '-crop', co.cropper, 'gray:-'
+        ).and_return(["\x00\x0a\xff".b, '', status])
+
+        expect(magicko.rm_patch(co)).to eq [0, 10, 255]
+      end
+
+      it 'uses ImageMagick 7 magick through MiniMagick' do
+        magicko = ma
+        allow(MiniMagick).to receive(:imagemagick7?).and_return(true)
+        expect(Open3).to receive(:capture3).with(
+          'magick', '-depth', '8', sh.image_path, '-crop', co.cropper, 'gray:-'
+        ).and_return(["\x00".b, '', status])
+
+        expect(magicko.rm_patch(co)).to eq [0]
+      end
+    end
+
     describe 'overlay stroke width' do
       it 'defaults to the legacy 3-pixel width' do
         expect(ma.overlay_stroke_width).to eq 3

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mork
 version: !ruby/object:Gem::Version
-  version: 0.18.1
+  version: 0.18.2
 platform: ruby
 authors:
 - Giuseppe Bertini