mini_magick 5.0.0 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2a979a253bd3d26fe275850919ab3569c69ae6b2817fadf6660bbeaa9ec3e07
-  data.tar.gz: a1c7c90b81883cdf2c1734906ff07a72bc50c427cf35835f67818d5245e78936
+  metadata.gz: 7ac6bfa9bd38b6ba1482ad9d52e4ce0f983a44ae6cc51d1e7cb66c1cca49209f
+  data.tar.gz: e3088be1a95e47dc6b0426a8bc76f3ac071e3755f301c3d06c6d46b442ae7274
 SHA512:
-  metadata.gz: 6cd0afcaab4af7f1f069938fef824290cdf03b5b17920594acc81c2dbb7b1c6828cb88af157e784fd27ba387cd27d2acf0fa8a5e1c3b9a02924ec11d7a4630eb
-  data.tar.gz: b99d1936faea4689b647d39832de3424dc1bdde6d748c0c9b0d8432dd24b6e89661690f141089d5a0a88315fcd2658a4da8c3ba2736929aeafbb4113cdc43541
+  metadata.gz: c2703437721ca376faf5674d2b0a10c34f456d0146ee4a7dc3ad506d700be9fcd098301213b1c688931ae872f8507691f02b70eb4f3131df2c1a760e8f86f25d
+  data.tar.gz: c8d33063710a5e0898e6bd2a5aaca6533c0d2943c4a5c545ab700de5e25eb38fa0efc4e08cf9d5eec46c3ba78d315231c541f6b4fe802306da181513b957291c

data/README.md

@@ -48,7 +48,7 @@ $ bundle add mini_magick
 
 ## Information
 
-* [API documentation](http://rubydoc.info/github/minimagick/minimagick)
+* [API documentation](https://rubydoc.info/gems/mini_magick)
 
 ## Usage
 
@@ -240,11 +240,12 @@ MiniMagick.configure do |config|
   config.tmdir = Dir.tmpdir # alternative directory for tempfiles
   config.logger = Logger.new($stdout) # where to log IM commands
   config.cli_prefix = nil # add prefix to all IM commands
+  config.cli_env = {} # environment variables to set for IM commands
 end
 ```
 
 For a more information, see
-[Configuration](http://rubydoc.info/github/minimagick/minimagick/MiniMagick/Configuration) API documentation.
+[Configuration](https://rubydoc.info/gems/mini_magick/MiniMagick/Configuration) API documentation.
 
 ### Composite
 
@@ -455,11 +456,14 @@ end
 ### GraphicsMagick
 
 As of MiniMagick 5+, [GraphicsMagick](http://www.graphicsmagick.org/) isn't
-officially supported. However, you can still configure MiniMagick to use it:
+officially supported. This means its installation won't be auto-detected, and no
+attempts will be made to handle differences in GraphicsMagick API or output.
+
+However, you can still configure MiniMagick to use it:
 
 ```rb
 MiniMagick.configure do |config|
-  config.cli_prefix = "gm"
+  config.graphicsmagick = true
 end
 ```
 
@@ -468,16 +472,27 @@ Some MiniMagick features won't be supported, such as global timeout,
 
 ### Limiting resources
 
-ImageMagick supports a number of environment variables for controlling its
+ImageMagick supports a number of [environment variables] for controlling its
 resource limits. For example, you can enforce memory or execution time limits by
-setting the following variables in your application's process environment:
+setting the following:
 
-* `MAGICK_MEMORY_LIMIT=128MiB`
-* `MAGICK_MAP_LIMIT=64MiB`
-* `MAGICK_TIME_LIMIT=30`
+```rb
+MiniMagick.configure do |config|
+  config.cli_env = {
+    "MAGICK_MEMORY_LIMIT" => "128MiB",
+    "MAGICK_MAP_LIMIT" => "64MiB",
+    "MAGICK_TIME_LIMIT" => "30"
+  }
+end
+```
 
-For a full list of variables and description, see [ImageMagick's resources
-documentation](http://www.imagemagick.org/script/resources.php#environment).
+For time limit you can also use the `timeout` configuration:
+
+```rb
+MiniMagick.configure do |config|
+  config.timeout = 30 # 30 seconds
+end
+```
 
 ### Changing temporary directory
 
@@ -538,3 +553,5 @@ Unlike RMagick, MiniMagick is a much thinner wrapper around ImageMagick.
 * To open files with MiniMagick you use `MiniMagick::Image.open` as you would
   `Magick::Image.read`. To open a file and directly edit it, use
   `MiniMagick::Image.new`.
+
+[environment variables]: https://imagemagick.org/script/resources.php#environment

data/lib/mini_magick/configuration.rb

@@ -4,6 +4,13 @@ require 'logger'
 module MiniMagick
   module Configuration
 
+    ##
+    # Uses [GraphicsMagick](http://www.graphicsmagick.org/) instead of
+    # ImageMagick, by prefixing commands with `gm` instead of `magick`.
+    #
+    # @return [Boolean]
+    attr_accessor :graphicsmagick
+
     ##
     # Adds a prefix to the CLI command.
     # For example, you could use `firejail` to run all commands in a sandbox.
@@ -15,6 +22,16 @@ module MiniMagick
     #
     attr_accessor :cli_prefix
 
+    ##
+    # Adds environment variables to every CLI command call.
+    # For example, you could use it to set `LD_PRELOAD="/path/to/libsomething.so"`.
+    # Must be a hash of strings keyed to valid environment variable name strings.
+    # e.g. {'MY_ENV' => 'my value'}
+    #
+    # @return [Hash]
+    #
+    attr_accessor :cli_env
+
     ##
     # If you don't want commands to take too long, you can set a timeout (in
     # seconds).
@@ -55,6 +72,8 @@ module MiniMagick
       base.errors = true
       base.logger = Logger.new($stdout).tap { |l| l.level = Logger::INFO }
       base.warnings = true
+      base.cli_env = {}.freeze
+      base.graphicsmagick = false
     end
 
     ##

data/lib/mini_magick/image.rb

@@ -465,6 +465,13 @@ module MiniMagick
       end
     end
 
+    ##
+    # Prevents ruby from calling `#to_ary` on the image when checking if it's a
+    # splattable data structure in certain cases.
+    def respond_to_missing?(name, include_all)
+      false
+    end
+
     ##
     # Writes the temporary file out to either a file location (by passing in a
     # String) or by passing in a Stream that you can #write(chunk) to
@@ -487,8 +494,6 @@ module MiniMagick
       else
         IO.copy_stream File.open(path, "rb"), output_to
       end
-    ensure
-      destroy! if tempfile
     end
 
     ##

data/lib/mini_magick/shell.rb

@@ -21,14 +21,18 @@ module MiniMagick
         end
       end
 
-      $stderr.print(stderr) if warnings && stderr.strip != %(WARNING: The convert command is deprecated in IMv7, use "magick")
+      $stderr.print(stderr) if warnings
 
       [stdout, stderr, status]
     end
 
     def execute(command, stdin: "", timeout: MiniMagick.timeout)
+      env = {}
+      env.merge!(MiniMagick.cli_env)
+      env["MAGICK_TIME_LIMIT"] = timeout.to_s if timeout
+
       stdout, stderr, status = log(command.join(" ")) do
-        Open3.capture3({ "MAGICK_TIME_LIMIT" => timeout&.to_s }, *command, stdin_data: stdin)
+        Open3.capture3(env, *command, stdin_data: stdin)
       end
 
       [stdout, stderr, status&.exitstatus]

data/lib/mini_magick/tool.rb

@@ -122,8 +122,9 @@ module MiniMagick
     #
     def executable
       exe = [name]
+      exe.unshift "gm" if MiniMagick.graphicsmagick
       exe.unshift "magick" if MiniMagick.imagemagick7? && name != "magick"
-      Array(MiniMagick.cli_prefix).reverse_each { |p| exe.unshift p } if MiniMagick.cli_prefix
+      exe.unshift *Array(MiniMagick.cli_prefix)
       exe
     end
 

data/lib/mini_magick/version.rb

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

data/lib/mini_magick.rb

@@ -17,13 +17,14 @@ module MiniMagick
   #
   # @return [Boolean]
   def self.imagemagick7?
+    return false if graphicsmagick
     return @imagemagick7 if defined?(@imagemagick7)
     @imagemagick7 = !!MiniMagick::Utilities.which("magick")
   end
 
   %w[animate compare composite conjure convert display identify import mogrify montage stream].each do |tool|
-    name = imagemagick7? && tool == "convert" ? "magick" : tool
     define_singleton_method(tool) do |**options, &block|
+      name = imagemagick7? && tool == "convert" ? "magick" : tool
       MiniMagick::Tool.new(name, **options, &block)
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mini_magick
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.1.0
 platform: ruby
 authors:
 - Corey Johnson
@@ -10,10 +10,9 @@ authors:
 - James Miller
 - Thiago Fernandes Massa
 - Janko Marohnić
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-08 00:00:00.000000000 Z
+date: 2025-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -35,28 +34,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.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'
+        version: '3.5'
 description: Manipulate images with minimal use of memory via ImageMagick
 email:
 - probablycorey@gmail.com
@@ -85,7 +70,6 @@ licenses:
 - MIT
 metadata:
   changelog_uri: https://github.com/minimagick/minimagick/releases
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -101,8 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - You must have ImageMagick installed
-rubygems_version: 3.5.11
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Manipulate images with minimal use of memory via ImageMagick
 test_files: []