mini_magick 4.10.1 → 4.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29b57b7ad13279ad3a6cdef274c7b9cc6efd5c509db5f6bd826e6affe6364081
-  data.tar.gz: e958f807b9d779f94e502786510b656948d3ecbb9f89c2539ff0aa11afd0079e
+  metadata.gz: 20aea50f08b4b5c234dc8167e3b8f344b3bb5e279e4d28857ce38d2acbdc0772
+  data.tar.gz: 513048f1e3315516fe592da1ecb3dec41f8e7a55e8165fe37db0720a297c5daa
 SHA512:
-  metadata.gz: 71843702fea5e44a8ef160c03af2319b6cce43d8191201056fff1a32e9297c3045e0c2cb15a6611243c4ab0ed9f8883a4f1669ef570c8da659e1c1a17d3e922f
-  data.tar.gz: 5cb059a1319aa29750ec2e5e46d04b5b9256b2ca4896a72f28ca94594df573a16d607f35558fc49b00f9839b4e8553df94788e24842f43b18aaa10d9ec39c7e7
+  metadata.gz: b5e8d72969c3649b4514a5b53fb5d228fb5db58bd9bdef0b7457838ed1289e62c8a6c0ec28cda9463fc16a159724d024a23043de5a377c2824f5bc9b148a627d
+  data.tar.gz: 28e78716378e97ba8c57758cb684b0428d734c1e5163f626a53b38f52c8f133db7fe0f041727c3a5ee200d241cdbd9409986caacc49746d361905c76a4bfed38

data/lib/mini_magick/configuration.rb

@@ -4,14 +4,6 @@ require 'logger'
 module MiniMagick
   module Configuration
 
-    ##
-    # Set whether you want to use [ImageMagick](http://www.imagemagick.org) or
-    # [GraphicsMagick](http://www.graphicsmagick.org).
-    #
-    # @return [Symbol] `:imagemagick`, `:imagemagick7`, or `:graphicsmagick`
-    #
-    attr_accessor :cli
-
     ##
     # If you don't have the CLI tools in your PATH, you can set the path to the
     # executables.
@@ -53,6 +45,13 @@ module MiniMagick
     # @return [Logger]
     #
     attr_accessor :logger
+    ##
+    # Temporary directory used by MiniMagick, default is `Dir.tmpdir`, but
+    # you can override it.
+    #
+    # @return [String]
+    #
+    attr_accessor :tmpdir
 
     ##
     # If set to `true`, it will `identify` every newly created image, and raise
@@ -90,6 +89,7 @@ module MiniMagick
     attr_accessor :shell_api
 
     def self.extended(base)
+      base.tmpdir = Dir.tmpdir
       base.validate_on_create = true
       base.validate_on_write = true
       base.whiny = true

data/lib/mini_magick/image/info.rb

@@ -42,7 +42,7 @@ module MiniMagick
 
       def cheap_info(value)
         @info.fetch(value) do
-          format, width, height, size = self["%m %w %h %b"].split(" ")
+          format, width, height, size = parse_warnings(self["%m %w %h %b"]).split(" ")
 
           path = @path
           path = path.match(/\[\d+\]$/).pre_match if path =~ /\[\d+\]$/
@@ -62,6 +62,16 @@ module MiniMagick
         raise MiniMagick::Invalid, "image data can't be read"
       end
 
+      def parse_warnings(raw_info)
+        return raw_info unless raw_info.split("\n").size > 1
+
+        raw_info.split("\n").each do |line|
+          # must match "%m %w %h %b"
+          return line if line.match?(/^[A-Z]+ \d+ \d+ \d+(|\.\d+)([KMGTPEZY]{0,1})B$/)
+        end
+        raise TypeError
+      end
+
       def colorspace
         @info["colorspace"] ||= self["%r"]
       end

data/lib/mini_magick/image.rb

@@ -15,7 +15,7 @@ module MiniMagick
     # methods.
     #
     # Use this to pass in a stream object. Must respond to #read(size) or be a
-    # binary string object (BLOBBBB)
+    # binary string object (BLOB)
     #
     # Probably easier to use the {.open} method if you want to open a file or a
     # URL.
@@ -340,13 +340,18 @@ module MiniMagick
     #
     # 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
+    # 3) three or four elements in the range 0-255, one for each of the RGB(A) 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
     #
+    # @example
+    #   img = MiniMagick::Image.open 'image.jpg'
+    #   pixels = img.get_pixels("RGBA")
+    #   pixels[3][2][3] # the alpha channel value from the 4th-row, 3rd-column pixel
+    #
     # It can also be called after applying transformations:
     #
     # @example
@@ -357,19 +362,22 @@ module MiniMagick
     #
     # In this example, all pixels in pix should now have equal R, G, and B values.
     #
+    # @param map [String] A code for the mapping of the pixel data. Must be either
+    #   'RGB' or 'RGBA'. Default to 'RGB'
     # @return [Array] Matrix of each color of each pixel
-    def get_pixels
+    def get_pixels(map="RGB")
+      raise ArgumentError, "Invalid map value" unless ["RGB", "RGBA"].include?(map)
       convert = MiniMagick::Tool::Convert.new
       convert << path
       convert.depth(8)
-      convert << "RGB:-"
+      convert << "#{map}:-"
 
       # 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
+      pixels = pixels_array.each_slice(map.length).each_slice(width).to_a
 
       # deallocate large intermediary objects
       output.clear
@@ -378,6 +386,23 @@ module MiniMagick
       pixels
     end
 
+    ##
+    # This is used to create image from pixels. This might be required if you
+    # create pixels for some image processing reasons and you want to form 
+    # image from those pixels.
+    #
+    # *DANGER*: This operation can be very expensive. Please try to use with
+    # caution. 
+    # 
+    # @example
+    #   # It is given in readme.md file
+    ##
+    def self.get_image_from_pixels(pixels, dimension, map, depth, mime_type)
+      pixels = pixels.flatten
+      blob = pixels.pack('C*')
+      import_pixels(blob, *dimension, depth, map, mime_type)
+    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
@@ -436,6 +461,9 @@ module MiniMagick
       @info.clear
 
       self
+    rescue MiniMagick::Invalid, MiniMagick::Error => e
+      new_tempfile.unlink if new_tempfile && @tempfile != new_tempfile
+      raise e
     end
 
     ##

data/lib/mini_magick/shell.rb

@@ -14,7 +14,7 @@ module MiniMagick
       stdout, stderr, status = execute(command, stdin: options[:stdin])
 
       if status != 0 && options.fetch(:whiny, MiniMagick.whiny)
-        fail MiniMagick::Error, "`#{command.join(" ")}` failed with error:\n#{stderr}"
+        fail MiniMagick::Error, "`#{command.join(" ")}` failed with status: #{status} and error:\n#{stderr}"
       end
 
       $stderr.print(stderr) unless options[:stderr] == false
@@ -25,7 +25,7 @@ module MiniMagick
     def execute(command, options = {})
       stdout, stderr, status =
         log(command.join(" ")) do
-          send("execute_#{MiniMagick.shell_api.gsub("-", "_")}", command, options)
+          send("execute_#{MiniMagick.shell_api.tr("-", "_")}", command, options)
         end
 
       [stdout, stderr, status.exitstatus]
@@ -50,9 +50,7 @@ module MiniMagick
         end
         in_w.close
 
-        begin
-          Timeout.timeout(MiniMagick.timeout) { thread.join }
-        rescue Timeout::Error
+        unless thread.join(MiniMagick.timeout)
           Process.kill("TERM", thread.pid) rescue nil
           Process.waitpid(thread.pid)      rescue nil
           raise Timeout::Error, "MiniMagick command timed out: #{command}"

data/lib/mini_magick/tool.rb

@@ -44,8 +44,10 @@ module MiniMagick
     # @private
     attr_reader :name, :args
 
-    # @param whiny [Boolean] Whether to raise errors on exit codes different
-    #   than 0.
+    # @param name [String]
+    # @param options [Hash]
+    # @option options [Boolean] :whiny Whether to raise errors on non-zero
+    #   exit codes.
     # @example
     #   MiniMagick::Tool::Identify.new(whiny: false) do |identify|
     #     identify.help # returns exit status 1, which would otherwise throw an error
@@ -190,9 +192,15 @@ module MiniMagick
     #   end
     #   # executes `convert wand.gif \( wizard.gif -rotate 30 \) +append images.gif`
     #
-    def stack
+    def stack(*args)
       self << "("
-      yield self
+      args.each do |value|
+        case value
+        when Hash   then value.each { |key, value| send(key, *value) }
+        when String then self << value
+        end
+      end
+      yield self if block_given?
       self << ")"
     end
 
@@ -227,12 +235,13 @@ module MiniMagick
     ##
     # Define creator operator methods
     #
+    # @example
     #   mogrify = MiniMagick::Tool.new("mogrify")
     #   mogrify.canvas("khaki")
     #   mogrify.command.join(" ") #=> "mogrify canvas:khaki"
     #
     CREATION_OPERATORS.each do |operator|
-      define_method(operator.gsub('-', '_')) do |value = nil|
+      define_method(operator.tr('-', '_')) do |value = nil|
         self << "#{operator}:#{value}"
         self
       end
@@ -251,10 +260,11 @@ module MiniMagick
     ##
     # Any undefined method will be transformed into a CLI option
     #
+    # @example
     #   mogrify = MiniMagick::Tool.new("mogrify")
     #   mogrify.adaptive_blur("...")
     #   mogrify.foo_bar
-    #   mogrify.command.join(" ") "mogrify -adaptive-blur ... -foo-bar"
+    #   mogrify.command.join(" ") # => "mogrify -adaptive-blur ... -foo-bar"
     #
     def method_missing(name, *args)
       option = "-#{name.to_s.tr('_', '-')}"

data/lib/mini_magick/utilities.rb

@@ -24,7 +24,7 @@ module MiniMagick
     end
 
     def tempfile(extension)
-      Tempfile.new(["mini_magick", extension]).tap do |tempfile|
+      Tempfile.new(["mini_magick", extension], MiniMagick.tmpdir).tap do |tempfile|
         tempfile.binmode
         yield tempfile if block_given?
         tempfile.close

data/lib/mini_magick/version.rb

@@ -8,8 +8,8 @@ module MiniMagick
 
   module VERSION
     MAJOR = 4
-    MINOR = 10
-    TINY  = 1
+    MINOR = 12
+    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.10.1
+  version: 4.12.0
 platform: ruby
 authors:
 - Corey Johnson
@@ -10,10 +10,10 @@ authors:
 - James Miller
 - Thiago Fernandes Massa
 - Janko Marohnić
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-01-06 00:00:00.000000000 Z
+date: 2022-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -118,7 +118,6 @@ files:
 - lib/mini_magick/configuration.rb
 - lib/mini_magick/image.rb
 - lib/mini_magick/image/info.rb
-- lib/mini_magick/immutable_image.rb
 - lib/mini_magick/shell.rb
 - lib/mini_magick/tool.rb
 - lib/mini_magick/tool/animate.rb
@@ -140,7 +139,7 @@ homepage: https://github.com/minimagick/minimagick
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -156,8 +155,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - You must have ImageMagick or GraphicsMagick installed
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: Manipulate images with minimal use of memory via ImageMagick / GraphicsMagick
 test_files: []

data/lib/mini_magick/immutable_image.rb

@@ -1,18 +0,0 @@
-module MiniMagick
-  class Image
-    def initialize(source)
-      if source.is_a?(String) || source.is_a?(Pathname)
-        @source_path = source.to_s
-      elsif source.respond_to?(:path)
-        @source_path = source.path
-      else
-        fail ArgumentError, "invalid source object: #{source.inspect} (expected String, Pathname or #path)"
-      end
-    end
-
-    def method_missing
-    end
-  end
-end
-
-image = MiniMagick::Image.new()