mini_magick 4.9.3 → 4.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64f0a10a42282ac51172d0bcf2309a1cd4e8d6b8704ff516415b9e5b5685ada5
-  data.tar.gz: f09955027bb2cf88fb2f8158e1378d83e4999201b717be3ebf362966b6770db8
+  metadata.gz: 3ab4ce03957b9a0f941f9bd2c34a5dcab63faffac5143eb6e7c90d7d860b57c5
+  data.tar.gz: 7bd78f0c862f1ca72b34e3c6fc4d14297adfa9dd6bc36218a35ef68c235320b5
 SHA512:
-  metadata.gz: 108822b3868f6a43a92c711950d81ed6cbb63aacfc9646a7b19625fcaf666b247af8f7729949f16d3e66d16890d5f887b458bb2a0ff66a106a67c81ac61175cf
-  data.tar.gz: 76d7a867d165ae823e8386a396b554605dcb4c4bb9d34a2b7e071bfa46e3bfb0b8bbb3729bc9b69676edd64913c9acd2ff1ced4d824593a7d199a3f152707665
+  metadata.gz: 16c4bfa3744a2bea117bff0118afcbf89fac2f3d9e92c5c8af2b095f6c1381c1d000bede5086ccffd72ecca8152845cde11a5ff762186bd90793ee5d83e03a77
+  data.tar.gz: fe593ad2a7bfd4b6f2d9892533fd5347046e7dfb6cfd8e3bc6049cb1ae7686f5af60c23f33254175bca4728a58bdeeab2b9bfb873ebd94c46f14e68e086f002f

data/lib/mini_magick/configuration.rb

@@ -11,16 +11,12 @@ module MiniMagick
     # @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 +39,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
@@ -119,12 +115,14 @@ module MiniMagick
       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 +133,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 +164,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

@@ -82,17 +82,15 @@ 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)
-        else
-          File.extname(URI(path_or_url).path)
-        end
+      uri = URI(path_or_url.to_s)
 
+      ext ||= File.extname(uri.path)
       ext.sub!(/:.*/, '') # hack for filenames or URLs that include a colon
 
-      Kernel.open(path_or_url, "rb", options) do |file|
-        read(file, ext)
+      if uri.is_a?(URI::HTTP) || uri.is_a?(URI::FTP)
+        uri.open(options) { |file| read(file, ext) }
+      else
+        File.open(uri.to_s, "rb", options) { |file| read(file, ext) }
       end
     end
 

data/lib/mini_magick/image/info.rb

@@ -141,7 +141,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/version.rb

@@ -9,7 +9,7 @@ module MiniMagick
   module VERSION
     MAJOR = 4
     MINOR = 9
-    TINY  = 3
+    TINY  = 4
     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.9.4
 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: 2019-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -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.0.3
 signing_key: 
 specification_version: 4
 summary: Manipulate images with minimal use of memory via ImageMagick / GraphicsMagick