paperclip 4.2.2 → 6.1.0

data/spec/paperclip/storage/s3_spec.rb

@@ -1,19 +1,22 @@
-require 'spec_helper'
-require 'aws-sdk'
+require "spec_helper"
+require "aws-sdk-s3"
 
 describe Paperclip::Storage::S3 do
   before do
-    AWS.stub!
+    Aws.config[:stub_responses] = true
+  end
+
+  def aws2_add_region
+    { s3_region: 'us-east-1' }
   end
 
   context "Parsing S3 credentials" do
     before do
       @proxy_settings = {host: "127.0.0.1", port: 8888, user: "foo", password: "bar"}
-      rebuild_model storage: :s3,
+      rebuild_model (aws2_add_region).merge storage: :s3,
         bucket: "testing",
         http_proxy: @proxy_settings,
         s3_credentials: {not: :important}
-
       @dummy = Dummy.new
       @avatar = @dummy.avatar
     end
@@ -55,7 +58,8 @@ describe Paperclip::Storage::S3 do
   context ":bucket option via :s3_credentials" do
 
     before do
-      rebuild_model storage: :s3, s3_credentials: {bucket: 'testing'}
+      rebuild_model (aws2_add_region).merge storage: :s3,
+        s3_credentials: {bucket: 'testing'}
       @dummy = Dummy.new
     end
 
@@ -68,7 +72,8 @@ describe Paperclip::Storage::S3 do
   context ":bucket option" do
 
     before do
-      rebuild_model storage: :s3, bucket: "testing", s3_credentials: {}
+      rebuild_model (aws2_add_region).merge storage: :s3,
+        bucket: "testing", s3_credentials: {}
       @dummy = Dummy.new
     end
 
@@ -81,7 +86,7 @@ describe Paperclip::Storage::S3 do
   context "missing :bucket option" do
 
     before do
-      rebuild_model storage: :s3,
+      rebuild_model (aws2_add_region).merge storage: :s3,
         http_proxy: @proxy_settings,
         s3_credentials: {not: :important}
 
@@ -98,17 +103,18 @@ describe Paperclip::Storage::S3 do
 
   context "" do
     before do
-      rebuild_model storage: :s3,
+      rebuild_model (aws2_add_region).merge storage: :s3,
         s3_credentials: {},
         bucket: "bucket",
         path: ":attachment/:basename:dotextension",
         url: ":s3_path_url"
       @dummy = Dummy.new
       @dummy.avatar = stringy_file
+      @dummy.stubs(:new_record?).returns(false)
     end
 
     it "returns a url based on an S3 path" do
-      assert_match %r{^http://s3.amazonaws.com/bucket/avatars/data[^\.]}, @dummy.avatar.url
+      assert_match %r{^//s3.amazonaws.com/bucket/avatars/data[^\.]}, @dummy.avatar.url
     end
 
     it "uses the correct bucket" do
@@ -124,8 +130,8 @@ describe Paperclip::Storage::S3 do
     ["http", :http, ""].each do |protocol|
       context "as #{protocol.inspect}" do
         before do
-          rebuild_model storage: :s3, s3_protocol: protocol
-
+          rebuild_model (aws2_add_region).merge storage: :s3,
+            s3_protocol: protocol
           @dummy = Dummy.new
         end
 
@@ -138,13 +144,14 @@ describe Paperclip::Storage::S3 do
 
   context "s3_protocol: 'https'" do
     before do
-      rebuild_model storage: :s3,
+      rebuild_model (aws2_add_region).merge storage: :s3,
         s3_credentials: {},
         s3_protocol: 'https',
         bucket: "bucket",
         path: ":attachment/:basename:dotextension"
       @dummy = Dummy.new
       @dummy.avatar = stringy_file
+      @dummy.stubs(:new_record?).returns(false)
     end
 
     it "returns a url based on an S3 path" do
@@ -154,13 +161,14 @@ describe Paperclip::Storage::S3 do
 
   context "s3_protocol: ''" do
     before do
-      rebuild_model storage: :s3,
+      rebuild_model (aws2_add_region).merge storage: :s3,
         s3_credentials: {},
         s3_protocol: '',
         bucket: "bucket",
         path: ":attachment/:basename:dotextension"
       @dummy = Dummy.new
       @dummy.avatar = stringy_file
+      @dummy.stubs(:new_record?).returns(false)
     end
 
     it "returns a protocol-relative URL" do
@@ -170,13 +178,14 @@ describe Paperclip::Storage::S3 do
 
   context "s3_protocol: :https" do
     before do
-      rebuild_model storage: :s3,
+      rebuild_model (aws2_add_region).merge storage: :s3,
         s3_credentials: {},
         s3_protocol: :https,
         bucket: "bucket",
         path: ":attachment/:basename:dotextension"
       @dummy = Dummy.new
       @dummy.avatar = stringy_file
+      @dummy.stubs(:new_record?).returns(false)
     end
 
     it "returns a url based on an S3 path" do
@@ -186,13 +195,14 @@ describe Paperclip::Storage::S3 do
 
   context "s3_protocol: ''" do
     before do
-      rebuild_model storage: :s3,
+      rebuild_model (aws2_add_region).merge storage: :s3,
         s3_credentials: {},
         s3_protocol: '',
         bucket: "bucket",
         path: ":attachment/:basename:dotextension"
       @dummy = Dummy.new
       @dummy.avatar = stringy_file
+      @dummy.stubs(:new_record?).returns(false)
     end
 
     it "returns a url based on an S3 path" do
@@ -202,7 +212,7 @@ describe Paperclip::Storage::S3 do
 
   context "An attachment that uses S3 for storage and has the style in the path" do
     before do
-      rebuild_model storage: :s3,
+      rebuild_model (aws2_add_region).merge storage: :s3,
         bucket: "testing",
         path: ":attachment/:style/:basename:dotextension",
         styles: {
@@ -227,29 +237,33 @@ describe Paperclip::Storage::S3 do
     end
   end
 
+  # the s3_host_name will be defined by the s3_region
   context "s3_host_name" do
     before do
       rebuild_model storage: :s3,
         s3_credentials: {},
         bucket: "bucket",
         path: ":attachment/:basename:dotextension",
-        s3_host_name: "s3-ap-northeast-1.amazonaws.com"
+        s3_host_name: "s3-ap-northeast-1.amazonaws.com",
+        s3_region: "ap-northeast-1"
       @dummy = Dummy.new
       @dummy.avatar = stringy_file
+      @dummy.stubs(:new_record?).returns(false)
     end
 
     it "returns a url based on an :s3_host_name path" do
-      assert_match %r{^http://s3-ap-northeast-1.amazonaws.com/bucket/avatars/data[^\.]}, @dummy.avatar.url
+      assert_match %r{^//s3-ap-northeast-1.amazonaws.com/bucket/avatars/data[^\.]}, @dummy.avatar.url
     end
 
     it "uses the S3 bucket with the correct host name" do
-      assert_equal "s3-ap-northeast-1.amazonaws.com", @dummy.avatar.s3_bucket.config.s3_endpoint
+      assert_equal "s3.ap-northeast-1.amazonaws.com",
+        @dummy.avatar.s3_bucket.client.config.endpoint.host
     end
   end
 
   context "dynamic s3_host_name" do
     before do
-      rebuild_model storage: :s3,
+      rebuild_model (aws2_add_region).merge storage: :s3,
         s3_credentials: {},
         bucket: "bucket",
         path: ":attachment/:basename:dotextension",
@@ -259,18 +273,72 @@ describe Paperclip::Storage::S3 do
         attr_accessor :value
       end
       @dummy.avatar = stringy_file
+      @dummy.stubs(:new_record?).returns(false)
     end
 
     it "uses s3_host_name as a proc if available" do
       @dummy.value = "s3.something.com"
-      assert_equal "http://s3.something.com/bucket/avatars/data", @dummy.avatar.url(:original, timestamp: false)
+      assert_equal "//s3.something.com/bucket/avatars/data", @dummy.avatar.url(:original, timestamp: false)
+    end
+  end
+
+  context "use_accelerate_endpoint" do
+    context "defaults to false" do
+      before do
+        rebuild_model(
+          storage: :s3,
+          s3_credentials: {},
+          bucket: "bucket",
+          path: ":attachment/:basename:dotextension",
+          s3_host_name: "s3-ap-northeast-1.amazonaws.com",
+          s3_region: "ap-northeast-1",
+        )
+        @dummy = Dummy.new
+        @dummy.avatar = stringy_file
+        @dummy.stubs(:new_record?).returns(false)
+      end
+
+      it "returns a url based on an :s3_host_name path" do
+        assert_match %r{^//s3-ap-northeast-1.amazonaws.com/bucket/avatars/data[^\.]},
+          @dummy.avatar.url
+      end
+
+      it "uses the S3 client with the use_accelerate_endpoint config is false" do
+        expect(@dummy.avatar.s3_bucket.client.config.use_accelerate_endpoint).to be(false)
+      end
+    end
+
+    context "set to true" do
+      before do
+        rebuild_model(
+          storage: :s3,
+          s3_credentials: {},
+          bucket: "bucket",
+          path: ":attachment/:basename:dotextension",
+          s3_host_name: "s3-accelerate.amazonaws.com",
+          s3_region: "ap-northeast-1",
+          use_accelerate_endpoint: true,
+        )
+        @dummy = Dummy.new
+        @dummy.avatar = stringy_file
+        @dummy.stubs(:new_record?).returns(false)
+      end
+
+      it "returns a url based on an :s3_host_name path" do
+        assert_match %r{^//s3-accelerate.amazonaws.com/bucket/avatars/data[^\.]},
+          @dummy.avatar.url
+      end
+
+      it "uses the S3 client with the use_accelerate_endpoint config is true" do
+        expect(@dummy.avatar.s3_bucket.client.config.use_accelerate_endpoint).to be(true)
+      end
     end
   end
 
   context "An attachment that uses S3 for storage and has styles that return different file types" do
     before do
-      rebuild_model styles: { large: ['500x500#', :jpg] },
-        storage: :s3,
+      rebuild_model (aws2_add_region).merge storage: :s3,
+        styles: { large: ['500x500#', :jpg] },
         bucket: "bucket",
         path: ":attachment/:basename:dotextension",
         s3_credentials: {
@@ -281,6 +349,7 @@ describe Paperclip::Storage::S3 do
         File.open(fixture_file('5k.png'), 'rb') do |file|
           @dummy = Dummy.new
           @dummy.avatar = file
+          @dummy.stubs(:new_record?).returns(false)
         end
     end
 
@@ -303,8 +372,10 @@ describe Paperclip::Storage::S3 do
 
   context "An attachment that uses S3 for storage and has a proc for styles" do
     before do
-      rebuild_model styles: lambda { |attachment| attachment.instance.counter; {thumbnail: { geometry: "50x50#", s3_headers: {'Cache-Control' => 'max-age=31557600'}} }},
-        storage: :s3,
+      rebuild_model (aws2_add_region).merge storage: :s3,
+        styles: lambda { |attachment| attachment.instance.counter
+          {thumbnail: { geometry: "50x50#",
+                        s3_headers: {'Cache-Control' => 'max-age=31557600'}} }},
         bucket: "bucket",
         path: ":attachment/:style/:basename:dotextension",
         s3_credentials: {
@@ -328,8 +399,14 @@ describe Paperclip::Storage::S3 do
         object = stub
         @dummy.avatar.stubs(:s3_object).with(:original).returns(object)
         @dummy.avatar.stubs(:s3_object).with(:thumbnail).returns(object)
-        object.expects(:write).with(anything, content_type: 'image/png', acl: :public_read)
-        object.expects(:write).with(anything, content_type: 'image/png', acl: :public_read, cache_control: 'max-age=31557600')
+
+        object.expects(:upload_file)
+          .with(anything, content_type: 'image/png',
+                acl: :"public-read")
+        object.expects(:upload_file)
+          .with(anything, content_type: 'image/png',
+                acl: :"public-read",
+                cache_control: 'max-age=31557600')
         @dummy.save
     end
 
@@ -340,20 +417,73 @@ describe Paperclip::Storage::S3 do
     end
   end
 
+  context "An attachment that uses S3 for storage and has styles" do
+    before do
+      rebuild_model(
+        (aws2_add_region).merge(
+          storage: :s3,
+          styles: { thumb: ["90x90#", :jpg] },
+          bucket: "bucket",
+          s3_credentials: {
+            "access_key_id" => "12345",
+            "secret_access_key" => "54321" }
+        )
+      )
+
+      @file = File.new(fixture_file("5k.png"), "rb")
+      @dummy = Dummy.new
+      @dummy.avatar = @file
+      @dummy.save
+    end
+
+    context "reprocess" do
+      before do
+        @object = stub
+        @dummy.avatar.stubs(:s3_object).with(:original).returns(@object)
+        @dummy.avatar.stubs(:s3_object).with(:thumb).returns(@object)
+        @object.stubs(:get).yields(@file.read)
+        @object.stubs(:exists?).returns(true)
+      end
+
+      it "uploads original" do
+        @object.expects(:upload_file).with(
+          anything,
+          content_type: "image/png",
+          acl: :"public-read").returns(true)
+        @object.expects(:upload_file).with(
+          anything,
+          content_type: "image/jpeg",
+          acl: :"public-read").returns(true)
+        @dummy.avatar.reprocess!
+      end
+
+      it "doesn't upload original" do
+        @object.expects(:upload_file).with(
+          anything,
+          content_type: "image/jpeg",
+          acl: :"public-read").returns(true)
+        @dummy.avatar.reprocess!(:thumb)
+      end
+    end
+
+    after { @file.close }
+  end
+
   context "An attachment that uses S3 for storage and has spaces in file name" do
     before do
-      rebuild_model styles: { large: ['500x500#', :jpg] },
-        storage: :s3,
+      rebuild_model(
+        (aws2_add_region).merge storage: :s3,
+        styles: { large: ["500x500#", :jpg] },
         bucket: "bucket",
-        s3_credentials: {
-          'access_key_id' => "12345",
-          'secret_access_key' => "54321"
-        }
+        s3_credentials: { "access_key_id" => "12345",
+                          "secret_access_key" => "54321" }
+        )
 
-        File.open(fixture_file('spaced file.png'), 'rb') do |file|
-          @dummy = Dummy.new
-          @dummy.avatar = file
-        end
+      File.open(fixture_file("spaced file.png"), "rb") do |file|
+        @dummy = Dummy.new
+        @dummy.avatar = file
+        @dummy.stubs(:new_record?).returns(false)
+      end
     end
 
     it "returns a replaced version for path" do
@@ -367,24 +497,25 @@ describe Paperclip::Storage::S3 do
 
   context "An attachment that uses S3 for storage and has a question mark in file name" do
     before do
-      rebuild_model styles: { large: ['500x500#', :jpg] },
-        storage: :s3,
+      rebuild_model (aws2_add_region).merge storage: :s3,
+        styles: { large: ['500x500#', :jpg] },
         bucket: "bucket",
         s3_credentials: {
           'access_key_id' => "12345",
           'secret_access_key' => "54321"
         }
 
-        stringio = stringy_file
-        class << stringio
-          def original_filename
-            "question?mark.png"
-          end
+      stringio = stringy_file
+      class << stringio
+        def original_filename
+          "question?mark.png"
         end
-        file = Paperclip.io_adapters.for(stringio)
-        @dummy = Dummy.new
-        @dummy.avatar = file
-        @dummy.save
+      end
+      file = Paperclip.io_adapters.for(stringio, hash_digest: Digest::MD5)
+      @dummy = Dummy.new
+      @dummy.avatar = file
+      @dummy.save
+      @dummy.stubs(:new_record?).returns(false)
     end
 
     it "returns a replaced version for path" do
@@ -398,42 +529,74 @@ describe Paperclip::Storage::S3 do
 
   context "" do
     before do
-      rebuild_model storage: :s3,
+      rebuild_model (aws2_add_region).merge storage: :s3,
         s3_credentials: {},
         bucket: "bucket",
         path: ":attachment/:basename:dotextension",
         url: ":s3_domain_url"
       @dummy = Dummy.new
       @dummy.avatar = stringy_file
+      @dummy.stubs(:new_record?).returns(false)
     end
 
     it "returns a url based on an S3 subdomain" do
-      assert_match %r{^http://bucket.s3.amazonaws.com/avatars/data[^\.]}, @dummy.avatar.url
+      assert_match %r{^//bucket.s3.amazonaws.com/avatars/data[^\.]}, @dummy.avatar.url
     end
   end
 
   context "" do
     before do
-      rebuild_model storage: :s3,
+      rebuild_model(
+        (aws2_add_region).merge storage: :s3,
         s3_credentials: {
-        production: { bucket: "prod_bucket" },
-        development: { bucket: "dev_bucket" }
-      },
-      s3_host_alias: "something.something.com",
-      path: ":attachment/:basename:dotextension",
-      url: ":s3_alias_url"
+          production: { bucket: "prod_bucket" },
+          development: { bucket: "dev_bucket" }
+        },
+        bucket: "bucket",
+        s3_host_alias: "something.something.com",
+        path: ":attachment/:basename:dotextension",
+        url: ":s3_alias_url"
+        )
       @dummy = Dummy.new
       @dummy.avatar = stringy_file
+      @dummy.stubs(:new_record?).returns(false)
     end
 
     it "returns a url based on the host_alias" do
-      assert_match %r{^http://something.something.com/avatars/data[^\.]}, @dummy.avatar.url
+      assert_match %r{^//something.something.com/avatars/data[^\.]}, @dummy.avatar.url
+    end
+  end
+
+  context "generating a url with a prefixed host alias" do
+    before do
+      rebuild_model(
+        aws2_add_region.merge(
+          storage: :s3,
+          s3_credentials: {
+            production: { bucket: "prod_bucket" },
+            development: { bucket: "dev_bucket" },
+          },
+          bucket: "bucket",
+          s3_host_alias: "something.something.com",
+          s3_prefixes_in_alias: 2,
+          path: "prefix1/prefix2/:attachment/:basename:dotextension",
+          url: ":s3_alias_url",
+        )
+      )
+      @dummy = Dummy.new
+      @dummy.avatar = stringy_file
+      @dummy.stubs(:new_record?).returns(false)
+    end
+
+    it "returns a url with the prefixes removed" do
+      assert_match %r{^//something.something.com/avatars/data[^\.]},
+                   @dummy.avatar.url
     end
   end
 
   context "generating a url with a proc as the host alias" do
     before do
-      rebuild_model storage: :s3,
+      rebuild_model (aws2_add_region).merge storage: :s3,
         s3_credentials: { bucket: "prod_bucket" },
         s3_host_alias: Proc.new{|atch| "cdn#{atch.instance.counter % 4}.example.com"},
         path: ":attachment/:basename:dotextension",
@@ -447,11 +610,12 @@ describe Paperclip::Storage::S3 do
       end
       @dummy = Dummy.new
       @dummy.avatar = stringy_file
+      @dummy.stubs(:new_record?).returns(false)
     end
 
     it "returns a url based on the host_alias" do
-      assert_match %r{^http://cdn1.example.com/avatars/data[^\.]}, @dummy.avatar.url
-      assert_match %r{^http://cdn2.example.com/avatars/data[^\.]}, @dummy.avatar.url
+      assert_match %r{^//cdn1.example.com/avatars/data[^\.]}, @dummy.avatar.url
+      assert_match %r{^//cdn2.example.com/avatars/data[^\.]}, @dummy.avatar.url
     end
 
     it "still returns the bucket name" do
@@ -462,13 +626,14 @@ describe Paperclip::Storage::S3 do
 
   context "" do
     before do
-      rebuild_model storage: :s3,
+      rebuild_model (aws2_add_region).merge storage: :s3,
         s3_credentials: {},
         bucket: "bucket",
         path: ":attachment/:basename:dotextension",
         url: ":asset_host"
       @dummy = Dummy.new
       @dummy.avatar = stringy_file
+      @dummy.stubs(:new_record?).returns(false)
     end
 
     it "returns a relative URL for Rails to calculate assets host" do
@@ -492,7 +657,7 @@ describe Paperclip::Storage::S3 do
           url: ":s3_alias_url"
         }
 
-        rebuild_model base_options.merge(options)
+        rebuild_model (aws2_add_region).merge base_options.merge(options)
       }
     end
 
@@ -505,8 +670,8 @@ describe Paperclip::Storage::S3 do
 
         object = stub
         @dummy.avatar.stubs(:s3_object).returns(object)
-        object.expects(:url_for).with(:read, expires: 3600, secure: true)
 
+        object.expects(:presigned_url).with(:get, expires_in: 3600)
         @dummy.avatar.expiring_url
       end
     end
@@ -520,8 +685,9 @@ describe Paperclip::Storage::S3 do
 
         object = stub
         @dummy.avatar.stubs(:s3_object).returns(object)
-        object.expects(:url_for).with(:read, expires: 3600, secure: true, response_content_disposition: "inline")
-
+        object.expects(:presigned_url)
+          .with(:get, expires_in: 3600,
+                response_content_disposition: "inline")
         @dummy.avatar.expiring_url
       end
     end
@@ -542,8 +708,8 @@ describe Paperclip::Storage::S3 do
 
         object = stub
         @dummy.avatar.stubs(:s3_object).returns(object)
-        object.expects(:url_for).with(:read, expires: 3600, secure: true, response_content_type: "image/png")
-
+        object.expects(:presigned_url)
+          .with(:get, expires_in: 3600, response_content_type: "image/png")
         @dummy.avatar.expiring_url
       end
     end
@@ -571,15 +737,15 @@ describe Paperclip::Storage::S3 do
 
   context "Generating a url with an expiration for each style" do
     before do
-      rebuild_model storage: :s3,
+      rebuild_model (aws2_add_region).merge storage: :s3,
         s3_credentials: {
-        production: { bucket: "prod_bucket" },
-        development: { bucket: "dev_bucket" }
-      },
-      s3_permissions: :private,
-      s3_host_alias: "something.something.com",
-      path: ":attachment/:style/:basename:dotextension",
-      url: ":s3_alias_url"
+          production: { bucket: "prod_bucket" },
+          development: { bucket: "dev_bucket" }
+        },
+        s3_permissions: :private,
+        s3_host_alias: "something.something.com",
+        path: ":attachment/:style/:basename:dotextension",
+        url: ":s3_alias_url"
 
       rails_env("production") do
         @dummy = Dummy.new
@@ -590,26 +756,26 @@ describe Paperclip::Storage::S3 do
     it "generates 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)
+      object.expects(:presigned_url).with(:get, expires_in: 1800)
       @dummy.avatar.expiring_url(1800, :thumb)
     end
 
     it "generates 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)
+      object.expects(:presigned_url).with(:get, expires_in: 1800)
       @dummy.avatar.expiring_url(1800)
     end
   end
 
   context "Parsing S3 credentials with a bucket in them" do
     before do
-      rebuild_model storage: :s3,
+      rebuild_model (aws2_add_region).merge storage: :s3,
         s3_credentials: {
-        production: { bucket: "prod_bucket" },
-        development: { bucket: "dev_bucket" }
-      }
-        @dummy = Dummy.new
+          production: { bucket: "prod_bucket" },
+          development: { bucket: "dev_bucket" }
+        }
+      @dummy = Dummy.new
     end
 
     it "gets the right bucket in production" do
@@ -627,47 +793,59 @@ describe Paperclip::Storage::S3 do
     end
   end
 
+  # the bucket.name is determined by the :s3_region
   context "Parsing S3 credentials with a s3_host_name in them" do
     before do
       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" }
+        production: {
+          s3_region: "world-end",
+          s3_host_name: "s3-world-end.amazonaws.com" },
+        development: {
+          s3_region: "ap-northeast-1",
+          s3_host_name: "s3-ap-northeast-1.amazonaws.com" },
+        test: {
+          s3_region: "" }
         }
-        @dummy = Dummy.new
+      @dummy = Dummy.new
     end
 
     it "gets the right s3_host_name in production" do
       rails_env("production") do
         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
+        assert_match %r{^s3.world-end.amazonaws.com},
+          @dummy.avatar.s3_bucket.client.config.endpoint.host
       end
     end
 
     it "gets the right s3_host_name in development" do
       rails_env("development") do
-        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
+        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.client.config.endpoint.host
       end
     end
 
     it "gets the right s3_host_name if the key does not exist" do
       rails_env("test") do
         assert_match %r{^s3.amazonaws.com}, @dummy.avatar.s3_host_name
-        assert_match %r{^s3.amazonaws.com}, @dummy.avatar.s3_bucket.config.s3_endpoint
+        assert_raises(Aws::Errors::MissingRegionError) do
+          @dummy.avatar.s3_bucket.client.config.endpoint.host
+        end
       end
     end
   end
 
   context "An attachment with S3 storage" do
     before do
-      rebuild_model storage: :s3,
+      rebuild_model (aws2_add_region).merge storage: :s3,
         bucket: "testing",
         path: ":attachment/:style/:basename:dotextension",
         s3_credentials: {
-          aws_access_key_id: "12345",
-          aws_secret_access_key: "54321"
+          access_key_id: "12345",
+          secret_access_key: "54321"
         }
     end
 
@@ -684,6 +862,7 @@ describe Paperclip::Storage::S3 do
         @file = File.new(fixture_file('5k.png'), 'rb')
         @dummy = Dummy.new
         @dummy.avatar = @file
+        @dummy.stubs(:new_record?).returns(false)
       end
 
       after { @file.close }
@@ -691,20 +870,19 @@ describe Paperclip::Storage::S3 do
       it "does not get a bucket to get a URL" do
         @dummy.avatar.expects(:s3).never
         @dummy.avatar.expects(:s3_bucket).never
-        assert_match %r{^http://s3\.amazonaws\.com/testing/avatars/original/5k\.png}, @dummy.avatar.url
+        assert_match %r{^//s3\.amazonaws\.com/testing/avatars/original/5k\.png}, @dummy.avatar.url
       end
 
       it "is rewound after flush_writes" do
         @dummy.avatar.instance_eval "def after_flush_writes; end"
-        @dummy.avatar.stubs(:s3_object).returns(stub(write: true))
-
+        @dummy.avatar.stubs(:s3_object).returns(stub(upload_file: true))
         files = @dummy.avatar.queued_for_write.values.each(&:read)
         @dummy.save
         assert files.none?(&:eof?), "Expect all the files to be rewound."
       end
 
       it "is removed after after_flush_writes" do
-        @dummy.avatar.stubs(:s3_object).returns(stub(write: true))
+        @dummy.avatar.stubs(:s3_object).returns(stub(upload_file: true))
         paths = @dummy.avatar.queued_for_write.values.map(&:path)
         @dummy.save
         assert paths.none?{ |path| File.exist?(path) },
@@ -713,10 +891,10 @@ describe Paperclip::Storage::S3 do
 
       it "will retry to save again but back off on SlowDown" do
         @dummy.avatar.stubs(:sleep)
-        AWS::S3::S3Object.any_instance.stubs(:write).
-          raises(AWS::S3::Errors::SlowDown.new(stub, stub(status: 503, body: "")))
-
-        expect {@dummy.save}.to raise_error(AWS::S3::Errors::SlowDown)
+        Aws::S3::Object.any_instance.stubs(:upload_file).
+          raises(Aws::S3::Errors::SlowDown.new(stub,
+                                               stub(status: 503, body: "")))
+        expect {@dummy.save}.to raise_error(Aws::S3::Errors::SlowDown)
         expect(@dummy.avatar).to have_received(:sleep).with(1)
         expect(@dummy.avatar).to have_received(:sleep).with(2)
         expect(@dummy.avatar).to have_received(:sleep).with(4)
@@ -728,9 +906,8 @@ describe Paperclip::Storage::S3 do
         before do
           object = stub
           @dummy.avatar.stubs(:s3_object).returns(object)
-          object.expects(:write).with(anything,
-                                      content_type: "image/png",
-                                      acl: :public_read)
+          object.expects(:upload_file)
+            .with(anything, content_type: 'image/png', acl: :"public-read")
           @dummy.save
         end
 
@@ -741,12 +918,11 @@ describe Paperclip::Storage::S3 do
 
       context "and saved without a bucket" do
         before do
-          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)
+          Aws::S3::Bucket.any_instance.expects(:create)
+          Aws::S3::Object.any_instance.stubs(:upload_file).
+            raises(Aws::S3::Errors::NoSuchBucket
+                    .new(stub,
+                         stub(status: 404, body: "<foo/>"))).then.returns(nil)
           @dummy.save
         end
 
@@ -757,8 +933,8 @@ describe Paperclip::Storage::S3 do
 
       context "and remove" do
         before do
-          AWS::S3::S3Object.any_instance.stubs(:exists?).returns(true)
-          AWS::S3::S3Object.any_instance.stubs(:delete)
+          Aws::S3::Object.any_instance.stubs(:exists?).returns(true)
+          Aws::S3::Object.any_instance.stubs(:delete)
           @dummy.destroy
         end
 
@@ -769,7 +945,9 @@ describe Paperclip::Storage::S3 do
 
       context 'that the file were missing' do
         before do
-          AWS::S3::S3Object.any_instance.stubs(:exists?).raises(AWS::Errors::Base)
+          Aws::S3::Object.any_instance.stubs(:exists?)
+            .raises(Aws::S3::Errors::ServiceError.new("rspec stub raises",
+                                                      "object exists?"))
         end
 
         it 'returns false on exists?' do
@@ -781,7 +959,7 @@ describe Paperclip::Storage::S3 do
 
   context "An attachment with S3 storage and bucket defined as a Proc" do
     before do
-      rebuild_model storage: :s3,
+      rebuild_model (aws2_add_region).merge storage: :s3,
         bucket: lambda { |attachment| "bucket_#{attachment.instance.other}" },
         s3_credentials: {not: :important}
     end
@@ -796,7 +974,7 @@ describe Paperclip::Storage::S3 do
 
   context "An attachment with S3 storage and S3 credentials defined as a Proc" do
     before do
-      rebuild_model storage: :s3,
+      rebuild_model (aws2_add_region).merge storage: :s3,
         bucket: {not: :important},
         s3_credentials: lambda { |attachment|
           Hash['access_key_id' => "access#{attachment.instance.other}", 'secret_access_key' => "secret#{attachment.instance.other}"]
@@ -813,22 +991,23 @@ describe Paperclip::Storage::S3 do
     before do
       class DummyCredentialProvider; end
 
-      rebuild_model storage: :s3,
+      rebuild_model (aws2_add_region).merge storage: :s3,
         bucket: "testing",
         s3_credentials: {
-          credential_provider: DummyCredentialProvider.new
+          credentials: DummyCredentialProvider.new
         }
-        @dummy = Dummy.new
+      @dummy = Dummy.new
     end
 
     it "sets the credential-provider" do
-      expect(@dummy.avatar.s3_bucket.config.credential_provider).to be_a DummyCredentialProvider
+      expect(@dummy.avatar.s3_bucket.client.config.credentials).to be_a DummyCredentialProvider
     end
   end
 
   context "An attachment with S3 storage and S3 credentials in an unsupported manor" do
     before do
-      rebuild_model storage: :s3, bucket: "testing", s3_credentials: ["unsupported"]
+      rebuild_model (aws2_add_region).merge storage: :s3,
+        bucket: "testing", s3_credentials: ["unsupported"]
       @dummy = Dummy.new
     end
 
@@ -841,7 +1020,7 @@ describe Paperclip::Storage::S3 do
 
   context "An attachment with S3 storage and S3 credentials not supplied" do
     before do
-      rebuild_model storage: :s3, bucket: "testing"
+      rebuild_model (aws2_add_region).merge storage: :s3, bucket: "testing"
       @dummy = Dummy.new
     end
 
@@ -852,7 +1031,7 @@ describe Paperclip::Storage::S3 do
 
   context "An attachment with S3 storage and specific s3 headers set" do
     before do
-      rebuild_model storage: :s3,
+      rebuild_model (aws2_add_region).merge storage: :s3,
         bucket: "testing",
         path: ":attachment/:style/:basename:dotextension",
         s3_credentials: {
@@ -875,10 +1054,12 @@ describe Paperclip::Storage::S3 do
         before 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')
+
+          object.expects(:upload_file)
+            .with(anything,
+                  content_type: 'image/png',
+                  acl: :"public-read",
+                  cache_control: 'max-age=31557600')
           @dummy.save
         end
 
@@ -891,7 +1072,7 @@ describe Paperclip::Storage::S3 do
 
   context "An attachment with S3 storage and metadata set using header names" do
     before do
-      rebuild_model storage: :s3,
+      rebuild_model (aws2_add_region).merge storage: :s3,
         bucket: "testing",
         path: ":attachment/:style/:basename:dotextension",
         s3_credentials: {
@@ -914,10 +1095,12 @@ describe Paperclip::Storage::S3 do
         before 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" })
+
+          object.expects(:upload_file)
+            .with(anything,
+                  content_type: 'image/png',
+                  acl: :"public-read",
+                  metadata: { "color" => "red" })
           @dummy.save
         end
 
@@ -930,7 +1113,7 @@ describe Paperclip::Storage::S3 do
 
   context "An attachment with S3 storage and metadata set using the :s3_metadata option" do
     before do
-      rebuild_model storage: :s3,
+      rebuild_model (aws2_add_region).merge storage: :s3,
         bucket: "testing",
         path: ":attachment/:style/:basename:dotextension",
         s3_credentials: {
@@ -953,10 +1136,12 @@ describe Paperclip::Storage::S3 do
         before 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" })
+
+          object.expects(:upload_file)
+            .with(anything,
+                  content_type: 'image/png',
+                  acl: :"public-read",
+                  metadata: { "color" => "red" })
           @dummy.save
         end
 
@@ -970,7 +1155,7 @@ describe Paperclip::Storage::S3 do
   context "An attachment with S3 storage and storage class set" do
     context "using the header name" do
       before do
-        rebuild_model storage: :s3,
+        rebuild_model (aws2_add_region).merge storage: :s3,
           bucket: "testing",
           path: ":attachment/:style/:basename:dotextension",
           s3_credentials: {
@@ -993,10 +1178,12 @@ describe Paperclip::Storage::S3 do
           before 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")
+
+            object.expects(:upload_file)
+              .with(anything,
+                    content_type: 'image/png',
+                    acl: :"public-read",
+                    storage_class: "reduced_redundancy")
             @dummy.save
           end
 
@@ -1009,7 +1196,7 @@ describe Paperclip::Storage::S3 do
 
     context "using per style hash" do
       before do
-        rebuild_model :storage => :s3,
+        rebuild_model (aws2_add_region).merge :storage => :s3,
           :bucket => "testing",
           :path => ":attachment/:style/:basename.:extension",
           :styles => {
@@ -1038,9 +1225,15 @@ describe Paperclip::Storage::S3 do
             object = stub
             [:thumb, :original].each do |style|
               @dummy.avatar.stubs(:s3_object).with(style).returns(object)
-              expected_options = {:content_type => "image/png", :acl => :public_read}
+
+              expected_options = {
+                :content_type => "image/png",
+                acl: :"public-read"
+              }
               expected_options.merge!(:storage_class => :reduced_redundancy) if style == :thumb
-              object.expects(:write).with(anything, expected_options)
+
+              object.expects(:upload_file)
+                .with(anything, expected_options)
             end
             @dummy.save
           end
@@ -1054,7 +1247,7 @@ describe Paperclip::Storage::S3 do
 
     context "using global hash option" do
       before do
-        rebuild_model :storage => :s3,
+        rebuild_model (aws2_add_region).merge :storage => :s3,
           :bucket => "testing",
           :path => ":attachment/:style/:basename.:extension",
           :styles => {
@@ -1081,9 +1274,11 @@ describe Paperclip::Storage::S3 do
             object = stub
             [:thumb, :original].each do |style|
               @dummy.avatar.stubs(:s3_object).with(style).returns(object)
-              object.expects(:write).with(anything, :content_type => "image/png",
-                                          :acl => :public_read,
-                                          :storage_class => :reduced_redundancy)
+
+              object.expects(:upload_file)
+                .with(anything, :content_type => "image/png",
+                      acl: :"public-read",
+                      :storage_class => :reduced_redundancy)
             end
             @dummy.save
           end
@@ -1100,7 +1295,7 @@ describe Paperclip::Storage::S3 do
     [nil, false, ''].each do |tech|
       before do
         rebuild_model(
-          storage: :s3,
+          (aws2_add_region).merge storage: :s3,
           bucket: "testing",
           path: ":attachment/:style/:basename:dotextension",
           s3_credentials: {
@@ -1122,9 +1317,9 @@ describe Paperclip::Storage::S3 do
           before do
             object = stub
             @dummy.avatar.stubs(:s3_object).returns(object)
-            object.expects(:write).with(anything,
-                                        content_type: "image/png",
-                                        acl: :public_read)
+
+            object.expects(:upload_file)
+              .with(anything, :content_type => "image/png", acl: :"public-read")
             @dummy.save
           end
 
@@ -1138,14 +1333,14 @@ describe Paperclip::Storage::S3 do
 
   context "An attachment with S3 storage and using AES256 encryption" do
     before do
-      rebuild_model storage: :s3,
+      rebuild_model (aws2_add_region).merge storage: :s3,
         bucket: "testing",
         path: ":attachment/:style/:basename:dotextension",
         s3_credentials: {
           'access_key_id' => "12345",
           'secret_access_key' => "54321"
         },
-        s3_server_side_encryption: :aes256
+        s3_server_side_encryption: "AES256"
     end
 
     context "when assigned" do
@@ -1161,10 +1356,11 @@ describe Paperclip::Storage::S3 do
         before do
           object = stub
           @dummy.avatar.stubs(:s3_object).returns(object)
-          object.expects(:write).with(anything,
-                                      content_type: "image/png",
-                                      acl: :public_read,
-                                      server_side_encryption: :aes256)
+
+          object.expects(:upload_file)
+            .with(anything, content_type: "image/png",
+                  acl: :"public-read",
+                  server_side_encryption: "AES256")
           @dummy.save
         end
 
@@ -1177,7 +1373,7 @@ describe Paperclip::Storage::S3 do
 
   context "An attachment with S3 storage and storage class set using the :storage_class option" do
     before do
-      rebuild_model storage: :s3,
+      rebuild_model (aws2_add_region).merge storage: :s3,
         bucket: "testing",
         path: ":attachment/:style/:basename:dotextension",
         s3_credentials: {
@@ -1200,10 +1396,12 @@ describe Paperclip::Storage::S3 do
         before 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)
+
+          object.expects(:upload_file)
+            .with(anything,
+                  content_type: "image/png",
+                  acl: :"public-read",
+                  storage_class: :reduced_redundancy)
           @dummy.save
         end
 
@@ -1221,7 +1419,7 @@ describe Paperclip::Storage::S3 do
       ENV['S3_SECRET'] = 'pathname_secret'
 
       rails_env('test') do
-        rebuild_model storage: :s3,
+        rebuild_model (aws2_add_region).merge storage: :s3,
           s3_credentials: Pathname.new(fixture_file('s3.yml'))
 
         Dummy.delete_all
@@ -1231,8 +1429,12 @@ describe Paperclip::Storage::S3 do
 
     it "parses 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
+
+      assert_equal 'pathname_key',
+         @dummy.avatar.s3_bucket.client.config.access_key_id
+
+      assert_equal 'pathname_secret',
+         @dummy.avatar.s3_bucket.client.config.secret_access_key
     end
   end
 
@@ -1243,7 +1445,7 @@ describe Paperclip::Storage::S3 do
       ENV['S3_SECRET'] = 'env_secret'
 
       rails_env('test') do
-        rebuild_model storage: :s3,
+        rebuild_model (aws2_add_region).merge storage: :s3,
           s3_credentials: File.new(fixture_file('s3.yml'))
 
         Dummy.delete_all
@@ -1254,15 +1456,19 @@ describe Paperclip::Storage::S3 do
 
     it "runs the file through ERB" do
       assert_equal 'env_bucket', @dummy.avatar.bucket_name
-      assert_equal 'env_key', @dummy.avatar.s3_bucket.config.access_key_id
-      assert_equal 'env_secret', @dummy.avatar.s3_bucket.config.secret_access_key
+
+      assert_equal 'env_key',
+          @dummy.avatar.s3_bucket.client.config.access_key_id
+
+      assert_equal 'env_secret',
+          @dummy.avatar.s3_bucket.client.config.secret_access_key
     end
   end
 
   context "S3 Permissions" do
     context "defaults to :public_read" do
       before do
-        rebuild_model storage: :s3,
+        rebuild_model (aws2_add_region).merge storage: :s3,
           bucket: "testing",
           path: ":attachment/:style/:basename:dotextension",
           s3_credentials: {
@@ -1284,9 +1490,9 @@ describe Paperclip::Storage::S3 do
           before do
             object = stub
             @dummy.avatar.stubs(:s3_object).returns(object)
-            object.expects(:write).with(anything,
-                                        content_type: "image/png",
-                                        acl: :public_read)
+
+            object.expects(:upload_file)
+              .with(anything, content_type: "image/png", acl: :"public-read")
             @dummy.save
           end
 
@@ -1299,7 +1505,7 @@ describe Paperclip::Storage::S3 do
 
     context "string permissions set" do
       before do
-        rebuild_model storage: :s3,
+        rebuild_model (aws2_add_region).merge storage: :s3,
           bucket: "testing",
           path: ":attachment/:style/:basename:dotextension",
           s3_credentials: {
@@ -1322,9 +1528,9 @@ describe Paperclip::Storage::S3 do
           before do
             object = stub
             @dummy.avatar.stubs(:s3_object).returns(object)
-            object.expects(:write).with(anything,
-                                        content_type: "image/png",
-                                        acl: :private)
+
+            object.expects(:upload_file)
+              .with(anything, content_type: "image/png", acl: :private)
             @dummy.save
           end
 
@@ -1337,7 +1543,7 @@ describe Paperclip::Storage::S3 do
 
     context "hash permissions set" do
       before do
-        rebuild_model storage: :s3,
+        rebuild_model (aws2_add_region).merge storage: :s3,
           bucket: "testing",
           path: ":attachment/:style/:basename:dotextension",
           styles: {
@@ -1367,9 +1573,11 @@ describe Paperclip::Storage::S3 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: style == :thumb ? :public_read : :private)
+
+              object.expects(:upload_file)
+                .with(anything,
+                      content_type: "image/png",
+                      acl: style == :thumb ? :public_read : :private)
             end
             @dummy.save
           end
@@ -1384,7 +1592,7 @@ describe Paperclip::Storage::S3 do
     context "proc permission set" do
       before do
         rebuild_model(
-          storage: :s3,
+          (aws2_add_region).merge storage: :s3,
           bucket: "testing",
           path: ":attachment/:style/:basename:dotextension",
           styles: {
@@ -1395,40 +1603,17 @@ describe Paperclip::Storage::S3 do
             'secret_access_key' => "54321"
           },
           s3_permissions: lambda {|attachment, style|
-            attachment.instance.private_attachment? && style.to_sym != :thumb ? :private : :public_read
+            attachment.instance.private_attachment? && style.to_sym != :thumb ? :private : :"public-read"
           }
         )
       end
-
-      context "when assigned" do
-        before do
-          @file = File.new(fixture_file('5k.png'), 'rb')
-          @dummy = Dummy.new
-          @dummy.stubs(:private_attachment? => true)
-          @dummy.avatar = @file
-        end
-
-        after { @file.close }
-
-        context "and saved" do
-          before do
-            @dummy.save
-          end
-
-          it "succeeds" do
-            assert @dummy.avatar.url().include?       "https://"
-            assert @dummy.avatar.url(:thumb).include? "http://"
-          end
-        end
-      end
-
     end
   end
 
   context "An attachment with S3 storage and metadata set using a proc as headers" do
     before do
       rebuild_model(
-        storage: :s3,
+        (aws2_add_region).merge storage: :s3,
         bucket: "testing",
         path: ":attachment/:style/:basename:dotextension",
         styles: {
@@ -1459,10 +1644,12 @@ describe Paperclip::Storage::S3 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"')
+
+            object.expects(:upload_file)
+              .with(anything,
+                    content_type: "image/png",
+                    acl: :"public-read",
+                    content_disposition: 'attachment; filename="Custom Avatar Name.png"')
           end
           @dummy.save
         end
@@ -1476,7 +1663,7 @@ describe Paperclip::Storage::S3 do
 
   context "path is a proc" do
     before do
-      rebuild_model storage: :s3,
+      rebuild_model (aws2_add_region).merge storage: :s3,
         path: ->(attachment) { attachment.instance.attachment_path }
 
       @dummy = Dummy.new
@@ -1493,7 +1680,6 @@ describe Paperclip::Storage::S3 do
     end
   end
 
-
   private
 
   def rails_env(env)
@@ -1504,5 +1690,4 @@ describe Paperclip::Storage::S3 do
       Rails.env = stored_env
     end
   end
-
 end