paperclip 2.3.4 → 2.3.5

data/lib/paperclip/iostream.rb

@@ -1,29 +1,27 @@
 # Provides method that can be included on File-type objects (IO, StringIO, Tempfile, etc) to allow stream copying
 # and Tempfile conversion.
 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")
+  def to_tempfile(object)
+    return object.to_tempfile if object.respond_to?(:to_tempfile)
+    name = object.respond_to?(:original_filename) ? object.original_filename : (object.respond_to?(:path) ? object.path : "stream")
     tempfile = Paperclip::Tempfile.new(["stream", File.extname(name)])
     tempfile.binmode
-    self.stream_to(tempfile)
+    stream_to(object, tempfile)
   end
 
   # Copies one read-able object from one place to another in blocks, obviating the need to load
-  # the whole thing into memory. Defaults to 8k blocks. If this module is included in both
-  # StringIO and Tempfile, then either can have its data copied anywhere else without typing
-  # worries or memory overhead worries. Returns a File if a String is passed in as the destination
-  # and returns the IO or Tempfile as passed in if one is sent as the destination.
-  def stream_to path_or_file, in_blocks_of = 8192
+  # the whole thing into memory. Defaults to 8k blocks. Returns a File if a String is passed
+  # in as the destination and returns the IO or Tempfile as passed in if one is sent as the destination.
+  def stream_to object, path_or_file, in_blocks_of = 8192
     dstio = case path_or_file
             when String   then File.new(path_or_file, "wb+")
             when IO       then path_or_file
             when Tempfile then path_or_file
             end
     buffer = ""
-    self.rewind
-    while self.read(in_blocks_of, buffer) do
+    object.rewind
+    while object.read(in_blocks_of, buffer) do
       dstio.write(buffer)
     end
     dstio.rewind
@@ -31,18 +29,6 @@ module IOStream
   end
 end
 
-class IO #:nodoc:
-  include IOStream
-end
-
-%w( Tempfile StringIO ).each do |klass|
-  if Object.const_defined? klass
-    Object.const_get(klass).class_eval do
-      include IOStream
-    end
-  end
-end
-
 # Corrects a bug in Windows when asking for Tempfile size.
 if defined? Tempfile
   class Tempfile

data/lib/paperclip/processor.rb

@@ -50,7 +50,7 @@ module Paperclip
           prefix, suffix = basename, ''
         end
 
-        t = time.now.strftime("%y%m%d")
+        t = Time.now.strftime("%y%m%d")
         path = "#{prefix}#{t}-#{$$}-#{rand(0x100000000).to_s(36)}-#{n}#{suffix}"
       end
     end

data/lib/paperclip/storage/s3.rb

@@ -127,10 +127,10 @@ module Paperclip
       # 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]
-        filename = path(style).split(".")
+        filename = path(style)
         extname  = File.extname(filename)
         basename = File.basename(filename, extname)
-        file = Tempfile.new(basename, extname)
+        file = Tempfile.new([basename, extname])
         file.write(AWS::S3::S3Object.value(path(style), bucket_name))
         file.rewind
         return file

data/lib/paperclip/upfile.rb

@@ -35,7 +35,9 @@ module Paperclip
 
     # Returns the hash of the file.
     def fingerprint
-      Digest::MD5.hexdigest(self.read)
+      data = self.read
+      self.rewind
+      Digest::MD5.hexdigest(data)
     end
   end
 end

data/lib/paperclip/version.rb

@@ -1,3 +1,3 @@
 module Paperclip
-  VERSION = "2.3.4" unless defined? Paperclip::VERSION
+  VERSION = "2.3.5" unless defined? Paperclip::VERSION
 end

data/test/iostream_test.rb

@@ -1,14 +1,7 @@
 require 'test/helper'
 
 class IOStreamTest < Test::Unit::TestCase
-  context "IOStream" do
-    should "be included in IO, File, Tempfile, and StringIO" do
-      [IO, File, Tempfile, StringIO].each do |klass|
-        assert klass.included_modules.include?(IOStream), "Not in #{klass}"
-      end
-    end
-  end
-
+  include IOStream
   context "A file" do
     setup do
       @file = File.new(File.join(File.dirname(__FILE__), "fixtures", "5k.png"), 'rb')
@@ -21,7 +14,7 @@ class IOStreamTest < Test::Unit::TestCase
       context "and given a String" do
         setup do
           FileUtils.mkdir_p(File.join(ROOT, 'tmp'))
-          assert @result = @file.stream_to(File.join(ROOT, 'tmp', 'iostream.string.test'))
+          assert @result = stream_to(@file, File.join(ROOT, 'tmp', 'iostream.string.test'))
         end
 
         should "return a File" do
@@ -38,7 +31,7 @@ class IOStreamTest < Test::Unit::TestCase
         setup do
           tempfile = Tempfile.new('iostream.test')
           tempfile.binmode
-          assert @result = @file.stream_to(tempfile)
+          assert @result = stream_to(@file, tempfile)
         end
 
         should "return a Tempfile" do
@@ -53,9 +46,9 @@ class IOStreamTest < Test::Unit::TestCase
 
     end
 
-    context "that is sent #to_tempfile" do
+    context "that is converted #to_tempfile" do
       setup do
-        assert @tempfile = @file.to_tempfile
+        assert @tempfile = to_tempfile(@file)
       end
 
       should "convert it to a Paperclip Tempfile" do

data/test/storage_test.rb

@@ -351,6 +351,11 @@ class StorageTest < Test::Unit::TestCase
           should "be on S3" do
             assert true
           end
+
+          should "generate a tempfile with the right name" do
+            file = @dummy.avatar.to_file
+            assert_match /^original.*\.png$/, File.basename(file.path)
+          end
         end
       end
     end

data/test/thumbnail_test.rb

@@ -8,7 +8,6 @@ class ThumbnailTest < Test::Unit::TestCase
     end
 
     should "have its path contain a real extension" do
-      p @tempfile.path
       assert_equal ".jpg", File.extname(@tempfile.path)
     end
 

data/test/upfile_test.rb

@@ -33,4 +33,21 @@ class UpfileTest < Test::Unit::TestCase
     end
     assert_equal 'text/plain', file.content_type
   end
+
+  should "return a MD5 fingerprint of the file" do
+    file = StringIO.new("1234567890")
+    class << file
+      include Paperclip::Upfile
+    end
+    assert_equal "e807f1fcf82d132f9bb018ca6738a19f", file.fingerprint
+  end
+
+  should "still be readable after the file fingerprints itself" do
+    file = StringIO.new("1234567890")
+    class << file
+      include Paperclip::Upfile
+    end
+    file.fingerprint
+    assert_equal "1234567890", file.read
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: paperclip
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 2
   - 3
-  - 4
-  version: 2.3.4
+  - 5
+  version: 2.3.5
 platform: ruby
 authors: 
 - Jon Yurek
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-06 00:00:00 -04:00
+date: 2010-10-26 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -119,8 +119,10 @@ files:
 - lib/generators/paperclip/templates/paperclip_migration.rb.erb
 - lib/generators/paperclip/USAGE
 - lib/paperclip/attachment.rb
+- lib/paperclip/attachment.rbc
 - lib/paperclip/callback_compatability.rb
 - lib/paperclip/command_line.rb
+- lib/paperclip/configuration.rbc
 - lib/paperclip/geometry.rb
 - lib/paperclip/interpolations.rb
 - lib/paperclip/iostream.rb
@@ -139,6 +141,7 @@ files:
 - lib/paperclip/upfile.rb
 - lib/paperclip/version.rb
 - lib/paperclip.rb
+- lib/paperclip.rbc
 - lib/tasks/paperclip.rake
 - test/attachment_test.rb
 - test/command_line_test.rb