kt-paperclip 5.4.0 → 7.1.1

data/spec/support/fixtures/aws_s3.yml

@@ -0,0 +1,13 @@
+default: &default
+  acl: public-read
+development:
+  <<: *default
+  key: 54321
+production:
+  <<: *default
+  key: 12345
+test:
+  <<: *default
+  bucket: <%= ENV['S3_BUCKET'] %>
+  access_key_id: <%= ENV['S3_KEY'] %>
+  secret_access_key: <%= ENV['S3_SECRET'] %>

data/spec/support/matchers/exist.rb

@@ -1,4 +1,4 @@
-RSpec::Matchers.define :exist do |expected|
+RSpec::Matchers.define :exist do |_expected|
   match do |actual|
     File.exist?(actual)
   end

data/spec/support/matchers/have_column.rb

@@ -4,7 +4,7 @@ RSpec::Matchers.define :have_column do |column_name|
   end
 
   match do |columns|
-    column = columns.detect{|column| column.name == column_name }
+    column = columns.detect { |column| column.name == column_name }
     column && column.default.to_s == @default.to_s
   end
 

data/spec/support/mock_url_generator_builder.rb

@@ -1,6 +1,5 @@
 class MockUrlGeneratorBuilder
-  def initializer
-  end
+  def initializer; end
 
   def new(attachment)
     @attachment = attachment
@@ -16,7 +15,7 @@ class MockUrlGeneratorBuilder
 
   def has_generated_url_with_options?(options)
     # options.is_a_subhash_of(@generated_url_with_options)
-    options.inject(true) do |acc,(k,v)|
+    options.inject(true) do |acc, (k, v)|
       acc && @generated_url_with_options[k] == v
     end
   end

data/spec/support/model_reconstruction.rb

@@ -1,7 +1,11 @@
 module ModelReconstruction
-  def reset_class class_name
-    ActiveRecord::Base.send(:include, Paperclip::Glue)
-    Object.send(:remove_const, class_name) rescue nil
+  def reset_class(class_name)
+    ActiveRecord::Base.include Paperclip::Glue
+    begin
+      Object.send(:remove_const, class_name)
+    rescue StandardError
+      nil
+    end
     klass = Object.const_set(class_name, Class.new(ActiveRecord::Base))
 
     klass.class_eval do
@@ -22,29 +26,29 @@ module ModelReconstruction
     klass
   end
 
-  def reset_table table_name, &block
-    block ||= lambda { |table| true }
-    ActiveRecord::Base.connection.create_table :dummies, **{force: true}, &block
+  def reset_table(_table_name, &block)
+    block ||= lambda { |_table| true }
+    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
 
-  def rebuild_model options = {}
-    ActiveRecord::Base.connection.create_table :dummies, **{force: true} do |table|
+  def rebuild_model(options = {})
+    ActiveRecord::Base.connection.create_table :dummies, force: true do |table|
       table.column :title, :string
       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
     rebuild_class options
   end
 
-  def rebuild_class options = {}
+  def rebuild_class(options = {})
     reset_class("Dummy").tap do |klass|
       klass.has_attached_file :avatar, options
       klass.do_not_validate_attachment_file_type :avatar
@@ -52,7 +56,7 @@ module ModelReconstruction
     end
   end
 
-  def rebuild_meta_class_of obj, options = {}
+  def rebuild_meta_class_of(obj, options = {})
     meta_class_of(obj).tap do |metaklass|
       metaklass.has_attached_file :avatar, options
       metaklass.do_not_validate_attachment_file_type :avatar

data/spec/support/reporting.rb

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

data/spec/support/test_data.rb

@@ -1,5 +1,5 @@
 module TestData
-  def attachment(options={})
+  def attachment(options = {})
     Paperclip::Attachment.new(:avatar, FakeModel.new, options)
   end
 
@@ -8,6 +8,6 @@ module TestData
   end
 
   def fixture_file(filename)
-    File.join(File.dirname(__FILE__), 'fixtures', filename)
+    File.join(File.dirname(__FILE__), "fixtures", filename)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kt-paperclip
 version: !ruby/object:Gem::Version
-  version: 5.4.0
+  version: 7.1.1
 platform: ruby
 authors:
 - Surendra Singhi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-21 00:00:00.000000000 Z
+date: 2022-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -17,9 +17,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,9 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -37,9 +31,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -47,51 +38,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6.0'
 - !ruby/object:Gem::Dependency
-  name: terrapin
+  name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: mime-types
+  name: marcel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
-  name: mimemagic
+  name: terrapin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.8
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.8
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -99,9 +87,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -109,11 +94,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6.0'
 - !ruby/object:Gem::Dependency
-  name: shoulda
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -127,21 +109,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 0.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
-  name: appraisal
+  name: aws-sdk-s3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -155,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mocha
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -169,39 +151,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: aws-sdk
+  name: capybara
   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
+  name: cucumber-expressions
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: cucumber-rails
   requirement: !ruby/object:Gem::Requirement
@@ -217,35 +193,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: cucumber-expressions
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        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
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.0
-- !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: fakeweb
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -259,7 +207,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: capybara
+  name: fog-aws
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -273,7 +221,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: fog-local
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -287,7 +235,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: fog-aws
+  name: generator_spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -301,7 +249,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: fog-local
+  name: launchy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -315,7 +263,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: launchy
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -329,7 +277,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -343,7 +291,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: fakeweb
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -357,27 +305,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: railties
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.2.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.2.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: generator_spec
+  name: shoulda
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -412,6 +354,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".codeclimate.yml"
+- ".github/FUNDING.yml"
+- ".github/ISSUE_TEMPLATE/bug_report.md"
+- ".github/ISSUE_TEMPLATE/custom.md"
+- ".github/ISSUE_TEMPLATE/feature_request.md"
 - ".gitignore"
 - ".hound.yml"
 - ".rubocop.yml"
@@ -444,6 +390,11 @@ files:
 - features/support/selectors.rb
 - gemfiles/4.2.gemfile
 - gemfiles/5.0.gemfile
+- gemfiles/5.1.gemfile
+- gemfiles/5.2.gemfile
+- gemfiles/6.0.gemfile
+- gemfiles/6.1.gemfile
+- gemfiles/7.0.gemfile
 - lib/generators/paperclip/USAGE
 - lib/generators/paperclip/paperclip_generator.rb
 - lib/generators/paperclip/templates/paperclip_migration.rb.erb
@@ -568,7 +519,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
@@ -577,12 +527,14 @@ files:
 - spec/support/fixtures/animated
 - spec/support/fixtures/animated.gif
 - spec/support/fixtures/animated.unknown
+- spec/support/fixtures/aws_s3.yml
 - spec/support/fixtures/bad.png
 - spec/support/fixtures/empty.html
 - spec/support/fixtures/empty.xlsx
 - spec/support/fixtures/fog.yml
 - spec/support/fixtures/rotated.jpg
 - spec/support/fixtures/s3.yml
+- spec/support/fixtures/sample.xlsm
 - spec/support/fixtures/spaced file.jpg
 - spec/support/fixtures/spaced file.png
 - spec/support/fixtures/text.txt
@@ -607,9 +559,9 @@ post_install_message: |
   #  NOTE FOR UPGRADING FROM 4.3.0 OR EARLIER      #
   ##################################################
 
-  Paperclip is now compatible with aws-sdk >= 2.0.0.
+  Paperclip is now compatible with aws-sdk-s3.
 
-  If you are using S3 storage, aws-sdk >= 2.0.0 requires you to make a few small
+  If you are using S3 storage, aws-sdk-s3 requires you to make a few small
   changes:
 
   * You must set the `s3_region`
@@ -618,7 +570,7 @@ post_install_message: |
     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
+  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:
@@ -627,7 +579,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

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