mini_magick 4.6.1 → 4.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4a0a556ff59b381d54bd9baeef89aa7ccaab8e5
-  data.tar.gz: 11a3549176fa09ed8afc3751cbd64d1b2a3aceb8
+  metadata.gz: 05cb25170ed225d7cf9cd284fb2ab22c3f420c1e
+  data.tar.gz: cf813a1f5be6b785e3480c75f24af283d30ac5df
 SHA512:
-  metadata.gz: 3d55ad85c6fefd00cbe9cceabaa158eafb096384309e5baaf7133df542d6ff5273f8e17bed5ec7c5163ebe5fa110635835cb52fc453d045158164f734581aa5a
-  data.tar.gz: 9c50eeddd1c9e4393522754679f4b2ba4db953a375568c2c26dab4c9958a56b89feb404d930a2ce30fd37fdd82d88ec85256f3c5df9553964524ceea474a3948
+  metadata.gz: 9cf14a742ba8854518d7e5b3b825161ab740244f8d94ce07ce71e5b1793747ba3d650923758eeec2d8ec38bdebc2155c72d5c136ce6475ade7f9fbfe3679130d
+  data.tar.gz: 0141e84fce516b37c6ca2191875fdb28c5c942cad1033d5bf8ce03ed69acca9c26208148639b39ca964139d7f3c2c634d94e10af55316270e669dba39630f08f

data/lib/mini_magick/image.rb

@@ -316,6 +316,47 @@ module MiniMagick
     alias pages layers
     alias frames layers
 
+    ##
+    # Returns a matrix of pixels from the image. The matrix is constructed as
+    # an array (1) of arrays (2) of arrays (3) of unsigned integers:
+    #
+    # 1) one for each row of pixels
+    # 2) one for each column of pixels
+    # 3) three elements in the range 0-255, one for each of the RGB color channels
+    #
+    # @example
+    #   img = MiniMagick::Image.open 'image.jpg'
+    #   pixels = img.get_pixels
+    #   pixels[3][2][1] # the green channel value from the 4th-row, 3rd-column pixel
+    #
+    # It can also be called after applying transformations:
+    #
+    # @example
+    #   img = MiniMagick::Image.open 'image.jpg'
+    #   img.crop '20x30+10+5'
+    #   img.colorspace 'Gray'
+    #   pixels = img.get_pixels
+    #
+    # In this example, all pixels in pix should now have equal R, G, and B values.
+    #
+    # @return [Array] Matrix of each color of each pixel
+    def get_pixels
+      output = MiniMagick::Tool::Convert.new do |convert|
+        convert << path
+        convert.depth(8)
+        convert << "RGB:-"
+      end
+
+      pixels_array = output.unpack("C*")
+      pixels = pixels_array.each_slice(3).each_slice(width).to_a
+
+      # deallocate large intermediary objects
+      output.clear
+      pixels_array.clear
+
+      pixels
+    end
+
     ##
     # This is used to change the format of the image. That is, from "tiff to
     # jpg" or something like that. Once you run it, the instance is pointing to
@@ -531,6 +572,5 @@ module MiniMagick
     def layer?
       path =~ /\[\d+\]$/
     end
-
   end
 end

data/lib/mini_magick/shell.rb

@@ -13,12 +13,9 @@ module MiniMagick
     def run(command, options = {})
       stdout, stderr, status = execute(command, stdin: options[:stdin])
 
-      case status
-      when 1
+      if status != 0 && options.fetch(:whiny, MiniMagick.whiny)
         fail MiniMagick::Error, "`#{command.join(" ")}` failed with error:\n#{stderr}"
-      when 127
-        fail MiniMagick::Error, stderr
-      end if options.fetch(:whiny, MiniMagick.whiny)
+      end
 
       $stderr.print(stderr) unless options[:stderr] == false
 
@@ -28,9 +25,7 @@ module MiniMagick
     def execute(command, options = {})
       stdout, stderr, status =
         log(command.join(" ")) do
-          Timeout.timeout(MiniMagick.timeout) do
-            send("execute_#{MiniMagick.shell_api.gsub("-", "_")}", command, options)
-          end
+          send("execute_#{MiniMagick.shell_api.gsub("-", "_")}", command, options)
         end
 
       [stdout, stderr, status.exitstatus]
@@ -43,20 +38,38 @@ module MiniMagick
     def execute_open3(command, options = {})
       require "open3"
 
-      Open3.capture3(*command, binmode: true, stdin_data: options[:stdin].to_s)
+      in_w, out_r, err_r, subprocess_thread = Open3.popen3(*command)
+
+      capture_command(in_w, out_r, err_r, subprocess_thread, options)
     end
 
     def execute_posix_spawn(command, options = {})
       require "posix-spawn"
 
-      pid, stdin, stdout, stderr = POSIX::Spawn.popen4(*command)
-      [stdin, stdout, stderr].each(&:binmode)
-      stdin.write(options[:stdin].to_s)
-      out = stdout.read
-      err = stderr.read
-      Process.waitpid(pid)
+      pid, in_w, out_r, err_r = POSIX::Spawn.popen4(*command)
+      subprocess_thread = Process.detach(pid)
+
+      capture_command(in_w, out_r, err_r, subprocess_thread, options)
+    end
+
+    def capture_command(in_w, out_r, err_r, subprocess_thread, options)
+      [in_w, out_r, err_r].each(&:binmode)
+      stdout_reader = Thread.new { out_r.read }
+      stderr_reader = Thread.new { err_r.read }
+      begin
+        in_w.write options[:stdin].to_s
+      rescue Errno::EPIPE
+      end
+      in_w.close
+
+      Timeout.timeout(MiniMagick.timeout) { subprocess_thread.join }
 
-      [out, err, $?]
+      [stdout_reader.value, stderr_reader.value, subprocess_thread.value]
+    rescue Timeout::Error => error
+      Process.kill("TERM", subprocess_thread.pid)
+      raise error
+    ensure
+      [out_r, err_r].each(&:close)
     end
 
     def log(command, &block)

data/lib/mini_magick/version.rb

@@ -8,8 +8,8 @@ module MiniMagick
 
   module VERSION
     MAJOR = 4
-    MINOR = 6
-    TINY  = 1
+    MINOR = 7
+    TINY  = 0
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mini_magick
 version: !ruby/object:Gem::Version
-  version: 4.6.1
+  version: 4.7.0
 platform: ruby
 authors:
 - Corey Johnson
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-12 00:00:00.000000000 Z
+date: 2017-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -43,6 +43,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.5.0
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: posix-spawn
   requirement: !ruby/object:Gem::Requirement