mini_magick 1.2.2 → 1.2.3

data/History.txt

@@ -4,3 +4,8 @@
 # 2.) identify doesn't trip over strangley named files
 # 3.) TempFile uses file extention now (Thanks http://marsorange.com/archives/of-mogrify-ruby-tempfile-dynamic-class-definitions)
 # 4.) identify commands escape output path correctly
+
+== 1.2.3 / 2007-06-15
+
+# 1.) Image::from_file doesn't drop the file extension anymore, it and use the image_temp_file correctly
+# 4.) TempFiles are stored as an instance variable in Image instances so they don't get cleaned up prematurely via garbage collection

data/lib/mini_magick.rb

@@ -7,38 +7,41 @@ require File.join(File.dirname(__FILE__), '/image_temp_file')
 module MiniMagick
   class MiniMagickError < RuntimeError; end
 
-  VERSION = '1.2.2'
+  VERSION = '1.2.3'
 
   class Image
     attr :path
+    attr :tempfile
     attr :output
 
     # Class Methods
     # -------------
     class <<self
-      def from_blob(blob)
+      def from_blob(blob, extension=nil)
         begin
-          @tmp = ImageTempFile.new("minimagick") # Keep reference to the tempfile so garbage collection doesn't destroy it
-          @tmp.binmode
-          @tmp.write(blob)
+          tempfile = ImageTempFile.new("minimagick#{extension}")
+          tempfile.binmode
+          tempfile.write(blob)
         ensure
-          @tmp.close
+          tempfile.close
         end
-        return self.new(@tmp.path)
+        
+        return self.new(tempfile.path, tempfile)
       end
 
       # Use this if you don't want to overwrite the image file
       def from_file(image_path)
         File.open(image_path, "rb") do |f|
-          self.from_blob(f.read)
+          self.from_blob(f.read, File.extname(image_path))
         end
       end
     end
 
     # Instance Methods
     # ----------------
-    def initialize(input_path)
+    def initialize(input_path, tempfile=nil)
       @path = input_path
+      @tempfile = tempfile # ensures that the tempfile will stick around until this image is garbage collected.
 
       # Ensure that the file is an image
       run_command("identify", @path)

data/test/test_mini_magick_test.rb

@@ -7,6 +7,7 @@ class ImageTest < Test::Unit::TestCase
   CURRENT_DIR = File.dirname(File.expand_path(__FILE__)) + "/"
 
   SIMPLE_IMAGE_PATH = CURRENT_DIR + "simple.gif"
+  TIFF_IMAGE_PATH = CURRENT_DIR + "burner.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"
@@ -49,6 +50,13 @@ class ImageTest < Test::Unit::TestCase
     assert_equal 55, image[:height]
     assert_match(/^gif$/i, image[:format])
   end
+
+  def test_tiff
+    image = Image.new(TIFF_IMAGE_PATH)    
+    assert_equal "tiff", image[:format].downcase
+    assert_equal 317, image[:width]
+    assert_equal 275, image[:height]
+  end
   
   def test_gif_with_jpg_format
     image = Image.new(GIF_WITH_JPG_EXT)    

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0.1
 specification_version: 1
 name: mini_magick
 version: !ruby/object:Gem::Version 
-  version: 1.2.2
-date: 2007-06-01 00:00:00 -04:00
+  version: 1.2.3
+date: 2007-06-15 00:00:00 -04:00
 summary: A simple image manipulation library based on ImageMagick.
 require_paths: 
 - lib