mini_magick 2.3 → 3.2

data/VERSION

@@ -1 +1 @@
-2.3
+3.2

data/lib/mini_magick.rb

@@ -1,11 +1,24 @@
 require 'tempfile'
 require 'subexec'
-require 'open-uri'
+require 'pathname'
 
 module MiniMagick
   class << self
     attr_accessor :processor
     attr_accessor :timeout
+
+
+    # Experimental method for automatically selecting a processor
+    # such as gm. Only works on *nix.
+    #
+    # TODO: Write tests for this and figure out what platforms it supports
+    def choose_processor
+      if `type -P mogrify`.size > 0
+        return
+      elsif `type -P gm`.size > 0
+        self.processor = "gm"
+      end
+    end
   end
 
   MOGRIFY_COMMANDS = %w{adaptive-blur adaptive-resize adaptive-sharpen adjoin affine alpha annotate antialias append authenticate auto-gamma auto-level auto-orient background bench iterations bias black-threshold blue-primary point blue-shift factor blur border bordercolor brightness-contrast caption string cdl filename channel type charcoal radius chop clip clamp clip-mask filename clip-path id clone index clut contrast-stretch coalesce colorize color-matrix colors colorspace type combine comment string compose operator composite compress type contrast convolve coefficients crop cycle amount decipher filename debug events define format:option deconstruct delay delete index density depth despeckle direction type display server dispose method distort type coefficients dither method draw string edge radius emboss radius encipher filename encoding type endian type enhance equalize evaluate operator evaluate-sequence operator extent extract family name fft fill filter type flatten flip floodfill flop font name format string frame function name fuzz distance fx expression gamma gaussian-blur geometry gravity type green-primary point help identify ifft implode amount insert index intent type interlace type interline-spacing interpolate method interword-spacing kerning label string lat layers method level limit type linear-stretch liquid-rescale log format loop iterations mask filename mattecolor median radius modulate monitor monochrome morph morphology method kernel motion-blur negate noise radius normalize opaque ordered-dither NxN orient type page paint radius ping pointsize polaroid angle posterize levels precision preview type print string process image-filter profile filename quality quantizespace quiet radial-blur angle raise random-threshold low,high red-primary point regard-warnings region remap filename render repage resample resize respect-parentheses roll rotate degrees sample sampling-factor scale scene seed segments selective-blur separate sepia-tone threshold set attribute shade degrees shadow sharpen shave shear sigmoidal-contrast size sketch solarize threshold splice spread radius strip stroke strokewidth stretch type style type swap indexes swirl degrees texture filename threshold thumbnail tile filename tile-offset tint transform transparent transparent-color transpose transverse treedepth trim type type undercolor unique-colors units type unsharp verbose version view vignette virtual-pixel method wave weight type white-point point white-threshold write filename}
@@ -55,9 +68,7 @@ module MiniMagick
       #
       # Extension is either guessed from the path or you can specify it as a second parameter.
       #
-      # If you pass in what looks like a URL, we will see if Kernel#open exists. If it doesn't
-      # then we require 'open-uri'. That way, if you have a work-alike library, we won't demolish it.
-      # Open-uri never gets required unless you pass in something with "://" in it.
+      # If you pass in what looks like a URL, we require 'open-uri' before opening it.
       #
       # @param file_or_url [String] Either a local file path or a URL that open-uri can read
       # @param ext [String] Specify the extension you want to read it as
@@ -65,9 +76,7 @@ module MiniMagick
       def open(file_or_url, ext = File.extname(file_or_url))
         file_or_url = file_or_url.to_s # Force it to be a String... hell or highwater
         if file_or_url.include?("://")
-          if !Kernel.respond_to?("open")
-            require 'open-uri'
-          end
+          require 'open-uri'
           self.read(Kernel::open(file_or_url), ext)
         else
           File.open(file_or_url, "rb") do |f|
@@ -111,7 +120,7 @@ module MiniMagick
 
     # Create a new MiniMagick::Image object
     #
-    # _DANGER_: The file location passed in here is the *working copy*. That is, it gets *modified*. 
+    # _DANGER_: The file location passed in here is the *working copy*. That is, it gets *modified*.
     # you can either copy it yourself or use the MiniMagick::Image.open(path) method which creates a
     # temporary file for you and protects your original!
     #
@@ -121,7 +130,10 @@ module MiniMagick
       @path = input_path
       @tempfile = tempfile # ensures that the tempfile will stick around until this image is garbage collected.
     end
-
+    
+    def escaped_path
+      Pathname.new(@path).to_s.gsub(" ", "\\ ")
+    end
 
     # Checks to make sure that MiniMagick can read the file and understand it.
     #
@@ -144,6 +156,7 @@ module MiniMagick
     #    image["format"]      #=> "TIFF"
     #    image["height"]      #=> 41 (pixels)
     #    image["width"]       #=> 50 (pixels)
+    #    image["colorspace"]  #=> "DirectClassRGB"
     #    image["dimensions"]  #=> [50, 41]
     #    image["size"]        #=> 2050 (bits)
     #    image["original_at"] #=> 2005-02-23 23:17:24 +0000 (Read from Exif data)
@@ -155,28 +168,30 @@ module MiniMagick
     def [](value)
       # 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", format_option("%r"), escaped_path).split("\n")[0]
       when "format"
-        run_command("identify", "-format", format_option("%m"), @path).split("\n")[0]
+        run_command("identify", "-format", format_option("%m"), escaped_path).split("\n")[0]
       when "height"
-        run_command("identify", "-format", format_option("%h"), @path).split("\n")[0].to_i
+        run_command("identify", "-format", format_option("%h"), escaped_path).split("\n")[0].to_i
       when "width"
-        run_command("identify", "-format", format_option("%w"), @path).split("\n")[0].to_i
+        run_command("identify", "-format", format_option("%w"), escaped_path).split("\n")[0].to_i
       when "dimensions"
-        run_command("identify", "-format", format_option("%w %h"), @path).split("\n")[0].split.map{|v|v.to_i}
+        run_command("identify", "-format", format_option("%w %h"), escaped_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).chop
+        result = run_command('identify', '-format', "\"%[#{value}]\"", escaped_path).chop
         if result.include?(",")
           read_character_data(result)
         else
           result
         end
       else
-        run_command('identify', '-format', "\"#{value}\"", @path).split("\n")[0]
+        run_command('identify', '-format', "\"#{value}\"", escaped_path).split("\n")[0]
       end
     end
 
@@ -186,7 +201,7 @@ 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 << escaped_path)
     end
 
     # This is used to change the format of the image. That is, from "tiff to jpg" or something like that.
@@ -204,7 +219,10 @@ module MiniMagick
     # @param page [Integer] If this is an animated gif, say which 'page' you want with an integer. Leave as default if you don't care.
     # @return [nil]
     def format(format, page = 0)
-      run_command("mogrify", "-format", format, @path)
+      c = CommandBuilder.new('mogrify', '-format', format)
+      yield c if block_given?
+      c << @path
+      run(c)
 
       old_path = @path.dup
       @path.sub!(/(\.\w*)?$/, ".#{format}")
@@ -214,7 +232,7 @@ module MiniMagick
         begin
           FileUtils.copy_file(@path.sub(".#{format}", "-#{page}.#{format}"), @path)
         rescue => ex
-          raise MiniMagickError, "Unable to format to #{format}; #{ex}" unless File.exist?(@path)
+          raise MiniMagick::Error, "Unable to format to #{format}; #{ex}" unless File.exist?(@path)
         end
       end
     ensure
@@ -229,10 +247,27 @@ module MiniMagick
       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
+    # passing in a Stream that you can #write(chunk) to repeatedly
+    #
+    # @param output_to [IOStream, String] Some kind of stream object that needs to be read or a file path as a String
+    # @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_path)
-      FileUtils.copy_file @path, output_path
-      run_command "identify", output_path # Verify that we have a good image
+    def write(output_to)
+      if output_to.kind_of?(String) || !output_to.respond_to?(:write)
+        FileUtils.copy_file @path, output_to
+        # We need to escape the output path if it contains a space
+        escaped_output_to = output_to.to_s.gsub(' ', '\\ ')
+        run_command "identify", escaped_output_to # Verify that we have a good image
+      else # stream
+        File.open(@path, "rb") do |f|
+          f.binmode
+          while chunk = f.read(8192)
+            output_to.write(chunk)
+          end
+        end
+        output_to
+      end
     end
 
     # Gives you raw image data back
@@ -255,14 +290,14 @@ module MiniMagick
 
     # You can use multiple commands together using this method. Very easy to use!
     #
-    # @example 
+    # @example
     #   image.combine_options do |c|
     #     c.draw "image Over 0,0 10,10 '#{MINUS_IMAGE_PATH}'"
     #     c.thumbnail "300x500>"
     #     c.background background
     #   end
     #
-    # @yieldparam command [CommandBuilder] 
+    # @yieldparam command [CommandBuilder]
     def combine_options(&block)
       c = CommandBuilder.new('mogrify')
       block.call(c)
@@ -272,7 +307,7 @@ module MiniMagick
 
     # Check to see if we are running on win32 -- we need to escape things differently
     def windows?
-      !(RUBY_PLATFORM =~ /win32/).nil?
+      !(RUBY_PLATFORM =~ /win32|mswin|mingw/).nil?
     end
 
     def composite(other_image, output_extension = 'jpg', &block)
@@ -299,6 +334,11 @@ module MiniMagick
     end
 
     def run_command(command, *args)
+      # -ping "efficiently determine image characteristics."
+      if command == 'identify'
+        args.unshift '-ping'
+      end
+
       run(CommandBuilder.new(command, *args))
     end
 
@@ -362,15 +402,27 @@ module MiniMagick
         raise Error, "You must call 'format' on the image object directly!"
       elsif MOGRIFY_COMMANDS.include?(guessed_command_name)
         add(guessed_command_name, *options)
+        self
       else
         super(symbol, *args)
       end
     end
 
+    def +(*options)
+      push(@args.pop.gsub /^-/, '+')
+      if options.any?
+        options.each do |o|
+          push "\"#{ o }\""
+        end
+      end
+    end
+
     def add(command, *options)
       push "-#{command}"
       if options.any?
-        push "\"#{options.join(" ")}\""
+        options.each do |o|
+          push "\"#{ o }\""
+        end
       end
     end
 
@@ -378,11 +430,5 @@ module MiniMagick
       @args << arg.to_s.strip
     end
     alias :<< :push
-
-    # @deprecated Please don't use the + method its has been deprecated
-    def +(value)
-      warn "Warning: The MiniMagick::ComandBuilder#+ command has been deprecated. Please use c << '+#{value}' instead"
-      push "+#{value}"
-    end
   end
 end

data/test/command_builder_test.rb

@@ -14,10 +14,16 @@ class CommandBuilderTest < Test::Unit::TestCase
   def test_complicated
     c = CommandBuilder.new("test")
     c.resize "30x40"
-    c.alpha 1, 3, 4
+    c.alpha "1 3 4"
     c.resize "mome fingo"
     assert_equal "-resize \"30x40\" -alpha \"1 3 4\" -resize \"mome fingo\"", c.args.join(" ")
   end
+
+  def test_plus_modifier_and_multiple_options
+    c = CommandBuilder.new("test")
+    c.distort.+ 'srt', '0.6 20'
+    assert_equal "+distort \"srt\" \"0.6 20\"", c.args.join(" ")
+  end
   
   def test_valid_command
     begin

data/test/image_test.rb

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'test/unit'
-require 'stringio'
 require 'pathname'
+require 'stringio'
 require File.expand_path('../../lib/mini_magick', __FILE__)
 
 #MiniMagick.processor = :gm
@@ -13,7 +13,7 @@ class ImageTest < Test::Unit::TestCase
 
   SIMPLE_IMAGE_PATH = CURRENT_DIR + "simple.gif"
   MINUS_IMAGE_PATH  = CURRENT_DIR + "simple-minus.gif"
-  TIFF_IMAGE_PATH   = CURRENT_DIR + "leaves.tiff"
+  TIFF_IMAGE_PATH   = CURRENT_DIR + "leaves spaced.tiff"
   NOT_AN_IMAGE_PATH = CURRENT_DIR + "not_an_image.php"
   GIF_WITH_JPG_EXT  = CURRENT_DIR + "actually_a_gif.jpg"
   EXIF_IMAGE_PATH   = CURRENT_DIR + "trogdor.jpg"
@@ -50,7 +50,7 @@ class ImageTest < Test::Unit::TestCase
     image = Image.new(SIMPLE_IMAGE_PATH)
     image.destroy!
   end
-  
+
   def test_remote_image
     image = Image.open("http://www.google.com/images/logos/logo.png")
     image.valid?
@@ -70,6 +70,28 @@ class ImageTest < Test::Unit::TestCase
     image.destroy!
   end
 
+  def test_image_write_with_space_in_output_path
+    output_path = "test output.gif"
+    begin
+      image = Image.new(SIMPLE_IMAGE_PATH)
+      image.write output_path
+
+      assert File.exists?(output_path)
+    ensure
+      File.delete output_path
+    end
+    image.destroy!
+  end
+
+  def test_image_write_with_stream
+    stream = StringIO.new
+    image = Image.open(SIMPLE_IMAGE_PATH)
+    image.write("/tmp/foo.gif")
+    image.write(stream)
+#    assert Image.read(stream.string).valid?
+    image.destroy!
+  end
+
   def test_not_an_image
     image = Image.new(NOT_AN_IMAGE_PATH)
     assert_equal false, image.valid?
@@ -88,6 +110,7 @@ class ImageTest < Test::Unit::TestCase
     assert_equal 150, image[:width]
     assert_equal 55, image[:height]
     assert_equal [150, 55], image[:dimensions]
+    assert_equal 'PseudoClassRGB', image[:colorspace]
     assert_match(/^gif$/i, image[:format])
     image.destroy!
   end
@@ -220,7 +243,7 @@ class ImageTest < Test::Unit::TestCase
     end
     image.destroy!
   end
-  
+
   # http://github.com/probablycorey/mini_magick/issues#issue/15
   def test_issue_15
     image = Image.open(Pathname.new(SIMPLE_IMAGE_PATH))

metadata

@@ -1,11 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: mini_magick
 version: !ruby/object:Gem::Version 
+  hash: 3
   prerelease: false
   segments: 
-  - 2
   - 3
-  version: "2.3"
+  - 2
+  version: "3.2"
 platform: ruby
 authors: 
 - Corey Johnson
@@ -15,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-12 00:00:00 +01:00
+date: 2011-01-11 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,6 +27,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 0
         - 0
@@ -56,7 +58,7 @@ files:
 - test/command_builder_test.rb
 - test/composited.jpg
 - test/image_test.rb
-- test/leaves.tiff
+- test/leaves spaced.tiff
 - test/not_an_image.php
 - test/simple-minus.gif
 - test/simple.gif
@@ -75,6 +77,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -83,6 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -99,7 +103,7 @@ test_files:
 - test/command_builder_test.rb
 - test/composited.jpg
 - test/image_test.rb
-- test/leaves.tiff
+- test/leaves spaced.tiff
 - test/not_an_image.php
 - test/simple-minus.gif
 - test/simple.gif