paperclip 5.3.0 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 823fa4ed80655c6ae50b1d241142e5afb3ed9e22
-  data.tar.gz: bb9ceacd62b0e1f6167f6d0c6392a696b788ca73
+  metadata.gz: 610c7d5a2752fdd632262c73bcfbdf2cfc170663
+  data.tar.gz: 4c8484cdd5426d92a272d45e0bd9ee46e77e9c07
 SHA512:
-  metadata.gz: 4e5b7a64e9db33be68a6a5b8467a8df6c074d16990e51c93bea5a070896b2ce3905ccdc0cad6323148229f3a03209974791a90234d948bb65f7f85868cab35f2
-  data.tar.gz: 376768f292bdc225375aee8dce8c22b58e22904dabbf5044a7a2383b760b362e7a39830e9c63091e5ff1774b49ecd6f1dfbfdb293f198c66f80d3d8bb1fe1987
+  metadata.gz: 9d03df62f808fe6cb43b50389ed78071a592bd5b72ad73477ccebd08b12bba0f3e6810209e8d00bcb15128c9f359efccf04f874dddc84e1c89c7adcb16fb6ad0
+  data.tar.gz: e8c3f8a23d4d42d75460a1204f37e5ba75fd4e3a6b58859d1d3e33929a46e253e60d5cbd923e11dda6856ec43d5c19fff3cc57f83a3e08dbe8d2f6574c059286

data/NEWS

@@ -1,3 +1,7 @@
+6.0.0 (2018-03-09):
+
+* Improvement: Depend only on `aws-sdk-s3` instead of `aws-sdk` (https://github.com/thoughtbot/paperclip/pull/2481)
+
 5.3.0 (2018-03-09):
 
 * Improvement: Use `FactoryBot` instead of `FactoryGirl` (https://github.com/thoughtbot/paperclip/pull/2501)

data/README.md

@@ -567,7 +567,7 @@ Storage
 Paperclip ships with 3 storage adapters:
 
 * File Storage
-* S3 Storage (via `aws-sdk`)
+* S3 Storage (via `aws-sdk-s3`)
 * Fog Storage
 
 If you would like to use Paperclip with another storage, you can install these
@@ -593,10 +593,10 @@ _**NOTE**: This is a change from previous versions of Paperclip, but is overall
 safer choice for the default file store._
 
 You may also choose to store your files using Amazon's S3 service. To do so, include
-the `aws-sdk` gem in your Gemfile:
+the `aws-sdk-s3` gem in your Gemfile:
 
 ```ruby
-gem 'aws-sdk', '~> 2.3.0'
+gem 'aws-sdk-s3'
 ```
 
 And then you can specify using S3 from `has_attached_file`.

data/features/step_definitions/rails_steps.rb

@@ -17,7 +17,7 @@ Given /^I generate a new rails application$/ do
       gem "jruby-openssl", :platform => :jruby
       gem "capybara"
       gem "gherkin"
-      gem "aws-sdk", "~> 2.0.0"
+      gem "aws-sdk-s3"
       gem "racc", :platform => :rbx
       gem "rubysl", :platform => :rbx
       """

data/lib/paperclip/storage/s3.rb

@@ -3,8 +3,8 @@ module Paperclip
     # Amazon's S3 file hosting service is a scalable, easy place to store files for
     # distribution. You can find out more about it at http://aws.amazon.com/s3
     #
-    # To use Paperclip with S3, include the +aws-sdk+ gem in your Gemfile:
-    #   gem 'aws-sdk'
+    # To use Paperclip with S3, include the +aws-sdk-s3+ gem in your Gemfile:
+    #   gem 'aws-sdk-s3'
     # There are a few S3-specific options for has_attached_file:
     # * +s3_credentials+: Takes a path, a File, a Hash or a Proc. The path (or File) must point
     #   to a YAML file containing the +access_key_id+ and +secret_access_key+ that Amazon
@@ -96,7 +96,7 @@ module Paperclip
     #   separate parts of your file name.
     # * +s3_host_name+: If you are using your bucket in Tokyo region
     #   etc, write host_name (e.g., 's3-ap-northeast-1.amazonaws.com').
-    # * +s3_region+: For aws-sdk v2, s3_region is required.
+    # * +s3_region+: For aws-sdk-s3, s3_region is required.
     # * +s3_metadata+: These key/value pairs will be stored with the
     #   object.  This option works by prefixing each key with
     #   "x-amz-meta-" before sending it as a header on the object
@@ -118,20 +118,16 @@ module Paperclip
     #     :s3_storage_class => :REDUCED_REDUNDANCY
     #
     #   Other storage classes, such as <tt>:STANDARD_IA</tt>, are also available—see the
-    #   documentation for the <tt>aws-sdk</tt> gem for the full list.
+    #   documentation for the <tt>aws-sdk-s3</tt> gem for the full list.
 
     module S3
       def self.extended base
         begin
-          require 'aws-sdk'
+          require "aws-sdk-s3"
         rescue LoadError => e
-          e.message << " (You may need to install the aws-sdk gem)"
+          e.message << " (You may need to install the aws-sdk-s3 gem)"
           raise e
         end
-        if Gem::Version.new(Aws::VERSION) >= Gem::Version.new(2) &&
-           Gem::Version.new(Aws::VERSION) <= Gem::Version.new("2.0.33")
-          raise LoadError, "paperclip does not support aws-sdk versions 2.0.0 - 2.0.33.  Please upgrade aws-sdk to a newer version."
-        end
 
         base.instance_eval do
           @s3_options     = @options[:s3_options]     || {}
@@ -159,11 +155,6 @@ module Paperclip
 
           @http_proxy = @options[:http_proxy] || nil
 
-          if @options.has_key?(:use_accelerate_endpoint) &&
-              Gem::Version.new(Aws::VERSION) < Gem::Version.new("2.3.0")
-            raise LoadError, ":use_accelerate_endpoint is only available from aws-sdk version 2.3.0. Please upgrade aws-sdk to a newer version."
-          end
-
           @use_accelerate_endpoint = @options[:use_accelerate_endpoint]
         end
 

data/lib/paperclip/version.rb

@@ -1,5 +1,5 @@
 module Paperclip
   unless defined?(Paperclip::VERSION)
-    VERSION = "5.3.0".freeze
+    VERSION = "6.0.0".freeze
   end
 end

data/paperclip.gemspec

@@ -35,7 +35,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency('rspec', '~> 3.0')
   s.add_development_dependency('appraisal')
   s.add_development_dependency('mocha')
-  s.add_development_dependency('aws-sdk', '>= 2.3.0', '< 3.0')
+  s.add_development_dependency('aws-sdk-s3')
   s.add_development_dependency('bourne')
   s.add_development_dependency('cucumber-rails')
   s.add_development_dependency('cucumber-expressions', '4.0.3') # TODO: investigate failures on 4.0.4

data/spec/paperclip/storage/s3_spec.rb

@@ -1,5 +1,5 @@
-require 'spec_helper'
-require 'aws-sdk'
+require "spec_helper"
+require "aws-sdk-s3"
 
 describe Paperclip::Storage::S3 do
   before do
@@ -237,7 +237,7 @@ describe Paperclip::Storage::S3 do
     end
   end
 
-  # if using aws-sdk-v2, the s3_host_name will be defined by the s3_region
+  # the s3_host_name will be defined by the s3_region
   context "s3_host_name" do
     before do
       rebuild_model storage: :s3,
@@ -282,7 +282,7 @@ describe Paperclip::Storage::S3 do
     end
   end
 
-  context "use_accelerate_endpoint", if: aws_accelerate_available? do
+  context "use_accelerate_endpoint" do
     context "defaults to false" do
       before do
         rebuild_model(
@@ -308,7 +308,7 @@ describe Paperclip::Storage::S3 do
       end
     end
 
-    context "set to true", if: aws_accelerate_available? do
+    context "set to true" do
       before do
         rebuild_model(
           storage: :s3,
@@ -793,7 +793,7 @@ describe Paperclip::Storage::S3 do
     end
   end
 
-  # for aws-sdk-v2 the bucket.name is determined by the :s3_region
+  # 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,

data/spec/spec_helper.rb

@@ -39,7 +39,6 @@ RSpec.configure do |config|
   config.include TestData
   config.include Reporting
   config.extend VersionHelper
-  config.extend ConditionalFilterHelper
   config.mock_framework = :mocha
   config.before(:all) do
     rebuild_model

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paperclip
 version: !ruby/object:Gem::Version
-  version: 5.3.0
+  version: 6.0.0
 platform: ruby
 authors:
 - Jon Yurek
@@ -151,25 +151,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: aws-sdk
+  name: aws-sdk-s3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bourne
   requirement: !ruby/object:Gem::Requirement
@@ -543,7 +537,6 @@ files:
 - spec/paperclip/validators_spec.rb
 - spec/spec_helper.rb
 - spec/support/assertions.rb
-- spec/support/conditional_filter_helper.rb
 - spec/support/fake_model.rb
 - spec/support/fake_rails.rb
 - spec/support/fixtures/12k.png
@@ -691,7 +684,6 @@ test_files:
 - spec/paperclip/validators_spec.rb
 - spec/spec_helper.rb
 - spec/support/assertions.rb
-- spec/support/conditional_filter_helper.rb
 - spec/support/fake_model.rb
 - spec/support/fake_rails.rb
 - spec/support/fixtures/12k.png

data/spec/support/conditional_filter_helper.rb

@@ -1,5 +0,0 @@
-module ConditionalFilterHelper
-  def aws_accelerate_available?
-    (Gem::Version.new(Aws::VERSION) >= Gem::Version.new("2.3.0"))
-  end
-end