mini_magick 3.0 → 3.2

data/VERSION

@@ -1 +1 @@
-3.0
+3.2

data/lib/mini_magick.rb

@@ -1,5 +1,6 @@
 require 'tempfile'
 require 'subexec'
+require 'pathname'
 
 module MiniMagick
   class << self
@@ -129,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.
     #
@@ -152,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)
@@ -163,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
 
@@ -194,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.
@@ -212,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}")
@@ -246,7 +256,9 @@ module MiniMagick
     def write(output_to)
       if output_to.kind_of?(String) || !output_to.respond_to?(:write)
         FileUtils.copy_file @path, output_to
-        run_command "identify", output_to # Verify that we have a good image
+        # 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
@@ -322,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
 
@@ -385,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
 
@@ -401,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,6 +1,5 @@
 require 'rubygems'
 require 'test/unit'
-require 'mocha'
 require 'pathname'
 require 'stringio'
 require File.expand_path('../../lib/mini_magick', __FILE__)
@@ -14,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"
@@ -71,6 +70,19 @@ 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)
@@ -98,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
@@ -249,16 +262,4 @@ class ImageTest < Test::Unit::TestCase
     end
     image.destroy!
   end
-
-  # testing that if copying files formatted from an animation fails,
-  # it raises an appropriate error
-  def test_throw_animation_copy_after_format_error
-    image = Image.open(ANIMATION_PATH)
-    FileUtils.stubs(:copy_file).raises(Errno::ENOENT)
-    assert_raises MiniMagick::Error do
-      image.format('png')
-    end
-  end
-
-
 end

metadata

@@ -1,11 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: mini_magick
 version: !ruby/object:Gem::Version 
+  hash: 3
   prerelease: false
   segments: 
   - 3
-  - 0
-  version: "3.0"
+  - 2
+  version: "3.2"
 platform: ruby
 authors: 
 - Corey Johnson
@@ -15,16 +16,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-28 00:00:00 +01:00
+date: 2011-01-11 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: subexec
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 0
         - 0
@@ -32,20 +35,6 @@ dependencies:
         version: 0.0.4
   type: :runtime
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: mocha
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 9
-        - 9
-        version: 0.9.9
-  type: :development
-  version_requirements: *id002
 description: ""
 email: 
 - probablycorey@gmail.com
@@ -64,6 +53,16 @@ files:
 - Rakefile
 - lib/mini_gmagick.rb
 - lib/mini_magick.rb
+- test/actually_a_gif.jpg
+- test/animation.gif
+- test/command_builder_test.rb
+- test/composited.jpg
+- test/image_test.rb
+- test/leaves spaced.tiff
+- test/not_an_image.php
+- test/simple-minus.gif
+- test/simple.gif
+- test/trogdor.jpg
 has_rdoc: true
 homepage: http://github.com/probablycorey/mini_magick
 licenses: []
@@ -74,23 +73,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Manipulate images with minimal use of memory via ImageMagick / GraphicsMagick
@@ -100,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