mini_magick 4.1.0 → 4.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8921e089d8d63d1391e76876bc63b4e3ff953706
-  data.tar.gz: 38930195578ded9545d86b4225718671a9cd8b6a
+  metadata.gz: 21c28d5cb2938a6c126985b362544f64858220aa
+  data.tar.gz: 94bdee8c2c92bc7d9e5548202397dff054bd99bc
 SHA512:
-  metadata.gz: 39cc0fccd098a964a02be8e2cde7565d492ab9a5831df89a2f1b90d751d67368c13584c05ef3253aab51f8aecf107a52ca489a6849bd32e80a334869500f4628
-  data.tar.gz: 9c620a81d8b8e601a172d3b8333f4020048e2b7d385ce40fe85caff7f6df7480f1e08c8046d8fa10d66164eb264efe06d9303f111444f55c6193546ca34ab0f2
+  metadata.gz: 907e11e72c97a02dcc8eaeb80d8c1bdee96561c8ae0134a14a2c00b4385e2dd6b1d9526dead4f523b4df219fe78c09fc1472609e87983a6d0b3d674aa21f8033
+  data.tar.gz: d7f00b1e55cd0e5ab4abfaccd62fa220a34adbc03556a5b92626aa68dc41bd4c3dd61ac1fd0e7a4664a6e6e70971e95227350a11700dccb1ced09914edd782b7

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}"
@@ -148,8 +155,6 @@ module MiniMagick
       @logger || MiniMagick::Logger.new($stdout)
     end
 
-    private
-
     def reload_tools
       MiniMagick::Tool::OptionMethods.instances.each(&:reload_methods)
     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
@@ -25,6 +25,8 @@ module MiniMagick
           raw_exif(value)
         when "exif"
           exif
+        when "details"
+          details
         else
           raw(value)
         end
@@ -34,8 +36,6 @@ module MiniMagick
         @info.clear
       end
 
-      private
-
       def cheap_info(value)
         @info.fetch(value) do
           format, width, height, size = self["%m %w %h %b"].split(" ")
@@ -45,17 +45,18 @@ 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)
         end
+      rescue ArgumentError, TypeError
+        raise MiniMagick::Invalid, "image data can't be read"
       end
 
       def colorspace
-        @info.fetch("colorspace") do
-          @info["colorspace"] = self["%r"]
-        end
+        @info["colorspace"] ||= self["%r"]
       end
 
       def mime_type
@@ -75,10 +76,10 @@ module MiniMagick
       end
 
       def exif
-        @info.fetch("exif") do
+        @info["exif"] ||= (
           output = self["%[EXIF:*]"]
           pairs = output.gsub(/^exif:/, "").split("\n").map { |line| line.split("=") }
-          exif = Hash[pairs].tap do |hash|
+          Hash[pairs].tap do |hash|
             ASCII_ENCODED_EXIF_KEYS.each do |key|
               next unless hash.has_key?(key)
 
@@ -86,22 +87,35 @@ module MiniMagick
               hash[key] = decode_comma_separated_ascii_characters(value)
             end
           end
-
-          @info["exif"] = exif
-        end
+        )
       end
 
       def raw(value)
-        key = "raw:#{value}"
-        @info.fetch(key) do
-          @info[key] = identify { |b| b.format(value) }
-        end
+        @info["raw:#{value}"] ||= identify { |b| b.format(value) }
       end
 
       def signature
-        @info.fetch("signature") do
-          @info["signature"] = self["%#"]
-        end
+        @info["signature"] ||= self["%#"]
+      end
+
+      def details
+        @info["details"] ||= (
+          details_string = identify(&:verbose)
+          key_stack = []
+          details_string.lines.to_a[1..-1].each_with_object({}) do |line, details_hash|
+            level = line[/^\s*/].length / 2 - 1
+            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) }
+            if value.empty?
+              hash[key] = {}
+              key_stack.push key
+            else
+              hash[key] = value
+            end
+          end
+        )
       end
 
       def identify
@@ -113,7 +127,6 @@ module MiniMagick
 
       def decode_comma_separated_ascii_characters(encoded_value)
         return encoded_value unless encoded_value.include?(',')
-
         encoded_value.scan(/\d+/).map(&:to_i).map(&:chr).join
       end
 

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
@@ -258,6 +264,11 @@ module MiniMagick
     # @return [String]
     #
     attribute :signature
+    ##
+    # Returns the information from `identify -verbose` in a Hash format.
+    #
+    # @return [Hash]
+    attribute :details
 
     ##
     # Use this method if you want to access raw Identify's format API.
@@ -424,7 +435,7 @@ module MiniMagick
     #
     # @see http://www.imagemagick.org/script/composite.php
     #
-    def composite(other_image, output_extension = 'jpg', mask = nil)
+    def composite(other_image, output_extension = type.downcase, mask = nil)
       output_tempfile = MiniMagick::Utilities.tempfile(".#{output_extension}")
 
       MiniMagick::Tool::Composite.new do |composite|
@@ -484,14 +495,12 @@ module MiniMagick
       end
     end
 
-    private
-
     def mogrify(page = nil)
       @info.clear
 
       MiniMagick::Tool::Mogrify.new do |builder|
         builder.instance_eval do
-          def format(*)
+          def format(*args)
             fail NoMethodError,
               "you must call #format on a MiniMagick::Image directly"
           end

data/lib/mini_magick/logger.rb

@@ -23,8 +23,6 @@ module MiniMagick
       end
     end
 
-    private
-
     def output(data)
       printf @io, "#{format}\n", data
     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
@@ -42,8 +38,6 @@ module MiniMagick
       ["", "executable not found: \"#{command.first}\"", 127]
     end
 
-    private
-
     def execute_open3(*command)
       require "open3"
       Open3.capture3(*command)

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
 
     ##
@@ -184,8 +172,6 @@ module MiniMagick
       self << ")"
     end
 
-    private
-
     ##
     # Dynamically generates modules with dynamically generated option methods
     # for each command-line tool. It uses the `-help` page of a command-line
@@ -219,8 +205,6 @@ module MiniMagick
         option *cli_options
       end
 
-      private
-
       ##
       # Creates method based on command-line option's name.
       #
@@ -228,12 +212,12 @@ 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)
         options.each do |option|
-          define_method(option[1..-1].gsub('-', '_')) do |*values|
+          define_method(option[1..-1].tr('-', '_')) do |*values|
             self << option
             self.merge!(values)
             self
@@ -263,11 +247,28 @@ module MiniMagick
       end
 
       def cli_options
-        help = MiniMagick::Tool.new(@tool_name, false) { |b| b << "-help" }
-        cli_options = help.scan(/^\s+-[a-z\-]+/).map(&:strip)
+        tool = MiniMagick::Tool.new(@tool_name)
+        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
 
     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 = 1
-    TINY  = 0
+    MINOR = 2
+    TINY  = 10
     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.1.0
+  version: 4.2.10
 platform: ruby
 authors:
 - Corey Johnson
@@ -9,10 +9,11 @@ authors:
 - Peter Kieltyka
 - James Miller
 - Thiago Fernandes Massa
+- Janko Marohnić
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-17 00:00:00.000000000 Z
+date: 2015-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -63,6 +64,7 @@ email:
 - peter@nulayer.com
 - bensie@gmail.com
 - thiagown@gmail.com
+- janko.marohnic@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []