ripta-dm-paperclip 2.2.9.2 → 2.5.0.1

data/lib/dm-paperclip/validations.rb

@@ -1,6 +1,41 @@
 module Paperclip
   module Validate
 
+    module ClassMethods
+
+      # Places ActiveRecord-style validations on the size of the file assigned. The
+      # possible options are:
+      # * +in+: a Range of bytes (i.e. +1..1.megabyte+),
+      # * +less_than+: equivalent to :in => 0..options[:less_than]
+      # * +greater_than+: equivalent to :in => options[:greater_than]..Infinity
+      # * +message+: error message to display, use :min and :max as replacements
+      def validates_attachment_size(*fields)
+        opts = opts_from_validator_args(fields)
+        add_validator_to_context(opts, fields, Paperclip::Validate::SizeValidator)
+      end
+
+      # Adds errors if thumbnail creation fails. The same as specifying :whiny_thumbnails => true.
+      def validates_attachment_thumbnails name, options = {}
+        self.attachment_definitions[name][:whiny_thumbnails] = true
+      end
+
+      # Places ActiveRecord-style validations on the presence of a file.
+      def validates_attachment_presence(*fields)
+        opts = opts_from_validator_args(fields)
+        add_validator_to_context(opts, fields, Paperclip::Validate::RequiredFieldValidator)
+      end
+
+      # Places ActiveRecord-style validations on the content type of the file assigned. The
+      # possible options are:
+      # * +content_type+: Allowed content types.  Can be a single content type or an array.  Allows all by default.
+      # * +message+: The message to display when the uploaded file has an invalid content type.
+      def validates_attachment_content_type(*fields)
+        opts = opts_from_validator_args(fields)
+        add_validator_to_context(opts, fields, Paperclip::Validate::ContentTypeValidator)
+      end
+
+    end
+
     class SizeValidator < DataMapper::Validate::GenericValidator #:nodoc:
       def initialize(field_name, options={})
         super
@@ -16,9 +51,9 @@ module Paperclip
         return true if @options[:in].include? field_value.to_i
 
         error_message ||= @options[:message] unless @options[:message].nil?
-        error_message ||= "%s must be less than %s bytes".t(Extlib::Inflection.humanize(@field_name), @options[:less_than]) unless @options[:less_than].nil?
-        error_message ||= "%s must be greater than %s bytes".t(Extlib::Inflection.humanize(@field_name), @options[:greater_than]) unless @options[:greater_than].nil?
-        error_message ||= "%s must be between %s and %s bytes".t(Extlib::Inflection.humanize(@field_name), @options[:in].first, @options[:in].last)
+        error_message ||= "%s must be less than %s bytes".t(ActiveSupport::Inflector.humanize(@field_name), @options[:less_than]) unless @options[:less_than].nil?
+        error_message ||= "%s must be greater than %s bytes".t(ActiveSupport::Inflector.humanize(@field_name), @options[:greater_than]) unless @options[:greater_than].nil?
+        error_message ||= "%s must be between %s and %s bytes".t(ActiveSupport::Inflector.humanize(@field_name), @options[:in].first, @options[:in].last)
         add_error(target, error_message , @field_name)
         return false
       end
@@ -33,7 +68,7 @@ module Paperclip
       def call(target)
         field_value = target.validation_property_value(@field_name)
         if field_value.nil? || field_value.original_filename.blank?
-          error_message = @options[:message] || "%s must be set".t(Extlib::Inflection.humanize(@field_name))
+          error_message = @options[:message] || "%s must be set".t(ActiveSupport::Inflector.humanize(@field_name))
           add_error(target, error_message , @field_name)
           return false
         end
@@ -56,7 +91,7 @@ module Paperclip
             content_type = target.validation_property_value(:"#{@field_name}_content_type")
             unless valid_types.any?{|t| t === content_type }
               error_message ||= @options[:message] unless @options[:message].nil?
-              error_message ||= "%s's content type of '%s' is not a valid content type".t(Extlib::Inflection.humanize(@field_name), content_type)
+              error_message ||= "%s's content type of '%s' is not a valid content type".t(ActiveSupport::Inflector.humanize(@field_name), content_type)
               add_error(target, error_message , @field_name)
               return false
             end

data/test/attachment_test.rb

@@ -149,9 +149,12 @@ class AttachmentTest < Test::Unit::TestCase
     setup do
       rebuild_model
 
+      @tempfile = mock
+      @tempfile.expects(:size).returns(10)
+
       @not_file = mock
       @not_file.stubs(:nil?).returns(false)
-      @not_file.expects(:to_tempfile).returns(self)
+      @not_file.expects(:to_tempfile).returns(@tempfile)
       @not_file.expects(:original_filename).returns("filename.png\r\n")
       @not_file.expects(:content_type).returns("image/png\r\n")
       @not_file.expects(:size).returns(10)
@@ -178,10 +181,13 @@ class AttachmentTest < Test::Unit::TestCase
     setup do
       rebuild_model
 
+      @tempfile = mock
+      @tempfile.expects(:size).returns(10)
+
       @not_file = mock
       @not_file.stubs(:nil?).returns(false)
-      @not_file.expects(:to_tempfile).returns(self)
-      @not_file.expects(:original_filename).returns("sheep_say_b�.png\r\n")
+      @not_file.expects(:to_tempfile).returns(@tempfile)
+      @not_file.expects(:original_filename).returns("sheep_say_b_.png\r\n")
       @not_file.expects(:content_type).returns("image/png\r\n")
       @not_file.expects(:size).returns(10)
 
@@ -229,12 +235,12 @@ class AttachmentTest < Test::Unit::TestCase
 
     context "with a file assigned in the database" do
       setup do
-        @instance.stubs(:attribute_get).with(:avatar_file_name).returns('5k.png')
-        @instance.stubs(:attribute_get).with(:avatar_content_type).returns("image/png")
-        @instance.stubs(:attribute_get).with(:avatar_file_size).returns(12345)
+        @instance.stubs(:avatar_file_name).returns('5k.png')
+        @instance.stubs(:avatar_content_type).returns("image/png")
+        @instance.stubs(:avatar_file_size).returns(12345)
         @now = Time.now
         Time.stubs(:now).returns(@now)
-        @instance.stubs(:attribute_get).with(:avatar_updated_at).returns(Time.now)
+        @instance.stubs(:avatar_updated_at).returns(Time.now)
       end
 
       should "return a correct url even if the file does not exist" do
@@ -257,12 +263,12 @@ class AttachmentTest < Test::Unit::TestCase
       end
 
       should "return the proper path when filename has a single .'s" do
-        assert_equal "./test/../tmp/avatars/dummies/original/#{@instance.id}/5k.png", @attachment.path
+        assert_equal File.expand_path("./test/../tmp/avatars/dummies/original/#{@instance.id}/5k.png"), File.expand_path(@attachment.path)
       end
 
       should "return the proper path when filename has multiple .'s" do
-        @instance.stubs(:attribute_get).with(:avatar_file_name).returns("5k.old.png")      
-        assert_equal "./test/../tmp/avatars/dummies/original/#{@instance.id}/5k.old.png", @attachment.path
+        @instance.stubs(:avatar_file_name).returns("5k.old.png")      
+        assert_equal File.expand_path("./test/../tmp/avatars/dummies/original/#{@instance.id}/5k.old.png"), File.expand_path(@attachment.path)
       end
 
       context "when expecting three styles" do
@@ -299,7 +305,7 @@ class AttachmentTest < Test::Unit::TestCase
 
             should "commit the files to disk" do
               [:large, :medium, :small].each do |style|
-                io = @attachment.to_io(style)
+                io = @attachment.to_file(style)
                 assert File.exists?(io)
                 assert ! io.is_a?(::Tempfile)
               end
@@ -310,7 +316,7 @@ class AttachmentTest < Test::Unit::TestCase
                [:medium, 100, 15, "GIF"],
                [:small, 32, 32, "JPEG"]].each do |style|
                 cmd = "identify -format '%w %h %b %m' " + 
-                      "#{@attachment.to_io(style.first).path}"
+                      "#{@attachment.path(style.first)}"
                 out = `#{cmd}`
                 width, height, size, format = out.split(" ")
                 assert_equal style[1].to_s, width.to_s 
@@ -328,15 +334,12 @@ class AttachmentTest < Test::Unit::TestCase
                 @existing_names = @attachment.styles.keys.collect do |style|
                   @attachment.path(style)
                 end
-                @instance.expects(:attributes=).with({ :avatar_file_name => nil,
-                  :avatar_content_type => nil,
-                  :avatar_file_size => nil })
                 @attachment.assign nil
                 @attachment.save
               end
 
               should "delete the files" do
-                @existing_names.each{|f| assert !File.exists?(f) }
+                @existing_names.each { |f| assert !File.exists?(f) }
               end
             end
           end

data/test/geometry_test.rb

@@ -62,7 +62,7 @@ class GeometryTest < Test::Unit::TestCase
     should "make sure the modifier gets passed during transformation_to" do
       assert @src = Paperclip::Geometry.parse("123x456")
       assert @dst = Paperclip::Geometry.parse("123x456>")
-      assert_equal "123x456>", @src.transformation_to(@dst).to_s
+      assert_equal "123x456>", @src.transformation_to(@dst).join
     end
 
     should "be generated from a file" do

data/test/helper.rb

@@ -1,9 +1,14 @@
 require 'rubygems'
+require 'bundler'
+Bundler.setup
+Bundler.require(:development, :runtime, :datamapper)
+
 require 'test/unit'
 require 'shoulda'
 require 'mocha'
 require 'tempfile'
 
+require 'extlib'
 require 'dm-core'
 require 'dm-validations'
 require 'dm-migrations'
@@ -22,7 +27,8 @@ Merb.class_eval do
   def self.root
     "#{ROOT}"
   end
-  def self.env
+  def self.env(str=nil)
+    ENV['RAILS_ENV'] = str if str
     ENV['RAILS_ENV']
   end
 end
@@ -42,6 +48,12 @@ unless defined?(Mash)
   end
 end
 
+Paperclip.configure do |config|
+  config.root               = Merb.root # the application root to anchor relative urls (defaults to Dir.pwd)
+  config.env                = Merb.env  # server env support, defaults to ENV['RACK_ENV'] or 'development'
+  config.use_dm_validations = true      # validate attachment sizes and such, defaults to false
+end
+
 def rebuild_model options = {}
   Object.send(:remove_const, "Dummy") rescue nil
   Object.const_set("Dummy", Class.new())
@@ -49,7 +61,7 @@ def rebuild_model options = {}
     include DataMapper::Resource
     include DataMapper::Validate
     include Paperclip::Resource
-    property :id, Integer, :serial => true
+    property :id, ::DataMapper::Property::Serial
     property :other, String
     has_attached_file :avatar, options
   end
@@ -57,8 +69,8 @@ def rebuild_model options = {}
 end
 
 def temporary_env(new_env)
-  old_env = defined?(RAILS_ENV) ? RAILS_ENV : nil
-  Object.const_set("RAILS_ENV", new_env)
+  old_env = Merb.env
+  Merb.env(new_env)
   yield
-  Object.const_set("RAILS_ENV", old_env)
+  Merb.env(old_env)
 end

data/test/iostream_test.rb

@@ -1,10 +1,4 @@
-require 'rubygems'
-require 'test/unit'
-require 'stringio'
-require 'tempfile'
-require 'shoulda'
-
-require File.join(File.dirname(__FILE__), '..', 'lib', 'dm-paperclip', 'iostream.rb')
+require 'test/helper'
 
 class IOStreamTest < Test::Unit::TestCase
   context "IOStream" do
@@ -17,29 +11,46 @@ class IOStreamTest < Test::Unit::TestCase
 
   context "A file" do
     setup do
-      @file = File.new(File.join(File.dirname(__FILE__), "fixtures", "5k.png"))
+      @file = File.new(File.join(File.dirname(__FILE__), "fixtures", "5k.png"), 'rb')
     end
 
+    teardown { @file.close }
+
     context "that is sent #stream_to" do
 
-      [["/tmp/iostream.string.test", File],
-       [Tempfile.new('iostream.test'), Tempfile]].each do |args|
+      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'))
+        end
 
-        context "and given a #{args[0].class.to_s}" do
-          setup do
-            assert @result = @file.stream_to(args[0])
-          end
+        should "return a File" do
+          assert @result.is_a?(File)
+        end
 
-          should "return a #{args[1].to_s}" do
-            assert @result.is_a?(args[1])
-          end
+        should "contain the same data as the original file" do
+          @file.rewind; @result.rewind
+          assert_equal @file.read, @result.read
+        end
+      end
 
-          should "contain the same data as the original file" do
-            @file.rewind; @result.rewind
-            assert_equal @file.read, @result.read
-          end
+      context "and given a Tempfile" do
+        setup do
+          tempfile = Tempfile.new('iostream.test')
+          tempfile.binmode
+          assert @result = @file.stream_to(tempfile)
+        end
+
+        should "return a Tempfile" do
+          assert @result.is_a?(Tempfile)
+        end
+
+        should "contain the same data as the original file" do
+          @file.rewind; @result.rewind
+          assert_equal @file.read, @result.read
         end
       end
+
     end
 
     context "that is sent #to_tempfile" do
@@ -47,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
@@ -57,4 +75,4 @@ class IOStreamTest < Test::Unit::TestCase
       end
     end
   end
-end
+end

data/test/paperclip_test.rb

@@ -21,7 +21,7 @@ class PaperclipTest < Test::Unit::TestCase
         include DataMapper::Resource
         include DataMapper::Validate
         include Paperclip::Resource
-        property :id, Integer, :serial => true
+        property :id, ::DataMapper::Property::Serial
         property :other, String
         has_attached_file :file
       end

data/test/storage_test.rb

@@ -1,13 +1,10 @@
-require 'rubygems'
-require 'test/unit'
-require 'shoulda'
-require 'right_aws'
-
-require File.join(File.dirname(__FILE__), '..', 'lib', 'dm-paperclip', 'geometry.rb')
+require 'test/helper'
+require 'aws/s3'
 
 class StorageTest < Test::Unit::TestCase
   context "Parsing S3 credentials" do
     setup do
+      AWS::S3::Base.stubs(:establish_connection!)
       rebuild_model :storage => :s3,
                     :bucket => "testing",
                     :s3_credentials => {:not => :important}
@@ -15,48 +12,133 @@ class StorageTest < Test::Unit::TestCase
       @dummy = Dummy.new
       @avatar = @dummy.avatar
 
-      @current_env = ENV['RAILS_ENV']
+      @current_env = Merb.env
     end
 
     teardown do
-      ENV['RAILS_ENV'] = @current_env
+      Merb.env(@current_env)
     end
 
-    should "get the correct credentials when RAILS_ENV is production" do
-      ENV['RAILS_ENV'] = 'production'
-      assert_equal({'key' => "12345"},
+    should "get the correct credentials when environment is production" do
+      Merb.env("production")
+      assert_equal({:key => "12345"},
                    @avatar.parse_credentials('production' => {:key => '12345'},
                                              :development => {:key => "54321"}))
     end
 
-    should "get the correct credentials when RAILS_ENV is development" do
-      ENV['RAILS_ENV'] = 'development'
-      assert_equal({'key' => "54321"},
+    should "get the correct credentials when environment is development" do
+      Merb.env("development")
+      assert_equal({:key => "54321"},
                    @avatar.parse_credentials('production' => {:key => '12345'},
                                              :development => {:key => "54321"}))
     end
 
     should "return the argument if the key does not exist" do
-      ENV['RAILS_ENV'] = "not really an env"
-      assert_equal({'test' => "12345"}, @avatar.parse_credentials(:test => "12345"))
+      Merb.env("not really an env")
+      assert_equal({:test => "12345"}, @avatar.parse_credentials(:test => "12345"))
+    end
+  end
+
+  context "" do
+    setup do
+      AWS::S3::Base.stubs(:establish_connection!)
+      rebuild_model :storage => :s3,
+                    :s3_credentials => {},
+                    :bucket => "bucket",
+                    :path => ":attachment/:basename.:extension",
+                    :url => ":s3_path_url"
+      @dummy = Dummy.new
+      @dummy.avatar = StringIO.new(".")
+    end
+
+    should "return a url based on an S3 path" do
+      assert_match %r{^http://s3.amazonaws.com/bucket/avatars/stringio.txt}, @dummy.avatar.url
+    end
+  end
+  context "" do
+    setup do
+      AWS::S3::Base.stubs(:establish_connection!)
+      rebuild_model :storage => :s3,
+                    :s3_credentials => {},
+                    :bucket => "bucket",
+                    :path => ":attachment/:basename.:extension",
+                    :url => ":s3_domain_url"
+      @dummy = Dummy.new
+      @dummy.avatar = StringIO.new(".")
+    end
+
+    should "return a url based on an S3 subdomain" do
+      assert_match %r{^http://bucket.s3.amazonaws.com/avatars/stringio.txt}, @dummy.avatar.url
+    end
+  end
+  context "" do
+    setup do
+      AWS::S3::Base.stubs(:establish_connection!)
+      rebuild_model :storage => :s3,
+                    :s3_credentials => {
+                      :production   => { :bucket => "prod_bucket" },
+                      :development  => { :bucket => "dev_bucket" }
+                    },
+                    :s3_host_alias => "something.something.com",
+                    :path => ":attachment/:basename.:extension",
+                    :url => ":s3_alias_url"
+      @dummy = Dummy.new
+      @dummy.avatar = StringIO.new(".")
+    end
+
+    should "return a url based on the host_alias" do
+      assert_match %r{^http://something.something.com/avatars/stringio.txt}, @dummy.avatar.url
+    end
+  end
+  
+  context "Generating a url with an expiration" do
+    setup do
+      AWS::S3::Base.stubs(:establish_connection!)
+      rebuild_model :storage => :s3,
+                    :s3_credentials => {
+                      :production   => { :bucket => "prod_bucket" },
+                      :development  => { :bucket => "dev_bucket" }
+                    },
+                    :s3_host_alias => "something.something.com",
+                    :path => ":attachment/:basename.:extension",
+                    :url => ":s3_alias_url"
+                    
+      Merb.env("production")
+      
+      @dummy = Dummy.new
+      @dummy.avatar = StringIO.new(".")
+      
+      AWS::S3::S3Object.expects(:url_for).with("avatars/stringio.txt", "prod_bucket", { :expires_in => 3600 })
+      
+      @dummy.avatar.expiring_url
+    end
+    
+    should "should succeed" do
+      assert true
     end
   end
 
   context "Parsing S3 credentials with a bucket in them" do
     setup do
+      AWS::S3::Base.stubs(:establish_connection!)
       rebuild_model :storage => :s3,
                     :s3_credentials => {
                       :production   => { :bucket => "prod_bucket" },
                       :development  => { :bucket => "dev_bucket" }
                     }
       @dummy = Dummy.new
+      @old_env = Merb.env
     end
 
-    should "get the right bucket in production", :before => lambda{ ENV.expects(:[]).returns('production') } do
+    teardown{ Merb.env(@old_env) }
+
+    should "get the right bucket in production" do
+      Merb.env("production")
       assert_equal "prod_bucket", @dummy.avatar.bucket_name
     end
 
-    should "get the right bucket in development", :before => lambda{ ENV.expects(:[]).returns('development') } do
+    should "get the right bucket in development" do
+      Merb.env("development")
       assert_equal "dev_bucket", @dummy.avatar.bucket_name
     end
   end
@@ -82,11 +164,13 @@ class StorageTest < Test::Unit::TestCase
 
     context "when assigned" do
       setup do
-        @file = File.new(File.join(File.dirname(__FILE__), 'fixtures', '5k.png'))
+        @file = File.new(File.join(File.dirname(__FILE__), 'fixtures', '5k.png'), 'rb')
         @dummy = Dummy.new
         @dummy.avatar = @file
       end
 
+      teardown { @file.close }
+
       should "not get a bucket to get a URL" do
         @dummy.avatar.expects(:s3).never
         @dummy.avatar.expects(:s3_bucket).never
@@ -95,15 +179,7 @@ class StorageTest < Test::Unit::TestCase
 
       context "and saved" do
         setup do
-          @s3_mock     = stub
-          @bucket_mock = stub
-          RightAws::S3.expects(:new).with("12345", "54321", {}).returns(@s3_mock)
-          @s3_mock.expects(:bucket).with("testing", true, "public-read").returns(@bucket_mock)
-          @key_mock = stub
-          @bucket_mock.expects(:key).returns(@key_mock)
-          @key_mock.expects(:data=)
-          @key_mock.expects(:put)
-          @dummy.id = 1
+          AWS::S3::S3Object.stubs(:store).with(@dummy.avatar.path, anything, 'testing', :content_type => 'image/png', :access => :public_read)
           @dummy.save
         end
 
@@ -114,13 +190,8 @@ class StorageTest < Test::Unit::TestCase
       
       context "and remove" do
         setup do
-          @s3_mock     = stub
-          @bucket_mock = stub
-          RightAws::S3.expects(:new).with("12345", "54321", {}).returns(@s3_mock)
-          @s3_mock.expects(:bucket).with("testing", true, "public-read").returns(@bucket_mock)
-          @key_mock = stub
-          @bucket_mock.expects(:key).at_least(2).returns(@key_mock)
-          @key_mock.expects(:delete)
+          AWS::S3::S3Object.stubs(:exists?).returns(true)
+          AWS::S3::S3Object.stubs(:delete)
           @dummy.destroy_attached_files
         end
 
@@ -130,6 +201,84 @@ class StorageTest < Test::Unit::TestCase
       end
     end
   end
+  
+  context "An attachment with S3 storage and bucket defined as a Proc" do
+    setup do
+      AWS::S3::Base.stubs(:establish_connection!)
+      rebuild_model :storage => :s3,
+                    :bucket => lambda { |attachment| "bucket_#{attachment.instance.other}" },
+                    :s3_credentials => {:not => :important}
+    end
+    
+    should "get the right bucket name" do
+      assert "bucket_a", Dummy.new(:other => 'a').avatar.bucket_name
+      assert "bucket_b", Dummy.new(:other => 'b').avatar.bucket_name
+    end
+  end
+
+  context "An attachment with S3 storage and specific s3 headers set" do
+    setup do
+      AWS::S3::Base.stubs(:establish_connection!)
+      rebuild_model :storage => :s3,
+                    :bucket => "testing",
+                    :path => ":attachment/:style/:basename.:extension",
+                    :s3_credentials => {
+                      'access_key_id' => "12345",
+                      'secret_access_key' => "54321"
+                    },
+                    :s3_headers => {'Cache-Control' => 'max-age=31557600'}
+    end
+
+    context "when assigned" do
+      setup do
+        @file = File.new(File.join(File.dirname(__FILE__), 'fixtures', '5k.png'), 'rb')
+        @dummy = Dummy.new
+        @dummy.avatar = @file
+      end
+
+      teardown { @file.close }
+
+      context "and saved" do
+        setup do
+          AWS::S3::Base.stubs(:establish_connection!)
+          AWS::S3::S3Object.stubs(:store).with(@dummy.avatar.path,
+                                               anything,
+                                               'testing',
+                                               :content_type => 'image/png',
+                                               :access => :public_read,
+                                               'Cache-Control' => 'max-age=31557600')
+          @dummy.save
+        end
+
+        should "succeed" do
+          assert true
+        end
+      end
+    end
+  end
+
+  context "with S3 credentials in a YAML file" do
+    setup do
+      ENV['S3_KEY']    = 'env_key'
+      ENV['S3_BUCKET'] = 'env_bucket'
+      ENV['S3_SECRET'] = 'env_secret'
+
+      Merb.env('test')
+
+      rebuild_model :storage        => :s3,
+                    :s3_credentials => File.new(File.join(File.dirname(__FILE__), "fixtures/s3.yml"))
+
+      Dummy.auto_migrate!
+
+      @dummy = Dummy.new
+    end
+
+    should "run it the file through ERB" do
+      assert_equal 'env_bucket', @dummy.avatar.bucket_name
+      assert_equal 'env_key', AWS::S3::Base.connection.options[:access_key_id]
+      assert_equal 'env_secret', AWS::S3::Base.connection.options[:secret_access_key]
+    end
+  end
 
   unless ENV["S3_TEST_BUCKET"].blank?
     context "Using S3 for real, an attachment with S3 storage" do
@@ -140,7 +289,7 @@ class StorageTest < Test::Unit::TestCase
                       :path => ":class/:attachment/:id/:style.:extension",
                       :s3_credentials => File.new(File.join(File.dirname(__FILE__), "s3.yml"))
 
-        Dummy.delete_all
+        Dummy.auto_migrate!
         @dummy = Dummy.new
       end
 
@@ -150,12 +299,14 @@ class StorageTest < Test::Unit::TestCase
 
       context "when assigned" do
         setup do
-          @file = File.new(File.join(File.dirname(__FILE__), 'fixtures', '5k.png'))
+          @file = File.new(File.join(File.dirname(__FILE__), 'fixtures', '5k.png'), 'rb')
           @dummy.avatar = @file
         end
 
-        should "still return a Tempfile when sent #to_io" do
-          assert_equal Tempfile, @dummy.avatar.to_io.class
+        teardown { @file.close }
+
+        should "still return a Tempfile when sent #to_file" do
+          assert_equal Tempfile, @dummy.avatar.to_file.class
         end
 
         context "and saved" do
@@ -170,4 +321,4 @@ class StorageTest < Test::Unit::TestCase
       end
     end
   end
-end
+end