mini_magick 4.7.0 → 4.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05cb25170ed225d7cf9cd284fb2ab22c3f420c1e
-  data.tar.gz: cf813a1f5be6b785e3480c75f24af283d30ac5df
+  metadata.gz: 49a53e90d9387b9fa7dbb83e10e08fcc7650e2e8
+  data.tar.gz: af2fecfe830084869b34bd41b6b2077b5ec4218a
 SHA512:
-  metadata.gz: 9cf14a742ba8854518d7e5b3b825161ab740244f8d94ce07ce71e5b1793747ba3d650923758eeec2d8ec38bdebc2155c72d5c136ce6475ade7f9fbfe3679130d
-  data.tar.gz: 0141e84fce516b37c6ca2191875fdb28c5c942cad1033d5bf8ce03ed69acca9c26208148639b39ca964139d7f3c2c634d94e10af55316270e669dba39630f08f
+  metadata.gz: fa011122b74d076892ae48198f56b71ab809f20bdca8d56c1a0754ccd7711c03093bcd6721b6b15aedd4599ede040ccb3d23d4947dbf4748f7531b5e68f0e5bb
+  data.tar.gz: 2507b667f71982f46c181a4b0ae8c55f94a2d01338f035a98e0df38ff18639b39a957bbd754c6b481e61c0a95f446e16e157e4b9562c1551f2696651c7ef22f0

data/lib/mini_magick/image.rb

@@ -76,9 +76,12 @@ module MiniMagick
     # @param path_or_url [String] Either a local file path or a URL that
     #   open-uri can read
     # @param ext [String] Specify the extension you want to read it as
+    # @param options [Hash] Specify options for the open method
     # @return [MiniMagick::Image] The loaded image
     #
-    def self.open(path_or_url, ext = nil)
+    def self.open(path_or_url, ext = nil, options = {})
+      options, ext = ext, nil if ext.is_a?(Hash)
+
       ext ||=
         if File.exist?(path_or_url)
           File.extname(path_or_url)
@@ -86,7 +89,9 @@ module MiniMagick
           File.extname(URI(path_or_url).path)
         end
 
-      Kernel.open(path_or_url, "rb") do |file|
+      ext.sub!(/:.*/, '') # hack for filenames or URLs that include a colon
+
+      Kernel.open(path_or_url, "rb", options) do |file|
         read(file, ext)
       end
     end
@@ -341,11 +346,14 @@ module MiniMagick
     #
     # @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
+      convert = MiniMagick::Tool::Convert.new
+      convert << path
+      convert.depth(8)
+      convert << "RGB:-"
+
+      # Do not use `convert.call` here. We need the whole binary (unstripped) output here.
+      shell = MiniMagick::Shell.new
+      output, * = shell.run(convert.command)
 
       pixels_array = output.unpack("C*")
       pixels = pixels_array.each_slice(3).each_slice(width).to_a
@@ -553,13 +561,7 @@ module MiniMagick
     end
 
     def mogrify(page = nil)
-      MiniMagick::Tool::Mogrify.new do |builder|
-        builder.instance_eval do
-          def format(*args)
-            fail NoMethodError,
-              "you must call #format on a MiniMagick::Image directly"
-          end
-        end
+      MiniMagick::Tool::MogrifyRestricted.new do |builder|
         yield builder if block_given?
         builder << (page ? "#{path}[#{page}]" : path)
       end

data/lib/mini_magick/tool/mogrify_restricted.rb

@@ -0,0 +1,15 @@
+require "mini_magick/tool/mogrify"
+
+module MiniMagick
+  class Tool
+    ##
+    # @see http://www.imagemagick.org/script/mogrify.php
+    #
+    class MogrifyRestricted < Mogrify
+      def format(*args)
+        fail NoMethodError,
+          "you must call #format on a MiniMagick::Image directly"
+      end
+    end
+  end
+end

data/lib/mini_magick/tool.rb

@@ -92,7 +92,7 @@ module MiniMagick
       stdout, stderr, status = shell.run(command, options)
       yield stdout, stderr, status if block_given?
 
-      stdout.strip
+      stdout.chomp("\n")
     end
 
     ##
@@ -286,5 +286,6 @@ require "mini_magick/tool/display"
 require "mini_magick/tool/identify"
 require "mini_magick/tool/import"
 require "mini_magick/tool/mogrify"
+require "mini_magick/tool/mogrify_restricted"
 require "mini_magick/tool/montage"
 require "mini_magick/tool/stream"

data/lib/mini_magick/version.rb

@@ -8,7 +8,7 @@ module MiniMagick
 
   module VERSION
     MAJOR = 4
-    MINOR = 7
+    MINOR = 8
     TINY  = 0
     PRE   = nil
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mini_magick
 version: !ruby/object:Gem::Version
-  version: 4.7.0
+  version: 4.8.0
 platform: ruby
 authors:
 - Corey Johnson
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-28 00:00:00.000000000 Z
+date: 2017-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -85,6 +85,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  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'
 description: Manipulate images with minimal use of memory via ImageMagick / GraphicsMagick
 email:
 - probablycorey@gmail.com
@@ -115,6 +129,7 @@ files:
 - lib/mini_magick/tool/identify.rb
 - lib/mini_magick/tool/import.rb
 - lib/mini_magick/tool/mogrify.rb
+- lib/mini_magick/tool/mogrify_restricted.rb
 - lib/mini_magick/tool/montage.rb
 - lib/mini_magick/tool/stream.rb
 - lib/mini_magick/utilities.rb
@@ -140,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - You must have ImageMagick or GraphicsMagick installed
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Manipulate images with minimal use of memory via ImageMagick / GraphicsMagick