mini_magick 4.9.3 → 4.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64f0a10a42282ac51172d0bcf2309a1cd4e8d6b8704ff516415b9e5b5685ada5
-  data.tar.gz: f09955027bb2cf88fb2f8158e1378d83e4999201b717be3ebf362966b6770db8
+  metadata.gz: f97cb0365a2a45cdb41c9091a4339fdd75a37cdb041c454cab800fd9464f5c0f
+  data.tar.gz: b5f97721ee2657631def0e8c498f257639e126a3ad745688356ae5a15ff5de9f
 SHA512:
-  metadata.gz: 108822b3868f6a43a92c711950d81ed6cbb63aacfc9646a7b19625fcaf666b247af8f7729949f16d3e66d16890d5f887b458bb2a0ff66a106a67c81ac61175cf
-  data.tar.gz: 76d7a867d165ae823e8386a396b554605dcb4c4bb9d34a2b7e071bfa46e3bfb0b8bbb3729bc9b69676edd64913c9acd2ff1ced4d824593a7d199a3f152707665
+  metadata.gz: 5339cf648a6cdc78f5a115e03ab77ec3f61bd83de5fcea0638ccb354e9b03b4c29e59b31e6681da9e1a238b2bee73b2a460ed5db0989eca90c097f29a9b0ebb5
+  data.tar.gz: 53b55f439ac4172e68e82c20e67a357160303fc3c382c0d7bb4bfeb4ba1e3e469b95ff89c517ab15f0c67436ab1c831fee5d7e88d0e981876cbc059b5c7dfad6

data/lib/mini_magick/configuration.rb

@@ -4,23 +4,11 @@ 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
-    # @private (for backwards compatibility)
-    attr_accessor :processor
-
     ##
     # If you don't have the CLI tools in your PATH, you can set the path to the
     # executables.
     #
-    # @return [String]
-    #
-    attr_accessor :cli_path
+    attr_writer :cli_path
     # @private (for backwards compatibility)
     attr_accessor :processor_path
 
@@ -43,12 +31,12 @@ module MiniMagick
     #
     attr_accessor :timeout
     ##
-    # When set to `true`, it outputs each command to STDOUT in their shell
+    # When get to `true`, it outputs each command to STDOUT in their shell
     # version.
     #
     # @return [Boolean]
     #
-    attr_accessor :debug
+    attr_reader :debug
     ##
     # Logger for {#debug}, default is `MiniMagick::Logger.new(STDOUT)`, but
     # you can override it, for example if you want the logs to be written to
@@ -114,17 +102,19 @@ module MiniMagick
     end
 
     CLI_DETECTION = {
+      imagemagick7:   "magick",
       imagemagick:    "mogrify",
       graphicsmagick: "gm",
-      imagemagick7:   "magick",
     }
 
+    # @private (for backwards compatibility)
     def processor
       @processor ||= CLI_DETECTION.values.detect do |processor|
         MiniMagick::Utilities.which(processor)
       end
     end
 
+    # @private (for backwards compatibility)
     def processor=(processor)
       @processor = processor.to_s
 
@@ -135,11 +125,27 @@ module MiniMagick
       end
     end
 
+    ##
+    # Get [ImageMagick](http://www.imagemagick.org) or
+    # [GraphicsMagick](http://www.graphicsmagick.org).
+    #
+    # @return [Symbol] `:imagemagick` or `:graphicsmagick`
+    #
     def cli
-      @cli || CLI_DETECTION.key(processor) or
-        fail MiniMagick::Error, "You must have ImageMagick or GraphicsMagick installed"
+      if instance_variable_defined?("@cli")
+        instance_variable_get("@cli")
+      else
+        cli = CLI_DETECTION.key(processor) or
+          fail MiniMagick::Error, "You must have ImageMagick or GraphicsMagick installed"
+
+        instance_variable_set("@cli", cli)
+      end
     end
 
+    ##
+    # Set whether you want to use [ImageMagick](http://www.imagemagick.org) or
+    # [GraphicsMagick](http://www.graphicsmagick.org).
+    #
     def cli=(value)
       @cli = value
 
@@ -150,10 +156,26 @@ module MiniMagick
       end
     end
 
+    ##
+    # If you set the path of CLI tools, you can get the path of the
+    # executables.
+    #
+    # @return [String]
+    #
     def cli_path
-      @cli_path || @processor_path
+      if instance_variable_defined?("@cli_path")
+        instance_variable_get("@cli_path")
+      else
+        processor_path = instance_variable_get("@processor_path") if instance_variable_defined?("@processor_path")
+
+        instance_variable_set("@cli_path", processor_path)
+      end
     end
 
+    ##
+    # When set to `true`, it outputs each command to STDOUT in their shell
+    # version.
+    #
     def debug=(value)
       warn "MiniMagick.debug is deprecated and will be removed in MiniMagick 5. Use `MiniMagick.logger.level = Logger::DEBUG` instead."
       logger.level = value ? Logger::DEBUG : Logger::INFO

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.
@@ -82,17 +82,30 @@ module MiniMagick
     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)
+      # Don't use Kernel#open, but reuse its logic
+      openable =
+        if path_or_url.respond_to?(:open)
+          path_or_url
+        elsif path_or_url.respond_to?(:to_str) &&
+              %r{\A[A-Za-z][A-Za-z0-9+\-\.]*://} =~ path_or_url &&
+              (uri = URI.parse(path_or_url)).respond_to?(:open)
+          uri
         else
-          File.extname(URI(path_or_url).path)
+          options = { binmode: true }.merge(options)
+          Pathname(path_or_url)
         end
 
+      if openable.is_a?(URI::Generic)
+        ext ||= File.extname(openable.path)
+      else
+        ext ||= File.extname(openable.to_s)
+      end
       ext.sub!(/:.*/, '') # hack for filenames or URLs that include a colon
 
-      Kernel.open(path_or_url, "rb", options) do |file|
-        read(file, ext)
+      if openable.is_a?(URI::Generic)
+        openable.open(options) { |file| read(file, ext) }
+      else
+        openable.open(**options) { |file| read(file, ext) }
       end
     end
 
@@ -365,6 +378,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
@@ -574,5 +604,31 @@ module MiniMagick
     def layer?
       path =~ /\[\d+\]$/
     end
+
+    ##
+    # Compares if image width
+    # is greater than height
+    # ============
+    # |          |
+    # |          |
+    # ============
+    # @return [Boolean]
+    def landscape?
+      width > height
+    end
+
+    ##
+    # Compares if image height
+    # is greater than width
+    # ======
+    # |    |
+    # |    |
+    # |    |
+    # |    |
+    # ======
+    # @return [Boolean]
+    def portrait?
+      height > width
+    end
   end
 end

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+\]$/
@@ -61,6 +61,16 @@ module MiniMagick
       rescue ArgumentError, TypeError
         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+B$/
+        end
+        raise TypeError
+      end
 
       def colorspace
         @info["colorspace"] ||= self["%r"]
@@ -141,7 +151,7 @@ module MiniMagick
             end
 
             key, _, value = line.partition(/:[\s]/).map(&:strip)
-            hash = key_stack.inject(details_hash) { |h, k| h.fetch(k) }
+            hash = key_stack.inject(details_hash) { |_hash, _key| _hash.fetch(_key) }
             if value.empty?
               hash[key] = {}
               key_stack.push key

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,6 +235,7 @@ module MiniMagick
     ##
     # Define creator operator methods
     #
+    # @example
     #   mogrify = MiniMagick::Tool.new("mogrify")
     #   mogrify.canvas("khaki")
     #   mogrify.command.join(" ") #=> "mogrify canvas:khaki"
@@ -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/version.rb

@@ -8,8 +8,8 @@ module MiniMagick
 
   module VERSION
     MAJOR = 4
-    MINOR = 9
-    TINY  = 3
+    MINOR = 11
+    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.9.3
+  version: 4.11.0
 platform: ruby
 authors:
 - Corey Johnson
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-24 00:00:00.000000000 Z
+date: 2020-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -147,7 +147,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -155,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - You must have ImageMagick or GraphicsMagick installed
-rubygems_version: 3.0.1
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Manipulate images with minimal use of memory via ImageMagick / GraphicsMagick