Merge pull request #2075 from thoughtbot/tc-remove-aws-v1

Remove AWS v1 support

.travis.yml

@@ -8,7 +8,6 @@ script: "bundle exec rake clean spec cucumber"
 gemfile:
 gemfile:
   - gemfiles/4.2.awsv2.1.gemfile
   - gemfiles/4.2.awsv2.1.gemfile
   - gemfiles/4.2.awsv2.0.gemfile
   - gemfiles/4.2.awsv2.0.gemfile
-  - gemfiles/4.2.awsv1.gemfile
 
 
 sudo: false
 sudo: false
 cache: bundler
 cache: bundler

Appraisals

@@ -7,8 +7,3 @@ appraise "4.2.awsv2.0" do
   gem "rails", "~> 4.2.0"
   gem "rails", "~> 4.2.0"
   gem "aws-sdk", "~> 2.0.0"
   gem "aws-sdk", "~> 2.0.0"
 end
 end
-
-appraise "4.2.awsv1" do
-  gem "rails", "~> 4.2.0"
-  gem "aws-sdk", "~> 1.5"
-end

README.md

@@ -561,7 +561,7 @@ Storage
 Paperclip ships with 3 storage adapters:
 Paperclip ships with 3 storage adapters:
 
 
 * File Storage
 * File Storage
-* S3 Storage (via `aws-sdk` or `aws-sdk-v1`)
+* S3 Storage (via `aws-sdk`)
 * Fog Storage
 * Fog Storage
 
 
 If you would like to use Paperclip with another storage, you can install these
 If you would like to use Paperclip with another storage, you can install these
@@ -591,10 +591,6 @@ the `aws-sdk` gem in your Gemfile:
 ```ruby
 ```ruby
 gem 'aws-sdk', '>= 2.0.0' # If using paperclip `master` (upcoming v5.0)
 gem 'aws-sdk', '>= 2.0.0' # If using paperclip `master` (upcoming v5.0)
 ```
 ```
-or
-```ruby
-gem 'aws-sdk-v1' # If using paperclip <= v4.3.1
-```
 
 
 And then you can specify using S3 from `has_attached_file`.
 And then you can specify using S3 from `has_attached_file`.
 You can find more information about configuring and using S3 storage in
 You can find more information about configuring and using S3 storage in

UPGRADING

@@ -12,8 +12,3 @@ changes:
   note that the format of the permissions changed from using an underscore to
   note that the format of the permissions changed from using an underscore to
   using a hyphen. For example, `:public_read` needs to be changed to
   using a hyphen. For example, `:public_read` needs to be changed to
   `public-read`.
   `public-read`.
-
-If you want to continue using an earlier version of aws-sdk, replace
- aws-sdk with aws-sdk-v1 in your Gemfile.
-
-If both are in your Gemfile, paperclip will use aws-sdk v2.

gemfiles/4.2.awsv1.gemfile

-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "sqlite3", "~> 1.3.8", platforms: :ruby
-gem "pry"
-gem "rails", "~> 4.2.0"
-gem "aws-sdk", "~> 1.5"
-
-group :development, :test do
-  gem "activerecord-import"
-  gem "mime-types", "~> 1.16"
-  gem "builder"
-  gem "rubocop", :require => false
-end
-
-gemspec path: "../"

lib/paperclip/storage/s3.rb

@@ -41,7 +41,7 @@ module Paperclip
     # * +s3_permissions+: This is a String that should be one of the "canned" access
     # * +s3_permissions+: This is a String that should be one of the "canned" access
     #   policies that S3 provides (more information can be found here:
     #   policies that S3 provides (more information can be found here:
     #   http://docs.aws.amazon.com/AmazonS3/latest/dev/ACLOverview.html)
     #   http://docs.aws.amazon.com/AmazonS3/latest/dev/ACLOverview.html)
-    #   The default for Paperclip is :public_read (aws-sdk v1) / public-read (aws-sdk v2).
+    #   The default for Paperclip is public-read.
     #
     #
     #   You can set permission on a per style bases by doing the following:
     #   You can set permission on a per style bases by doing the following:
     #     :s3_permissions => {
     #     :s3_permissions => {
@@ -194,13 +194,11 @@ module Paperclip
 
 
       def expiring_url(time = 3600, style_name = default_style)
       def expiring_url(time = 3600, style_name = default_style)
         if path(style_name)
         if path(style_name)
-          if aws_v1?
-            base_options = { :expires => time, :secure => use_secure_protocol?(style_name) }
-            s3_object(style_name).url_for(:read, base_options.merge(s3_url_options)).to_s
-          else
-            base_options = { :expires_in => time }
-            s3_object(style_name).presigned_url(:get, base_options.merge(s3_url_options)).to_s
-          end
+          base_options = { expires_in: time }
+          s3_object(style_name).presigned_url(
+            :get,
+            base_options.merge(s3_url_options),
+          ).to_s
         else
         else
           url(style_name)
           url(style_name)
         end
         end
@@ -244,11 +242,7 @@ module Paperclip
 
 
       def s3_interface
       def s3_interface
         @s3_interface ||= begin
         @s3_interface ||= begin
-          config = if aws_v1?
-            { :s3_endpoint => s3_host_name }
-          else
-            { :region => s3_region }
-          end
+          config = { region: s3_region }
 
 
           if using_http_proxy?
           if using_http_proxy?
 
 
@@ -272,19 +266,11 @@ module Paperclip
 
 
       def obtain_s3_instance_for(options)
       def obtain_s3_instance_for(options)
         instances = (Thread.current[:paperclip_s3_instances] ||= {})
         instances = (Thread.current[:paperclip_s3_instances] ||= {})
-        instances[options] ||= if aws_v1?
-          AWS_CLASS::S3.new(options)
-        else
-          AWS_CLASS::S3::Resource.new(options)
-        end
+        instances[options] ||= AWS_CLASS::S3::Resource.new(options)
       end
       end
 
 
       def s3_bucket
       def s3_bucket
-        @s3_bucket ||= if aws_v1?
-          s3_interface.buckets[bucket_name]
-        else
-          s3_interface.bucket(bucket_name)
-        end
+        @s3_bucket ||= s3_interface.bucket(bucket_name)
       end
       end
 
 
       def style_name_as_path(style_name)
       def style_name_as_path(style_name)
@@ -292,11 +278,7 @@ module Paperclip
       end
       end
 
 
       def s3_object style_name = default_style
       def s3_object style_name = default_style
-        if aws_v1?
-          s3_bucket.objects[style_name_as_path(style_name)]
-        else
-          s3_bucket.object(style_name_as_path(style_name))
-        end
+        s3_bucket.object style_name_as_path(style_name)
       end
       end
 
 
       def using_http_proxy?
       def using_http_proxy?
@@ -367,11 +349,7 @@ module Paperclip
       end
       end
 
 
       def create_bucket
       def create_bucket
-        if aws_v1?
-          s3_interface.buckets.create(bucket_name)
-        else
-          s3_interface.bucket(bucket_name).create
-        end
+        s3_interface.bucket(bucket_name).create
       end
       end
 
 
       def flush_writes #:nodoc:
       def flush_writes #:nodoc:
@@ -402,11 +380,7 @@ module Paperclip
             write_options[:metadata] = @s3_metadata unless @s3_metadata.empty?
             write_options[:metadata] = @s3_metadata unless @s3_metadata.empty?
             write_options.merge!(@s3_headers)
             write_options.merge!(@s3_headers)
 
 
-            if aws_v1?
-              s3_object(style).write(file, write_options)
-            else
-              s3_object(style).upload_file(file.path, write_options)
-            end
+            s3_object(style).upload_file(file.path, write_options)
           rescue AWS_CLASS::S3::Errors::NoSuchBucket
           rescue AWS_CLASS::S3::Errors::NoSuchBucket
             create_bucket
             create_bucket
             retry
             retry
@@ -432,11 +406,7 @@ module Paperclip
         @queued_for_delete.each do |path|
         @queued_for_delete.each do |path|
           begin
           begin
             log("deleting #{path}")
             log("deleting #{path}")
-            if aws_v1?
-              s3_bucket.objects[path.sub(%r{\A/},'')]
-            else
-              s3_bucket.object(path.sub(%r{\A/},''))
-            end.delete
+            s3_bucket.object(path.sub(%r{\A/}, "")).delete
           rescue AWS_BASE_ERROR => e
           rescue AWS_BASE_ERROR => e
             # Ignore this.
             # Ignore this.
           end
           end
@@ -447,7 +417,7 @@ module Paperclip
       def copy_to_local_file(style, local_dest_path)
       def copy_to_local_file(style, local_dest_path)
         log("copying #{path(style)} to local file #{local_dest_path}")
         log("copying #{path(style)} to local file #{local_dest_path}")
         ::File.open(local_dest_path, 'wb') do |local_file|
         ::File.open(local_dest_path, 'wb') do |local_file|
-          s3_object(style).send(aws_v1? ? :read : :get) do |chunk|
+          s3_object(style).get do |chunk|
             local_file.write(chunk)
             local_file.write(chunk)
           end
           end
         end
         end
@@ -458,10 +428,6 @@ module Paperclip
 
 
       private
       private
 
 
-      def aws_v1?
-        Gem::Version.new(AWS_CLASS::VERSION) < Gem::Version.new(2)
-      end
-
       def find_credentials creds
       def find_credentials creds
         case creds
         case creds
         when File
         when File