Skip to content

Commit

Permalink
Only use Tempfile subclass in 1.8.6 and below. Fixes thoughtbot#278.
Browse files Browse the repository at this point in the history
  • Loading branch information
Jon Yurek committed Oct 6, 2010
1 parent 05498d2 commit 1fef4c3
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 8 deletions.
2 changes: 1 addition & 1 deletion lib/paperclip/iostream.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ module IOStream
# Returns a Tempfile containing the contents of the readable object.
def to_tempfile
name = respond_to?(:original_filename) ? original_filename : (respond_to?(:path) ? path : "stream")
tempfile = Paperclip::Tempfile.new("stream" + File.extname(name))
tempfile = Paperclip::Tempfile.new(["stream", File.extname(name)])
tempfile.binmode
self.stream_to(tempfile)
end
Expand Down
17 changes: 13 additions & 4 deletions lib/paperclip/processor.rb
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,19 @@ def self.make file, options = {}, attachment = nil
# on this blog post:
# http://marsorange.com/archives/of-mogrify-ruby-tempfile-dynamic-class-definitions
class Tempfile < ::Tempfile
# Replaces Tempfile's +make_tmpname+ with one that honors file extensions.
def make_tmpname(basename, n)
extension = File.extname(basename)
sprintf("%s,%d,%d%s", File.basename(basename, extension), $$, n.to_i, extension)
# This is Ruby 1.8.7's implementation.
if RUBY_VERSION <= "1.8.6"
def make_tmpname(basename, n)
case basename
when Array
prefix, suffix = *basename
else
prefix, suffix = basename, ''
end

t = time.now.strftime("%y%m%d")
path = "#{prefix}#{t}-#{$$}-#{rand(0x100000000).to_s(36)}-#{n}#{suffix}"
end
end
end
end
5 changes: 4 additions & 1 deletion lib/paperclip/storage/s3.rb
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,10 @@ def s3_protocol
# style, in the format most representative of the current storage.
def to_file style = default_style
return @queued_for_write[style] if @queued_for_write[style]
file = Tempfile.new(path(style))
filename = path(style).split(".")
extname = File.extname(filename)
basename = File.basename(filename, extname)
file = Tempfile.new(basename, extname)
file.write(AWS::S3::S3Object.value(path(style), bucket_name))
file.rewind
return file
Expand Down
2 changes: 1 addition & 1 deletion lib/paperclip/thumbnail.rb
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ def convert_options?
# that contains the new image.
def make
src = @file
dst = Tempfile.new([@basename, @format].compact.join("."))
dst = Tempfile.new([@basename, @format ? ".#{@format}" : ''])
dst.binmode

begin
Expand Down
3 changes: 2 additions & 1 deletion test/thumbnail_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@ class ThumbnailTest < Test::Unit::TestCase

context "A Paperclip Tempfile" do
setup do
@tempfile = Paperclip::Tempfile.new("file.jpg")
@tempfile = Paperclip::Tempfile.new(["file", ".jpg"])
end

should "have its path contain a real extension" do
p @tempfile.path
assert_equal ".jpg", File.extname(@tempfile.path)
end

Expand Down

0 comments on commit 1fef4c3

Please sign in to comment.