mini_magick 4.2.9 → 4.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40fe759f030711a8b4cae6a7334ba2c553f848a3
-  data.tar.gz: 37037fc7631d55294c20ad991dbc8f0bfb6c8fb2
+  metadata.gz: 7f0d6f6689137d1749757919b43718103e708beb
+  data.tar.gz: 310371ca24dc3ab384f2eaff5dcfc2053cdf0d99
 SHA512:
-  metadata.gz: 89c0deeaf8dc29605ac7651803be5af576822fcfa8485056254eec3710d31563a9f7d536b2f35d7e677d0b8ab9a4a35d5147aec18d0fba8e1fb9fbcb97f454b2
-  data.tar.gz: c553cc750c068c345fbc2757af7eb063e4d222102313f2a64930f9d67ff16adadfc636fe6b17b6377ce03bea0335f0f77d9a47ee6b7652ec02eb3cbf9b5eff28
+  metadata.gz: bbaa819729b8f53bd43cfbc3f3d82bba32ca50d6f76730176ec99239ecf519752962f1040b11b5fbca17d4d092f9ddd362aa0e87aab62410043cc2375c6e2bc2
+  data.tar.gz: 1a3163bcc33173731cd6c0d22e3b0cf2a54c3516426dc72bf2eb67826f5efc431af8b8ea1af6435539d4a035b70466728448e1d00d63685a785d79d3870d40e2

data/lib/mini_magick/configuration.rb

@@ -114,8 +114,6 @@ module MiniMagick
           "processor has to be set to either \"mogrify\" or \"gm\"" \
           ", was set to #{@processor.inspect}"
       end
-
-      reload_tools
     end
 
     def cli
@@ -131,20 +129,11 @@ module MiniMagick
     def cli=(value)
       @cli = value
 
-      case @cli
-      when :imagemagick
-        Utilities.which("mogrify") or
-          raise MiniMagick::Error, "ImageMagick is not installed or CLI is not found"
-      when :graphicsmagick
-        Utilities.which("gm") or
-          raise MiniMagick::Error, "GraphicsMagick is not installed or CLI is not found"
-      else
+      if not [:imagemagick, :graphicsmagick].include?(@cli)
         raise ArgumentError,
           "CLI has to be set to either :imagemagick or :graphicsmagick" \
           ", was set to #{@cli.inspect}"
       end
-
-      reload_tools
     end
 
     def cli_path
@@ -155,8 +144,9 @@ module MiniMagick
       @logger || MiniMagick::Logger.new($stdout)
     end
 
+    # Backwards compatibility
     def reload_tools
-      MiniMagick::Tool::OptionMethods.instances.each(&:reload_methods)
+      warn "[MiniMagick] MiniMagick.reload_tools is deprecated because it is no longer necessary"
     end
 
   end

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,8 +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.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) }
@@ -119,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

@@ -121,7 +121,7 @@ module MiniMagick
     #
     def self.attribute(name, key = name.to_s)
       define_method(name) do |*args|
-        if args.any? && MiniMagick::Tool::Mogrify.instance_methods.include?(name)
+        if args.any? && name != :resolution
           mogrify { |b| b.send(name, *args) }
         else
           @info[key, *args]
@@ -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
@@ -387,16 +394,12 @@ module MiniMagick
     #
     def method_missing(name, *args)
       mogrify do |builder|
-        if builder.respond_to?(name)
-          builder.send(name, *args)
-        else
-          super
-        end
+        builder.send(name, *args)
       end
     end
 
     def respond_to_missing?(method_name, include_private = false)
-      MiniMagick::Tool::Mogrify.new.respond_to?(method_name, include_private)
+      MiniMagick::Tool::Mogrify.option_methods.include?(method_name.to_s)
     end
 
     ##
@@ -496,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)
@@ -509,6 +510,8 @@ module MiniMagick
         builder << (page ? "#{path}[#{page}]" : path)
       end
 
+      @info.clear
+
       self
     end
 

data/lib/mini_magick/tool.rb

@@ -15,11 +15,10 @@ module MiniMagick
   #
   class Tool
 
-    # @private
-    def self.inherited(child)
-      child_name = child.name.split("::").last.downcase
-      child.send :include, MiniMagick::Tool::OptionMethods.new(child_name)
-    end
+    CREATION_OPERATORS = %w[
+      xc canvas logo rose gradient radial-gradient plasma pattern label caption
+      text
+    ]
 
     ##
     # Aside from classic instantiation, it also accepts a block, and then
@@ -173,86 +172,62 @@ module MiniMagick
     end
 
     ##
-    # Dynamically generates modules with dynamically generated option methods
-    # for each command-line tool. It uses the `-help` page of a command-line
-    # tool and generates methods from it. It then includes the generated
-    # module into the tool class.
+    # Define creator operator methods
     #
-    # @private
+    #   mogrify = MiniMagick::Tool.new("mogrify")
+    #   mogrify.canvas("khaki")
+    #   mogrify.command.join(" ") #=> "mogrify canvas:khaki"
     #
-    class OptionMethods < Module # think about it for a minute
-
-      def self.instances
-        @instances ||= []
+    CREATION_OPERATORS.each do |operator|
+      define_method(operator.gsub('-', '_')) do |value = nil|
+        self << "#{operator}:#{value}"
+        self
       end
+    end
 
-      def initialize(tool_name)
-        @tool_name = tool_name
-        reload_methods
-        self.class.instances << self
-      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
 
-      def to_s
-        "OptionMethods(#{@tool_name})"
-      end
+    ##
+    # Any undefined method will be transformed into a CLI option
+    #
+    #   mogrify = MiniMagick::Tool.new("mogrify")
+    #   mogrify.adaptive_blur("...")
+    #   mogrify.foo_bar
+    #   mogrify.command.join(" ") "mogrify -adaptive-blur ... -foo-bar"
+    #
+    def method_missing(name, *args)
+      option = "-#{name.to_s.tr('_', '-')}"
+      self << option
+      self.merge!(args)
+      self
+    end
 
-      ##
-      # Dynamically generates operator methods from the "-help" page.
-      #
-      def reload_methods
-        instance_methods(false).each { |method| undef_method(method) }
-        creation_operator *creation_operators
-        option *cli_options
-      end
+    def respond_to_missing?(method_name, include_private = false)
+      true
+    end
 
-      ##
-      # Creates method based on command-line option's name.
-      #
-      #   mogrify = MiniMagick::Tool.new("mogrify")
-      #   mogrify.antialias
-      #   mogrify.depth(8)
-      #   mogrify.resize("500x500")
-      #   mogrify.command.join(" ")
-      #   #=> "mogrify -antialias -depth 8 -resize 500x500"
-      #
-      def option(*options)
-        options.each do |option|
-          define_method(option[1..-1].tr('-', '_')) do |*values|
-            self << option
-            self.merge!(values)
-            self
-          end
-        end
-      end
+    def self.option_methods
+      @option_methods ||= (
+        tool = new
+        tool << "-help"
+        help_page = tool.call(false, stderr: false)
 
-      ##
-      # Creates method based on creation operator's name.
-      #
-      #   mogrify = MiniMagick::Tool.new("mogrify")
-      #   mogrify.canvas("khaki")
-      #   mogrify.command.join(" ") #=> "mogrify canvas:khaki"
-      #
-      def creation_operator(*operators)
-        operators.each do |operator|
-          define_method(operator.gsub('-', '_')) do |value = nil|
-            self << "#{operator}:#{value}"
-            self
-          end
+        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
-      end
-
-      def creation_operators
-        %w[xc canvas logo rose gradient radial-gradient
-           plasma tile pattern label caption text]
-      end
-
-      def cli_options
-        tool = MiniMagick::Tool.new(@tool_name)
-        tool << "-help"
-        help = tool.call(false, stderr: false)
-        cli_options = help.scan(/^\s+-[a-z\-]+/).map(&:strip)
-      end
 
+        cli_options.map { |o| o[1..-1].tr('-','_') }
+      )
     end
 
   end

data/lib/mini_magick/version.rb

@@ -8,8 +8,8 @@ module MiniMagick
 
   module VERSION
     MAJOR = 4
-    MINOR = 2
-    TINY  = 9
+    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.2.9
+  version: 4.4.0
 platform: ruby
 authors:
 - Corey Johnson
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-02 00:00:00.000000000 Z
+date: 2016-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake