paperclip 4.3.7 → 6.1.0

data/spec/paperclip/validators_spec.rb

@@ -3,6 +3,7 @@ require 'spec_helper'
 describe Paperclip::Validators do
   context "using the helper" do
     before do
+      rebuild_class
       Dummy.validates_attachment :avatar, presence: true, content_type: { content_type: "image/jpeg" }, size: { in: 0..10240 }
     end
 
@@ -30,8 +31,8 @@ describe Paperclip::Validators do
     before do
       rebuild_class
       Dummy.validates_attachment :avatar, file_type_ignorance: true, file_name: [
-          { matches: /\A.*\.jpe?g\Z/i, message: :invalid_extension },
-          { matches: /\A.{,8}\..+\Z/i, message: [:too_long, count: 8] },
+          { matches: /\A.*\.jpe?g\z/i, message: :invalid_extension },
+          { matches: /\A.{,8}\..+\z/i, message: [:too_long, count: 8] },
       ]
     end
 
@@ -64,12 +65,11 @@ describe Paperclip::Validators do
       assert_raises(RuntimeError){ dummy.valid? }
     end
 
-    it 'allows you to attach a file that does not violates these validations' do
+    it 'allows you to attach a file that does not violate these validations' do
       dummy = Dummy.new(avatar: File.new(fixture_file('rotated.jpg')))
-      expect(dummy.errors.keys).to match_array []
+      expect(dummy.errors.full_messages).to be_empty
       assert dummy.valid?
     end
-
   end
 
   context "using the helper with a conditional" do

data/spec/spec_helper.rb

@@ -7,6 +7,8 @@ require 'active_support/core_ext'
 require 'mocha/api'
 require 'bourne'
 require 'ostruct'
+require 'pathname'
+require 'activerecord-import'
 
 ROOT = Pathname(File.expand_path(File.join(File.dirname(__FILE__), '..')))
 
@@ -20,7 +22,8 @@ FIXTURES_DIR = File.join(File.dirname(__FILE__), "fixtures")
 config = YAML::load(IO.read(File.dirname(__FILE__) + '/database.yml'))
 ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/debug.log")
 ActiveRecord::Base.establish_connection(config['test'])
-unless ActiveRecord::VERSION::STRING < "4.2"
+if ActiveRecord::VERSION::STRING >= "4.2" &&
+    ActiveRecord::VERSION::STRING < "5.0"
   ActiveRecord::Base.raise_in_transactional_callbacks = true
 end
 Paperclip.options[:logger] = ActiveRecord::Base.logger
@@ -34,8 +37,8 @@ RSpec.configure do |config|
   config.include Assertions
   config.include ModelReconstruction
   config.include TestData
+  config.include Reporting
   config.extend VersionHelper
-  config.extend RailsHelpers::ClassMethods
   config.mock_framework = :mocha
   config.before(:all) do
     rebuild_model

data/spec/support/assertions.rb

@@ -48,19 +48,30 @@ module Assertions
   end
 
   def assert_success_response(url)
+    url = "http:#{url}" unless url =~ /http/
     Net::HTTP.get_response(URI.parse(url)) do |response|
-      assert_equal "200", response.code,
+      assert_equal "200",
+        response.code,
         "Expected HTTP response code 200, got #{response.code}"
     end
   end
 
   def assert_not_found_response(url)
+    url = "http:#{url}" unless url =~ /http/
     Net::HTTP.get_response(URI.parse(url)) do |response|
       assert_equal "404", response.code,
         "Expected HTTP response code 404, got #{response.code}"
     end
   end
 
+  def assert_forbidden_response(url)
+    url = "http:#{url}" unless url =~ /http/
+    Net::HTTP.get_response(URI.parse(url)) do |response|
+      assert_equal "403", response.code,
+        "Expected HTTP response code 403, got #{response.code}"
+    end
+  end
+
   def assert_frame_dimensions(range, frames)
     frames.each_with_index do |frame, frame_index|
       frame.split('x').each_with_index do |dimension, dimension_index |

data/spec/support/mock_attachment.rb

@@ -1,7 +1,9 @@
 class MockAttachment
   attr_accessor :updated_at, :original_filename
+  attr_reader :options
 
   def initialize(options = {})
+    @options = options
     @model = options[:model]
     @responds_to_updated_at = options[:responds_to_updated_at]
     @updated_at = options[:updated_at]

data/spec/support/mock_url_generator_builder.rb

@@ -2,9 +2,9 @@ class MockUrlGeneratorBuilder
   def initializer
   end
 
-  def new(attachment, attachment_options)
+  def new(attachment)
     @attachment = attachment
-    @attachment_options = attachment_options
+    @attachment_options = @attachment.options
     self
   end
 

data/spec/support/model_reconstruction.rb

@@ -10,7 +10,15 @@ module ModelReconstruction
 
     klass.reset_column_information
     klass.connection_pool.clear_table_cache!(klass.table_name) if klass.connection_pool.respond_to?(:clear_table_cache!)
-    klass.connection.schema_cache.clear_table_cache!(klass.table_name) if klass.connection.respond_to?(:schema_cache)
+
+    if klass.connection.respond_to?(:schema_cache)
+      if ActiveRecord::VERSION::STRING >= "5.0"
+        klass.connection.schema_cache.clear_data_source_cache!(klass.table_name)
+      else
+        klass.connection.schema_cache.clear_table_cache!(klass.table_name)
+      end
+    end
+
     klass
   end
 
@@ -19,7 +27,7 @@ module ModelReconstruction
     ActiveRecord::Base.connection.create_table :dummies, {force: true}, &block
   end
 
-  def modify_table table_name, &block
+  def modify_table &block
     ActiveRecord::Base.connection.change_table :dummies, &block
   end
 
@@ -29,7 +37,7 @@ module ModelReconstruction
       table.column :other, :string
       table.column :avatar_file_name, :string
       table.column :avatar_content_type, :string
-      table.column :avatar_file_size, :integer
+      table.column :avatar_file_size, :bigint
       table.column :avatar_updated_at, :datetime
       table.column :avatar_fingerprint, :string
     end

data/spec/support/reporting.rb

@@ -0,0 +1,11 @@
+module Reporting
+  def silence_stream(stream)
+    old_stream = stream.dup
+    stream.reopen(RbConfig::CONFIG['host_os'] =~ /mswin|mingw/ ? 'NUL:' : '/dev/null')
+    stream.sync = true
+    yield
+  ensure
+    stream.reopen(old_stream)
+    old_stream.close
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paperclip
 version: !ruby/object:Gem::Version
-  version: 4.3.7
+  version: 6.1.0
 platform: ruby
 authors:
 - Jon Yurek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-01 00:00:00.000000000 Z
+date: 2018-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
-  name: cocaine
+  name: terrapin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.5
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.5
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
@@ -70,14 +70,14 @@ dependencies:
   name: mimemagic
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.0
 - !ruby/object:Gem::Dependency
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
@@ -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: 1.5.7
-    - - "<="
-      - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.7
-    - - "<="
-      - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bourne
   requirement: !ruby/object:Gem::Requirement
@@ -185,19 +179,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: cucumber
+  name: cucumber-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.18
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: cucumber-expressions
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.18
+        version: 4.0.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 4.0.3
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
@@ -338,20 +346,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: actionmailer
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.2.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: generator_spec
   requirement: !ruby/object:Gem::Requirement
@@ -387,6 +381,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".codeclimate.yml"
+- ".github/issue_template.md"
 - ".gitignore"
 - ".hound.yml"
 - ".rubocop.yml"
@@ -395,12 +391,13 @@ files:
 - CONTRIBUTING.md
 - Gemfile
 - LICENSE
+- MIGRATING-ES.md
+- MIGRATING.md
 - NEWS
 - README.md
 - RELEASING.md
 - Rakefile
 - UPGRADING
-- cucumber/paperclip_steps.rb
 - features/basic_integration.feature
 - features/migration.feature
 - features/rake_tasks.feature
@@ -418,9 +415,8 @@ files:
 - features/support/paths.rb
 - features/support/rails.rb
 - features/support/selectors.rb
-- gemfiles/3.2.gemfile
-- gemfiles/4.1.gemfile
 - gemfiles/4.2.gemfile
+- gemfiles/5.0.gemfile
 - lib/generators/paperclip/USAGE
 - lib/generators/paperclip/paperclip_generator.rb
 - lib/generators/paperclip/templates/paperclip_migration.rb.erb
@@ -429,7 +425,6 @@ files:
 - lib/paperclip/attachment_registry.rb
 - lib/paperclip/callbacks.rb
 - lib/paperclip/content_type_detector.rb
-- lib/paperclip/deprecations.rb
 - lib/paperclip/errors.rb
 - lib/paperclip/file_command_content_type_detector.rb
 - lib/paperclip/filename_cleaner.rb
@@ -453,14 +448,7 @@ files:
 - lib/paperclip/io_adapters/stringio_adapter.rb
 - lib/paperclip/io_adapters/uploaded_file_adapter.rb
 - lib/paperclip/io_adapters/uri_adapter.rb
-- lib/paperclip/locales/de.yml
 - lib/paperclip/locales/en.yml
-- lib/paperclip/locales/es.yml
-- lib/paperclip/locales/ja.yml
-- lib/paperclip/locales/pt-BR.yml
-- lib/paperclip/locales/zh-CN.yml
-- lib/paperclip/locales/zh-HK.yml
-- lib/paperclip/locales/zh-TW.yml
 - lib/paperclip/logger.rb
 - lib/paperclip/matchers.rb
 - lib/paperclip/matchers/have_attached_file_matcher.rb
@@ -500,7 +488,6 @@ files:
 - spec/paperclip/attachment_registry_spec.rb
 - spec/paperclip/attachment_spec.rb
 - spec/paperclip/content_type_detector_spec.rb
-- spec/paperclip/deprecations_spec.rb
 - spec/paperclip/file_command_content_type_detector_spec.rb
 - spec/paperclip/filename_cleaner_spec.rb
 - spec/paperclip/geometry_detector_spec.rb
@@ -542,6 +529,7 @@ files:
 - spec/paperclip/storage/s3_spec.rb
 - spec/paperclip/style_spec.rb
 - spec/paperclip/tempfile_factory_spec.rb
+- spec/paperclip/tempfile_spec.rb
 - spec/paperclip/thumbnail_spec.rb
 - spec/paperclip/url_generator_spec.rb
 - spec/paperclip/validators/attachment_content_type_validator_spec.rb
@@ -552,7 +540,6 @@ files:
 - spec/paperclip/validators_spec.rb
 - spec/spec_helper.rb
 - spec/support/assertions.rb
-- spec/support/deprecations.rb
 - spec/support/fake_model.rb
 - spec/support/fake_rails.rb
 - spec/support/fixtures/12k.png
@@ -579,14 +566,31 @@ files:
 - spec/support/mock_interpolator.rb
 - spec/support/mock_url_generator_builder.rb
 - spec/support/model_reconstruction.rb
-- spec/support/rails_helpers.rb
+- spec/support/reporting.rb
 - spec/support/test_data.rb
 - spec/support/version_helper.rb
 homepage: https://github.com/thoughtbot/paperclip
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message: |
+  ##################################################
+  #  NOTE FOR UPGRADING FROM 4.3.0 OR EARLIER      #
+  ##################################################
+
+  Paperclip is now compatible with aws-sdk-s3.
+
+  If you are using S3 storage, aws-sdk-s3 requires you to make a few small
+  changes:
+
+  * You must set the `s3_region`
+  * If you are explicitly setting permissions anywhere, such as in an initializer,
+    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* (not 6) 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
@@ -594,7 +598,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -603,7 +607,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - ImageMagick
 rubyforge_project: 
-rubygems_version: 2.6.2
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: File attachments as attributes for ActiveRecord
@@ -631,7 +635,6 @@ test_files:
 - spec/paperclip/attachment_registry_spec.rb
 - spec/paperclip/attachment_spec.rb
 - spec/paperclip/content_type_detector_spec.rb
-- spec/paperclip/deprecations_spec.rb
 - spec/paperclip/file_command_content_type_detector_spec.rb
 - spec/paperclip/filename_cleaner_spec.rb
 - spec/paperclip/geometry_detector_spec.rb
@@ -673,6 +676,7 @@ test_files:
 - spec/paperclip/storage/s3_spec.rb
 - spec/paperclip/style_spec.rb
 - spec/paperclip/tempfile_factory_spec.rb
+- spec/paperclip/tempfile_spec.rb
 - spec/paperclip/thumbnail_spec.rb
 - spec/paperclip/url_generator_spec.rb
 - spec/paperclip/validators/attachment_content_type_validator_spec.rb
@@ -683,7 +687,6 @@ test_files:
 - spec/paperclip/validators_spec.rb
 - spec/spec_helper.rb
 - spec/support/assertions.rb
-- spec/support/deprecations.rb
 - spec/support/fake_model.rb
 - spec/support/fake_rails.rb
 - spec/support/fixtures/12k.png
@@ -710,6 +713,6 @@ test_files:
 - spec/support/mock_interpolator.rb
 - spec/support/mock_url_generator_builder.rb
 - spec/support/model_reconstruction.rb
-- spec/support/rails_helpers.rb
+- spec/support/reporting.rb
 - spec/support/test_data.rb
 - spec/support/version_helper.rb