kt-paperclip 7.1.1 → 7.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 669710c8c7ce2b2bc967e6e4896e8baf9bf3ed5c091dc793eff8c906152b188a
-  data.tar.gz: a8af06de8724aaf50001704dfb4a58acfc69e68a579054c0d047562cca4acdff
+  metadata.gz: a7308352f1d792e5e861ba828d1eb3994b5956fc51df06a4cbfedfe134ce105d
+  data.tar.gz: be4d4161c411a18edaf2a92b5a48d746d87d01f3d5a6e4fe5fecc20f87ad42a4
 SHA512:
-  metadata.gz: 688c24cb640ae5b6fdc0f8db3bca0a67f86e033a3920c9eb68d63fd8526a54562ccc70188cbb7daf65c01338ddc6f096144dc4f33fb979412bdd48415051dff5
-  data.tar.gz: 5476e60a4d1b00139b12f69ca076094f6ea69ad2e8050552dc4695fdfeaca158c89fe496c1c484ed828ee67c3946cdbac1c50e550a6490f239aa35621d11ede9
+  metadata.gz: e202f7d5a1a9466f69118e485c5c747f10942644337940b6141ffb41904118353cab09858fbdabf4e68ba87d9e5199109a1a1525d7eaeea4a1601ba9e384459f
+  data.tar.gz: 20fb1d6bd39a2d21a5b2f627d5ab92aba95ae88d523319de7b06e5e0983c281e76ae218a6bccf64fdc16362652cb1cc1251eab7fdacc14b6428b8dbafd2bdc81

data/NEWS

@@ -1,5 +1,13 @@
 [UNRELEASED]
-Issue file delete only once per unique style when nullifying attachment or destroying an object. Avoids triggering a rate limit error on Google Cloud Storage.
+
+7.2.1 (2023-09-09)
+* Improvement: Support file extension names both as symbols and strings for :content_type_mappings
+
+7.2.0 (2023-05-30)
+* Paperclip schema statements are consistent with ActiveRecord::Migration::Compatibility versioning. Old migrations containing Paperclip schema statements perform the same schema changes both before and after an ActiveRecord version upgrade.
+
+7.0.1 (2021-10-06)
+* Issue file delete only once per unique style when nullifying attachment or destroying an object. Avoids triggering a rate limit error on Google Cloud Storage.
 
 7.0.0 (2021-05-28)
 * Replace `mimemagic` gem with `marcel` due to licensing issues. See https://github.com/kreeti/kt-paperclip/pull/54 for details and limitations

data/README.md

@@ -592,9 +592,9 @@ Storage
 
 Paperclip ships with 3 storage adapters:
 
-* File Storage
-* S3 Storage (via `aws-sdk-s3`)
-* Fog Storage
+* File Storage (`storage: :filesystem`)
+* S3 Storage (via `aws-sdk-s3`) (`storage: :s3`)
+* Fog Storage (`storage: :fog`)
 
 If you would like to use Paperclip with another storage, you can install these
 gems along side with Paperclip:

data/lib/paperclip/geometry_detector_factory.rb

@@ -7,7 +7,7 @@ module Paperclip
 
     def make
       geometry = GeometryParser.new(geometry_string.strip).make
-      geometry || raise(Errors::NotIdentifiedByImageMagickError.new)
+      geometry || raise(Errors::NotIdentifiedByImageMagickError.new("Could not identify image size"))
     end
 
     private

data/lib/paperclip/glue.rb

@@ -4,14 +4,15 @@ require "paperclip/schema"
 
 module Paperclip
   module Glue
+    LOCALE_PATHS = Dir.glob("#{File.dirname(__FILE__)}/locales/*.{rb,yml}")
+
     def self.included(base)
       base.extend ClassMethods
       base.send :include, Callbacks
       base.send :include, Validators
       base.send :include, Schema if defined? ActiveRecord::Base
 
-      locale_path = Dir.glob(File.dirname(__FILE__) + "/locales/*.{rb,yml}")
-      I18n.load_path += locale_path unless I18n.load_path.include?(locale_path)
+      I18n.load_path += LOCALE_PATHS unless (LOCALE_PATHS - I18n.load_path).empty?
     end
   end
 end

data/lib/paperclip/interpolations.rb

@@ -54,10 +54,14 @@ module Paperclip
     # Returns the interpolated URL. Will raise an error if the url itself
     # contains ":url" to prevent infinite recursion. This interpolation
     # is used in the default :path to ease default specifications.
-    RIGHT_HERE = "#{__FILE__.gsub(%r{\A\./}, '')}:#{__LINE__ + 3}"
     def url(attachment, style_name)
-      raise Errors::InfiniteInterpolationError if caller.any? { |b| b.index(RIGHT_HERE) }
+      if Thread.current.thread_variable_get(:kt_paperclip_no_recursion)
+        raise Errors::InfiniteInterpolationError
+      end
+      Thread.current.thread_variable_set(:kt_paperclip_no_recursion, true)
       attachment.url(style_name, timestamp: false, escape: false)
+    ensure
+      Thread.current.thread_variable_set(:kt_paperclip_no_recursion, false)
     end
 
     # Returns the timestamp as defined by the <attachment>_updated_at field

data/lib/paperclip/locales/gd.yml

@@ -0,0 +1,20 @@
+gd:
+  errors:
+    messages:
+      in_between: "– feumaidh seo a bhith eadar %{min} ’s %{max}"
+      spoofed_media_type: "– tha susbaint ann nach eil a-rèir na chaidh aithris"
+
+  number:
+    human:
+      storage_units:
+        format: "%n %u"
+        units:
+          byte:
+            one:   "bhaidht"
+            two:   "bhaidht"
+            few:   "baidhtean"
+            other: "baidht"
+          kb: "KB"
+          mb: "MB"
+          gb: "GB"
+          tb: "TB"

data/lib/paperclip/media_type_spoof_detector.rb

@@ -76,11 +76,14 @@ module Paperclip
       Paperclip.run("file", "-b --mime :file", file: @file.path).
         split(/[:;\s]+/).first
     rescue Terrapin::CommandLineError
+      Paperclip.log("Problem getting type from `file` command. Possible that `file` doesn't exist on this system. Content Type validations don't work without this.")
+
       ""
     end
 
     def mapped_content_type
-      Paperclip.options[:content_type_mappings][filename_extension]
+      content_type_mappings = Paperclip.options[:content_type_mappings]
+      content_type_mappings[filename_extension] || content_type_mappings[filename_extension.to_s]
     end
 
     def filename_extension

data/lib/paperclip/schema.rb

@@ -6,12 +6,12 @@ module Paperclip
     COLUMNS = { file_name: :string,
                 content_type: :string,
                 file_size: :bigint,
-                updated_at: :datetime }.freeze
+                updated_at: :datetime }
 
     def self.included(_base)
       ActiveRecord::ConnectionAdapters::Table.include TableDefinition
       ActiveRecord::ConnectionAdapters::TableDefinition.include TableDefinition
-      ActiveRecord::ConnectionAdapters::AbstractAdapter.include Statements
+      ActiveRecord::Migration.include Statements
       ActiveRecord::Migration::CommandRecorder.include CommandRecorder
     end
 

data/lib/paperclip/storage/s3.rb

@@ -137,6 +137,9 @@ module Paperclip
           @s3_headers = {}
           merge_s3_headers(@options[:s3_headers], @s3_headers, @s3_metadata)
 
+          @s3_acl_enabled = @options[:s3_acl_enabled]
+          @s3_acl_enabled = true if @s3_acl_enabled.nil?
+
           @s3_storage_class = set_storage_class(@options[:s3_storage_class])
 
           @s3_server_side_encryption = "AES256"
@@ -359,9 +362,12 @@ module Paperclip
             log("saving #{path(style)}")
             write_options = {
               content_type: file.content_type,
-              acl: s3_permissions(style)
             }
 
+            if @s3_acl_enabled
+              write_options[:acl] = s3_permissions(style)
+            end
+
             # add storage class for this style if defined
             storage_class = s3_storage_class(style)
             write_options.merge!(storage_class: storage_class) if storage_class
@@ -427,9 +433,9 @@ module Paperclip
       def find_credentials(creds)
         case creds
         when File
-          YAML::safe_load(ERB.new(File.read(creds.path)).result, [], [], true)
+          load_credentials_from_file(creds.path)
         when String, Pathname
-          YAML::safe_load(ERB.new(File.read(creds)).result, [], [], true)
+          load_credentials_from_file(creds)
         when Hash
           creds
         when NilClass
@@ -439,6 +445,14 @@ module Paperclip
         end
       end
 
+      def load_credentials_from_file(path)
+        if Gem::Version.new(Psych::VERSION) >= Gem::Version.new("3.1.0")
+          YAML::safe_load(ERB.new(File.read(path)).result, aliases: true)
+        else
+          YAML::safe_load(ERB.new(File.read(path)).result, [], [], true)
+        end
+      end
+
       def use_secure_protocol?(style_name)
         s3_protocol(style_name) == "https"
       end

data/lib/paperclip/validators/attachment_size_validator.rb

@@ -35,8 +35,8 @@ module Paperclip
           options.slice(*AVAILABLE_CHECKS).each do |option, option_value|
             option_value = option_value.call(record) if option_value.is_a?(Proc)
             option_value = extract_option_value(option, option_value)
-            operator = Rails::VERSION::MAJOR >= 7 ? COMPARE_CHECKS[option] : CHECKS[option]
-              
+            operator = ActiveModel::VERSION::MAJOR >= 7 ? COMPARE_CHECKS[option] : CHECKS[option]
+
             unless value.send(operator, option_value)
               error_message_key = options[:in] ? :in_between : option
               error_attrs.each do |error_attr_name|

data/lib/paperclip/version.rb

@@ -1,3 +1,3 @@
 module Paperclip
-  VERSION = "7.1.1" unless defined?(Paperclip::VERSION)
+  VERSION = "7.2.2" unless defined?(Paperclip::VERSION)
 end

data/paperclip.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
   s.add_dependency("activesupport", ">= 4.2.0")
   s.add_dependency("mime-types")
   s.add_dependency("marcel", "~> 1.0.1")
-  s.add_dependency("terrapin", "~> 0.6.0")
+  s.add_dependency("terrapin", ">= 0.6.0", "< 2.0")
 
   s.add_development_dependency("activerecord", ">= 4.2.0")
   s.add_development_dependency("appraisal")

data/spec/paperclip/attachment_spec.rb

@@ -1333,7 +1333,7 @@ describe Paperclip::Attachment do
 
   context "An attachment with only a avatar_file_name column" do
     before do
-      ActiveRecord::Base.connection.create_table :dummies, force: true do |table|
+      ActiveRecord::Migration.create_table :dummies, force: true do |table|
         table.column :avatar_file_name, :string
       end
       rebuild_class
@@ -1359,7 +1359,7 @@ describe Paperclip::Attachment do
 
     context "and avatar_created_at column" do
       before do
-        ActiveRecord::Base.connection.add_column :dummies, :avatar_created_at, :timestamp
+        ActiveRecord::Migration.add_column :dummies, :avatar_created_at, :timestamp
         rebuild_class
         @dummy = Dummy.new
       end
@@ -1396,7 +1396,7 @@ describe Paperclip::Attachment do
 
     context "and avatar_updated_at column" do
       before do
-        ActiveRecord::Base.connection.add_column :dummies, :avatar_updated_at, :timestamp
+        ActiveRecord::Migration.add_column :dummies, :avatar_updated_at, :timestamp
         rebuild_class
         @dummy = Dummy.new
       end
@@ -1426,7 +1426,7 @@ describe Paperclip::Attachment do
 
     context "and avatar_content_type column" do
       before do
-        ActiveRecord::Base.connection.add_column :dummies, :avatar_content_type, :string
+        ActiveRecord::Migration.add_column :dummies, :avatar_content_type, :string
         rebuild_class
         @dummy = Dummy.new
       end
@@ -1443,7 +1443,7 @@ describe Paperclip::Attachment do
 
     context "and avatar_file_size column" do
       before do
-        ActiveRecord::Base.connection.add_column :dummies, :avatar_file_size, :bigint
+        ActiveRecord::Migration.add_column :dummies, :avatar_file_size, :bigint
         rebuild_class
         @dummy = Dummy.new
       end
@@ -1467,7 +1467,7 @@ describe Paperclip::Attachment do
 
     context "and avatar_fingerprint column" do
       before do
-        ActiveRecord::Base.connection.add_column :dummies, :avatar_fingerprint, :string
+        ActiveRecord::Migration.add_column :dummies, :avatar_fingerprint, :string
         rebuild_class
         @dummy = Dummy.new
       end

data/spec/paperclip/geometry_detector_spec.rb

@@ -35,4 +35,13 @@ describe Paperclip::GeometryDetector do
       Paperclip.options[:use_exif_orientation] = true
     end
   end
+
+  it "raises an exception with a message when the file is not an image" do
+    file = fixture_file("text.txt")
+    factory = Paperclip::GeometryDetector.new(file)
+
+    expect do
+      factory.make
+    end.to raise_error(Paperclip::Errors::NotIdentifiedByImageMagickError, "Could not identify image size")
+  end
 end

data/spec/paperclip/geometry_spec.rb

@@ -147,23 +147,35 @@ describe Paperclip::Geometry do
 
     it "does not generate from a bad file" do
       file = "/home/This File Does Not Exist.omg"
-      expect { @geo = Paperclip::Geometry.from_file(file) }.to raise_error(Paperclip::Errors::NotIdentifiedByImageMagickError)
+      expect do
+        @geo = Paperclip::Geometry.from_file(file)
+      end.to raise_error(Paperclip::Errors::NotIdentifiedByImageMagickError,
+                         "Could not identify image size")
     end
 
     it "does not generate from a blank filename" do
       file = ""
-      expect { @geo = Paperclip::Geometry.from_file(file) }.to raise_error(Paperclip::Errors::NotIdentifiedByImageMagickError)
+      expect do
+        @geo = Paperclip::Geometry.from_file(file)
+      end.to raise_error(Paperclip::Errors::NotIdentifiedByImageMagickError,
+                         "Cannot find the geometry of a file with a blank name")
     end
 
     it "does not generate from a nil file" do
       file = nil
-      expect { @geo = Paperclip::Geometry.from_file(file) }.to raise_error(Paperclip::Errors::NotIdentifiedByImageMagickError)
+      expect do
+        @geo = Paperclip::Geometry.from_file(file)
+      end.to raise_error(Paperclip::Errors::NotIdentifiedByImageMagickError,
+                         "Cannot find the geometry of a file with a blank name")
     end
 
     it "does not generate from a file with no path" do
       file = double("file", path: "")
       allow(file).to receive(:respond_to?).with(:path).and_return(true)
-      expect { @geo = Paperclip::Geometry.from_file(file) }.to raise_error(Paperclip::Errors::NotIdentifiedByImageMagickError)
+      expect do
+        @geo = Paperclip::Geometry.from_file(file)
+      end.to raise_error(Paperclip::Errors::NotIdentifiedByImageMagickError,
+                         "Cannot find the geometry of a file with a blank name")
     end
 
     it "lets us know when a command isn't found versus a processing error" do

data/spec/paperclip/glue_spec.rb

@@ -39,4 +39,25 @@ describe Paperclip::Glue do
       Object.send :remove_const, "NonActiveRecordModel"
     end
   end
+
+  describe "when included" do
+    it "does not mutate I18n.load_path more than once" do
+      before_load_path = I18n.load_path
+      I18n.load_path = []
+
+      # expect twice because the load_path is reset after creating the classes
+      expect(I18n.config).to receive(:load_path=).and_call_original.twice
+
+      FirstModel = Class.new
+      FirstModel.include Paperclip::Glue
+
+      SecondModel = Class.new
+      SecondModel.include Paperclip::Glue
+
+      ThirdModel = Class.new
+      ThirdModel.include Paperclip::Glue
+
+      I18n.load_path = before_load_path
+    end
+  end
 end

data/spec/paperclip/io_adapters/uri_adapter_spec.rb

@@ -224,7 +224,7 @@ describe Paperclip::UriAdapter do
 
       it "calls open with read_timeout option" do
         expect(@uri_opener)
-          .to receive(:open).with(@uri, read_timeout: 120).at_least(1).times
+          .to receive(:open).with(@uri, { read_timeout: 120 }).at_least(1).times
       end
     end
   end

data/spec/paperclip/media_type_spoof_detector_spec.rb

@@ -32,12 +32,18 @@ describe Paperclip::MediaTypeSpoofDetector do
   end
 
   it "does not reject when the extension => content_type is in :content_type_mappings" do
+    file = Tempfile.open(["test", ".PEM"])
+    file.puts "Certificate!"
+    file.close
+
+    adapter = Paperclip.io_adapters.for(File.new(file.path))
+
     begin
       Paperclip.options[:content_type_mappings] = { pem: "text/plain" }
-      file = Tempfile.open(["test", ".PEM"])
-      file.puts "Certificate!"
-      file.close
-      adapter = Paperclip.io_adapters.for(File.new(file.path))
+      assert !Paperclip::MediaTypeSpoofDetector.using(adapter, adapter.original_filename, adapter.content_type).spoofed?
+
+      # As a string.
+      Paperclip.options[:content_type_mappings] = { "pem" => "text/plain" }
       assert !Paperclip::MediaTypeSpoofDetector.using(adapter, adapter.original_filename, adapter.content_type).spoofed?
     ensure
       Paperclip.options[:content_type_mappings] = {}

data/spec/paperclip/paperclip_missing_attachment_styles_spec.rb

@@ -49,7 +49,7 @@ describe "Missing Attachment Styles" do
     expected_hash = { Dummy: { avatar: [:export, :thumb] } }
     assert_equal expected_hash, Paperclip.missing_attachments_styles
 
-    ActiveRecord::Base.connection.create_table :books, force: true
+    ActiveRecord::Migration.create_table :books, force: true
     class ::Book < ActiveRecord::Base
       has_attached_file :cover, styles: { small: "x100", large: "1000x1000>" }
       has_attached_file :sample, styles: { thumb: "x100" }

data/spec/paperclip/paperclip_spec.rb

@@ -63,7 +63,7 @@ describe Paperclip do
   context "Calling Paperclip.run with a logger" do
     it "passes the defined logger if :log_command is set" do
       Paperclip.options[:log_command] = true
-      expect(Terrapin::CommandLine).to receive(:new).with("convert", "stuff", logger: Paperclip.logger).and_return(double(run: nil))
+      expect(Terrapin::CommandLine).to receive(:new).with("convert", "stuff", { logger: Paperclip.logger }).and_return(double(run: nil))
       Paperclip.run("convert", "stuff")
     end
   end

data/spec/paperclip/schema_spec.rb

@@ -11,7 +11,7 @@ describe Paperclip::Schema do
 
   after do
     begin
-      Dummy.connection.drop_table :dummies
+      ActiveRecord::Migration.drop_table :dummies
     rescue StandardError
       nil
     end
@@ -23,7 +23,7 @@ describe Paperclip::Schema do
         ActiveSupport::Deprecation.silenced = false
       end
       it "creates attachment columns" do
-        Dummy.connection.create_table :dummies, force: true do |t|
+        ActiveRecord::Migration.create_table :dummies, force: true do |t|
           ActiveSupport::Deprecation.silence do
             t.has_attached_file :avatar
           end
@@ -38,7 +38,7 @@ describe Paperclip::Schema do
       end
 
       it "displays deprecation warning" do
-        Dummy.connection.create_table :dummies, force: true do |t|
+        ActiveRecord::Migration.create_table :dummies, force: true do |t|
           assert_deprecated do
             t.has_attached_file :avatar
           end
@@ -48,7 +48,7 @@ describe Paperclip::Schema do
 
     context "using #attachment" do
       before do
-        Dummy.connection.create_table :dummies, force: true do |t|
+        ActiveRecord::Migration.create_table :dummies, force: true do |t|
           t.attachment :avatar
         end
       end
@@ -65,7 +65,7 @@ describe Paperclip::Schema do
 
     context "using #attachment with options" do
       before do
-        Dummy.connection.create_table :dummies, force: true do |t|
+        ActiveRecord::Migration.create_table :dummies, force: true do |t|
           t.attachment :avatar, default: 1, file_name: { default: "default" }
         end
       end
@@ -83,13 +83,13 @@ describe Paperclip::Schema do
 
   context "within schema statement" do
     before do
-      Dummy.connection.create_table :dummies, force: true
+      ActiveRecord::Migration.create_table :dummies, force: true
     end
 
     context "migrating up" do
       context "with single attachment" do
         before do
-          Dummy.connection.add_attachment :dummies, :avatar
+          ActiveRecord::Migration.add_attachment :dummies, :avatar
         end
 
         it "creates attachment columns" do
@@ -104,7 +104,7 @@ describe Paperclip::Schema do
 
       context "with single attachment and options" do
         before do
-          Dummy.connection.add_attachment :dummies, :avatar, default: "1", file_name: { default: "default" }
+          ActiveRecord::Migration.add_attachment :dummies, :avatar, default: "1", file_name: { default: "default" }
         end
 
         it "sets defaults on columns" do
@@ -119,7 +119,7 @@ describe Paperclip::Schema do
 
       context "with multiple attachments" do
         before do
-          Dummy.connection.add_attachment :dummies, :avatar, :photo
+          ActiveRecord::Migration.add_attachment :dummies, :avatar, :photo
         end
 
         it "creates attachment columns" do
@@ -138,7 +138,7 @@ describe Paperclip::Schema do
 
       context "with multiple attachments and options" do
         before do
-          Dummy.connection.add_attachment :dummies, :avatar, :photo, default: "1", file_name: { default: "default" }
+          ActiveRecord::Migration.add_attachment :dummies, :avatar, :photo, default: "1", file_name: { default: "default" }
         end
 
         it "sets defaults on columns" do
@@ -157,7 +157,7 @@ describe Paperclip::Schema do
       context "with no attachment" do
         it "raises an error" do
           assert_raises ArgumentError do
-            Dummy.connection.add_attachment :dummies
+            ActiveRecord::Migration.add_attachment :dummies
           end
         end
       end
@@ -165,7 +165,7 @@ describe Paperclip::Schema do
 
     context "migrating down" do
       before do
-        Dummy.connection.change_table :dummies do |t|
+        ActiveRecord::Migration.change_table :dummies do |t|
           t.column :avatar_file_name, :string
           t.column :avatar_content_type, :string
           t.column :avatar_file_size, :bigint
@@ -179,7 +179,7 @@ describe Paperclip::Schema do
         end
         it "removes the attachment columns" do
           ActiveSupport::Deprecation.silence do
-            Dummy.connection.drop_attached_file :dummies, :avatar
+            ActiveRecord::Migration.drop_attached_file :dummies, :avatar
           end
 
           columns = Dummy.columns.map { |column| [column.name, column.sql_type] }
@@ -192,7 +192,7 @@ describe Paperclip::Schema do
 
         it "displays a deprecation warning" do
           assert_deprecated do
-            Dummy.connection.drop_attached_file :dummies, :avatar
+            ActiveRecord::Migration.drop_attached_file :dummies, :avatar
           end
         end
       end
@@ -200,7 +200,7 @@ describe Paperclip::Schema do
       context "using #remove_attachment" do
         context "with single attachment" do
           before do
-            Dummy.connection.remove_attachment :dummies, :avatar
+            ActiveRecord::Migration.remove_attachment :dummies, :avatar
           end
 
           it "removes the attachment columns" do
@@ -215,14 +215,14 @@ describe Paperclip::Schema do
 
         context "with multiple attachments" do
           before do
-            Dummy.connection.change_table :dummies do |t|
+            ActiveRecord::Migration.change_table :dummies do |t|
               t.column :photo_file_name, :string
               t.column :photo_content_type, :string
               t.column :photo_file_size, :bigint
               t.column :photo_updated_at, :datetime
             end
 
-            Dummy.connection.remove_attachment :dummies, :avatar, :photo
+            ActiveRecord::Migration.remove_attachment :dummies, :avatar, :photo
           end
 
           it "removes the attachment columns" do
@@ -242,7 +242,7 @@ describe Paperclip::Schema do
         context "with no attachment" do
           it "raises an error" do
             assert_raises ArgumentError do
-              Dummy.connection.remove_attachment :dummies
+              ActiveRecord::Migration.remove_attachment :dummies
             end
           end
         end

data/spec/paperclip/storage/s3_spec.rb

@@ -395,12 +395,22 @@ describe Paperclip::Storage::S3 do
       allow(@dummy.avatar).to receive(:s3_object).with(:thumbnail).and_return(object)
 
       expect(object).to receive(:upload_file).
-        with(anything, content_type: "image/png",
-                       acl: :"public-read")
+        with(
+          anything,
+          {
+            content_type: "image/png",
+            acl: :"public-read",
+          },
+        )
       expect(object).to receive(:upload_file).
-        with(anything, content_type: "image/png",
-                       acl: :"public-read",
-                       cache_control: "max-age=31557600")
+        with(
+          anything,
+          {
+            content_type: "image/png",
+            acl: :"public-read",
+            cache_control: "max-age=31557600",
+          },
+        )
       @dummy.save
     end
 
@@ -411,6 +421,62 @@ describe Paperclip::Storage::S3 do
     end
   end
 
+  context "An attachment that uses S3 for storage with acl disabled" do
+    before do
+      rebuild_model(
+        aws2_add_region.merge(
+          storage: :s3,
+          styles: { thumb: ["90x90#", :jpg] },
+          bucket: "bucket",
+          s3_acl_enabled: false,
+          s3_credentials: {
+            "access_key_id" => "12345",
+            "secret_access_key" => "54321"
+          }
+        )
+      )
+
+      @file = File.new(fixture_file("5k.png"), "rb")
+      @dummy = Dummy.new
+      @dummy.avatar = @file
+      @dummy.save
+    end
+
+    context "reprocess" do
+      before do
+        @object = double
+        allow(@dummy.avatar).to receive(:s3_object).with(:original).and_return(@object)
+        allow(@dummy.avatar).to receive(:s3_object).with(:thumb).and_return(@object)
+        allow(@object).to receive(:get).and_yield(@file.read)
+        allow(@object).to receive(:exists?).and_return(true)
+        allow(@object).to receive(:download_file).with(anything)
+      end
+
+      it "uploads original" do
+        expect(@object).to receive(:upload_file).with(
+          anything,
+          { content_type: "image/png" },
+        ).and_return(true)
+        @dummy.avatar.reprocess!
+        expect(@object).to receive(:upload_file).with(
+          anything,
+          { content_type: "image/png" },
+        ).and_return(true)
+        @dummy.avatar.reprocess!
+      end
+
+      it "doesn't upload original" do
+        expect(@object).to receive(:upload_file).with(
+          anything,
+          { content_type: "image/png" },
+        ).and_return(true)
+        @dummy.avatar.reprocess!
+      end
+    end
+
+    after { @file.close }
+  end
+
   context "An attachment that uses S3 for storage and has styles" do
     before do
       rebuild_model(
@@ -444,14 +510,18 @@ describe Paperclip::Storage::S3 do
       it "uploads original" do
         expect(@object).to receive(:upload_file).with(
           anything,
-          content_type: "image/png",
-          acl: :"public-read"
+          {
+            content_type: "image/png",
+            acl: :"public-read",
+          },
         ).and_return(true)
         @dummy.avatar.reprocess!
         expect(@object).to receive(:upload_file).with(
           anything,
-          content_type: "image/png",
-          acl: :"public-read"
+          {
+            content_type: "image/png",
+            acl: :"public-read",
+          },
         ).and_return(true)
         @dummy.avatar.reprocess!
       end
@@ -459,8 +529,10 @@ describe Paperclip::Storage::S3 do
       it "doesn't upload original" do
         expect(@object).to receive(:upload_file).with(
           anything,
-          content_type: "image/png",
-          acl: :"public-read"
+          {
+            content_type: "image/png",
+            acl: :"public-read",
+          },
         ).and_return(true)
         @dummy.avatar.reprocess!
       end
@@ -669,7 +741,7 @@ describe Paperclip::Storage::S3 do
         object = double
         allow(@dummy.avatar).to receive(:s3_object).and_return(object)
 
-        expect(object).to receive(:presigned_url).with(:get, expires_in: 3600)
+        expect(object).to receive(:presigned_url).with(:get, { expires_in: 3600 })
         @dummy.avatar.expiring_url
       end
     end
@@ -684,8 +756,13 @@ describe Paperclip::Storage::S3 do
         object = double
         allow(@dummy.avatar).to receive(:s3_object).and_return(object)
         expect(object).to receive(:presigned_url).
-          with(:get, expires_in: 3600,
-                     response_content_disposition: "inline")
+          with(
+            :get,
+            {
+              expires_in: 3600,
+              response_content_disposition: "inline",
+            },
+          )
         @dummy.avatar.expiring_url
       end
     end
@@ -707,7 +784,13 @@ describe Paperclip::Storage::S3 do
         object = double
         allow(@dummy.avatar).to receive(:s3_object).and_return(object)
         expect(object).to receive(:presigned_url).
-          with(:get, expires_in: 3600, response_content_type: "image/png")
+          with(
+            :get,
+            {
+              expires_in: 3600,
+              response_content_type: "image/png",
+            },
+          )
         @dummy.avatar.expiring_url
       end
     end
@@ -754,14 +837,14 @@ describe Paperclip::Storage::S3 do
     it "generates a url for the thumb" do
       object = double
       allow(@dummy.avatar).to receive(:s3_object).with(:thumb).and_return(object)
-      expect(object).to receive(:presigned_url).with(:get, expires_in: 1800)
+      expect(object).to receive(:presigned_url).with(:get, { expires_in: 1800 })
       @dummy.avatar.expiring_url(1800, :thumb)
     end
 
     it "generates a url for the default style" do
       object = double
       allow(@dummy.avatar).to receive(:s3_object).with(:original).and_return(object)
-      expect(object).to receive(:presigned_url).with(:get, expires_in: 1800)
+      expect(object).to receive(:presigned_url).with(:get, { expires_in: 1800 })
       @dummy.avatar.expiring_url(1800)
     end
   end
@@ -906,7 +989,7 @@ describe Paperclip::Storage::S3 do
           object = double
           allow(@dummy.avatar).to receive(:s3_object).and_return(object)
           expect(object).to receive(:upload_file).
-            with(anything, content_type: "image/png", acl: :"public-read")
+            with(anything, { content_type: "image/png", acl: :"public-read" })
           @dummy.save
         end
 
@@ -1066,10 +1149,14 @@ describe Paperclip::Storage::S3 do
           allow(@dummy.avatar).to receive(:s3_object).and_return(object)
 
           expect(object).to receive(:upload_file).
-            with(anything,
-                 content_type: "image/png",
-                 acl: :"public-read",
-                 cache_control: "max-age=31557600")
+            with(
+              anything,
+              {
+                content_type: "image/png",
+                acl: :"public-read",
+                cache_control: "max-age=31557600",
+              },
+            )
           @dummy.save
         end
 
@@ -1107,10 +1194,14 @@ describe Paperclip::Storage::S3 do
           allow(@dummy.avatar).to receive(:s3_object).and_return(object)
 
           expect(object).to receive(:upload_file).
-            with(anything,
+            with(
+              anything,
+              {
                  content_type: "image/png",
                  acl: :"public-read",
-                 metadata: { "color" => "red" })
+                 metadata: { "color" => "red" },
+              },
+            )
           @dummy.save
         end
 
@@ -1148,10 +1239,14 @@ describe Paperclip::Storage::S3 do
           allow(@dummy.avatar).to receive(:s3_object).and_return(object)
 
           expect(object).to receive(:upload_file).
-            with(anything,
+            with(
+              anything,
+              {
                  content_type: "image/png",
                  acl: :"public-read",
-                 metadata: { "color" => "red" })
+                 metadata: { "color" => "red" },
+              },
+            )
           @dummy.save
         end
 
@@ -1190,10 +1285,14 @@ describe Paperclip::Storage::S3 do
             allow(@dummy.avatar).to receive(:s3_object).and_return(object)
 
             expect(object).to receive(:upload_file).
-              with(anything,
+              with(
+                anything,
+                {
                    content_type: "image/png",
                    acl: :"public-read",
-                   storage_class: "reduced_redundancy")
+                   storage_class: "reduced_redundancy",
+                },
+              )
             @dummy.save
           end
 
@@ -1286,9 +1385,14 @@ describe Paperclip::Storage::S3 do
               allow(@dummy.avatar).to receive(:s3_object).with(style).and_return(object)
 
               expect(object).to receive(:upload_file).
-                with(anything, content_type: "image/png",
-                               acl: :"public-read",
-                               storage_class: :reduced_redundancy)
+                with(
+                  anything,
+                  {
+                    content_type: "image/png",
+                    acl: :"public-read",
+                    storage_class: :reduced_redundancy,
+                  },
+                )
             end
             @dummy.save
           end
@@ -1331,7 +1435,7 @@ describe Paperclip::Storage::S3 do
             allow(@dummy.avatar).to receive(:s3_object).and_return(object)
 
             expect(object).to receive(:upload_file).
-              with(anything, content_type: "image/png", acl: :"public-read")
+              with(anything, { content_type: "image/png", acl: :"public-read" })
             @dummy.save
           end
 
@@ -1370,9 +1474,14 @@ describe Paperclip::Storage::S3 do
           allow(@dummy.avatar).to receive(:s3_object).and_return(object)
 
           expect(object).to receive(:upload_file).
-            with(anything, content_type: "image/png",
-                           acl: :"public-read",
-                           server_side_encryption: "AES256")
+            with(
+              anything,
+              {
+                content_type: "image/png",
+                acl: :"public-read",
+                server_side_encryption: "AES256",
+              },
+            )
           @dummy.save
         end
 
@@ -1410,10 +1519,14 @@ describe Paperclip::Storage::S3 do
           allow(@dummy.avatar).to receive(:s3_object).and_return(object)
 
           expect(object).to receive(:upload_file).
-            with(anything,
-                 content_type: "image/png",
-                 acl: :"public-read",
-                 storage_class: :reduced_redundancy)
+            with(
+              anything,
+              {
+                content_type: "image/png",
+                acl: :"public-read",
+                storage_class: :reduced_redundancy,
+              },
+            )
           @dummy.save
         end
 
@@ -1557,7 +1670,7 @@ describe Paperclip::Storage::S3 do
             allow(@dummy.avatar).to receive(:s3_object).and_return(object)
 
             expect(object).to receive(:upload_file).
-              with(anything, content_type: "image/png", acl: :"public-read")
+              with(anything, { content_type: "image/png", acl: :"public-read" })
             @dummy.save
           end
 
@@ -1595,7 +1708,7 @@ describe Paperclip::Storage::S3 do
             allow(@dummy.avatar).to receive(:s3_object).and_return(object)
 
             expect(object).to receive(:upload_file).
-              with(anything, content_type: "image/png", acl: :private)
+              with(anything, { content_type: "image/png", acl: :private })
             @dummy.save
           end
 
@@ -1641,8 +1754,10 @@ describe Paperclip::Storage::S3 do
 
               expect(object).to receive(:upload_file).
                 with(anything,
-                     content_type: "image/png",
-                     acl: style == :thumb ? :public_read : :private)
+                     {
+                       content_type: "image/png",
+                       acl: style == :thumb ? :public_read : :private
+                     })
             end
             @dummy.save
           end
@@ -1711,10 +1826,14 @@ describe Paperclip::Storage::S3 do
             allow(@dummy.avatar).to receive(:s3_object).with(style).and_return(object)
 
             expect(object).to receive(:upload_file).
-              with(anything,
-                   content_type: "image/png",
-                   acl: :"public-read",
-                   content_disposition: 'attachment; filename="Custom Avatar Name.png"')
+              with(
+                anything,
+                {
+                  content_type: "image/png",
+                  acl: :"public-read",
+                  content_disposition: 'attachment; filename="Custom Avatar Name.png"',
+                },
+              )
           end
           @dummy.save
         end

data/spec/spec_helper.rb

@@ -21,6 +21,7 @@ FIXTURES_DIR = File.join(File.dirname(__FILE__), "fixtures")
 config = YAML::safe_load(IO.read(File.dirname(__FILE__) + "/database.yml"))
 ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/debug.log")
 ActiveRecord::Base.establish_connection(config["test"])
+ActiveRecord::Migration.verbose = false
 if ActiveRecord::VERSION::STRING >= "4.2" &&
    ActiveRecord::VERSION::STRING < "5.0"
   ActiveRecord::Base.raise_in_transactional_callbacks = true

data/spec/support/model_reconstruction.rb

@@ -28,15 +28,15 @@ module ModelReconstruction
 
   def reset_table(_table_name, &block)
     block ||= lambda { |_table| true }
-    ActiveRecord::Base.connection.create_table :dummies, **{ force: true }, &block
+    ActiveRecord::Migration.create_table :dummies, **{ force: true }, &block
   end
 
   def modify_table(&block)
-    ActiveRecord::Base.connection.change_table :dummies, &block
+    ActiveRecord::Migration.change_table :dummies, &block
   end
 
   def rebuild_model(options = {})
-    ActiveRecord::Base.connection.create_table :dummies, force: true do |table|
+    ActiveRecord::Migration.create_table :dummies, force: true do |table|
       table.column :title, :string
       table.column :other, :string
       table.column :avatar_file_name, :string

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kt-paperclip
 version: !ruby/object:Gem::Version
-  version: 7.1.1
+  version: 7.2.2
 platform: ruby
 authors:
 - Surendra Singhi
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-09 00:00:00.000000000 Z
+date: 2024-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -70,16 +70,22 @@ dependencies:
   name: terrapin
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -428,6 +434,7 @@ files:
 - lib/paperclip/io_adapters/uploaded_file_adapter.rb
 - lib/paperclip/io_adapters/uri_adapter.rb
 - lib/paperclip/locales/en.yml
+- lib/paperclip/locales/gd.yml
 - lib/paperclip/logger.rb
 - lib/paperclip/matchers.rb
 - lib/paperclip/matchers/have_attached_file_matcher.rb
@@ -587,8 +594,114 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - ImageMagick
-rubygems_version: 3.0.1
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: File attachments as attributes for ActiveRecord
-test_files: []
+test_files:
+- features/basic_integration.feature
+- features/migration.feature
+- features/rake_tasks.feature
+- features/step_definitions/attachment_steps.rb
+- features/step_definitions/html_steps.rb
+- features/step_definitions/rails_steps.rb
+- features/step_definitions/s3_steps.rb
+- features/step_definitions/web_steps.rb
+- features/support/env.rb
+- features/support/fakeweb.rb
+- features/support/file_helpers.rb
+- features/support/fixtures/boot_config.txt
+- features/support/fixtures/gemfile.txt
+- features/support/fixtures/preinitializer.txt
+- features/support/paths.rb
+- features/support/rails.rb
+- features/support/selectors.rb
+- spec/database.yml
+- spec/paperclip/attachment_definitions_spec.rb
+- spec/paperclip/attachment_processing_spec.rb
+- spec/paperclip/attachment_registry_spec.rb
+- spec/paperclip/attachment_spec.rb
+- spec/paperclip/content_type_detector_spec.rb
+- spec/paperclip/file_command_content_type_detector_spec.rb
+- spec/paperclip/filename_cleaner_spec.rb
+- spec/paperclip/geometry_detector_spec.rb
+- spec/paperclip/geometry_parser_spec.rb
+- spec/paperclip/geometry_spec.rb
+- spec/paperclip/glue_spec.rb
+- spec/paperclip/has_attached_file_spec.rb
+- spec/paperclip/integration_spec.rb
+- spec/paperclip/interpolations_spec.rb
+- spec/paperclip/io_adapters/abstract_adapter_spec.rb
+- spec/paperclip/io_adapters/attachment_adapter_spec.rb
+- spec/paperclip/io_adapters/data_uri_adapter_spec.rb
+- spec/paperclip/io_adapters/empty_string_adapter_spec.rb
+- spec/paperclip/io_adapters/file_adapter_spec.rb
+- spec/paperclip/io_adapters/http_url_proxy_adapter_spec.rb
+- spec/paperclip/io_adapters/identity_adapter_spec.rb
+- spec/paperclip/io_adapters/nil_adapter_spec.rb
+- spec/paperclip/io_adapters/registry_spec.rb
+- spec/paperclip/io_adapters/stringio_adapter_spec.rb
+- spec/paperclip/io_adapters/uploaded_file_adapter_spec.rb
+- spec/paperclip/io_adapters/uri_adapter_spec.rb
+- spec/paperclip/matchers/have_attached_file_matcher_spec.rb
+- spec/paperclip/matchers/validate_attachment_content_type_matcher_spec.rb
+- spec/paperclip/matchers/validate_attachment_presence_matcher_spec.rb
+- spec/paperclip/matchers/validate_attachment_size_matcher_spec.rb
+- spec/paperclip/media_type_spoof_detector_spec.rb
+- spec/paperclip/meta_class_spec.rb
+- spec/paperclip/paperclip_missing_attachment_styles_spec.rb
+- spec/paperclip/paperclip_spec.rb
+- spec/paperclip/plural_cache_spec.rb
+- spec/paperclip/processor_helpers_spec.rb
+- spec/paperclip/processor_spec.rb
+- spec/paperclip/rails_environment_spec.rb
+- spec/paperclip/rake_spec.rb
+- spec/paperclip/schema_spec.rb
+- spec/paperclip/storage/filesystem_spec.rb
+- spec/paperclip/storage/fog_spec.rb
+- spec/paperclip/storage/s3_live_spec.rb
+- 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
+- spec/paperclip/validators/attachment_file_name_validator_spec.rb
+- spec/paperclip/validators/attachment_presence_validator_spec.rb
+- spec/paperclip/validators/attachment_size_validator_spec.rb
+- spec/paperclip/validators/media_type_spoof_detection_validator_spec.rb
+- spec/paperclip/validators_spec.rb
+- spec/spec_helper.rb
+- spec/support/assertions.rb
+- spec/support/fake_model.rb
+- spec/support/fake_rails.rb
+- spec/support/fixtures/12k.png
+- spec/support/fixtures/50x50.png
+- spec/support/fixtures/5k.png
+- 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
+- spec/support/fixtures/twopage.pdf
+- spec/support/fixtures/uppercase.PNG
+- spec/support/matchers/accept.rb
+- spec/support/matchers/exist.rb
+- spec/support/matchers/have_column.rb
+- spec/support/mock_attachment.rb
+- spec/support/mock_interpolator.rb
+- spec/support/mock_url_generator_builder.rb
+- spec/support/model_reconstruction.rb
+- spec/support/reporting.rb
+- spec/support/test_data.rb
+- spec/support/version_helper.rb