Browse files

Only use Tempfile subclass in 1.8.6 and below. Fixes #278.

  • Loading branch information...
1 parent 05498d2 commit 1fef4c302d076575a1ca9691e01eb96ee9262ebc @jyurek jyurek committed Oct 5, 2010
Showing with 21 additions and 8 deletions.
  1. +1 −1 lib/paperclip/iostream.rb
  2. +13 −4 lib/paperclip/processor.rb
  3. +4 −1 lib/paperclip/storage/s3.rb
  4. +1 −1 lib/paperclip/thumbnail.rb
  5. +2 −1 test/thumbnail_test.rb
View
2 lib/paperclip/iostream.rb
@@ -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
View
17 lib/paperclip/processor.rb
@@ -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
View
5 lib/paperclip/storage/s3.rb
@@ -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
View
2 lib/paperclip/thumbnail.rb
@@ -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
View
3 test/thumbnail_test.rb
@@ -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

0 comments on commit 1fef4c3

Please sign in to comment.