mini_magick 1.1.0 → 1.2.0

data/Rakefile

@@ -49,7 +49,7 @@ spec = Gem::Specification.new do |s|
   s.author = "Corey Johnson"
   s.email = "probablycorey@gmail.com"
   s.rubyforge_project = PKG_NAME
-  s.homepage = "http://journal.gleepglop.com"
+  s.homepage = "http://gleepglop.com"
 
   s.has_rdoc = true
   s.requirements << 'none'
@@ -63,6 +63,6 @@ end
   
 Rake::GemPackageTask.new(spec) do |p|
   p.gem_spec = spec
-  p.need_tar = true
+  p.need_tar = false
   p.need_zip = true
 end

data/lib/mini_magick.rb

@@ -1,11 +1,12 @@
 require "open-uri"
 require "tempfile"
 require "stringio"
+require "fileutils"
 
 module MiniMagick
   class MiniMagickError < Exception; end
   
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
     
   class Image
     attr :path
@@ -17,11 +18,10 @@ module MiniMagick
         begin
           tmp = Tempfile.new("minimagic")
           tmp.binmode 
-          tmp.write(blob)         
+          tmp.write(blob)
         ensure
           tmp.close
         end      
-        
         return self.new(tmp.path)
       end
       
@@ -46,11 +46,11 @@ module MiniMagick
       # Why do I go to the trouble of putting in newline chars? Because otherwise animated gifs screw everything up
       case value.to_s
       when "format"
-        run_command("identify", "-format", "%m\\\\n", @path).split("\n")[0]
+        run_command("identify", "-format", format_option("%m"), @path).split("\n")[0]        	
       when "height"
-        run_command("identify", "-format", "%h\\\\n", @path).split("\n")[0].to_i
+        run_command("identify", "-format", format_option("%h"), @path).split("\n")[0].to_i
       when "width"
-        run_command("identify", "-format", "%w\\\\n", @path).split("\n")[0].to_i
+        run_command("identify", "-format", format_option("%w"), @path).split("\n")[0].to_i
       when "original_at"
         # Get the EXIF original capture as a Time object
         Time.local(*self["EXIF:DateTimeOriginal"].split(/:|\s+/)) rescue nil
@@ -68,13 +68,11 @@ module MiniMagick
       
       raise "Unable to format to #{format}" unless File.exists?(@path)
     end
-        
+    
+    # Writes the temporary image that we are using for processing to the output path
     def write(output_path)        
-      open(output_path, "wb") do |output_file|
-        open(@path, "rb") do |image_file|
-          output_file.write(image_file.read)
-        end
-      end
+      FileUtils.copy_file @path, output_path
+      run_command "identify #{output_path}"		# Verify that we have a good image
     end
       
     # If an unknown method is called then it is sent through the morgrify program
@@ -94,9 +92,31 @@ module MiniMagick
     # Private (Don't look in here!)
     # -----------------------------
     private
+    
+    # Check to see if we are running on win32 -- we need to escape things differently    
+    def windows?
+    	!(RUBY_PLATFORM =~ /win32/).nil?
+    end    
+       
+    # Outputs a carriage-return delimited format string for Unix and Windows 
+    def format_option(format)
+        if windows?
+        	format = "#{format}\\n"
+        else
+        	format = "#{format}\\\\n"
+        end              
+    end    
         
     def run_command(command, *args)
-      args = args.collect {|a| a.to_s}
+      args = args.collect do |a|
+        a = a.to_s
+        unless a[0,1] == '-'  # don't quote switches
+          "\"#{a}\""          # values quoted because they can contain characters like '>'
+        else
+          a
+        end
+      end
+      
       output = `#{command} #{args.join(' ')}`
       
       if $? != 0

data/test/mini_magick_test.rb

@@ -12,7 +12,7 @@ class ImageTest < Test::Unit::TestCase
   EXIF_IMAGE_PATH = CURRENT_DIR + "trogdor.jpg"
   
   def test_image_from_blob
-    File.open(SIMPLE_IMAGE_PATH, "r") do |f|
+    File.open(SIMPLE_IMAGE_PATH, "rb") do |f|
       image = Image.from_blob(f.read)
     end
   end
@@ -64,6 +64,15 @@ class ImageTest < Test::Unit::TestCase
     assert_match(/^gif$/i, image[:format])
   end 
   
+  def test_image_resize_with_minimum
+    image = Image.from_file(SIMPLE_IMAGE_PATH)
+    original_width, original_height = image[:width], image[:height]
+    image.resize "#{original_width + 10}x#{original_height + 10}>"
+
+    assert_equal original_width, image[:width]
+    assert_equal original_height, image[:height]
+  end
+  
   def test_image_combine_options_resize_blur
     image = Image.from_file(SIMPLE_IMAGE_PATH)
     image.combine_options do |c|

metadata

@@ -3,13 +3,13 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: mini_magick
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
-date: 2006-04-16 00:00:00 -04:00
+  version: 1.2.0
+date: 2006-08-07 00:00:00 -04:00
 summary: Manipulate images with minimal use of memory.
 require_paths: 
 - lib
 email: probablycorey@gmail.com
-homepage: http://journal.gleepglop.com
+homepage: http://gleepglop.com
 rubyforge_project: mini_magick
 description: Uses command-line ImageMagick tools to resize, rotate, and mogrify images.
 autorequire: mini_magick