mini_magick 4.2.10 → 4.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21c28d5cb2938a6c126985b362544f64858220aa
-  data.tar.gz: 94bdee8c2c92bc7d9e5548202397dff054bd99bc
+  metadata.gz: 9d7353bb4abb1f24f782090a89632e2697cc8f77
+  data.tar.gz: ec2f0d8462829f39796474f292c4d06ef9f7ec35
 SHA512:
-  metadata.gz: 907e11e72c97a02dcc8eaeb80d8c1bdee96561c8ae0134a14a2c00b4385e2dd6b1d9526dead4f523b4df219fe78c09fc1472609e87983a6d0b3d674aa21f8033
-  data.tar.gz: d7f00b1e55cd0e5ab4abfaccd62fa220a34adbc03556a5b92626aa68dc41bd4c3dd61ac1fd0e7a4664a6e6e70971e95227350a11700dccb1ced09914edd782b7
+  metadata.gz: 9ceb0494e0c4d9f568482d2c7c8249ed91e01931ddfffd8e119df1de379e4f35343ba5c40af38daa4b021d359a3d44e4c3ab6e86e096d97487e9beb387697a55
+  data.tar.gz: 9bba8837c2ee3f10751932dee4afcd46724392d7e04a01ee1527aacb8c7043a092e7de7067f85e194da9e8cfeeff03a4d9ec11ea04c93151e8e020983bc0bd20

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,6 +106,7 @@ 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?
             level = line[/^\s*/].length / 2 - 1
             key_stack.pop until key_stack.size <= level
 
@@ -119,9 +123,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]
@@ -332,13 +332,11 @@ 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}")
       end
 
       MiniMagick::Tool::Convert.new do |convert|
@@ -355,6 +353,7 @@ module MiniMagick
       end
 
       path.replace new_path
+      @info.clear
 
       self
     end
@@ -387,16 +386,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 +491,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 +502,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,89 +172,52 @@ 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 ||= []
-      end
-
-      def initialize(tool_name)
-        @tool_name = tool_name
-        reload_methods
-        self.class.instances << self
-      end
-
-      def to_s
-        "OptionMethods(#{@tool_name})"
-      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
-
-      ##
-      # 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
+    CREATION_OPERATORS.each do |operator|
+      define_method(operator.gsub('-', '_')) do |value = nil|
+        self << "#{operator}:#{value}"
+        self
       end
+    end
 
-      ##
-      # 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
-        end
-      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
 
-      def creation_operators
-        %w[xc canvas logo rose gradient radial-gradient
-           plasma tile pattern label caption text]
-      end
+    def respond_to_missing?(method_name, include_private = false)
+      true
+    end
 
-      def cli_options
-        tool = MiniMagick::Tool.new(@tool_name)
+    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)
-        cli_options << "-gravity" if @tool_name == "mogrify" && MiniMagick.graphicsmagick?
-        cli_options
-      end
+        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

data/lib/mini_magick/version.rb

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