mini_magick 4.2.4 → 4.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8aceebe51bb1048d1c278bc2e62cc380d69478a1
-  data.tar.gz: 680cf6fbd416b7e6ad4eb6be6ac4c4511043c12d
+  metadata.gz: ea018518f84a24383054e66dfd339b36d004f3f0
+  data.tar.gz: 90b0ab0e59ce32941f9d804915ce29ddbbaa247f
 SHA512:
-  metadata.gz: 94248ff16bec98b38585bd742623e777d2b2019f5af568939d74829d104642f2cb2932a2eedf707e050360baf75b81ea77dc9729a5bd0c173237e84e025fd5c6
-  data.tar.gz: dcc5e762bafebbc6b44f6e1db27375ba139f09475f06a3ecc97b874b46c2927f123698e20a9aa2444e126125d9565220d5b580930217a99623251a3669045cda
+  metadata.gz: 12c91ebcb9b87f12a9ee2b55e3857d8b75ef840a5c941ea36cb284c949f026f819b2aeabdcf4172f22a9f656a7db9536ac5223bb7caaa0ce120d100bf0120c0d
+  data.tar.gz: 537dd43b9e236ad805faa32a12d6d30a94c36f761719002c73a145fcf5ca35f8b5028c3e42182e396a6bab8ada521439297a34327cf07e8b2063355926fcd7d0

data/lib/mini_magick/configuration.rb

@@ -7,7 +7,7 @@ module MiniMagick
     # Set whether you want to use [ImageMagick](http://www.imagemagick.org) or
     # [GraphicsMagick](http://www.graphicsmagick.org).
     #
-    # @return [Symbol] `:imagemagick` or `:minimagick`
+    # @return [Symbol] `:imagemagick` or `:graphicsmagick`
     #
     attr_accessor :cli
     # @private (for backwards compatibility)
@@ -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,13 +129,11 @@ module MiniMagick
     def cli=(value)
       @cli = value
 
-      unless [:imagemagick, :graphicsmagick].include?(@cli)
+      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
@@ -148,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

@@ -11,7 +11,7 @@ module MiniMagick
 
       def [](value, *args)
         case value
-        when "format", "width", "height", "dimensions", "size"
+        when "format", "width", "height", "dimensions", "size", "human_size"
           cheap_info(value)
         when "colorspace"
           colorspace
@@ -45,7 +45,8 @@ module MiniMagick
             "width"      => Integer(width),
             "height"     => Integer(height),
             "dimensions" => [Integer(width), Integer(height)],
-            "size"       => size.to_i,
+            "size"       => File.size(@path),
+            "human_size" => size,
           )
 
           @info.fetch(value)
@@ -100,10 +101,11 @@ module MiniMagick
       def details
         @info["details"] ||= (
           details_string = identify(&:verbose)
-          details_string.each_line.with_object([]).inject({}) do |details_hash, (line, key_stack)|
+          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
-            next details_hash if level == -1 # we ignore the root level
-            key_stack.pop if level < key_stack.size
+            key_stack.pop until key_stack.size <= level
 
             key, _, value = line.partition(/:[\s\n]/).map(&:strip)
             hash = key_stack.inject(details_hash) { |hash, key| hash.fetch(key) }
@@ -113,8 +115,6 @@ module MiniMagick
             else
               hash[key] = value
             end
-
-            details_hash
           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]
@@ -223,12 +223,18 @@ module MiniMagick
     #
     attribute :dimensions
     ##
-    # Returns the file size of the image.
+    # Returns the file size of the image (in bytes).
     #
     # @return [Integer]
     #
     attribute :size
     ##
+    # Returns the file size in a human readable format.
+    #
+    # @return [String]
+    #
+    attribute :human_size
+    ##
     # @return [String]
     #
     attribute :colorspace
@@ -381,16 +387,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)
+      true
     end
 
     ##

data/lib/mini_magick/shell.rb

@@ -10,11 +10,7 @@ module MiniMagick
   #
   class Shell
 
-    def initialize(whiny = true)
-      @whiny = whiny
-    end
-
-    def run(command)
+    def run(command, options = {})
       stdout, stderr, code = execute(command)
 
       case code
@@ -22,9 +18,9 @@ module MiniMagick
         fail MiniMagick::Error, "`#{command.join(" ")}` failed with error:\n#{stderr}"
       when 127
         fail MiniMagick::Error, stderr
-      end if @whiny
+      end if options.fetch(:whiny, true)
 
-      $stderr.print(stderr)
+      $stderr.print(stderr) unless options[:stderr] == false
 
       stdout
     end

data/lib/mini_magick/tool.rb

@@ -15,23 +15,10 @@ module MiniMagick
   #
   class Tool
 
-    autoload :Animate,   "mini_magick/tool/animate"
-    autoload :Compare,   "mini_magick/tool/compare"
-    autoload :Composite, "mini_magick/tool/composite"
-    autoload :Conjure,   "mini_magick/tool/conjure"
-    autoload :Convert,   "mini_magick/tool/convert"
-    autoload :Display,   "mini_magick/tool/display"
-    autoload :Identify,  "mini_magick/tool/identify"
-    autoload :Import,    "mini_magick/tool/import"
-    autoload :Mogrify,   "mini_magick/tool/mogrify"
-    autoload :Montage,   "mini_magick/tool/montage"
-    autoload :Stream,    "mini_magick/tool/stream"
-
-    # @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 tile pattern label
+      caption text
+    ]
 
     ##
     # Aside from classic instantiation, it also accepts a block, and then
@@ -78,7 +65,7 @@ module MiniMagick
     #   mogrify = MiniMagick::Tool::Mogrify.new
     #   mogrify.resize("500x500")
     #   mogrify << "path/to/image.jpg"
-    #   mogirfy.call # executes `mogrify -resize 500x500 path/to/image.jpg`
+    #   mogrify.call # executes `mogrify -resize 500x500 path/to/image.jpg`
     #
     # @param whiny [Boolean] Whether you want an error to be raised when
     #   ImageMagick returns an exit code of 1. You may want this because
@@ -87,9 +74,9 @@ module MiniMagick
     #
     # @return [String] Output of the command
     #
-    def call(whiny = @whiny)
-      shell = MiniMagick::Shell.new(whiny)
-      shell.run(command).strip
+    def call(whiny = @whiny, options = {})
+      shell = MiniMagick::Shell.new
+      shell.run(command, options.merge(whiny: whiny)).strip
     end
 
     ##
@@ -185,85 +172,49 @@ 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")
-      #   mogirfy.command.join(" ")
-      #   #=> "mogrify -antialias -depth 8 -resize 500x500"
-      #
-      def option(*options)
-        options.each do |option|
-          define_method(option[1..-1].gsub('-', '_')) do |*values|
-            self << option
-            self.merge!(values)
-            self
-          end
-        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
-
-      def creation_operators
-        %w[xc canvas logo rose gradient radial-gradient
-           plasma tile pattern label caption text]
+    CREATION_OPERATORS.each do |operator|
+      define_method(operator.gsub('-', '_')) do |value = nil|
+        self << "#{operator}:#{value}"
+        self
       end
+    end
 
-      def cli_options
-        help = MiniMagick::Tool.new(@tool_name, false) { |b| b << "-help" }
-        cli_options = help.scan(/^\s+-[a-z\-]+/).map(&:strip)
-      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 respond_to_missing?(method_name, include_private = false)
+      true
     end
 
   end
 end
+
+require "mini_magick/tool/animate"
+require "mini_magick/tool/compare"
+require "mini_magick/tool/composite"
+require "mini_magick/tool/conjure"
+require "mini_magick/tool/convert"
+require "mini_magick/tool/display"
+require "mini_magick/tool/identify"
+require "mini_magick/tool/import"
+require "mini_magick/tool/mogrify"
+require "mini_magick/tool/montage"
+require "mini_magick/tool/stream"

data/lib/mini_magick/version.rb

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

data/lib/mini_magick.rb

@@ -1,6 +1,4 @@
 require 'mini_magick/configuration'
-require 'mini_magick/tool'
-require 'mini_magick/image'
 
 module MiniMagick
 
@@ -19,6 +17,7 @@ module MiniMagick
     old_cli = self.cli
     self.cli = cli
     yield
+  ensure
     self.cli = old_cli
   end
 
@@ -51,3 +50,6 @@ module MiniMagick
   class Invalid < StandardError; end
 
 end
+
+require 'mini_magick/tool'
+require 'mini_magick/image'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mini_magick
 version: !ruby/object:Gem::Version
-  version: 4.2.4
+  version: 4.3.1
 platform: ruby
 authors:
 - Corey Johnson
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-11 00:00:00.000000000 Z
+date: 2015-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -118,3 +118,4 @@ signing_key:
 specification_version: 4
 summary: Manipulate images with minimal use of memory via ImageMagick / GraphicsMagick
 test_files: []
+has_rdoc: