paperclip 5.0.0.beta1 → 5.0.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a699912c4b56d87a1b16846ed1b9772f6149aeeb
-  data.tar.gz: f975845257fa910032dfc7b52913cd2b17917079
+  metadata.gz: f6fccc7d5627358582473c510bef269b25156565
+  data.tar.gz: 07eb1f02126bb0022635083684eaf43ba049a466
 SHA512:
-  metadata.gz: 46c3a1935badc5820ca134933317f37bd284b2d01ff755b52250f5105e27aa562e3bfb9d20f1aa95c44994b0de477c1feec81d24b53be3e5e9e1852bd45d5448
-  data.tar.gz: 43b0e540a847140ba445040281be26d23308f9afe204d0bd5911fa6b245cd7cbb079e987460effe2784d94f7019313cbb5fd662fe9c1dc09160bcde9cb28db13
+  metadata.gz: 7bf6930cb7bd20a9dd477d1596f9a4ea6ec78108f079424ed4163125f86358275e164667597a6bedec27244435e749dbaf97fbff73a2df724eeb4174ec60ba6c
+  data.tar.gz: ee22ab27c69ca3a529ba6b41fcbe6a4f580a16f46b31eae9e1427d13d0bf29bbbe01b65471ebc148c0c21f53213ad39ff2b74f60287b70671d7b676abd2b1d76

data/NEWS

@@ -1,4 +1,11 @@
-5.0.0.beta1
+5.0.0.beta2 (2015-04-01):
+
+* Bugfix: Dynamic fog directory option is now respected
+* Bugfix: Fixes cocaine duplicated paths [#2169]
+* Removal of dead code (older versions of Rails and AWS SDK)
+* README adjustments
+
+5.0.0.beta1 (2015-03-13):
 
 * Drop support to end-of-life'd ruby 2.0.
 * Drop support for end-of-life'd Rails 3.2 and 4.1

data/README.md

@@ -159,7 +159,7 @@ Paperclip is distributed as a gem, which is how it should be used in your app.
 Include the gem in your Gemfile:
 
 ```ruby
-gem "paperclip", "~> 5.0"
+gem "paperclip", "~> 5.0.0.beta1"
 ```
 
 Or, if you want to get the latest, you can get master from the main paperclip repository:
@@ -189,18 +189,6 @@ Quick Start
 
 ### Models
 
-**Rails 3**
-
-```ruby
-class User < ActiveRecord::Base
-  attr_accessible :avatar
-  has_attached_file :avatar, styles: { medium: "300x300>", thumb: "100x100>" }, default_url: "/images/:style/missing.png"
-  validates_attachment_content_type :avatar, content_type: /\Aimage\/.*\Z/
-end
-```
-
-**Rails 4**
-
 ```ruby
 class User < ActiveRecord::Base
   has_attached_file :avatar, styles: { medium: "300x300>", thumb: "100x100>" }, default_url: "/images/:style/missing.png"
@@ -241,16 +229,6 @@ end
 
 ### Controller
 
-**Rails 3**
-
-```ruby
-def create
-  @user = User.create( params[:user] )
-end
-```
-
-**Rails 4**
-
 ```ruby
 def create
   @user = User.create( user_params )
@@ -451,14 +429,13 @@ will not cause errors to be raised.
 
 This can sometimes cause false validation errors in applications that use custom
 file extensions. In these cases you may wish to add your custom extension to the
-list of file extensions allowed for your MIME type configured by the `mime-types`
-gem:
+list of content type mappings by creating `config/initializers/paperclip.rb`:
 
 ```ruby
 # Allow ".foo" as an extension for files with the MIME type "text/plain".
-text_plain = MIME::Types["text/plain"].first
-text_plain.extensions << "foo"
-MIME::Types.index_extensions text_plain
+Paperclip.options[:content_type_mappings] = {
+  foo: %w(text/plain)
+}
 ```
 
 ---
@@ -595,16 +572,13 @@ You may also choose to store your files using Amazon's S3 service. To do so, inc
 the `aws-sdk` gem in your Gemfile:
 
 ```ruby
-gem 'aws-sdk', '>= 2.0.0' # If using paperclip `master` (upcoming v5.0)
+gem 'aws-sdk', '>= 2.0.34'
 ```
 
 And then you can specify using S3 from `has_attached_file`.
 You can find more information about configuring and using S3 storage in
 [the `Paperclip::Storage::S3` documentation](http://www.rubydoc.info/gems/paperclip/Paperclip/Storage/S3).
 
-_**NOTE**: If upgrading aws-sdk from v1.x to v2.x, be sure to read the
-[UPGRADING guide](https://github.com/thoughtbot/paperclip/blob/master/UPGRADING)._
-
 Files on the local filesystem (and in the Rails app's public directory) will be
 available to the internet at large. If you require access control, it's
 possible to place your files in a different location. You will need to change

data/UPGRADING

@@ -12,3 +12,6 @@ changes:
   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
   `public-read`.
+
+For a walkthrough of upgrading from 4 to 5 and aws-sdk >= 2.0 you can watch
+http://rubythursday.com/episodes/ruby-snack-27-upgrade-paperclip-and-aws-sdk-in-prep-for-rails-5

data/features/migration.feature

@@ -68,27 +68,3 @@ Feature: Migration
 
     When I rollback a migration
     Then I should not have attachment columns for "avatar"
-
-  Scenario: Rails 3.2 change method
-    Given I am using Rails newer than 3.1
-    When I write to "db/migrate/01_create_users.rb" with:
-      """
-      class CreateUsers < ActiveRecord::Migration
-        def self.up
-          create_table :users
-        end
-      end
-      """
-    When I write to "db/migrate/02_add_attachment_to_users.rb" with:
-      """
-      class AddAttachmentToUsers < ActiveRecord::Migration
-        def change
-          add_attachment :users, :avatar
-        end
-      end
-      """
-    And I run a migration
-    Then I should have attachment columns for "avatar"
-
-    When I rollback a migration
-    Then I should not have attachment columns for "avatar"

data/features/step_definitions/rails_steps.rb

@@ -190,12 +190,6 @@ When /^I comment out the gem "([^"]*)" from the Gemfile$/ do |gemname|
   comment_out_gem_in_gemfile gemname
 end
 
-Given /^I am using Rails newer than ([\d\.]+)$/ do |version|
-  if framework_version < version
-    pending "Not supported in Rails < #{version}"
-  end
-end
-
 Given(/^I add a "(.*?)" processor in "(.*?)"$/) do |processor, directory|
   filename = "#{directory}/#{processor}.rb"
   cd(".") do

data/features/step_definitions/s3_steps.rb

@@ -1,15 +1,11 @@
 When /^I attach the file "([^"]*)" to "([^"]*)" on S3$/ do |file_path, field|
   definition = Paperclip::AttachmentRegistry.definitions_for(User)[field.downcase.to_sym]
-  path = if defined?(::AWS)
-    "https://paperclip.s3.amazonaws.com#{definition[:path]}"
-  else
-    "https://paperclip.s3-us-west-2.amazonaws.com#{definition[:path]}"
-  end
+  path = "https://paperclip.s3-us-west-2.amazonaws.com#{definition[:path]}"
   path.gsub!(':filename', File.basename(file_path))
   path.gsub!(/:([^\/\.]+)/) do |match|
     "([^\/\.]+)"
   end
-  FakeWeb.register_uri(:put, Regexp.new(path), :body => defined?(::AWS) ? "OK" : "<xml></xml>")
+  FakeWeb.register_uri(:put, Regexp.new(path), :body => "<xml></xml>")
   step "I attach the file \"#{file_path}\" to \"#{field}\""
 end
 

data/lib/paperclip/helpers.rb

@@ -24,7 +24,8 @@ module Paperclip
     #
     def run(cmd, arguments = "", interpolation_values = {}, local_options = {})
       command_path = options[:command_path]
-      Cocaine::CommandLine.path = [Cocaine::CommandLine.path, command_path].flatten.compact.uniq
+      cocaine_path_array = Cocaine::CommandLine.path.try(:split, Cocaine::OS.path_separator)
+      Cocaine::CommandLine.path = [cocaine_path_array, command_path].flatten.compact.uniq
       if logging? && (options[:log_command] || local_options[:log_command])
         local_options = local_options.merge(:logger => logger)
       end

data/lib/paperclip/schema.rb

@@ -12,10 +12,7 @@ module Paperclip
       ActiveRecord::ConnectionAdapters::Table.send :include, TableDefinition
       ActiveRecord::ConnectionAdapters::TableDefinition.send :include, TableDefinition
       ActiveRecord::ConnectionAdapters::AbstractAdapter.send :include, Statements
-
-      if defined?(ActiveRecord::Migration::CommandRecorder) # Rails 3.1+
-        ActiveRecord::Migration::CommandRecorder.send :include, CommandRecorder
-      end
+      ActiveRecord::Migration::CommandRecorder.send :include, CommandRecorder
     end
 
     module Statements
@@ -35,8 +32,6 @@ module Paperclip
       def remove_attachment(table_name, *attachment_names)
         raise ArgumentError, "Please specify attachment name in your remove_attachment call in your migration." if attachment_names.empty?
 
-        options = attachment_names.extract_options!
-
         attachment_names.each do |attachment_name|
           COLUMNS.keys.each do |column_name|
             remove_column(table_name, "#{attachment_name}_#{column_name}")

data/lib/paperclip/storage/fog.rb

@@ -195,10 +195,10 @@ module Paperclip
       end
 
       def host_name_for_directory
-        if @options[:fog_directory].to_s =~ Fog::AWS_BUCKET_SUBDOMAIN_RESTRICTON_REGEX
-          "#{@options[:fog_directory]}.s3.amazonaws.com"
+        if directory_name.to_s =~ Fog::AWS_BUCKET_SUBDOMAIN_RESTRICTON_REGEX
+          "#{directory_name}.s3.amazonaws.com"
         else
-          "s3.amazonaws.com/#{@options[:fog_directory]}"
+          "s3.amazonaws.com/#{directory_name}"
         end
       end
 
@@ -224,13 +224,15 @@ module Paperclip
       end
 
       def directory
-        dir = if @options[:fog_directory].respond_to?(:call)
+        @directory ||= connection.directories.new(key: directory_name)
+      end
+
+      def directory_name
+        if @options[:fog_directory].respond_to?(:call)
           @options[:fog_directory].call(self)
         else
           @options[:fog_directory]
         end
-
-        @directory ||= connection.directories.new(:key => dir)
       end
 
       def scheme

data/lib/paperclip/storage/s3.rb

@@ -113,37 +113,15 @@ module Paperclip
 
     module S3
       def self.extended base
-        unless defined?(AWS_CLASS)
-          begin
-            require 'aws-sdk'
-            const_set('AWS_CLASS', defined?(::Aws) ? ::Aws : ::AWS)
-            const_set('AWS_BASE_ERROR',
-              defined?(::Aws) ? Aws::Errors::ServiceError : AWS::Errors::Base)
-            const_set('DEFAULT_PERMISSION',
-              defined?(::AWS) ? :public_read : :'public-read')
-
-          rescue LoadError => e
-            e.message << " (You may need to install the aws-sdk gem)"
-            raise e
-          end
-          if Gem::Version.new(AWS_CLASS::VERSION) >= Gem::Version.new(2) && Gem::Version.new(AWS_CLASS::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
+        begin
+          require 'aws-sdk'
+        rescue LoadError => e
+          e.message << " (You may need to install the aws-sdk gem)"
+          raise e
         end
-
-        # Overriding log formatter to make sure it return a UTF-8 string
-        if defined?(AWS_CLASS::Core::LogFormatter)
-          AWS_CLASS::Core::LogFormatter.class_eval do
-            def summarize_hash(hash)
-              hash.map { |key, value| ":#{key}=>#{summarize_value(value)}".force_encoding('UTF-8') }.sort.join(',')
-            end
-          end
-        elsif defined?(AWS_CLASS::Core::ClientLogging)
-          AWS_CLASS::Core::ClientLogging.class_eval do
-            def sanitize_hash(hash)
-              hash.map { |key, value| "#{sanitize_value(key)}=>#{sanitize_value(value)}".force_encoding('UTF-8') }.sort.join(',')
-            end
-          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
@@ -153,7 +131,7 @@ module Paperclip
             Proc.new do |style, attachment|
               permission  = (@s3_permissions[style.to_s.to_sym] || @s3_permissions[:default])
               permission  = permission.call(attachment, style) if permission.respond_to?(:call)
-              (permission == DEFAULT_PERMISSION) ? 'http'.freeze : 'https'.freeze
+              (permission == :"public-read") ? 'http'.freeze : 'https'.freeze
             end
           @s3_metadata = @options[:s3_metadata] || {}
           @s3_headers = {}
@@ -266,7 +244,7 @@ module Paperclip
 
       def obtain_s3_instance_for(options)
         instances = (Thread.current[:paperclip_s3_instances] ||= {})
-        instances[options] ||= AWS_CLASS::S3::Resource.new(options)
+        instances[options] ||= ::Aws::S3::Resource.new(options)
       end
 
       def s3_bucket
@@ -303,7 +281,7 @@ module Paperclip
 
       def set_permissions permissions
         permissions = { :default => permissions } unless permissions.respond_to?(:merge)
-        permissions.merge :default => (permissions[:default] || DEFAULT_PERMISSION)
+        permissions.merge :default => (permissions[:default] || :"public-read")
       end
 
       def set_storage_class(storage_class)
@@ -323,7 +301,7 @@ module Paperclip
         else
           false
         end
-      rescue AWS_BASE_ERROR => e
+      rescue Aws::Errors::ServiceError => e
         false
       end
 
@@ -381,10 +359,10 @@ module Paperclip
             write_options.merge!(@s3_headers)
 
             s3_object(style).upload_file(file.path, write_options)
-          rescue AWS_CLASS::S3::Errors::NoSuchBucket
+          rescue ::Aws::S3::Errors::NoSuchBucket
             create_bucket
             retry
-          rescue AWS_CLASS::S3::Errors::SlowDown
+          rescue ::Aws::S3::Errors::SlowDown
             retries += 1
             if retries <= 5
               sleep((2 ** retries) * 0.5)
@@ -407,7 +385,7 @@ module Paperclip
           begin
             log("deleting #{path}")
             s3_bucket.object(path.sub(%r{\A/}, "")).delete
-          rescue AWS_BASE_ERROR => e
+          rescue Aws::Errors::ServiceError => e
             # Ignore this.
           end
         end
@@ -421,7 +399,7 @@ module Paperclip
             local_file.write(chunk)
           end
         end
-      rescue AWS_BASE_ERROR => e
+      rescue Aws::Errors::ServiceError => e
         warn("#{e} - cannot copy #{path(style)} to local file #{local_dest_path}")
         false
       end

data/lib/paperclip/validators/attachment_size_validator.rb

@@ -71,13 +71,7 @@ module Paperclip
       end
 
       def human_size(size)
-        if defined?(ActiveSupport::NumberHelper) # Rails 4.0+
-          ActiveSupport::NumberHelper.number_to_human_size(size)
-        else
-          storage_units_format = I18n.translate(:'number.human.storage_units.format', :locale => options[:locale], :raise => true)
-          unit = I18n.translate(:'number.human.storage_units.units.byte', :locale => options[:locale], :count => size.to_i, :raise => true)
-          storage_units_format.gsub(/%n/, size.to_i.to_s).gsub(/%u/, unit).html_safe
-        end
+        ActiveSupport::NumberHelper.number_to_human_size(size)
       end
 
       def min_value_in_human_size(record)

data/lib/paperclip/version.rb

@@ -1,3 +1,3 @@
 module Paperclip
-  VERSION = "5.0.0.beta1" unless defined? Paperclip::VERSION
+  VERSION = "5.0.0.beta2" unless defined? Paperclip::VERSION
 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.0.33', '< 3.0')
+  s.add_development_dependency('aws-sdk', '>= 2.0.34', '< 3.0')
   s.add_development_dependency('bourne')
   s.add_development_dependency('cucumber', '~> 1.3.18')
   s.add_development_dependency('aruba', '~> 0.9.0')

data/spec/paperclip/attachment_spec.rb

@@ -222,9 +222,6 @@ describe Paperclip::Attachment do
     dummy.avatar_file_name = "fake.jpg"
     dummy.stubs(:new_record?).returns(false)
     expected_string = '{"avatar":"/system/dummies/avatars/000/001/234/original/fake.jpg"}'
-    if ActiveRecord::Base.include_root_in_json # This is true by default in Rails 3, and false in 4
-      expected_string = %({"dummy":#{expected_string}})
-    end
     # active_model pre-3.2 checks only by calling any? on it, thus it doesn't work if it is empty
     assert_equal expected_string, dummy.to_json(only: [:dummy_key_for_old_active_model], methods: [:avatar])
   end

data/spec/paperclip/paperclip_spec.rb

@@ -29,7 +29,9 @@ describe Paperclip do
       Paperclip.options[:command_path] = "/opt/my_app/bin"
       Paperclip.run("convert", "stuff")
       Paperclip.run("convert", "more_stuff")
-      assert_equal 1, [Cocaine::CommandLine.path].flatten.size
+
+      cmd_path = Paperclip.options[:command_path]
+      assert_equal 1, Cocaine::CommandLine.path.scan(cmd_path).count
     end
   end
 

data/spec/paperclip/storage/fog_spec.rb

@@ -418,6 +418,9 @@ describe Paperclip::Storage::Fog do
           assert @connection.directories.get(@dynamic_fog_directory).inspect
         end
 
+        it "provides an url using dynamic bucket name" do
+          assert_match(/^https:\/\/dynamicpaperclip.s3.amazonaws.com\/avatars\/5k.png\?\d*$/, @dummy.avatar.url)
+        end
       end
 
       context "with a proc for the fog_host evaluating a model method" do

data/spec/paperclip/storage/s3_spec.rb

@@ -3,15 +3,11 @@ require 'aws-sdk'
 
 describe Paperclip::Storage::S3 do
   before do
-    if defined?(::Aws)
-      Aws.config[:stub_responses] = true
-    else
-      AWS.stub!
-    end
+    Aws.config[:stub_responses] = true
   end
 
   def aws2_add_region
-    defined?(::Aws) ? { s3_region: 'us-east-1' } : {}
+    { s3_region: 'us-east-1' }
   end
 
   context "Parsing S3 credentials" do
@@ -244,20 +240,12 @@ describe Paperclip::Storage::S3 do
   # if using aws-sdk-v2, the s3_host_name will be defined by the s3_region
   context "s3_host_name" do
     before do
-      if defined?(::Aws)
-        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"
-      else
-        rebuild_model storage: :s3,
-          s3_credentials: {},
-          bucket: "bucket",
-          path: ":attachment/:basename:dotextension",
-          s3_host_name: "s3-ap-northeast-1.amazonaws.com"
-      end
+      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)
@@ -269,9 +257,7 @@ describe Paperclip::Storage::S3 do
 
     it "uses the S3 bucket with the correct host name" do
       assert_equal "s3-ap-northeast-1.amazonaws.com",
-        (defined?(::Aws) ?
-          @dummy.avatar.s3_bucket.client.config.endpoint.host :
-          @dummy.avatar.s3_bucket.config.s3_endpoint)
+        @dummy.avatar.s3_bucket.client.config.endpoint.host
     end
   end
 
@@ -361,13 +347,12 @@ describe Paperclip::Storage::S3 do
         @dummy.avatar.stubs(:s3_object).with(:original).returns(object)
         @dummy.avatar.stubs(:s3_object).with(:thumbnail).returns(object)
 
-        object.expects((defined?(::Aws) ? :upload_file : :write))
+        object.expects(:upload_file)
           .with(anything, content_type: 'image/png',
-                acl: Paperclip::Storage::S3::DEFAULT_PERMISSION)
-
-        object.expects((defined?(::Aws) ? :upload_file : :write))
+                acl: :"public-read")
+        object.expects(:upload_file)
           .with(anything, content_type: 'image/png',
-                acl: Paperclip::Storage::S3::DEFAULT_PERMISSION,
+                acl: :"public-read",
                 cache_control: 'max-age=31557600')
         @dummy.save
     end
@@ -554,11 +539,7 @@ describe Paperclip::Storage::S3 do
         object = stub
         @dummy.avatar.stubs(:s3_object).returns(object)
 
-        if defined?(::Aws)
-          object.expects(:presigned_url).with(:get, expires_in: 3600)
-        else
-          object.expects(:url_for).with(:read, expires: 3600, secure: true)
-        end
+        object.expects(:presigned_url).with(:get, expires_in: 3600)
         @dummy.avatar.expiring_url
       end
     end
@@ -572,15 +553,9 @@ describe Paperclip::Storage::S3 do
 
         object = stub
         @dummy.avatar.stubs(:s3_object).returns(object)
-        if defined?(::Aws)
-          object.expects(:presigned_url)
-            .with(:get, expires_in: 3600,
-                  response_content_disposition: "inline")
-        else
-          object.expects(:url_for)
-            .with(:read, expires: 3600, secure: true,
-                  response_content_disposition: "inline")
-        end
+        object.expects(:presigned_url)
+          .with(:get, expires_in: 3600,
+                response_content_disposition: "inline")
         @dummy.avatar.expiring_url
       end
     end
@@ -601,14 +576,8 @@ describe Paperclip::Storage::S3 do
 
         object = stub
         @dummy.avatar.stubs(:s3_object).returns(object)
-        if defined?(::Aws)
-          object.expects(:presigned_url)
-            .with(:get, expires_in: 3600, response_content_type: "image/png")
-        else
-          object.expects(:url_for)
-            .with(:read, expires: 3600, secure: true,
-                  response_content_type: "image/png")
-        end
+        object.expects(:presigned_url)
+          .with(:get, expires_in: 3600, response_content_type: "image/png")
         @dummy.avatar.expiring_url
       end
     end
@@ -655,22 +624,14 @@ describe Paperclip::Storage::S3 do
     it "generates a url for the thumb" do
       object = stub
       @dummy.avatar.stubs(:s3_object).with(:thumb).returns(object)
-      if defined?(::Aws)
-        object.expects(:presigned_url).with(:get, expires_in: 1800)
-      else
-        object.expects(:url_for).with(:read, expires: 1800, secure: true)
-      end
+      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)
-      if defined?(::Aws)
-        object.expects(:presigned_url).with(:get, expires_in: 1800)
-      else
-        object.expects(:url_for).with(:read, expires: 1800, secure: true)
-      end
+      object.expects(:presigned_url).with(:get, expires_in: 1800)
       @dummy.avatar.expiring_url(1800)
     end
   end
@@ -703,65 +664,40 @@ describe Paperclip::Storage::S3 do
   # for aws-sdk-v2 the bucket.name is determined by the :s3_region
   context "Parsing S3 credentials with a s3_host_name in them" do
     before do
-      if defined?(::Aws)
-        rebuild_model storage: :s3,
-          bucket: 'testing',
-          s3_credentials: {
-          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" }
-          }
-      else
-        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" }
-          }
-      end
+      rebuild_model storage: :s3,
+        bucket: 'testing',
+        s3_credentials: {
+        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" }
+        }
       @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
-        if defined?(::Aws)
-          assert_match %r{^s3.world-end.amazonaws.com},
-            @dummy.avatar.s3_bucket.client.config.endpoint.host
-        else
-          assert_match %r{^s3-world-end.amazonaws.com},
-            @dummy.avatar.s3_bucket.config.s3_endpoint
-        end
+        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
-        if defined?(::Aws)
-          assert_match %r{^s3-ap-northeast-1.amazonaws.com},
-            @dummy.avatar.s3_bucket.client.config.endpoint.host
-        else
-          assert_match %r{^s3-ap-northeast-1.amazonaws.com},
-            @dummy.avatar.s3_bucket.config.s3_endpoint
-        end
+        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
-        if defined?(::Aws)
-          # :s3_region is *required* for aws-sdk-v2
-          assert_raises(Aws::Errors::MissingRegionError) do
-            @dummy.avatar.s3_bucket.client.config.endpoint.host
-          end
-        else
-          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
@@ -804,22 +740,14 @@ describe Paperclip::Storage::S3 do
 
       it "is rewound after flush_writes" do
         @dummy.avatar.instance_eval "def after_flush_writes; end"
-        if defined?(::Aws)
-          @dummy.avatar.stubs(:s3_object).returns(stub(upload_file: true))
-        else
-          @dummy.avatar.stubs(:s3_object).returns(stub(write: true))
-        end
+        @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
-        if defined?(::Aws)
-          @dummy.avatar.stubs(:s3_object).returns(stub(upload_file: true))
-        else
-          @dummy.avatar.stubs(:s3_object).returns(stub(write: true))
-        end
+        @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) },
@@ -828,17 +756,10 @@ describe Paperclip::Storage::S3 do
 
       it "will retry to save again but back off on SlowDown" do
         @dummy.avatar.stubs(:sleep)
-        if defined?(::Aws)
-          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)
-        else
-          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)
-        end
+        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)
@@ -850,9 +771,8 @@ describe Paperclip::Storage::S3 do
         before do
           object = stub
           @dummy.avatar.stubs(:s3_object).returns(object)
-          object.expects((defined?(::Aws) ? :upload_file : :write))
-            .with(anything, content_type: 'image/png',
-                  acl: Paperclip::Storage::S3::DEFAULT_PERMISSION)
+          object.expects(:upload_file)
+            .with(anything, content_type: 'image/png', acl: :"public-read")
           @dummy.save
         end
 
@@ -863,21 +783,11 @@ describe Paperclip::Storage::S3 do
 
       context "and saved without a bucket" do
         before do
-          if defined?(::Aws)
-            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)
-	  else
-            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)
-	  end
+          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
 
@@ -888,13 +798,8 @@ describe Paperclip::Storage::S3 do
 
       context "and remove" do
         before do
-          if defined?(::Aws)
-            Aws::S3::Object.any_instance.stubs(:exists?).returns(true)
-            Aws::S3::Object.any_instance.stubs(:delete)
-          else
-            AWS::S3::S3Object.any_instance.stubs(:exists?).returns(true)
-            AWS::S3::S3Object.any_instance.stubs(:delete)
-          end
+          Aws::S3::Object.any_instance.stubs(:exists?).returns(true)
+          Aws::S3::Object.any_instance.stubs(:delete)
           @dummy.destroy
         end
 
@@ -905,14 +810,9 @@ describe Paperclip::Storage::S3 do
 
       context 'that the file were missing' do
         before do
-          if defined?(::Aws)
-            Aws::S3::Object.any_instance.stubs(:exists?)
-              .raises(Aws::S3::Errors::ServiceError.new("rspec stub raises",
-                                                        "object exists?"))
-          else
-            AWS::S3::S3Object.any_instance.stubs(:exists?)
-              .raises(AWS::Errors::Base)
-          end
+          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
@@ -956,28 +856,16 @@ describe Paperclip::Storage::S3 do
     before do
       class DummyCredentialProvider; end
 
-      if defined?(::Aws)
-        rebuild_model (aws2_add_region).merge storage: :s3,
-          bucket: "testing",
-          s3_credentials: {
-            credentials: DummyCredentialProvider.new
-          }
-      else
-        rebuild_model storage: :s3,
-          bucket: "testing",
-          s3_credentials: {
-            credential_provider: DummyCredentialProvider.new
-          }
-      end
+      rebuild_model (aws2_add_region).merge storage: :s3,
+        bucket: "testing",
+        s3_credentials: {
+          credentials: DummyCredentialProvider.new
+        }
       @dummy = Dummy.new
     end
 
     it "sets the credential-provider" do
-      if defined?(::Aws)
-        expect(@dummy.avatar.s3_bucket.client.config.credentials).to be_a DummyCredentialProvider
-      else
-        expect(@dummy.avatar.s3_bucket.config.credential_provider).to be_a DummyCredentialProvider
-      end
+      expect(@dummy.avatar.s3_bucket.client.config.credentials).to be_a DummyCredentialProvider
     end
   end
 
@@ -1032,10 +920,10 @@ describe Paperclip::Storage::S3 do
           object = stub
           @dummy.avatar.stubs(:s3_object).returns(object)
 
-          object.expects((defined?(::Aws) ? :upload_file : :write))
+          object.expects(:upload_file)
             .with(anything,
                   content_type: 'image/png',
-                  acl: Paperclip::Storage::S3::DEFAULT_PERMISSION,
+                  acl: :"public-read",
                   cache_control: 'max-age=31557600')
           @dummy.save
         end
@@ -1073,10 +961,10 @@ describe Paperclip::Storage::S3 do
           object = stub
           @dummy.avatar.stubs(:s3_object).returns(object)
 
-          object.expects((defined?(::Aws) ? :upload_file : :write))
+          object.expects(:upload_file)
             .with(anything,
                   content_type: 'image/png',
-                  acl: Paperclip::Storage::S3::DEFAULT_PERMISSION,
+                  acl: :"public-read",
                   metadata: { "color" => "red" })
           @dummy.save
         end
@@ -1114,10 +1002,10 @@ describe Paperclip::Storage::S3 do
           object = stub
           @dummy.avatar.stubs(:s3_object).returns(object)
 
-          object.expects((defined?(::Aws) ? :upload_file : :write))
+          object.expects(:upload_file)
             .with(anything,
                   content_type: 'image/png',
-                  acl: Paperclip::Storage::S3::DEFAULT_PERMISSION,
+                  acl: :"public-read",
                   metadata: { "color" => "red" })
           @dummy.save
         end
@@ -1156,10 +1044,10 @@ describe Paperclip::Storage::S3 do
             object = stub
             @dummy.avatar.stubs(:s3_object).returns(object)
 
-            object.expects((defined?(::Aws) ? :upload_file : :write))
+            object.expects(:upload_file)
               .with(anything,
                     content_type: 'image/png',
-                    acl: Paperclip::Storage::S3::DEFAULT_PERMISSION,
+                    acl: :"public-read",
                     storage_class: "reduced_redundancy")
             @dummy.save
           end
@@ -1205,11 +1093,11 @@ describe Paperclip::Storage::S3 do
 
               expected_options = {
                 :content_type => "image/png",
-                :acl =>  Paperclip::Storage::S3::DEFAULT_PERMISSION
+                acl: :"public-read"
               }
               expected_options.merge!(:storage_class => :reduced_redundancy) if style == :thumb
 
-              object.expects((defined?(::Aws) ? :upload_file : :write))
+              object.expects(:upload_file)
                 .with(anything, expected_options)
             end
             @dummy.save
@@ -1252,9 +1140,9 @@ describe Paperclip::Storage::S3 do
             [:thumb, :original].each do |style|
               @dummy.avatar.stubs(:s3_object).with(style).returns(object)
 
-              object.expects((defined?(::Aws) ? :upload_file : :write))
+              object.expects(:upload_file)
                 .with(anything, :content_type => "image/png",
-                      :acl => Paperclip::Storage::S3::DEFAULT_PERMISSION,
+                      acl: :"public-read",
                       :storage_class => :reduced_redundancy)
             end
             @dummy.save
@@ -1295,9 +1183,8 @@ describe Paperclip::Storage::S3 do
             object = stub
             @dummy.avatar.stubs(:s3_object).returns(object)
 
-            object.expects((defined?(::Aws) ? :upload_file : :write))
-              .with(anything, :content_type => "image/png",
-                    :acl => Paperclip::Storage::S3::DEFAULT_PERMISSION)
+            object.expects(:upload_file)
+              .with(anything, :content_type => "image/png", acl: :"public-read")
             @dummy.save
           end
 
@@ -1335,9 +1222,9 @@ describe Paperclip::Storage::S3 do
           object = stub
           @dummy.avatar.stubs(:s3_object).returns(object)
 
-          object.expects((defined?(::Aws) ? :upload_file : :write))
+          object.expects(:upload_file)
             .with(anything, content_type: "image/png",
-                  acl: Paperclip::Storage::S3::DEFAULT_PERMISSION,
+                  acl: :"public-read",
                   server_side_encryption: :aes256)
           @dummy.save
         end
@@ -1375,10 +1262,10 @@ describe Paperclip::Storage::S3 do
           object = stub
           @dummy.avatar.stubs(:s3_object).returns(object)
 
-          object.expects((defined?(::Aws) ? :upload_file : :write))
+          object.expects(:upload_file)
             .with(anything,
                   content_type: "image/png",
-                  acl: Paperclip::Storage::S3::DEFAULT_PERMISSION,
+                  acl: :"public-read",
                   storage_class: :reduced_redundancy)
           @dummy.save
         end
@@ -1409,14 +1296,10 @@ describe Paperclip::Storage::S3 do
       assert_equal 'pathname_bucket', @dummy.avatar.bucket_name
 
       assert_equal 'pathname_key',
-        (defined?(::Aws) ?
-         @dummy.avatar.s3_bucket.client.config.access_key_id :
-         @dummy.avatar.s3_bucket.config.access_key_id)
+         @dummy.avatar.s3_bucket.client.config.access_key_id
 
       assert_equal 'pathname_secret',
-        (defined?(::Aws) ?
-         @dummy.avatar.s3_bucket.client.config.secret_access_key :
-         @dummy.avatar.s3_bucket.config.secret_access_key)
+         @dummy.avatar.s3_bucket.client.config.secret_access_key
     end
   end
 
@@ -1440,14 +1323,10 @@ describe Paperclip::Storage::S3 do
       assert_equal 'env_bucket', @dummy.avatar.bucket_name
 
       assert_equal 'env_key',
-        (defined?(::Aws) ?
-          @dummy.avatar.s3_bucket.client.config.access_key_id :
-          @dummy.avatar.s3_bucket.config.access_key_id)
+          @dummy.avatar.s3_bucket.client.config.access_key_id
 
       assert_equal 'env_secret',
-        (defined?(::Aws) ?
-          @dummy.avatar.s3_bucket.client.config.secret_access_key :
-          @dummy.avatar.s3_bucket.config.secret_access_key)
+          @dummy.avatar.s3_bucket.client.config.secret_access_key
     end
   end
 
@@ -1477,10 +1356,8 @@ describe Paperclip::Storage::S3 do
             object = stub
             @dummy.avatar.stubs(:s3_object).returns(object)
 
-            object.expects((defined?(::Aws) ? :upload_file : :write))
-              .with(anything,
-                    content_type: "image/png",
-                    acl: Paperclip::Storage::S3::DEFAULT_PERMISSION)
+            object.expects(:upload_file)
+              .with(anything, content_type: "image/png", acl: :"public-read")
             @dummy.save
           end
 
@@ -1517,7 +1394,7 @@ describe Paperclip::Storage::S3 do
             object = stub
             @dummy.avatar.stubs(:s3_object).returns(object)
 
-            object.expects((defined?(::Aws) ? :upload_file : :write))
+            object.expects(:upload_file)
               .with(anything, content_type: "image/png", acl: :private)
             @dummy.save
           end
@@ -1562,7 +1439,7 @@ describe Paperclip::Storage::S3 do
               object = stub
               @dummy.avatar.stubs(:s3_object).with(style).returns(object)
 
-              object.expects((defined?(::Aws) ? :upload_file : :write))
+              object.expects(:upload_file)
                 .with(anything,
                       content_type: "image/png",
                       acl: style == :thumb ? :public_read : :private)
@@ -1591,7 +1468,7 @@ describe Paperclip::Storage::S3 do
             'secret_access_key' => "54321"
           },
           s3_permissions: lambda {|attachment, style|
-            attachment.instance.private_attachment? && style.to_sym != :thumb ? :private : Paperclip::Storage::S3::DEFAULT_PERMISSION
+            attachment.instance.private_attachment? && style.to_sym != :thumb ? :private : :"public-read"
           }
         )
       end
@@ -1656,10 +1533,10 @@ describe Paperclip::Storage::S3 do
             object = stub
             @dummy.avatar.stubs(:s3_object).with(style).returns(object)
 
-            object.expects((defined?(::Aws) ? :upload_file : :write))
+            object.expects(:upload_file)
               .with(anything,
                     content_type: "image/png",
-                    acl: Paperclip::Storage::S3::DEFAULT_PERMISSION,
+                    acl: :"public-read",
                     content_disposition: 'attachment; filename="Custom Avatar Name.png"')
           end
           @dummy.save
@@ -1691,7 +1568,6 @@ describe Paperclip::Storage::S3 do
     end
   end
 
-
   private
 
   def rails_env(env)

data/spec/paperclip/validators/attachment_size_validator_spec.rb

@@ -12,14 +12,6 @@ describe Paperclip::Validators::AttachmentSizeValidator do
     ))
   end
 
-  def self.storage_units
-    if defined?(ActiveSupport::NumberHelper) # Rails 4.0+
-      { 5120 => '5 KB',       10240 => '10 KB' }
-    else
-      { 5120 => '5120 Bytes', 10240 => '10240 Bytes' }
-    end
-  end
-
   def self.should_allow_attachment_file_size(size)
     context "when the attachment size is #{size}" do
       it "adds error to dummy object" do
@@ -158,8 +150,10 @@ describe Paperclip::Validators::AttachmentSizeValidator do
           message: "is invalid. (Between %{min} and %{max} please.)"
       end
 
-      should_not_allow_attachment_file_size 11.kilobytes,
-        message: "is invalid. (Between #{storage_units[5120]} and #{storage_units[10240]} please.)"
+      should_not_allow_attachment_file_size(
+        11.kilobytes,
+        message: "is invalid. (Between 5 KB and 10 KB please.)"
+      )
     end
 
     context "given :less_than and :greater_than" do
@@ -169,8 +163,10 @@ describe Paperclip::Validators::AttachmentSizeValidator do
           message: "is invalid. (Between %{min} and %{max} please.)"
       end
 
-      should_not_allow_attachment_file_size 11.kilobytes,
-        message: "is invalid. (Between #{storage_units[5120]} and #{storage_units[10240]} please.)"
+      should_not_allow_attachment_file_size(
+        11.kilobytes,
+        message: "is invalid. (Between 5 KB and 10 KB please.)"
+      )
     end
   end
 
@@ -181,10 +177,15 @@ describe Paperclip::Validators::AttachmentSizeValidator do
           less_than: 10.kilobytes
       end
 
-      should_not_allow_attachment_file_size 11.kilobytes,
-        message: "must be less than #{storage_units[10240]}"
-      should_not_allow_attachment_file_size 4.kilobytes,
-        message: "must be greater than #{storage_units[5120]}"
+      should_not_allow_attachment_file_size(
+        11.kilobytes,
+        message: "must be less than 10 KB"
+      )
+
+      should_not_allow_attachment_file_size(
+        4.kilobytes,
+        message: "must be greater than 5 KB"
+      )
     end
 
     context "given a size range" do
@@ -192,10 +193,15 @@ describe Paperclip::Validators::AttachmentSizeValidator do
         build_validator in: (5.kilobytes..10.kilobytes)
       end
 
-      should_not_allow_attachment_file_size 11.kilobytes,
-        message: "must be in between #{storage_units[5120]} and #{storage_units[10240]}"
-      should_not_allow_attachment_file_size 4.kilobytes,
-        message: "must be in between #{storage_units[5120]} and #{storage_units[10240]}"
+      should_not_allow_attachment_file_size(
+        11.kilobytes,
+        message: "must be in between 5 KB and 10 KB"
+      )
+
+      should_not_allow_attachment_file_size(
+        4.kilobytes,
+        message: "must be in between 5 KB and 10 KB"
+      )
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paperclip
 version: !ruby/object:Gem::Version
-  version: 5.0.0.beta1
+  version: 5.0.0.beta2
 platform: ruby
 authors:
 - Jon Yurek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-23 00:00:00.000000000 Z
+date: 2016-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -156,7 +156,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.33
+        version: 2.0.34
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
@@ -166,7 +166,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.33
+        version: 2.0.34
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
@@ -400,7 +400,6 @@ files:
 - RELEASING.md
 - Rakefile
 - UPGRADING
-- cucumber/paperclip_steps.rb
 - features/basic_integration.feature
 - features/migration.feature
 - features/rake_tasks.feature
@@ -594,6 +593,9 @@ post_install_message: |
     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
     `public-read`.
+
+  For a walkthrough of upgrading from 4 to 5 and aws-sdk >= 2.0 you can watch
+  http://rubythursday.com/episodes/ruby-snack-27-upgrade-paperclip-and-aws-sdk-in-prep-for-rails-5
 rdoc_options: []
 require_paths:
 - lib
@@ -610,7 +612,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - ImageMagick
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.2
 signing_key: 
 specification_version: 4
 summary: File attachments as attributes for ActiveRecord

data/cucumber/paperclip_steps.rb

@@ -1,6 +0,0 @@
-When /^I attach an? "([^\"]*)" "([^\"]*)" file to an? "([^\"]*)" on S3$/ do |attachment, extension, model|
-  stub_paperclip_s3(model, attachment, extension)
-  attach_file attachment,
-              "features/support/paperclip/#{model.gsub(" ", "_").underscore}/#{attachment}.#{extension}"
-end
-