paperclip 2.4.5 → 2.5.0

data/test/storage/s3_test.rb

@@ -1,5 +1,5 @@
 require './test/helper'
-require 'aws/s3'
+require 'aws'
 
 class S3Test < Test::Unit::TestCase
   def rails_env(env)
@@ -8,10 +8,17 @@ class S3Test < Test::Unit::TestCase
     end
   end
 
+  def setup
+    AWS.config(:access_key_id => "TESTKEY", :secret_access_key => "TESTSECRET", :stub_requests => true)
+  end
+
+  def teardown
+    AWS.config(:access_key_id => nil, :secret_access_key => nil, :stub_requests => nil)
+  end
+
   context "Parsing S3 credentials" do
     setup do
       @proxy_settings = {:host => "127.0.0.1", :port => 8888, :user => "foo", :password => "bar"}
-      AWS::S3::Base.stubs(:establish_connection!)
       rebuild_model :storage => :s3,
                     :bucket => "testing",
                     :http_proxy => @proxy_settings,
@@ -51,9 +58,54 @@ class S3Test < Test::Unit::TestCase
 
   end
 
+  context ":bucket option via :s3_credentials" do
+
+    setup do
+      rebuild_model :storage => :s3, :s3_credentials => {:bucket => 'testing'}
+      @dummy = Dummy.new
+    end
+
+    should "populate #bucket_name" do
+      assert_equal @dummy.avatar.bucket_name, 'testing'
+    end
+
+  end
+
+  context ":bucket option" do
+
+    setup do
+      rebuild_model :storage => :s3, :bucket => "testing", :s3_credentials => {}
+      @dummy = Dummy.new
+    end
+
+    should "populate #bucket_name" do
+      assert_equal @dummy.avatar.bucket_name, 'testing'
+    end
+
+  end
+
+  context "missing :bucket option" do
+
+    setup do
+      rebuild_model :storage => :s3,
+                    #:bucket => "testing", # intentionally left out
+                    :http_proxy => @proxy_settings,
+                    :s3_credentials => {:not => :important}
+
+      @dummy = Dummy.new
+      @dummy.avatar = StringIO.new(".")
+
+    end
+
+    should "raise an argument error" do
+      exception = assert_raise(ArgumentError) { @dummy.save }
+      assert_match /missing required :bucket option/, exception.message
+    end
+
+  end
+
   context "" do
     setup do
-      AWS::S3::Base.stubs(:establish_connection!)
       rebuild_model :storage => :s3,
                     :s3_credentials => {},
                     :bucket => "bucket",
@@ -66,11 +118,46 @@ class S3Test < Test::Unit::TestCase
     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
+
+    should "use the correct bucket" do
+      assert_equal "bucket", @dummy.avatar.s3_bucket.name
+    end
+
+    should "use the correct key" do
+      assert_equal "avatars/stringio.txt", @dummy.avatar.s3_object.key
+    end
+
+  end
+
+  context "An attachment that uses S3 for storage and has the style in the path" do
+    setup do
+      rebuild_model :storage => :s3,
+                    :bucket => "testing",
+                    :path => ":attachment/:style/:basename.:extension",
+                    :styles => {
+                       :thumb => "80x80>"
+                    },
+                    :s3_credentials => {
+                      'access_key_id' => "12345",
+                      'secret_access_key' => "54321"
+                    }
+
+      @dummy = Dummy.new
+      @dummy.avatar = StringIO.new(".")
+      @avatar = @dummy.avatar
+    end
+
+    should "use an S3 object based on the correct path for the default style" do
+      assert_equal("avatars/original/stringio.txt", @dummy.avatar.s3_object.key)
+    end
+
+    should "use an S3 object based on the correct path for the custom style" do
+      assert_equal("avatars/thumb/stringio.txt", @dummy.avatar.s3_object(:thumb).key)
+    end
   end
 
   context "s3_host_name" do
     setup do
-      AWS::S3::Base.stubs(:establish_connection!)
       rebuild_model :storage => :s3,
                     :s3_credentials => {},
                     :bucket => "bucket",
@@ -83,11 +170,14 @@ class S3Test < Test::Unit::TestCase
     should "return a url based on an :s3_host_name path" do
       assert_match %r{^http://s3-ap-northeast-1.amazonaws.com/bucket/avatars/stringio.txt}, @dummy.avatar.url
     end
+
+    should "use the S3 bucket with the correct host name" do
+      assert_equal "s3-ap-northeast-1.amazonaws.com", @dummy.avatar.s3_bucket.config.s3_endpoint
+    end
   end
 
   context "An attachment that uses S3 for storage and has styles that return different file types" do
     setup do
-      AWS::S3::Base.stubs(:establish_connection!)
       rebuild_model :styles  => { :large => ['500x500#', :jpg] },
                     :storage => :s3,
                     :bucket  => "bucket",
@@ -98,21 +188,28 @@ class S3Test < Test::Unit::TestCase
                     }
 
       @dummy = Dummy.new
-      @dummy.avatar = File.new(File.join(File.dirname(__FILE__), '..', 'fixtures', '5k.png'), 'rb')
+      @dummy.avatar = File.new(fixture_file('5k.png'), 'rb')
     end
 
     should "return a url containing the correct original file mime type" do
       assert_match /.+\/5k.png/, @dummy.avatar.url
     end
 
+    should 'use the correct key for the original file mime type' do
+      assert_match /.+\/5k.png/, @dummy.avatar.s3_object.key
+    end
+
     should "return a url containing the correct processed file mime type" do
       assert_match /.+\/5k.jpg/, @dummy.avatar.url(:large)
     end
+
+    should "use the correct key for the processed file mime type" do
+      assert_match /.+\/5k.jpg/, @dummy.avatar.s3_object(:large).key
+    end
   end
 
   context "An attachment that uses S3 for storage and has spaces in file name" do
     setup do
-      AWS::S3::Base.stubs(:establish_connection!)
       rebuild_model :styles  => { :large => ['500x500#', :jpg] },
                     :storage => :s3,
                     :bucket  => "bucket",
@@ -122,7 +219,7 @@ class S3Test < Test::Unit::TestCase
                     }
 
       @dummy = Dummy.new
-      @dummy.avatar = File.new(File.join(File.dirname(__FILE__), '..', 'fixtures', 'spaced file.png'), 'rb')
+      @dummy.avatar = File.new(fixture_file('spaced file.png'), 'rb')
     end
 
     should "return an unescaped version for path" do
@@ -136,7 +233,6 @@ class S3Test < Test::Unit::TestCase
 
   context "" do
     setup do
-      AWS::S3::Base.stubs(:establish_connection!)
       rebuild_model :storage => :s3,
                     :s3_credentials => {},
                     :bucket => "bucket",
@@ -153,7 +249,6 @@ class S3Test < Test::Unit::TestCase
 
   context "" do
     setup do
-      AWS::S3::Base.stubs(:establish_connection!)
       rebuild_model :storage => :s3,
                     :s3_credentials => {
                       :production   => { :bucket => "prod_bucket" },
@@ -173,7 +268,6 @@ class S3Test < Test::Unit::TestCase
 
   context "generating a url with a proc as the host alias" do
     setup do
-      AWS::S3::Base.stubs(:establish_connection!)
       rebuild_model :storage => :s3,
                     :s3_credentials => { :bucket => "prod_bucket" },
                     :s3_host_alias => Proc.new{|atch| "cdn#{atch.instance.counter % 4}.example.com"},
@@ -203,7 +297,6 @@ class S3Test < Test::Unit::TestCase
 
   context "" do
     setup do
-      AWS::S3::Base.stubs(:establish_connection!)
       rebuild_model :storage => :s3,
                     :s3_credentials => {},
                     :bucket => "bucket",
@@ -220,7 +313,6 @@ class S3Test < Test::Unit::TestCase
 
   context "Generating a secure url with an expiration" do
     setup do
-      AWS::S3::Base.stubs(:establish_connection!)
       rebuild_model :storage => :s3,
                     :s3_credentials => {
                       :production   => { :bucket => "prod_bucket" },
@@ -236,7 +328,9 @@ class S3Test < Test::Unit::TestCase
       @dummy = Dummy.new
       @dummy.avatar = StringIO.new(".")
 
-      AWS::S3::S3Object.expects(:url_for).with("avatars/stringio.txt", "prod_bucket", { :expires_in => 3600, :use_ssl => true })
+      object = stub
+      @dummy.avatar.stubs(:s3_object).returns(object)
+      object.expects(:url_for).with(:read, :expires => 3600, :secure => true)
 
       @dummy.avatar.expiring_url
     end
@@ -246,9 +340,8 @@ class S3Test < Test::Unit::TestCase
     end
   end
 
-  context "Generating a url with an expiration" do
+  context "Generating a url with an expiration for each style" do
     setup do
-      AWS::S3::Base.stubs(:establish_connection!)
       rebuild_model :storage => :s3,
                     :s3_credentials => {
                       :production   => { :bucket => "prod_bucket" },
@@ -263,22 +356,25 @@ class S3Test < Test::Unit::TestCase
 
       @dummy = Dummy.new
       @dummy.avatar = StringIO.new(".")
+    end
 
-      AWS::S3::S3Object.expects(:url_for).with("avatars/original/stringio.txt", "prod_bucket", { :expires_in => 3600, :use_ssl => true })
-      @dummy.avatar.expiring_url
-
-      AWS::S3::S3Object.expects(:url_for).with("avatars/thumb/stringio.txt", "prod_bucket", { :expires_in => 1800, :use_ssl => true })
+    should "should generate a url for the thumb" do
+      object = stub
+      @dummy.avatar.stubs(:s3_object).with(:thumb).returns(object)
+      object.expects(:url_for).with(:read, :expires => 1800, :secure => true)
       @dummy.avatar.expiring_url(1800, :thumb)
     end
 
-    should "should succeed" do
-      assert true
+    should "should generate a url for the default style" do
+      object = stub
+      @dummy.avatar.stubs(:s3_object).with(:original).returns(object)
+      object.expects(:url_for).with(:read, :expires => 1800, :secure => true)
+      @dummy.avatar.expiring_url(1800)
     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" },
@@ -290,18 +386,20 @@ class S3Test < Test::Unit::TestCase
     should "get the right bucket in production" do
       rails_env("production")
       assert_equal "prod_bucket", @dummy.avatar.bucket_name
+      assert_equal "prod_bucket", @dummy.avatar.s3_bucket.name
     end
 
     should "get the right bucket in development" do
       rails_env("development")
       assert_equal "dev_bucket", @dummy.avatar.bucket_name
+      assert_equal "dev_bucket", @dummy.avatar.s3_bucket.name
     end
   end
 
   context "Parsing S3 credentials with a s3_host_name in them" do
     setup do
-      AWS::S3::Base.stubs(:establish_connection!)
       rebuild_model :storage => :s3,
+                    :bucket => 'testing',
                     :s3_credentials => {
                       :production   => { :s3_host_name => "s3-world-end.amazonaws.com" },
                       :development  => { :s3_host_name => "s3-ap-northeast-1.amazonaws.com" }
@@ -312,16 +410,19 @@ class S3Test < Test::Unit::TestCase
     should "get the right s3_host_name in production" do
       rails_env("production")
       assert_match %r{^s3-world-end.amazonaws.com}, @dummy.avatar.s3_host_name
+      assert_match %r{^s3-world-end.amazonaws.com}, @dummy.avatar.s3_bucket.config.s3_endpoint
     end
 
     should "get the right s3_host_name in development" do
       rails_env("development")
       assert_match %r{^s3-ap-northeast-1.amazonaws.com}, @dummy.avatar.s3_host_name
+      assert_match %r{^s3-ap-northeast-1.amazonaws.com}, @dummy.avatar.s3_bucket.config.s3_endpoint
     end
 
     should "get the right s3_host_name if the key does not exist" do
       rails_env("test")
       assert_match %r{^s3.amazonaws.com}, @dummy.avatar.s3_host_name
+      assert_match %r{^s3.amazonaws.com}, @dummy.avatar.s3_bucket.config.s3_endpoint
     end
   end
 
@@ -346,7 +447,7 @@ class S3Test < Test::Unit::TestCase
 
     context "when assigned" do
       setup do
-        @file = File.new(File.join(File.dirname(__FILE__), '..', 'fixtures', '5k.png'), 'rb')
+        @file = File.new(fixture_file('5k.png'), 'rb')
         @dummy = Dummy.new
         @dummy.avatar = @file
       end
@@ -361,7 +462,11 @@ class S3Test < Test::Unit::TestCase
 
       context "and saved" do
         setup do
-          AWS::S3::S3Object.stubs(:store).with(@dummy.avatar.path, anything, 'testing', :content_type => 'image/png', :access => :public_read)
+          object = stub
+          @dummy.avatar.stubs(:s3_object).returns(object)
+          object.expects(:write).with(anything,
+                                      :content_type => "image/png",
+                                      :acl => :public_read)
           @dummy.save
         end
 
@@ -371,7 +476,6 @@ class S3Test < Test::Unit::TestCase
       end
 
       should "delete tempfiles" do
-        AWS::S3::S3Object.stubs(:store).with(@dummy.avatar.path, anything, 'testing', :content_type => 'image/png', :access => :public_read)
         File.stubs(:exist?).returns(true)
         Paperclip::Tempfile.any_instance.expects(:close).at_least_once()
         Paperclip::Tempfile.any_instance.expects(:unlink).at_least_once()
@@ -381,11 +485,12 @@ class S3Test < Test::Unit::TestCase
 
       context "and saved without a bucket" do
         setup do
-          class AWS::S3::NoSuchBucket < AWS::S3::ResponseError
-            # Force the class to be created as a proper subclass of ResponseError thanks to AWS::S3's autocreation of exceptions
-          end
-          AWS::S3::Bucket.expects(:create).with("testing")
-          AWS::S3::S3Object.stubs(:store).raises(AWS::S3::NoSuchBucket.new(:message, :response)).then.returns(true)
+          AWS::S3::BucketCollection.any_instance.expects(:create).with("testing")
+          AWS::S3::S3Object.any_instance.stubs(:write).
+            raises(AWS::S3::Errors::NoSuchBucket.new(stub,
+                                                     stub(:status => 404,
+                                                          :body => "<foo/>"))).
+            then.returns(nil)
           @dummy.save
         end
 
@@ -396,8 +501,8 @@ class S3Test < Test::Unit::TestCase
 
       context "and remove" do
         setup do
-          AWS::S3::S3Object.stubs(:exists?).returns(true)
-          AWS::S3::S3Object.stubs(:delete)
+          AWS::S3::S3Object.any_instance.stubs(:exists?).returns(true)
+          AWS::S3::S3Object.any_instance.stubs(:delete)
           @dummy.destroy_attached_files
         end
 
@@ -410,7 +515,6 @@ class S3Test < Test::Unit::TestCase
 
   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}
@@ -418,13 +522,14 @@ class S3Test < Test::Unit::TestCase
 
     should "get the right bucket name" do
       assert "bucket_a", Dummy.new(:other => 'a').avatar.bucket_name
+      assert "bucket_a", Dummy.new(:other => 'a').avatar.s3_bucket.name
       assert "bucket_b", Dummy.new(:other => 'b').avatar.bucket_name
+      assert "bucket_b", Dummy.new(:other => 'b').avatar.s3_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",
@@ -435,6 +540,45 @@ class S3Test < Test::Unit::TestCase
                     :s3_headers => {'Cache-Control' => 'max-age=31557600'}
     end
 
+    context "when assigned" do
+      setup do
+        @file = File.new(fixture_file('5k.png'), 'rb')
+        @dummy = Dummy.new
+        @dummy.avatar = @file
+      end
+
+      teardown { @file.close }
+
+      context "and saved" do
+        setup do
+          object = stub
+          @dummy.avatar.stubs(:s3_object).returns(object)
+          object.expects(:write).with(anything,
+                                      :content_type => "image/png",
+                                      :acl => :public_read,
+                                      :cache_control => 'max-age=31557600')
+          @dummy.save
+        end
+
+        should "succeed" do
+          assert true
+        end
+      end
+    end
+  end
+
+  context "An attachment with S3 storage and metadata set using header names" do
+    setup do
+      rebuild_model :storage => :s3,
+                    :bucket => "testing",
+                    :path => ":attachment/:style/:basename.:extension",
+                    :s3_credentials => {
+                      'access_key_id' => "12345",
+                      'secret_access_key' => "54321"
+                    },
+                    :s3_headers => {'x-amz-meta-color' => 'red'}
+    end
+
     context "when assigned" do
       setup do
         @file = File.new(File.join(File.dirname(__FILE__), '..', 'fixtures', '5k.png'), 'rb')
@@ -446,13 +590,129 @@ class S3Test < Test::Unit::TestCase
 
       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')
+          object = stub
+          @dummy.avatar.stubs(:s3_object).returns(object)
+          object.expects(:write).with(anything,
+                                      :content_type => "image/png",
+                                      :acl => :public_read,
+                                      :metadata => { "color" => "red" })
+          @dummy.save
+        end
+
+        should "succeed" do
+          assert true
+        end
+      end
+    end
+  end
+
+  context "An attachment with S3 storage and metadata set using the :s3_metadata option" do
+    setup do
+      rebuild_model :storage => :s3,
+                    :bucket => "testing",
+                    :path => ":attachment/:style/:basename.:extension",
+                    :s3_credentials => {
+                      'access_key_id' => "12345",
+                      'secret_access_key' => "54321"
+                    },
+                    :s3_metadata => { "color" => "red" }
+    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
+          object = stub
+          @dummy.avatar.stubs(:s3_object).returns(object)
+          object.expects(:write).with(anything,
+                                      :content_type => "image/png",
+                                      :acl => :public_read,
+                                      :metadata => { "color" => "red" })
+          @dummy.save
+        end
+
+        should "succeed" do
+          assert true
+        end
+      end
+    end
+  end
+
+  context "An attachment with S3 storage and storage class set using the header name" do
+    setup do
+      rebuild_model :storage => :s3,
+                    :bucket => "testing",
+                    :path => ":attachment/:style/:basename.:extension",
+                    :s3_credentials => {
+                      'access_key_id' => "12345",
+                      'secret_access_key' => "54321"
+                    },
+                    :s3_headers => { "x-amz-storage-class" => "reduced_redundancy" }
+    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
+          object = stub
+          @dummy.avatar.stubs(:s3_object).returns(object)
+          object.expects(:write).with(anything,
+                                      :content_type => "image/png",
+                                      :acl => :public_read,
+                                      :storage_class => "reduced_redundancy")
+          @dummy.save
+        end
+
+        should "succeed" do
+          assert true
+        end
+      end
+    end
+  end
+
+  context "An attachment with S3 storage and storage class set using the :storage_class option" do
+    setup do
+      rebuild_model :storage => :s3,
+                    :bucket => "testing",
+                    :path => ":attachment/:style/:basename.:extension",
+                    :s3_credentials => {
+                      'access_key_id' => "12345",
+                      'secret_access_key' => "54321"
+                    },
+                    :s3_storage_class => :reduced_redundancy
+    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
+          object = stub
+          @dummy.avatar.stubs(:s3_object).returns(object)
+          object.expects(:write).with(anything,
+                                      :content_type => "image/png",
+                                      :acl => :public_read,
+                                      :storage_class => :reduced_redundancy)
           @dummy.save
         end
 
@@ -464,25 +724,25 @@ class S3Test < Test::Unit::TestCase
   end
 
   context "with S3 credentials supplied as Pathname" do
-     setup do
-       ENV['S3_KEY']    = 'pathname_key'
-       ENV['S3_BUCKET'] = 'pathname_bucket'
-       ENV['S3_SECRET'] = 'pathname_secret'
+    setup do
+      ENV['S3_KEY']    = 'pathname_key'
+      ENV['S3_BUCKET'] = 'pathname_bucket'
+      ENV['S3_SECRET'] = 'pathname_secret'
 
-       rails_env('test')
+      rails_env('test')
 
-       rebuild_model :storage        => :s3,
-                     :s3_credentials => Pathname.new(File.join(File.dirname(__FILE__))).join("../fixtures/s3.yml")
+      rebuild_model :storage        => :s3,
+                    :s3_credentials => Pathname.new(fixture_file('s3.yml'))
 
-       Dummy.delete_all
-       @dummy = Dummy.new
-     end
+      Dummy.delete_all
+      @dummy = Dummy.new
+    end
 
-     should "parse the credentials" do
-       assert_equal 'pathname_bucket', @dummy.avatar.bucket_name
-       assert_equal 'pathname_key', AWS::S3::Base.connection.options[:access_key_id]
-       assert_equal 'pathname_secret', AWS::S3::Base.connection.options[:secret_access_key]
-     end
+    should "parse the credentials" do
+      assert_equal 'pathname_bucket', @dummy.avatar.bucket_name
+      assert_equal 'pathname_key', @dummy.avatar.s3_bucket.config.access_key_id
+      assert_equal 'pathname_secret', @dummy.avatar.s3_bucket.config.secret_access_key
+    end
   end
 
   context "with S3 credentials in a YAML file" do
@@ -494,7 +754,7 @@ class S3Test < Test::Unit::TestCase
       rails_env('test')
 
       rebuild_model :storage        => :s3,
-                    :s3_credentials => File.new(File.join(File.dirname(__FILE__), "../fixtures/s3.yml"))
+                    :s3_credentials => File.new(fixture_file('s3.yml'))
 
       Dummy.delete_all
 
@@ -503,8 +763,8 @@ class S3Test < Test::Unit::TestCase
 
     should "run 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]
+      assert_equal 'env_key', @dummy.avatar.s3_bucket.config.access_key_id
+      assert_equal 'env_secret', @dummy.avatar.s3_bucket.config.secret_access_key
     end
   end
 
@@ -522,7 +782,7 @@ class S3Test < Test::Unit::TestCase
 
       context "when assigned" do
         setup do
-          @file = File.new(File.join(File.dirname(__FILE__), '..', 'fixtures', '5k.png'), 'rb')
+          @file = File.new(fixture_file('5k.png'), 'rb')
           @dummy = Dummy.new
           @dummy.avatar = @file
         end
@@ -531,12 +791,11 @@ class S3Test < Test::Unit::TestCase
 
         context "and saved" do
           setup do
-            AWS::S3::Base.stubs(:establish_connection!)
-            AWS::S3::S3Object.expects(:store).with(@dummy.avatar.path,
-                                                 anything,
-                                                 'testing',
-                                                 :content_type => 'image/png',
-                                                 :access => :public_read)
+            object = stub
+            @dummy.avatar.stubs(:s3_object).returns(object)
+            object.expects(:write).with(anything,
+                                        :content_type => "image/png",
+                                        :acl => :public_read)
             @dummy.save
           end
 
@@ -561,7 +820,7 @@ class S3Test < Test::Unit::TestCase
 
       context "when assigned" do
         setup do
-          @file = File.new(File.join(File.dirname(__FILE__), '..', 'fixtures', '5k.png'), 'rb')
+          @file = File.new(fixture_file('5k.png'), 'rb')
           @dummy = Dummy.new
           @dummy.avatar = @file
         end
@@ -570,12 +829,11 @@ class S3Test < Test::Unit::TestCase
 
         context "and saved" do
           setup do
-            AWS::S3::Base.stubs(:establish_connection!)
-            AWS::S3::S3Object.expects(:store).with(@dummy.avatar.path,
-                                                   anything,
-                                                   'testing',
-                                                   :content_type => 'image/png',
-                                                   :access => :private)
+            object = stub
+            @dummy.avatar.stubs(:s3_object).returns(object)
+            object.expects(:write).with(anything,
+                                        :content_type => "image/png",
+                                        :acl => :private)
             @dummy.save
           end
 
@@ -606,7 +864,7 @@ class S3Test < Test::Unit::TestCase
 
       context "when assigned" do
         setup do
-          @file = File.new(File.join(File.dirname(__FILE__), '..', 'fixtures', '5k.png'), 'rb')
+          @file = File.new(fixture_file('5k.png'), 'rb')
           @dummy = Dummy.new
           @dummy.avatar = @file
         end
@@ -615,13 +873,12 @@ class S3Test < Test::Unit::TestCase
 
         context "and saved" do
           setup do
-            AWS::S3::Base.stubs(:establish_connection!)
             [:thumb, :original].each do |style|
-              AWS::S3::S3Object.expects(:store).with("avatars/#{style}/5k.png",
-                                                    anything,
-                                                    'testing',
-                                                    :content_type => 'image/png',
-                                                    :access => style == :thumb ? :public_read : :private)
+              object = stub
+              @dummy.avatar.stubs(:s3_object).with(style).returns(object)
+              object.expects(:write).with(anything,
+                                          :content_type => "image/png",
+                                          :acl => style == :thumb ? :public_read : :private)
             end
             @dummy.save
           end
@@ -654,7 +911,7 @@ class S3Test < Test::Unit::TestCase
 
       context "when assigned" do
         setup do
-          @file = File.new(File.join(File.dirname(__FILE__), '..', 'fixtures', '5k.png'), 'rb')
+          @file = File.new(fixture_file('5k.png'), 'rb')
           @dummy = Dummy.new
           @dummy.stubs(:private_attachment? => true)
           @dummy.avatar = @file
@@ -664,15 +921,12 @@ class S3Test < Test::Unit::TestCase
 
         context "and saved" do
           setup do
-            AWS::S3::Base.stubs(:establish_connection!)
             [:thumb, :original].each do |style|
-              AWS::S3::S3Object.expects(:store).with(
-                "avatars/#{style}/5k.png",
-                anything,
-                'testing',
-                :content_type => 'image/png',
-                :access => style == :thumb ? :public_read : :private
-              )
+              object = stub
+              @dummy.avatar.stubs(:s3_object).with(style).returns(object)
+              object.expects(:write).with(anything,
+                                          :content_type => "image/png",
+                                          :acl => style == :thumb ? :public_read : :private)
             end
             @dummy.save
           end
@@ -686,4 +940,53 @@ class S3Test < Test::Unit::TestCase
 
     end
   end
+
+  context "An attachment with S3 storage and metadata set using a proc as headers" do
+    setup do
+      rebuild_model(
+        :storage => :s3,
+        :bucket => "testing",
+        :path => ":attachment/:style/:basename.:extension",
+        :styles => {
+          :thumb => "80x80>"
+        },
+        :s3_credentials => {
+          'access_key_id' => "12345",
+          'secret_access_key' => "54321"
+        },
+        :s3_headers => lambda {|attachment|
+          {'Content-Disposition' => "attachment; filename=\"#{attachment.name}\""}
+        }
+      )
+    end
+
+    context "when assigned" do
+      setup do
+        @file = File.new(fixture_file('5k.png'), 'rb')
+        @dummy = Dummy.new
+        @dummy.stubs(:name => 'Custom Avatar Name.png')
+        @dummy.avatar = @file
+      end
+
+      teardown { @file.close }
+
+      context "and saved" do
+        setup do
+          [:thumb, :original].each do |style|
+            object = stub
+            @dummy.avatar.stubs(:s3_object).with(style).returns(object)
+            object.expects(:write).with(anything,
+                                        :content_type => "image/png",
+                                        :acl => :public_read,
+                                        :content_disposition => 'attachment; filename="Custom Avatar Name.png"')
+          end
+          @dummy.save
+        end
+
+        should "succeed" do
+          assert true
+        end
+      end
+    end
+  end
 end