mini_magick 4.2.7 → 4.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ebe50720f44094421fa8d0f27a3a6934f69f70b
-  data.tar.gz: 24d09b9541aa1c4bf258000147e1be96b9f3bdf3
+  metadata.gz: 40fe759f030711a8b4cae6a7334ba2c553f848a3
+  data.tar.gz: 37037fc7631d55294c20ad991dbc8f0bfb6c8fb2
 SHA512:
-  metadata.gz: 42a75ad425fb787c4a7e74a25eaee6cb687df34e765e2e62a365f70a0f05d31763f486abc0274b127fac3a41b76c3bc9c031f477603ad482c0e309e2844f2b08
-  data.tar.gz: dcba1f309e1a09759c6ffb6cc0aaf154d789d4c5ef9a9282d19a297e64844838af46654dd23648317721ea360170c8de90017ad6444b6082e8d15d7913f9b3fb
+  metadata.gz: 89c0deeaf8dc29605ac7651803be5af576822fcfa8485056254eec3710d31563a9f7d536b2f35d7e677d0b8ab9a4a35d5147aec18d0fba8e1fb9fbcb97f454b2
+  data.tar.gz: c553cc750c068c345fbc2757af7eb063e4d222102313f2a64930f9d67ff16adadfc636fe6b17b6377ce03bea0335f0f77d9a47ee6b7652ec02eb3cbf9b5eff28

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'

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)
@@ -131,7 +131,14 @@ module MiniMagick
     def cli=(value)
       @cli = value
 
-      unless [:imagemagick, :graphicsmagick].include?(@cli)
+      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
         raise ArgumentError,
           "CLI has to be set to either :imagemagick or :graphicsmagick" \
           ", was set to #{@cli.inspect}"

data/lib/mini_magick/image.rb

@@ -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

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)

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,18 +15,6 @@ 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
@@ -78,7 +66,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 +75,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
 
     ##
@@ -224,7 +212,7 @@ module MiniMagick
       #   mogrify.antialias
       #   mogrify.depth(8)
       #   mogrify.resize("500x500")
-      #   mogirfy.command.join(" ")
+      #   mogrify.command.join(" ")
       #   #=> "mogrify -antialias -depth 8 -resize 500x500"
       #
       def option(*options)
@@ -259,7 +247,9 @@ module MiniMagick
       end
 
       def cli_options
-        help = MiniMagick::Tool.new(@tool_name, false) { |b| b << "-help" }
+        tool = MiniMagick::Tool.new(@tool_name)
+        tool << "-help"
+        help = tool.call(false, stderr: false)
         cli_options = help.scan(/^\s+-[a-z\-]+/).map(&:strip)
       end
 
@@ -267,3 +257,15 @@ module MiniMagick
 
   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

@@ -9,7 +9,7 @@ module MiniMagick
   module VERSION
     MAJOR = 4
     MINOR = 2
-    TINY  = 7
+    TINY  = 9
     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.2.7
+  version: 4.2.9
 platform: ruby
 authors:
 - Corey Johnson
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-28 00:00:00.000000000 Z
+date: 2015-08-02 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: