mini_magick 4.0.2 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4305ecb6d70854a5e0d8108ea344872224b2d81
-  data.tar.gz: 71e89af4b6640415d8d0f883b2ecbd660235493b
+  metadata.gz: 21f140f463e39c25ff85d153dde2633ae64253fc
+  data.tar.gz: 09fcec5741441ab2b4d7f8346ddfa2d6d5c40a51
 SHA512:
-  metadata.gz: 7be3875ffe3ea305e0c4a87fa41644094240f7b3c1675c7d5c552f866a7d7ffdb56fecbc962974756e9eb91326c27917bddb57b06121e90161b9ca4b25204d52
-  data.tar.gz: 116882e54bd0f9734a5eae2535b16c816073be328dd494ccece1714c7d7db3f4840d1df456bea8baded535e13b09faaff528c3790c0737485019ffe1ba0b61ef
+  metadata.gz: 6daee1a467de3117d0278a79d6006446c35bcf64afc746fa7ae04a45ee53b26334c171d7f73e58e0de97792496d82e4a00c336511e62427c55bb97e67f278f40
+  data.tar.gz: 87a1ccb4e52bbfd6fcfe4f4251f4d6711dd79aaa4d935b10d35c04db27ff11236dfca5422efb67c704c6953e54939751d4419cf1ca9d0bc63d91787b473ad3d3

data/lib/mini_magick/configuration.rb

@@ -45,6 +45,7 @@ module MiniMagick
     # @return [Logger]
     #
     attr_accessor :logger
+
     ##
     # If set to `true`, it will `identify` every newly created image, and raise
     # `MiniMagick::Invalid` if the image is not valid. Useful for validating
@@ -71,10 +72,20 @@ module MiniMagick
     #
     attr_accessor :whiny
 
+    ##
+    # Instructs MiniMagick how to execute the shell commands. Available
+    # APIs are "open3" (default) and "posix-spawn" (requires the "posix-spawn"
+    # gem).
+    #
+    # @return [String]
+    #
+    attr_accessor :shell_api
+
     def self.extended(base)
       base.validate_on_create = true
       base.validate_on_write = true
       base.whiny = true
+      base.shell_api = "open3"
     end
 
     ##

data/lib/mini_magick/image/info.rb

@@ -25,6 +25,8 @@ module MiniMagick
           raw_exif(value)
         when "exif"
           exif
+        when "details"
+          details
         else
           raw(value)
         end
@@ -53,9 +55,7 @@ module MiniMagick
       end
 
       def colorspace
-        @info.fetch("colorspace") do
-          @info["colorspace"] = self["%r"]
-        end
+        @info["colorspace"] ||= self["%r"]
       end
 
       def mime_type
@@ -75,10 +75,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 +86,40 @@ 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)
+          details_string.each_line.with_object([]).inject({}) do |details_hash, (line, key_stack)|
+            level = line[/^\s*/].length / 2 - 1
+            next details_hash if level == -1 # we ignore the root level
+            hash = key_stack.inject(details_hash) { |hash, key| hash.fetch(key) }
+            key, value = line.split(":", 2).map(&:strip)
+
+            if level == key_stack.size
+              if value.empty?
+                hash[key] = {}
+                key_stack.push key
+              else
+                hash[key] = value
+              end
+            elsif level < key_stack.size
+              key_stack.pop
+            end
+
+            details_hash
+          end
+        )
       end
 
       def identify
@@ -113,7 +131,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

@@ -80,10 +80,10 @@ module MiniMagick
     #
     def self.open(path_or_url, ext = nil)
       ext ||=
-        if path_or_url.to_s =~ URI.regexp
-          File.extname(URI(path_or_url).path)
-        else
+        if File.exist?(path_or_url)
           File.extname(path_or_url)
+        else
+          File.extname(URI(path_or_url).path)
         end
 
       Kernel.open(path_or_url, "rb") do |file|
@@ -258,6 +258,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 +429,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|

data/lib/mini_magick/shell.rb

@@ -1,6 +1,4 @@
 require "mini_magick/logger"
-
-require "open3"
 require "timeout"
 
 module MiniMagick
@@ -35,14 +33,29 @@ module MiniMagick
       stdout, stderr, status =
         MiniMagick.logger.debug(command.join(" ")) do
           Timeout.timeout(MiniMagick.timeout) do
-            Open3.capture3(*command)
+            send("execute_#{MiniMagick.shell_api.gsub("-", "_")}", *command)
           end
         end
 
       [stdout, stderr, status.exitstatus]
-    rescue Errno::ENOENT
+    rescue Errno::ENOENT, IOError
       ["", "executable not found: \"#{command.first}\"", 127]
     end
 
+    private
+
+    def execute_open3(*command)
+      require "open3"
+      Open3.capture3(*command)
+    end
+
+    def execute_posix_spawn(*command)
+      require "posix-spawn"
+      pid, stdin, stdout, stderr = POSIX::Spawn.popen4(*command)
+      Process.waitpid(pid)
+
+      [stdout.read, stderr.read, $?]
+    end
+
   end
 end

data/lib/mini_magick/tool.rb

@@ -149,10 +149,11 @@ module MiniMagick
     # Changes the last operator to its "plus" form.
     #
     # @example
-    #   mogrify = MiniMagick::Tool::Mogrify.new
-    #   mogrify.antialias.+
-    #   mogrify.distort.+("Perspective '0,0,4,5'")
-    #   mogrify.command #=> ["mogrify", "+antialias", "+distort", "Perspective '0,0,4,5'"]
+    #   MiniMagick::Tool::Mogrify.new do |mogrify|
+    #     mogrify.antialias.+
+    #     mogrify.distort.+("Perspective", "0,0,4,5 89,0,45,46")
+    #   end
+    #   # executes `mogrify +antialias +distort Perspective '0,0,4,5 89,0,45,46'`
     #
     # @return [self]
     #
@@ -162,6 +163,27 @@ module MiniMagick
       self
     end
 
+    ##
+    # Create an ImageMagick stack in the command (surround.
+    #
+    # @example
+    #   MiniMagick::Tool::Convert.new do |convert|
+    #     convert << "wand.gif"
+    #     convert.stack do |stack|
+    #       stack << "wand.gif"
+    #       stack.rotate(30)
+    #     end
+    #     convert.append.+
+    #     convert << "images.gif"
+    #   end
+    #   # executes `convert wand.gif \( wizard.gif -rotate 30 \) +append images.gif`
+    #
+    def stack
+      self << "("
+      yield self
+      self << ")"
+    end
+
     private
 
     ##
@@ -202,11 +224,12 @@ module MiniMagick
       ##
       # 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""
+      #   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|

data/lib/mini_magick/version.rb

@@ -8,8 +8,8 @@ module MiniMagick
 
   module VERSION
     MAJOR = 4
-    MINOR = 0
-    TINY  = 2
+    MINOR = 2
+    TINY  = 0
     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.0.2
+  version: 4.2.0
 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-01-09 00:00:00.000000000 Z
+date: 2015-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -42,6 +43,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.0
+- !ruby/object:Gem::Dependency
+  name: posix-spawn
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Manipulate images with minimal use of memory via ImageMagick / GraphicsMagick
 email:
 - probablycorey@gmail.com
@@ -49,6 +64,7 @@ email:
 - peter@nulayer.com
 - bensie@gmail.com
 - thiagown@gmail.com
+- janko.marohnic@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []