tupalo-mini_magick 3.2 → 3.2.2

data/lib/mini_magick.rb

@@ -392,9 +392,12 @@ module MiniMagick
       #
       # The 'montage' script has several options, see here: http://www.imagemagick.org/script/montage.php
       def self.new(images, output_extension, options={})
-        tempfile = Tempfile.new(['mini_magick', output_extension.to_s])
-        tempfile.binmode
-        tempfile.close
+        begin
+          tempfile = Tempfile.new(['mini_magick', ".#{output_extension}"])
+          tempfile.binmode
+        ensure
+          tempfile.close if tempfile
+        end
 
         args = options.collect { |key,value| "-#{key.to_s} #{value.to_s}" }  # collect hash parts into arguments
         images.each do |image|
@@ -404,7 +407,7 @@ module MiniMagick
 
         # This is a little hacky - cannikin's CommandeRunner would be a useful
         # alternative (http://github.com/cannikin/mini_magick).
-        Image.new(images.first.path).run_command('montage', *args)
+        Image.new(images.first.path, tempfile).run_command('montage', *args)
         return Image.open(tempfile.path)
       end
 

data/test/montage_test.rb

@@ -0,0 +1,30 @@
+require 'test/unit'
+require File.join(File.dirname(__FILE__), '../lib/mini_magick')
+
+class Montage < Test::Unit::TestCase
+  include MiniMagick
+
+  CURRENT_DIR = File.dirname(File.expand_path(__FILE__)) + "/"
+
+  TOP_IMAGE_PATH = CURRENT_DIR + "simple.gif"
+  BOTTOM_IMAGE_PATH = CURRENT_DIR + "leaves spaced.tiff"
+  OUTPUT_FORMAT = 'jpg'
+
+  def test_montage_from_images
+    begin
+      image1 = Image.open(TOP_IMAGE_PATH)
+      image2 = Image.open(BOTTOM_IMAGE_PATH)
+      output_path = CURRENT_DIR + 'montage.' + OUTPUT_FORMAT
+      output_image = Montage.new([image1, image2], OUTPUT_FORMAT)
+      
+      assert_equal output_image.class, MiniMagick::Image
+      
+      output_image.write(output_path)
+      
+      assert File.exists?(output_path)
+      assert_match(/^jpeg$/i, output_image[:format])
+    ensure
+      File.delete output_path
+    end
+  end
+end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tupalo-mini_magick
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 11
   prerelease: false
   segments: 
   - 3
   - 2
-  version: "3.2"
+  - 2
+  version: 3.2.2
 platform: ruby
 authors: 
 - Corey Johnson
@@ -17,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-21 00:00:00 +01:00
+date: 2010-12-23 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -76,6 +77,7 @@ files:
 - test/composited.jpg
 - test/image_test.rb
 - test/leaves spaced.tiff
+- test/montage_test.rb
 - test/not_an_image.php
 - test/simple-minus.gif
 - test/simple.gif
@@ -121,6 +123,7 @@ test_files:
 - test/composited.jpg
 - test/image_test.rb
 - test/leaves spaced.tiff
+- test/montage_test.rb
 - test/not_an_image.php
 - test/simple-minus.gif
 - test/simple.gif