@@ -4,7 +4,8 @@ module IOStream # Returns a Tempfile containing the contents of the readable object. def to_tempfile - tempfile = Tempfile.new("stream") + name = respond_to?(:original_filename) ? original_filename : (respond_to?(:path) ? path : "stream") + tempfile = Paperclip::Tempfile.new(File.basename(name)) tempfile.binmode self.stream_to(tempfile) end lib/paperclip/iostream.rb @@ -133,7 +133,7 @@ class AttachmentTest < Test::Unit::TestCase :styles => { :default => ["100x100", :png] }, :default_style => :default @file = StringIO.new("...") - @file.expects(:original_filename).returns("file.jpg") + @file.stubs(:original_filename).returns("file.jpg") end should "return the right extension for the path" do @attachment.assign(@file) test/attachment_test.rb @@ -3,7 +3,7 @@ require 'test/unit' require 'shoulda' require 'tempfile' -gem 'jferris-mocha', '0.9.5.0.1241126838' +gem 'jferris-mocha' require 'mocha' gem 'sqlite3-ruby' test/helper.rb @@ -58,8 +58,15 @@ class IOStreamTest < Test::Unit::TestCase assert @tempfile = @file.to_tempfile end - should "convert it to a Tempfile" do - assert @tempfile.is_a?(Tempfile) + should "convert it to a Paperclip Tempfile" do + assert @tempfile.is_a?(Paperclip::Tempfile) + end + + should "have the name be based on the original_filename" do + name = File.basename(@file.path) + extension = File.extname(name) + basename = File.basename(name, extension) + assert_match %r[^#{Regexp.quote(basename)}.*?#{Regexp.quote(extension)}], File.basename(@tempfile.path) end should "have the Tempfile contain the same data as the file" do test/iostream_test.rb 68286d689d956abe17f77e9e5b7c9537e8530bbc Jon Yurek jyurek@thoughtbot.com http://github.com/thoughtbot/paperclip/commit/c64223c60dd7b0c4c4bc218de906061a6563a5a8 c64223c60dd7b0c4c4bc218de906061a6563a5a8 2009-11-04T15:58:47-08:00 2009-11-04T15:58:47-08:00 Fixed an error where ImageMagick wasn't identifying images because the Tempfiles did not have the right extension. f98940b77f1d63dc2ea42a2cafd9bf5eb74c9ba1 Jon Yurek jyurek@thoughtbot.com