mini_magick 3.0 → 3.1

data/VERSION

@@ -1 +1 @@
-3.0
+3.1

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.
     #
@@ -164,27 +168,27 @@ module MiniMagick
       # Why do I go to the trouble of putting in newlines? Because otherwise animated gifs screw everything up
       case value.to_s
       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 +198,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.

data/test/image_test.rb

@@ -14,7 +14,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"

metadata

@@ -4,8 +4,8 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 3
-  - 0
-  version: "3.0"
+  - 1
+  version: "3.1"
 platform: ruby
 authors: 
 - Corey Johnson
@@ -15,13 +15,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-28 00:00:00 +01:00
+date: 2010-11-09 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 
@@ -36,6 +37,7 @@ dependencies:
   name: mocha
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -64,6 +66,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,6 +86,7 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -81,6 +94,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -90,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 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 +114,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