mini_magick 3.7.0 → 3.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 095e582679936f6e2e1a42ea57b449867fa6eb75
-  data.tar.gz: eb49ba1a91002faa50fc14d512e95668f55e398d
+  metadata.gz: 7708f032a0b010ff31ed437bd5f28c5bdf4b269b
+  data.tar.gz: 866153c83f7e87dfe3d1564ca32821221240d6a4
 SHA512:
-  metadata.gz: 0de53204c54171eae9d42c7789b62b7e11733b1019c2994656c76ca2c43040268e47a1f6c30baa9f41675880ff36cf5e22f47a028a3a8d9a2260d0340b570c0c
-  data.tar.gz: c03b97bb8c6be54b917afbc80ef3d738ced59c705ed209f3001c32cfe753bb4dc1e831397a1d0fb617b02cc95b9cb2d2a1574e2adc1334b90113e42d03556e4b
+  metadata.gz: f1af9965e59c483a1566299d984f1657a2fc673c398a07e2fc07fb8e3d821eb9ec4f4f6fbcbcbb2f4497714f703f410ab64bc2b02ded74cb952b019171663ef7
+  data.tar.gz: efe209dfdd7bedd32e7d44dc49cdda24e339a68e49fe4cfbfa900edb60c7a7b9c9627316df330d8ab90a6054e03f6db213c6360313d4ce26d35c925094437a11

data/Rakefile

@@ -6,13 +6,13 @@ $:.unshift 'lib'
 desc 'Default: run unit tests.'
 task :default => [:print_version, :spec]
 
-task :print_version do 
+task :print_version do
   puts `mogrify --version`
 end
 
 require 'rspec/core/rake_task'
 
-desc "Run specs"
+desc 'Run specs'
 RSpec::Core::RakeTask.new do |t|
-  t.pattern = "./spec/**/*_spec.rb"
+  t.pattern = './spec/**/*_spec.rb'
 end

data/lib/mini_magick.rb

@@ -9,10 +9,15 @@ require 'mini_magick/image'
 require 'mini_magick/utilities'
 
 module MiniMagick
+  @validate_on_create = true
+  @validate_on_write = true
+
   class << self
     attr_accessor :processor
     attr_accessor :processor_path
     attr_accessor :timeout
+    attr_accessor :validate_on_create
+    attr_accessor :validate_on_write
 
     ##
     # Tries to detect the current processor based if any of the processors exist.
@@ -21,29 +26,31 @@ module MiniMagick
     # === Returns
     # * [String] The detected procesor
     def choose_processor
-      if MiniMagick::Utilities.which('mogrify').size > 0
-        self.processor = 'mogrify'
-      elsif MiniMagick::Utilities.which('gm').size > 0
-        self.processor = "gm"
-      end
+      self.processor = if MiniMagick::Utilities.which('mogrify')
+                         :mogrify
+                       elsif MiniMagick::Utilities.which('gm')
+                         :gm
+                       else
+                         nil
+                       end
     end
-    
+
     ##
     # Discovers the imagemagick version based on mogrify's output.
     #
     # === Returns
     # * The imagemagick version
     def image_magick_version
-      @@version ||= Gem::Version.create(`mogrify --version`.split(" ")[2].split("-").first)
+      @@version ||= Gem::Version.create(`mogrify --version`.split(' ')[2].split('-').first)
     end
-    
+
     ##
     # The minimum allowed imagemagick version
     #
     # === Returns
     # * The minimum imagemagick version
     def minimum_image_magick_version
-      @@minimum_version ||= Gem::Version.create("6.6.3")
+      @@minimum_version ||= Gem::Version.create('6.6.3')
     end
 
     ##
@@ -61,9 +68,10 @@ module MiniMagick
     # === Returns
     # * [Boolean]
     def mogrify?
-      self.choose_processor if self.processor.nil?
+      choose_processor if processor.nil?
 
-      self.processor == 'mogrify'
+      return processor.to_s.downcase.to_sym == :mogrify unless processor.nil?
+      false
     end
 
     ##
@@ -72,9 +80,10 @@ module MiniMagick
     # === Returns
     # * [Boolean]
     def gm?
-      self.choose_processor if self.processor.nil?
+      choose_processor if processor.nil?
 
-      self.processor == 'gm'
+      return processor.to_s.downcase.to_sym == :gm unless processor.nil?
+      false
     end
   end
 end

data/lib/mini_magick/command_builder.rb

@@ -1,7 +1,7 @@
 module MiniMagick
   class CommandBuilder
-    MOGRIFY_COMMANDS = %w{adaptive-blur adaptive-resize adaptive-sharpen adjoin affine alpha annotate antialias append attenuate authenticate auto-gamma auto-level auto-orient backdrop background bench bias black-point-compensation black-threshold blend blue-primary blue-shift blur border bordercolor borderwidth brightness-contrast cache caption cdl channel charcoal chop clamp clip clip-mask clip-path clone clut coalesce colorize colormap color-matrix colors colorspace combine comment compose composite compress contrast contrast-stretch convolve crop cycle debug decipher deconstruct define delay delete density depth descend deskew despeckle direction displace display dispose dissimilarity-threshold dissolve distort dither draw duplicate edge emboss encipher encoding endian enhance equalize evaluate evaluate-sequence extent extract family features fft fill filter flatten flip floodfill flop font foreground format frame function fuzz fx gamma gaussian-blur geometry gravity green-primary hald-clut help highlight-color iconGeometry iconic identify ift immutable implode insert intent interlace interpolate interline-spacing interword-spacing kerning label lat layers level level-colors limit linear-stretch linewidth liquid-rescale list log loop lowlight-color magnify map mask mattecolor median metric mode modulate monitor monochrome morph morphology mosaic motion-blur name negate noise normalize opaque ordered-dither orient page paint path pause pen perceptible ping pointsize polaroid poly posterize precision preview print process profile quality quantize quiet radial-blur raise random-threshold red-primary regard-warnings region remap remote render repage resample resize respect-parentheses reverse roll rotate sample sampling-factor scale scene screen seed segment selective-blur separate sepia-tone set shade shadow shared-memory sharpen shave shear sigmoidal-contrast silent size sketch smush snaps solarize sparse-color splice spread statistic stegano stereo stretch strip stroke strokewidth style subimage-search swap swirl synchronize taint text-font texture threshold thumbnail tile tile-offset tint title transform transparent transparent-color transpose transverse treedepth trim type undercolor unique-colors units unsharp update verbose version view vignette virtual-pixel visual watermark wave weight white-point white-threshold window window-group write}
-    IMAGE_CREATION_OPERATORS = %w{canvas caption gradient label logo pattern plasma radial radient rose text tile xc }
+    MOGRIFY_COMMANDS = %w(adaptive-blur adaptive-resize adaptive-sharpen adjoin affine alpha annotate antialias append attenuate authenticate auto-gamma auto-level auto-orient backdrop background bench bias black-point-compensation black-threshold blend blue-primary blue-shift blur border bordercolor borderwidth brightness-contrast cache caption cdl channel charcoal chop clamp clip clip-mask clip-path clone clut coalesce colorize colormap color-matrix colors colorspace combine comment compose composite compress contrast contrast-stretch convolve crop cycle debug decipher deconstruct define delay delete density depth descend deskew despeckle direction displace display dispose dissimilarity-threshold dissolve distort dither draw duplicate edge emboss encipher encoding endian enhance equalize evaluate evaluate-sequence extent extract family features fft fill filter flatten flip floodfill flop font foreground format frame function fuzz fx gamma gaussian-blur geometry gravity green-primary hald-clut help highlight-color iconGeometry iconic identify ift immutable implode insert intent interlace interpolate interline-spacing interword-spacing kerning label lat layers level level-colors limit linear-stretch linewidth liquid-rescale list log loop lowlight-color magnify map mask mattecolor median metric mode modulate monitor monochrome morph morphology mosaic motion-blur name negate noise normalize opaque ordered-dither orient page paint path pause pen perceptible ping pointsize polaroid poly posterize precision preview print process profile quality quantize quiet radial-blur raise random-threshold red-primary regard-warnings region remap remote render repage resample resize respect-parentheses reverse roll rotate sample sampling-factor scale scene screen seed segment selective-blur separate sepia-tone set shade shadow shared-memory sharpen shave shear sigmoidal-contrast silent size sketch smush snaps solarize sparse-color splice spread statistic stegano stereo stretch strip stroke strokewidth style subimage-search swap swirl synchronize taint text-font texture threshold thumbnail tile tile-offset tint title transform transparent transparent-color transpose transverse treedepth trim type undercolor unique-colors units unsharp update verbose version view vignette virtual-pixel visual watermark wave weight white-point white-threshold window window-group write)
+    IMAGE_CREATION_OPERATORS = %w(canvas caption gradient label logo pattern plasma radial radient rose text tile xc)
 
     def initialize(tool, *options)
       @tool = tool
@@ -17,22 +17,11 @@ module MiniMagick
       com.strip
     end
 
-    def escape_string_windows(value)
-      # For Windows, ^ is the escape char, equivalent to \ in Unix.
-      escaped = value.gsub(/\^/, '^^').gsub(/>/, '^>')
-      if escaped !~ /^".+"$/ && escaped.include?("'")
-        escaped.inspect
-      else
-        escaped
-      end
-
-    end
-
     def args
       if !MiniMagick::Utilities.windows?
         @args.map(&:shellescape)
       else
-        @args.map { |arg| escape_string_windows(arg) }
+        @args.map { |arg| Utilities.windows_escape(arg) }
       end
     end
 
@@ -47,18 +36,21 @@ module MiniMagick
       # end
       # alias_method :"auto-orient", :auto_orient
 
-      dashed_command      = mogrify_command.to_s.gsub("_","-")
-      underscored_command = mogrify_command.to_s.gsub("-","_")
+      dashed_command      = mogrify_command.to_s.gsub('_', '-')
+      underscored_command = mogrify_command.to_s.gsub('-', '_')
 
       define_method(underscored_command) do |*options|
-        add_command(__method__.to_s.gsub("_","-"), *options)
+        options[1] = Utilities.windows_escape(options[1]) if mogrify_command == 'annotate'
+        add_command(__method__.to_s.gsub('_', '-'), *options)
         self
       end
+
       alias_method dashed_command, underscored_command
+      alias_method "mogrify_#{underscored_command}", underscored_command
     end
 
     def format(*options)
-      raise Error, "You must call 'format' on the image object directly!"
+      fail Error, "You must call 'format' on the image object directly!"
     end
 
     IMAGE_CREATION_OPERATORS.each do |operator|
@@ -66,6 +58,20 @@ module MiniMagick
         add_creation_operator(__method__.to_s, *options)
         self
       end
+
+      alias_method "operator_#{operator}", operator
+    end
+
+    (MOGRIFY_COMMANDS & IMAGE_CREATION_OPERATORS).each do |command_or_operator|
+      define_method command_or_operator do |*options|
+        if @tool == 'mogrify'
+          method = self.method("mogrify_#{command_or_operator}")
+        else
+          method = self.method("operator_#{command_or_operator}")
+        end
+        method.call(*options)
+      end
+
     end
 
     def +(*options)
@@ -99,6 +105,6 @@ module MiniMagick
     def push(arg)
       @args << arg.to_s.strip
     end
-    alias :<< :push
+    alias_method :<<, :push
   end
 end

data/lib/mini_magick/image.rb

@@ -1,7 +1,7 @@
 module MiniMagick
   class Image
     # @return [String] The location of the current working file
-    attr_accessor :path
+    attr_writer :path
 
     def path_for_windows_quote_space(path)
       path = Pathname.new(@path).to_s
@@ -11,13 +11,10 @@ module MiniMagick
     end
 
     def path
+      run_queue if @command_queued
       MiniMagick::Utilities.windows? ? path_for_windows_quote_space(@path) : @path
     end
 
-    def path=(path)
-      @path = path
-    end
-
     # Class Methods
     # -------------
     class << self
@@ -25,12 +22,14 @@ module MiniMagick
       #
       # Use this to pass in a stream object. Must respond to Object#read(size) or be a binary string object (BLOBBBB)
       #
-      # As a change from the old API, please try and use IOStream objects. They are much, much better and more efficient!
+      # As a change from the old API, please try and use IOStream objects.
+      # They are much, much better and more efficient!
       #
       # Probably easier to use the #open method if you want to open a file or a URL.
       #
       # @param stream [IOStream, String] Some kind of stream object that needs to be read or is a binary String blob!
-      # @param ext [String] A manual extension to use for reading the file. Not required, but if you are having issues, give this a try.
+      # @param ext [String] A manual extension to use for reading the file. Not required, but if you are having issues,
+      # give this a try.
       # @return [Image]
       def read(stream, ext = nil)
         if stream.is_a?(String)
@@ -41,7 +40,7 @@ module MiniMagick
           if File.respond_to?(:binread)
             stream = StringIO.new File.binread(stream.path.to_s)
           else
-            stream = StringIO.new File.open(stream.path.to_s,"rb") { |f| f.read }
+            stream = StringIO.new File.open(stream.path.to_s, 'rb') { |f| f.read }
           end
         end
 
@@ -54,7 +53,7 @@ module MiniMagick
 
       # @deprecated Please use Image.read instead!
       def from_blob(blob, ext = nil)
-        warn "Warning: MiniMagick::Image.from_blob method is deprecated. Instead, please use Image.read"
+        warn 'Warning: MiniMagick::Image.from_blob method is deprecated. Instead, please use Image.read'
         create(ext) { |f| f.write(blob) }
       end
 
@@ -71,15 +70,16 @@ module MiniMagick
       # * [rows] <tt>Integer</tt> -- Number of rows.
       # * [depth] <tt>Integer</tt> -- Bit depth of the encoded pixel data.
       # * [map] <tt>String</tt> -- A code for the mapping of the pixel data. Example: 'gray' or 'rgb'.
-      # * [format] <tt>String</tt> -- The file extension of the image format to be used when creating the image object. Defaults to 'png'.
+      # * [format] <tt>String</tt> -- The file extension of the image format to be used when creating the image object.
+      # Defaults to 'png'.
       #
-      def import_pixels(blob, columns, rows, depth, map, format="png")
+      def import_pixels(blob, columns, rows, depth, map, format = 'png')
         # Create an image object with the raw pixel data string:
-        image = create(".dat", validate = false) { |f| f.write(blob) }
+        image = create('.dat', false) { |f| f.write(blob) }
         # Use ImageMagick to convert the raw data file to an image file of the desired format:
         converted_image_path = image.path[0..-4] + format
-        arguments = ["-size", "#{columns}x#{rows}", "-depth", "#{depth}", "#{map}:#{image.path}", "#{converted_image_path}"]
-        cmd = CommandBuilder.new("convert", *arguments) #Example: convert -size 256x256 -depth 16 gray:blob.dat blob.png
+        arguments = ['-size', "#{columns}x#{rows}", '-depth', "#{depth}", "#{map}:#{image.path}", "#{converted_image_path}"]
+        cmd = CommandBuilder.new('convert', *arguments) # Example: convert -size 256x256 -depth 16 gray:blob.dat blob.png
         image.run(cmd)
         # Update the image instance with the path of the properly formatted image, and return:
         image.path = converted_image_path
@@ -98,24 +98,24 @@ module MiniMagick
       # @param ext [String] Specify the extension you want to read it as
       # @return [Image] The loaded image
       def open(file_or_url, ext = nil)
-        file_or_url = file_or_url.to_s # Force it to be a String... hell or highwater
-        if file_or_url.include?("://")
+        file_or_url = file_or_url.to_s # Force it to be a String... Hell or high water
+        if file_or_url.include?('://')
           require 'open-uri'
           ext ||= File.extname(URI.parse(file_or_url).path)
-          Kernel::open(file_or_url) do |f|
-            self.read(f, ext)
+          Kernel.open(file_or_url) do |f|
+            read(f, ext)
           end
         else
           ext ||= File.extname(file_or_url)
-          File.open(file_or_url, "rb") do |f|
-            self.read(f, ext)
+          File.open(file_or_url, 'rb') do |f|
+            read(f, ext)
           end
         end
       end
 
       # @deprecated Please use MiniMagick::Image.open(file_or_url) now
       def from_file(file, ext = nil)
-        warn "Warning: MiniMagick::Image.from_file is now deprecated. Please use Image.open"
+        warn 'Warning: MiniMagick::Image.from_file is now deprecated. Please use Image.open'
         open(file, ext)
       end
 
@@ -128,18 +128,16 @@ module MiniMagick
       # @param validate [Boolean] If false, skips validation of the created image. Defaults to true.
       # @yield [IOStream] You can #write bits to this object to create the new Image
       # @return [Image] The created image
-      def create(ext = nil, validate = true, &block)
+      def create(ext = nil, validate = MiniMagick.validate_on_create, &block)
         begin
           tempfile = Tempfile.new(['mini_magick', ext.to_s.downcase])
           tempfile.binmode
           block.call(tempfile)
           tempfile.close
 
-          image = self.new(tempfile.path, tempfile)
+          image = new(tempfile.path, tempfile)
 
-          if validate and !image.valid?
-            raise MiniMagick::Invalid
-          end
+          fail MiniMagick::Invalid if validate && !image.valid?
           return image
         ensure
           tempfile.close if tempfile
@@ -158,6 +156,21 @@ module MiniMagick
     def initialize(input_path, tempfile = nil)
       @path = input_path
       @tempfile = tempfile # ensures that the tempfile will stick around until this image is garbage collected.
+      @info = {}
+      reset_queue
+    end
+
+    def reset_queue
+      @command_queued = false
+      @queue = MiniMagick::CommandBuilder.new('mogrify')
+      @info.clear
+    end
+
+    def run_queue
+      return nil unless @command_queued
+      @queue << (MiniMagick::Utilities.windows? ? path_for_windows_quote_space(@path) : @path)
+      run(@queue)
+      reset_queue
     end
 
     # Checks to make sure that MiniMagick can read the file and understand it.
@@ -168,12 +181,17 @@ module MiniMagick
     #
     # @return [Boolean]
     def valid?
-      run_command("identify", path)
+      run_command('identify', path)
       true
     rescue MiniMagick::Invalid
       false
     end
 
+    def info(key)
+      run_queue if @command_queued
+
+      @info[key]
+    end
     # A rather low-level way to interact with the "identify" command. No nice API here, just
     # the crazy stuff you find in ImageMagick. See the examples listed!
     #
@@ -191,33 +209,42 @@ module MiniMagick
     # @see For reference see http://www.imagemagick.org/script/command-line-options.php#format
     # @return [String, Numeric, Array, Time, Object] Depends on the method called! Defaults to String for unknown commands
     def [](value)
+      retrieved = info(value)
+      return retrieved unless retrieved.nil?
+
       # Why do I go to the trouble of putting in newlines? Because otherwise animated gifs screw everything up
-      case value.to_s
-      when "colorspace"
-        run_command("identify", "-format", '%r\n', path).split("\n")[0].strip
-      when "format"
-        run_command("identify", "-format", '%m\n', path).split("\n")[0]
-      when "height"
-        run_command("identify", "-format", '%h\n', path).split("\n")[0].to_i
-      when "width"
-        run_command("identify", "-format", '%w\n', path).split("\n")[0].to_i
-      when "dimensions"
-        run_command("identify", "-format", MiniMagick::Utilities.windows? ? '"%w %h\n"' : '%w %h\n', path).split("\n")[0].split.map{|v|v.to_i}
-      when "size"
-        File.size(path) # Do this because calling identify -format "%b" on an animated gif fails!
-      when "original_at"
-        # Get the EXIF original capture as a Time object
-        Time.local(*self["EXIF:DateTimeOriginal"].split(/:|\s+/)) rescue nil
-      when /^EXIF\:/i
-        result = run_command('identify', '-format', "%[#{value}]", path).chomp
-        if result.include?(",")
-          read_character_data(result)
-        else
-          result
-        end
-      else
-        run_command('identify', '-format', value, path).split("\n")[0]
-      end
+      retrieved = case value.to_s
+                  when 'colorspace'
+                    run_command('identify', '-format', '%r\n', path).split("\n")[0].strip
+                  when 'format'
+                    run_command('identify', '-format', '%m\n', path).split("\n")[0]
+                  when 'dimensions', 'width', 'height'
+                    width_height = run_command(
+                      'identify', '-format', MiniMagick::Utilities.windows? ? '"%w %h\n"' : '%w %h\n', path
+                    ).split("\n")[0].split.map { |v| v.to_i }
+
+                    @info[:width] = width_height[0]
+                    @info[:height] = width_height[1]
+                    @info[:dimensions] = width_height
+                    nil
+                  when 'size'
+                    File.size(path) # Do this because calling identify -format "%b" on an animated gif fails!
+                  when 'original_at'
+                    # Get the EXIF original capture as a Time object
+                    Time.local(*self['EXIF:DateTimeOriginal'].split(/:|\s+/)) rescue nil
+                  when /^EXIF\:/i
+                    result = run_command('identify', '-format', "%[#{value}]", path).chomp
+                    if result.include?(',')
+                      read_character_data(result)
+                    else
+                      result
+                    end
+                  else
+                    run_command('identify', '-format', value, path).split("\n")[0]
+                  end
+
+      @info[value] = retrieved unless retrieved.nil?
+      @info[value]
     end
 
     # Sends raw commands to imagemagick's `mogrify` command. The image path is automatically appended to the command.
@@ -226,15 +253,15 @@ module MiniMagick
     #
     # @return [String] Whatever the result from the command line is. May not be terribly useful.
     def <<(*args)
-      run_command("mogrify", *args << path)
+      run_command('mogrify', *args << path)
     end
 
     # This is used to change the format of the image. That is, from "tiff to jpg" or something like that.
     # Once you run it, the instance is pointing to a new file with a new extension!
     #
     # *DANGER*: This renames the file that the instance is pointing to. So, if you manually opened the
-    # file with Image.new(file_path)... then that file is DELETED! If you used Image.open(file) then
-    # you are ok. The original file will still be there. But, any changes to it might not be...
+    # file with Image.new(file_path)... Then that file is DELETED! If you used Image.open(file) then
+    # you are OK. The original file will still be there. But, any changes to it might not be...
     #
     # Formatting an animation into a non-animated type will result in ImageMagick creating multiple
     # pages (starting with 0).  You can choose which page you want to manipulate.  We default to the
@@ -243,34 +270,34 @@ module MiniMagick
     # If you would like to convert between animated formats, pass nil as your
     # page and ImageMagick will copy all of the pages.
     #
-    # @param format [String] The target format... like 'jpg', 'gif', 'tiff', etc.
+    # @param format [String] The target format... Like 'jpg', 'gif', 'tiff', etc.
     # @param page [Integer] If this is an animated gif, say which 'page' you want
     # with an integer. Default 0 will convert only the first page; 'nil' will
     # convert all pages.
     # @return [nil]
     def format(format, page = 0)
+      run_queue if @command_queued
+
       c = CommandBuilder.new('mogrify', '-format', format)
       yield c if block_given?
-      if page
-        c << "#{path}[#{page}]"
-      else
-        c << path
-      end
+      c <<  (page ? "#{path}[#{page}]" : path)
       run(c)
 
       old_path = path
-      self.path = path.sub(/(\.\w*)?$/, ".#{format}")
+
+      self.path = path.sub(/(\.\w*)?$/, (page ? ".#{format}" : "-0.#{format}"))
+
       File.delete(old_path) if old_path != path
 
-      unless File.exists?(path)
-        raise MiniMagick::Error, "Unable to format to #{format}"
+      unless File.exist?(path)
+        fail MiniMagick::Error, "Unable to format to #{format}"
       end
     end
 
-    # Collapse images with sequences to the first frame (ie. animated gifs) and
+    # Collapse images with sequences to the first frame (i.e. animated gifs) and
     # preserve quality
     def collapse!
-      run_command("mogrify", "-quality", "100", "#{path}[0]")
+      run_command('mogrify', '-quality', '100', "#{path}[0]")
     end
 
     # Writes the temporary file out to either a file location (by passing in a String) or by
@@ -280,11 +307,17 @@ module MiniMagick
     # @return [IOStream, Boolean] If you pass in a file location [String] then you get a success boolean. If its a stream, you get it back.
     # Writes the temporary image that we are using for processing to the output path
     def write(output_to)
-      if output_to.kind_of?(String) || !output_to.respond_to?(:write)
+      run_queue if @command_queued
+
+      if output_to.kind_of?(String) || output_to.kind_of?(Pathname) || !output_to.respond_to?(:write)
         FileUtils.copy_file path, output_to
-        run_command "identify", MiniMagick::Utilities.windows? ? path_for_windows_quote_space(output_to.to_s) :  output_to.to_s # Verify that we have a good image
+        if MiniMagick.validate_on_write
+          run_command(
+            'identify', MiniMagick::Utilities.windows? ? path_for_windows_quote_space(output_to.to_s) : output_to.to_s
+          ) # Verify that we have a good image
+        end
       else # stream
-        File.open(path, "rb") do |f|
+        File.open(path, 'rb') do |f|
           f.binmode
           while chunk = f.read(8192)
             output_to.write(chunk)
@@ -297,6 +330,8 @@ module MiniMagick
     # Gives you raw image data back
     # @return [String] binary string
     def to_blob
+      run_queue if @command_queued
+
       f = File.new path
       f.binmode
       f.read
@@ -306,15 +341,14 @@ module MiniMagick
 
     def mime_type
       format = self[:format]
-      "image/" + format.to_s.downcase
+      'image/' + format.to_s.downcase
     end
 
     # If an unknown method is called then it is sent through the mogrify program
     # Look here to find all the commands (http://www.imagemagick.org/script/mogrify.php)
     def method_missing(symbol, *args)
-      combine_options do |c|
-        c.send(symbol, *args)
-      end
+      @queue.send(symbol, *args)
+      @command_queued = true
     end
 
     # You can use multiple commands together using this method. Very easy to use!
@@ -327,16 +361,15 @@ module MiniMagick
     #   end
     #
     # @yieldparam command [CommandBuilder]
-    def combine_options(tool = "mogrify", &block)
-      c = CommandBuilder.new(tool)
-
-      c << path if tool.to_s == "convert"
-      block.call(c)
-      c << path
-      run(c)
+    def combine_options
+      if block_given?
+        yield @queue
+        @command_queued = true
+      end
     end
 
-    def composite(other_image, output_extension = 'jpg', &block)
+    def composite(other_image, output_extension = 'jpg', mask = nil, &block)
+      run_queue if @command_queued
       begin
         second_tempfile = Tempfile.new(output_extension)
         second_tempfile.binmode
@@ -344,17 +377,20 @@ module MiniMagick
         second_tempfile.close
       end
 
-      command = CommandBuilder.new("composite")
+      command = CommandBuilder.new('composite')
       block.call(command) if block
       command.push(other_image.path)
-      command.push(self.path)
+      command.push(path)
+      command.push(mask.path) unless mask.nil?
       command.push(second_tempfile.path)
 
       run(command)
-      return Image.new(second_tempfile.path, second_tempfile)
+      Image.new(second_tempfile.path, second_tempfile)
     end
 
     def run_command(command, *args)
+      run_queue if @command_queued
+
       if command == 'identify'
         args.unshift '-ping'  # -ping "efficiently determine image characteristics."
         args.unshift '-quiet' if MiniMagick.mogrify? # graphicsmagick has no -quiet option.
@@ -374,11 +410,11 @@ module MiniMagick
 
         # Raise the appropriate error
         if sub.output =~ /no decode delegate/i || sub.output =~ /did not return an image/i
-          raise Invalid, sub.output
+          fail Invalid, sub.output
         else
           # TODO: should we do something different if the command times out ...?
-          # its definitely better for logging.. otherwise we dont really know
-          raise Error, "Command (#{command.inspect.gsub("\\", "")}) failed: #{{:status_code => sub.exitstatus, :output => sub.output}.inspect}"
+          # its definitely better for logging.. Otherwise we don't really know
+          fail Error, "Command (#{command.inspect.gsub("\\", "")}) failed: #{{ :status_code => sub.exitstatus, :output => sub.output }.inspect}"
         end
       else
         sub.output
@@ -387,19 +423,20 @@ module MiniMagick
 
     def destroy!
       return if @tempfile.nil?
-      File.unlink(path) if File.exists?(path)
+      File.unlink(path) if File.exist?(path)
       @tempfile = nil
     end
 
     private
-      # Sometimes we get back a list of character values
-      def read_character_data(list_of_characters)
-        chars = list_of_characters.gsub(" ", "").split(",")
-        result = ""
-        chars.each do |val|
-          result << ("%c" % val.to_i)
-        end
-        result
+
+    # Sometimes we get back a list of character values
+    def read_character_data(list_of_characters)
+      chars = list_of_characters.gsub(' ', '').split(',')
+      result = ''
+      chars.each do |val|
+        result << ('%c' % val.to_i)
       end
+      result
+    end
   end
 end

data/lib/mini_magick/utilities.rb

@@ -9,12 +9,12 @@ module MiniMagick
       def which(cmd)
         exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
         ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
-          exts.each { |ext|
+          exts.each do |ext|
             exe = File.join(path, "#{cmd}#{ext}")
             return exe if File.executable? exe
-          }
+          end
         end
-        return nil
+        nil
       end
 
       # Finds out if the host OS is windows
@@ -22,10 +22,15 @@ module MiniMagick
         RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/
       end
 
-      def windows_escape(cmdline)
-        '"' + cmdline.gsub(/\\(?=\\*\")/, "\\\\\\").gsub(/\"/, "\\\"").gsub(/\\$/, "\\\\\\").gsub("%", "%%") + '"'
+      def windows_escape(value)
+        # For Windows, ^ is the escape char, equivalent to \ in Unix.
+        escaped = value.gsub(/\^/, '^^').gsub(/>/, '^>')
+        if escaped !~ /^".+"$/ && escaped.include?("'")
+          escaped.inspect
+        else
+          escaped
+        end
       end
     end
   end
 end
-

data/lib/mini_magick/version.rb

@@ -1,3 +1,3 @@
 module MiniMagick
-  VERSION = "3.7.0"
+  VERSION = '3.8.0'
 end

metadata

@@ -1,92 +1,96 @@
 --- !ruby/object:Gem::Specification
 name: mini_magick
 version: !ruby/object:Gem::Version
-  version: 3.7.0
+  version: 3.8.0
 platform: ruby
 authors:
 - Corey Johnson
 - Hampton Catlin
 - Peter Kieltyka
+- James Miller
+- Thiago Fernandes Massa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-26 00:00:00.000000000 Z
+date: 2014-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: subexec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: rake
   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'
 - !ruby/object:Gem::Dependency
   name: test-unit
   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'
 - !ruby/object:Gem::Dependency
   name: rspec
   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'
 - !ruby/object:Gem::Dependency
   name: mocha
   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: ''
+description: 
 email:
 - probablycorey@gmail.com
 - hcatlin@gmail.com
 - peter@nulayer.com
+- bensie@gmail.com
+- thiagown@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -94,14 +98,15 @@ files:
 - MIT-LICENSE
 - Rakefile
 - lib/mini_gmagick.rb
+- lib/mini_magick.rb
 - lib/mini_magick/command_builder.rb
 - lib/mini_magick/errors.rb
 - lib/mini_magick/image.rb
 - lib/mini_magick/utilities.rb
 - lib/mini_magick/version.rb
-- lib/mini_magick.rb
 homepage: https://github.com/minimagick/minimagick
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -109,18 +114,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
 - You must have ImageMagick or GraphicsMagick installed
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Manipulate images with minimal use of memory via ImageMagick / GraphicsMagick