mini_magick 4.3.1 → 4.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea018518f84a24383054e66dfd339b36d004f3f0
-  data.tar.gz: 90b0ab0e59ce32941f9d804915ce29ddbbaa247f
+  metadata.gz: 7f0d6f6689137d1749757919b43718103e708beb
+  data.tar.gz: 310371ca24dc3ab384f2eaff5dcfc2053cdf0d99
 SHA512:
-  metadata.gz: 12c91ebcb9b87f12a9ee2b55e3857d8b75ef840a5c941ea36cb284c949f026f819b2aeabdcf4172f22a9f656a7db9536ac5223bb7caaa0ce120d100bf0120c0d
-  data.tar.gz: 537dd43b9e236ad805faa32a12d6d30a94c36f761719002c73a145fcf5ca35f8b5028c3e42182e396a6bab8ada521439297a34327cf07e8b2063355926fcd7d0
+  metadata.gz: bbaa819729b8f53bd43cfbc3f3d82bba32ca50d6f76730176ec99239ecf519752962f1040b11b5fbca17d4d092f9ddd362aa0e87aab62410043cc2375c6e2bc2
+  data.tar.gz: 1a3163bcc33173731cd6c0d22e3b0cf2a54c3516426dc72bf2eb67826f5efc431af8b8ea1af6435539d4a035b70466728448e1d00d63685a785d79d3870d40e2

data/lib/mini_magick/image/info.rb

@@ -40,12 +40,15 @@ module MiniMagick
         @info.fetch(value) do
           format, width, height, size = self["%m %w %h %b"].split(" ")
 
+          path = @path
+          path = path.match(/\[\d+\]$/).pre_match if path =~ /\[\d+\]$/
+
           @info.update(
             "format"     => format,
             "width"      => Integer(width),
             "height"     => Integer(height),
             "dimensions" => [Integer(width), Integer(height)],
-            "size"       => File.size(@path),
+            "size"       => File.size(path),
             "human_size" => size,
           )
 
@@ -103,9 +106,19 @@ module MiniMagick
           details_string = identify(&:verbose)
           key_stack = []
           details_string.lines.to_a[1..-1].each_with_object({}) do |line, details_hash|
-            next if line.strip.length.zero?
+            next if !line.valid_encoding? || line.strip.length.zero?
+
             level = line[/^\s*/].length / 2 - 1
-            key_stack.pop until key_stack.size <= level
+            if level >= 0
+              key_stack.pop until key_stack.size <= level
+            else
+              # Some metadata, such as SVG clipping paths, will be saved without
+              # indentation, resulting in a level of -1
+              last_key = details_hash.keys.last
+              details_hash[last_key] = '' if details_hash[last_key].empty?
+              details_hash[last_key] << line
+              next
+            end
 
             key, _, value = line.partition(/:[\s\n]/).map(&:strip)
             hash = key_stack.inject(details_hash) { |hash, key| hash.fetch(key) }
@@ -120,9 +133,12 @@ module MiniMagick
       end
 
       def identify
+        path = @path
+        path += "[0]" unless path =~ /\[\d+\]$/
+
         MiniMagick::Tool::Identify.new do |builder|
           yield builder if block_given?
-          builder << "#{@path}[0]"
+          builder << path
         end
       end
 

data/lib/mini_magick/image.rb

@@ -133,6 +133,10 @@ module MiniMagick
     # @return [String] The location of the current working file
     #
     attr_reader :path
+    ##
+    # @return [Tempfile] The underlying temporary file
+    #
+    attr_reader :tempfile
 
     ##
     # Create a new {MiniMagick::Image} object.
@@ -332,17 +336,19 @@ module MiniMagick
     # @return [self]
     #
     def format(format, page = 0)
-      @info.clear
-
       if @tempfile
         new_tempfile = MiniMagick::Utilities.tempfile(".#{format}")
         new_path = new_tempfile.path
       else
-        new_path = path.sub(/\.\w+$/, ".#{format}")
+        new_path = path.sub(/(\.\w+)?$/, ".#{format}")
+        new_path.sub!(/\[(\d+)\]/, '_\1') if layer?
       end
 
+      input_path = path.dup
+      input_path << "[#{page}]" if page && !layer?
+
       MiniMagick::Tool::Convert.new do |convert|
-        convert << (page ? "#{path}[#{page}]" : path)
+        convert << input_path
         yield convert if block_given?
         convert << new_path
       end
@@ -351,10 +357,11 @@ module MiniMagick
         @tempfile.unlink
         @tempfile = new_tempfile
       else
-        File.delete(path) unless path == new_path
+        File.delete(path) unless path == new_path || layer?
       end
 
       path.replace new_path
+      @info.clear
 
       self
     end
@@ -392,7 +399,7 @@ module MiniMagick
     end
 
     def respond_to_missing?(method_name, include_private = false)
-      true
+      MiniMagick::Tool::Mogrify.option_methods.include?(method_name.to_s)
     end
 
     ##
@@ -492,8 +499,6 @@ module MiniMagick
     end
 
     def mogrify(page = nil)
-      @info.clear
-
       MiniMagick::Tool::Mogrify.new do |builder|
         builder.instance_eval do
           def format(*args)
@@ -505,6 +510,8 @@ module MiniMagick
         builder << (page ? "#{path}[#{page}]" : path)
       end
 
+      @info.clear
+
       self
     end
 

data/lib/mini_magick/tool.rb

@@ -16,8 +16,8 @@ module MiniMagick
   class Tool
 
     CREATION_OPERATORS = %w[
-      xc canvas logo rose gradient radial-gradient plasma tile pattern label
-      caption text
+      xc canvas logo rose gradient radial-gradient plasma pattern label caption
+      text
     ]
 
     ##
@@ -185,6 +185,16 @@ module MiniMagick
       end
     end
 
+    ##
+    # This option is a valid ImageMagick option, but it's also a Ruby method,
+    # so we need to override it so that it correctly acts as an option method.
+    #
+    def clone(*args)
+      self << '-clone'
+      self.merge!(args)
+      self
+    end
+
     ##
     # Any undefined method will be transformed into a CLI option
     #
@@ -204,6 +214,22 @@ module MiniMagick
       true
     end
 
+    def self.option_methods
+      @option_methods ||= (
+        tool = new
+        tool << "-help"
+        help_page = tool.call(false, stderr: false)
+
+        cli_options = help_page.scan(/^\s+-[a-z\-]+/).map(&:strip)
+        if tool.name == "mogrify" && MiniMagick.graphicsmagick?
+          # These options were undocumented before 2015-06-14 (see gm bug 302)
+          cli_options |= %w[-box -convolve -gravity -linewidth -mattecolor -render -shave]
+        end
+
+        cli_options.map { |o| o[1..-1].tr('-','_') }
+      )
+    end
+
   end
 end
 

data/lib/mini_magick/version.rb

@@ -8,8 +8,8 @@ module MiniMagick
 
   module VERSION
     MAJOR = 4
-    MINOR = 3
-    TINY  = 1
+    MINOR = 4
+    TINY  = 0
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

data/lib/mini_magick.rb

@@ -1,3 +1,4 @@
+require 'mini_magick/version'
 require 'mini_magick/configuration'
 
 module MiniMagick

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mini_magick
 version: !ruby/object:Gem::Version
-  version: 4.3.1
+  version: 4.4.0
 platform: ruby
 authors:
 - Corey Johnson
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-03 00:00:00.000000000 Z
+date: 2016-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake