kt-paperclip 7.2.2 → 7.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7308352f1d792e5e861ba828d1eb3994b5956fc51df06a4cbfedfe134ce105d
-  data.tar.gz: be4d4161c411a18edaf2a92b5a48d746d87d01f3d5a6e4fe5fecc20f87ad42a4
+  metadata.gz: 213cd04cf7f631853227e9c3fc6d6a38733f3c278907497e1f8e3c2e7a98bac8
+  data.tar.gz: 01aec044e7eff086cef50fab323730f617fd455e4ba70ffb99a58d099a4ffde5
 SHA512:
-  metadata.gz: e202f7d5a1a9466f69118e485c5c747f10942644337940b6141ffb41904118353cab09858fbdabf4e68ba87d9e5199109a1a1525d7eaeea4a1601ba9e384459f
-  data.tar.gz: 20fb1d6bd39a2d21a5b2f627d5ab92aba95ae88d523319de7b06e5e0983c281e76ae218a6bccf64fdc16362652cb1cc1251eab7fdacc14b6428b8dbafd2bdc81
+  metadata.gz: a7e922d52efbde590030651a7cbdca2087aa3c163d6cc498273e9ca57ce5c2b371b44601ccb9e825ee196f1197689438cb91cfca240b6361f259650ea63e5d03
+  data.tar.gz: 412ef55d0817f23247e52859d1b39cb1358f55bfd8c8d67cb16df376b42cc2926611b938004d6cec95d7a211895702cb279721322c1ac16e235af954a6f1f40e

data/LICENSE

@@ -1,9 +1,9 @@
-
 LICENSE
 
 The MIT License
 
 Copyright (c) 2008-2016 Jon Yurek and thoughtbot, inc.
+Copyright (c) 2019-2025 Kreeti Technologies Pvt Ltd.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/{NEWS → OLD_NEWS}

@@ -1,5 +1,7 @@
 [UNRELEASED]
 
+* Improvement: Support aws-sdk-s3 >= 1.196.1 and multipart file downloads
+
 7.2.1 (2023-09-09)
 * Improvement: Support file extension names both as symbols and strings for :content_type_mappings
 

data/lib/paperclip/attachment.rb

@@ -10,30 +10,31 @@ module Paperclip
   class Attachment
     def self.default_options
       @default_options ||= {
-        convert_options:                  {},
-        default_style:                    :original,
-        default_url:                      "/:attachment/:style/missing.png",
-        escape_url:                       true,
-        restricted_characters:            /[&$+,\/:;=?@<>\[\]\{\}\|\\\^~%# ]/,
-        filename_cleaner:                 nil,
-        hash_data:                        ":class/:attachment/:id/:style/:updated_at",
-        hash_digest:                      "SHA1",
-        interpolator:                     Paperclip::Interpolations,
-        only_process:                     [],
-        path:                             ":rails_root/public:url",
-        preserve_files:                   false,
-        processors:                       [:thumbnail],
-        source_file_options:              {},
-        storage:                          :filesystem,
-        styles:                           {},
-        url:                              "/system/:class/:attachment/:id_partition/:style/:filename",
-        url_generator:                    Paperclip::UrlGenerator,
-        use_default_time_zone:            true,
-        use_timestamp:                    true,
-        whiny:                            Paperclip.options[:whiny] || Paperclip.options[:whiny_thumbnails],
-        validate_media_type:              true,
-        adapter_options:                  { hash_digest: Digest::MD5 },
-        check_validity_before_processing: true
+        convert_options:                   {},
+        default_style:                     :original,
+        default_url:                       "/:attachment/:style/missing.png",
+        escape_url:                        true,
+        restricted_characters:             /[&$+,\/:;=?@<>\[\]\{\}\|\\\^~%# ]/,
+        filename_cleaner:                  nil,
+        hash_data:                         ":class/:attachment/:id/:style/:updated_at",
+        hash_digest:                       "SHA1",
+        interpolator:                      Paperclip::Interpolations,
+        only_process:                      [],
+        path:                              ":rails_root/public:url",
+        preserve_files:                    false,
+        processors:                        [:thumbnail],
+        source_file_options:               {},
+        storage:                           :filesystem,
+        styles:                            {},
+        url:                               "/system/:class/:attachment/:id_partition/:style/:filename",
+        url_generator:                     Paperclip::UrlGenerator,
+        use_default_time_zone:             true,
+        use_timestamp:                     true,
+        whiny:                             Paperclip.options[:whiny] || Paperclip.options[:whiny_thumbnails],
+        validate_media_type:               true,
+        adapter_options:                   { hash_digest: Digest::MD5 },
+        check_validity_before_processing:  true,
+        return_file_attributes_on_destroy: false
       }
     end
 
@@ -69,6 +70,8 @@ module Paperclip
     # +interpolator+ - the object used to interpolate filenames and URLs. Defaults to Paperclip::Interpolations
     # +url_generator+ - the object used to generate URLs, using the interpolator. Defaults to Paperclip::UrlGenerator
     # +escape_url+ - Perform URI escaping to URLs. Defaults to true
+    # +return_file_attributes_on_destroy+ - whether attachment-related attributes should be displayed when
+    #                                       destroying a record. Defaults to false.
     def initialize(name, instance, options = {})
       @name              = name.to_sym
       @name_string       = name.to_s
@@ -563,12 +566,10 @@ module Paperclip
           path(style) if exists?(style)
         end.compact
       end
-      instance_write(:file_name, nil)
-      instance_write(:content_type, nil)
-      instance_write(:file_size, nil)
-      instance_write(:fingerprint, nil)
-      instance_write(:created_at, nil) if has_enabled_but_unset_created_at?
-      instance_write(:updated_at, nil)
+
+      return if show_attrs_and_destroy_callback_triggered?
+
+      clear_all_attachment_attributes
     end
 
     def flush_errors #:nodoc:
@@ -613,5 +614,21 @@ module Paperclip
     def has_enabled_but_unset_created_at?
       able_to_store_created_at? && !instance_read(:created_at)
     end
+
+    # Checks whether the option to show attributes to be destroyed is enabled and whether a destroy callback has been
+    # invoked when deleting the entire record.
+    def show_attrs_and_destroy_callback_triggered?
+      @options[:return_file_attributes_on_destroy] && instance.instance_variable_get(:@_destroy_callback_already_called)
+    end
+
+    # Sets attachment-related attributes to `nil`.
+    def clear_all_attachment_attributes
+      instance_write(:file_name, nil)
+      instance_write(:content_type, nil)
+      instance_write(:file_size, nil)
+      instance_write(:fingerprint, nil)
+      instance_write(:created_at, nil) if has_enabled_but_unset_created_at?
+      instance_write(:updated_at, nil)
+    end
   end
 end

data/lib/paperclip/geometry.rb

@@ -72,7 +72,7 @@ module Paperclip
 
     # Returns the width and height in a format suitable to be passed to Geometry.parse
     def to_s
-      s = ""
+      s = String.new
       s << width.to_i.to_s if width > 0
       s << "x#{height.to_i}" if height > 0
       s << modifier.to_s

data/lib/paperclip/io_adapters/abstract_adapter.rb

@@ -17,7 +17,7 @@ module Paperclip
       @fingerprint ||= begin
         digest = @options.fetch(:hash_digest).new
         File.open(path, "rb") do |f|
-          buf = ""
+          buf = String.new
           digest.update(buf) while f.read(16384, buf)
         end
         digest.hexdigest

data/lib/paperclip/io_adapters/attachment_adapter.rb

@@ -33,6 +33,15 @@ module Paperclip
       else
         begin
           source.copy_to_local_file(@style, destination.path)
+
+          # Some sources (like S3) writes to a temporary file first for multi-part downloads then moves
+          # it to the final destination path. This means our destination Tempfile reference is stale
+          # and reads will return an empty string. For compatibility, we need to copy the contents
+          # of the destination file to our current Tempfile instance.
+          if destination.size.zero?
+            IO.copy_stream(destination.path, destination)
+            destination.rewind
+          end
         rescue Errno::EACCES
           # clean up lingering tempfile if we cannot access source file
           destination.close(true)

data/lib/paperclip/locales/fr.yml

@@ -0,0 +1,18 @@
+fr:
+  errors:
+    messages:
+      in_between: "doit être entre %{min} et %{max}"
+      spoofed_media_type: "à du contenu qui ne correspond pas au type déclaré"
+
+  number:
+    human:
+      storage_units:
+        format: "%n %u"
+        units:
+          byte:
+            one:   "Octet"
+            other: "Octets"
+          kb: "ko"
+          mb: "Mo"
+          gb: "Go"
+          tb: "To"

data/lib/paperclip/locales/gd.yml

@@ -1,4 +1,4 @@
-gd:
+gd:
   errors:
     messages:
       in_between: "– feumaidh seo a bhith eadar %{min} ’s %{max}"

data/lib/paperclip/storage/fog.rb

@@ -214,9 +214,9 @@ module Paperclip
       def find_credentials(creds)
         case creds
         when File
-          YAML::safe_load(ERB.new(File.read(creds.path)).result)
+          load_credentials_from_file(creds.path)
         when String, Pathname
-          YAML::safe_load(ERB.new(File.read(creds)).result)
+          load_credentials_from_file(creds.path)
         when Hash
           creds
         else
@@ -228,6 +228,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 connection
         @connection ||= ::Fog::Storage.new(fog_credentials)
       end

data/lib/paperclip/storage/s3.rb

@@ -1,3 +1,4 @@
+# coding: utf-8
 module Paperclip
   module Storage
     # Amazon's S3 file hosting service is a scalable, easy place to store files for
@@ -280,6 +281,16 @@ module Paperclip
         s3_bucket.object style_name_as_path(style_name)
       end
 
+      def s3_transfer_manager
+        @s3_transfer_manager ||= begin
+          if ::Aws::S3.const_defined?(:TransferManager, false)
+            ::Aws::S3::TransferManager.new(client: s3_interface.client)
+          else
+            nil
+          end
+        end
+      end
+
       def use_accelerate_endpoint?
         !!@use_accelerate_endpoint
       end
@@ -386,7 +397,12 @@ module Paperclip
             write_options[:metadata] = @s3_metadata unless @s3_metadata.empty?
             write_options.merge!(@s3_headers)
 
-            s3_object(style).upload_file(file.path, write_options)
+            if s3_transfer_manager
+              destination = style_name_as_path(style)
+              s3_transfer_manager.upload_file(file.path, **write_options, bucket: bucket_name, key: destination)
+            else
+              s3_object(style).upload_file(file.path, write_options)
+            end
           rescue ::Aws::S3::Errors::NoSuchBucket
             create_bucket
             retry
@@ -422,7 +438,13 @@ module Paperclip
 
       def copy_to_local_file(style, local_dest_path)
         log("copying #{path(style)} to local file #{local_dest_path}")
-        s3_object(style).download_file(local_dest_path)
+        
+        if s3_transfer_manager
+          source = style_name_as_path(style)
+          s3_transfer_manager.download_file(local_dest_path, bucket: bucket_name, key: source)
+        else
+          s3_object(style).download_file(local_dest_path)
+        end
       rescue Aws::Errors::ServiceError => e
         warn("#{e} - cannot copy #{path(style)} to local file #{local_dest_path}")
         false
@@ -433,7 +455,7 @@ module Paperclip
       def find_credentials(creds)
         case creds
         when File
-          load_credentials_from_file(creds.path)
+           load_credentials_from_file(creds.path)
         when String, Pathname
           load_credentials_from_file(creds)
         when Hash

data/lib/paperclip/version.rb

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

data/spec/paperclip/attachment_spec.rb

@@ -1267,7 +1267,7 @@ describe Paperclip::Attachment do
                 @existing_names.each { |f| assert_file_not_exists(f) }
               end
 
-              it "deletes the files when you call #delete" do
+              it "deletes the files when you call #destroy" do
                 expect(@attachment).to receive(:instance_write).with(:file_name, nil)
                 expect(@attachment).to receive(:instance_write).with(:content_type, nil)
                 expect(@attachment).to receive(:instance_write).with(:file_size, nil)
@@ -1277,6 +1277,32 @@ describe Paperclip::Attachment do
                 @existing_names.each { |f| assert_file_not_exists(f) }
               end
 
+              it "deletes the files when you destroy the model" do
+                expect(@attachment).to receive(:instance_write).with(:file_name, nil)
+                expect(@attachment).to receive(:instance_write).with(:content_type, nil)
+                expect(@attachment).to receive(:instance_write).with(:file_size, nil)
+                expect(@attachment).to receive(:instance_write).with(:fingerprint, nil)
+                expect(@attachment).to receive(:instance_write).with(:updated_at, nil)
+                @attachment.instance.destroy
+                @existing_names.each { |f| assert_file_not_exists(f) }
+              end
+
+              context "when 'return_file_attributes_on_destroy' option is set to true" do
+                before do
+                  @attachment.options[:return_file_attributes_on_destroy] = true
+                end
+
+                it "does not override attachment-related attributes and deletes the files" do
+                  expect(@attachment).not_to receive(:instance_write)
+                  expect(@attachment).not_to receive(:instance_write)
+                  expect(@attachment).not_to receive(:instance_write)
+                  expect(@attachment).not_to receive(:instance_write)
+                  expect(@attachment).not_to receive(:instance_write)
+                  @attachment.instance.destroy
+                  @existing_names.each { |f| assert_file_not_exists(f) }
+                end
+              end
+
               context "when keeping old files" do
                 before do
                   @attachment.options[:keep_old_files] = true
@@ -1304,7 +1330,7 @@ describe Paperclip::Attachment do
                   @existing_names.each { |f| assert_file_exists(f) }
                 end
 
-                it "keeps the files when you call #delete" do
+                it "keeps the files when you call #destroy" do
                   expect(@attachment).to receive(:instance_write).with(:file_name, nil)
                   expect(@attachment).to receive(:instance_write).with(:content_type, nil)
                   expect(@attachment).to receive(:instance_write).with(:file_size, nil)

data/spec/paperclip/io_adapters/attachment_adapter_spec.rb

@@ -6,6 +6,33 @@ describe Paperclip::AttachmentAdapter do
     @attachment = Dummy.new.avatar
   end
 
+  context "for an attachment that renames the source to the destination" do
+    before do
+      @file = File.new(fixture_file("5k.png"))
+      @file.binmode
+
+      @attachment.assign(@file)
+      @attachment.save
+
+      allow(@attachment).to receive(:copy_to_local_file) do |style, path|
+        FileUtils.cp(@file.path, "#{@file.path}.tmp")
+        FileUtils.mv("#{@file.path}.tmp", path)
+      end
+
+      @subject = Paperclip.io_adapters.for(@attachment,
+                                           hash_digest: Digest::MD5)
+    end
+
+    after do
+      @file.close
+      @subject.close
+    end
+
+    it "handles the case where the source is renamed to the destination" do
+      assert_equal @file.read, @subject.read
+    end
+  end
+
   context "for an attachment" do
     before do
       @file = File.new(fixture_file("5k.png"))

data/spec/paperclip/storage/s3_spec.rb

@@ -6,6 +6,10 @@ describe Paperclip::Storage::S3 do
     Aws.config[:stub_responses] = true
   end
 
+  def s3_uses_transfer_manager?
+    defined?(Aws::S3::TransferManager)
+  end
+
   def aws2_add_region
     { s3_region: "us-east-1" }
   end
@@ -389,27 +393,30 @@ describe Paperclip::Storage::S3 do
 
       @dummy = Dummy.new
       @dummy.avatar = @file
-
       object = double
-      allow(@dummy.avatar).to receive(:s3_object).with(:original).and_return(object)
-      allow(@dummy.avatar).to receive(:s3_object).with(:thumbnail).and_return(object)
 
+      if s3_uses_transfer_manager?
+        allow(@dummy.avatar).to receive(:s3_transfer_manager).and_return(object)
+      else
+        allow(@dummy.avatar).to receive(:s3_object).with(:original).and_return(object)
+        allow(@dummy.avatar).to receive(:s3_object).with(:thumbnail).and_return(object)
+      end
       expect(object).to receive(:upload_file).
         with(
           anything,
-          {
+          hash_including(
             content_type: "image/png",
             acl: :"public-read",
-          },
+          ),
         )
       expect(object).to receive(:upload_file).
         with(
           anything,
-          {
+          hash_including(
             content_type: "image/png",
             acl: :"public-read",
             cache_control: "max-age=31557600",
-          },
+          ),
         )
       @dummy.save
     end
@@ -417,7 +424,12 @@ describe Paperclip::Storage::S3 do
     after { @file.close }
 
     it "succeeds" do
-      assert_equal @dummy.counter, 7
+      if s3_uses_transfer_manager?
+        count = 9
+      else
+        count = 7
+      end
+      assert_equal @dummy.counter, count
     end
   end
 
@@ -445,22 +457,27 @@ describe Paperclip::Storage::S3 do
     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)
+        if s3_uses_transfer_manager?
+          allow(@dummy.avatar).to receive(:s3_transfer_manager).and_return(@object)
+          allow(@object).to receive(:download_file).with(any_args)
+        else
+          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
       end
 
       it "uploads original" do
         expect(@object).to receive(:upload_file).with(
           anything,
-          { content_type: "image/png" },
+          hash_including(content_type: "image/png"),
         ).and_return(true)
         @dummy.avatar.reprocess!
         expect(@object).to receive(:upload_file).with(
           anything,
-          { content_type: "image/png" },
+          hash_including(content_type: "image/png"),
         ).and_return(true)
         @dummy.avatar.reprocess!
       end
@@ -468,7 +485,7 @@ describe Paperclip::Storage::S3 do
       it "doesn't upload original" do
         expect(@object).to receive(:upload_file).with(
           anything,
-          { content_type: "image/png" },
+          hash_including(content_type: "image/png"),
         ).and_return(true)
         @dummy.avatar.reprocess!
       end
@@ -500,28 +517,33 @@ describe Paperclip::Storage::S3 do
     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)
+        if s3_uses_transfer_manager?
+          allow(@dummy.avatar).to receive(:s3_transfer_manager).and_return(@object)
+          allow(@object).to receive(:download_file).with(any_args)
+        else
+          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
       end
 
       it "uploads original" do
         expect(@object).to receive(:upload_file).with(
           anything,
-          {
+          hash_including(
             content_type: "image/png",
             acl: :"public-read",
-          },
+          ),
         ).and_return(true)
         @dummy.avatar.reprocess!
         expect(@object).to receive(:upload_file).with(
           anything,
-          {
+          hash_including(
             content_type: "image/png",
             acl: :"public-read",
-          },
+          ),
         ).and_return(true)
         @dummy.avatar.reprocess!
       end
@@ -529,10 +551,10 @@ describe Paperclip::Storage::S3 do
       it "doesn't upload original" do
         expect(@object).to receive(:upload_file).with(
           anything,
-          {
+          hash_including(
             content_type: "image/png",
             acl: :"public-read",
-          },
+          ),
         ).and_return(true)
         @dummy.avatar.reprocess!
       end
@@ -973,9 +995,12 @@ describe Paperclip::Storage::S3 do
 
       it "will retry to save again but back off on SlowDown" do
         allow(@dummy.avatar).to receive(:sleep)
-        allow_any_instance_of(Aws::S3::Object).to receive(:upload_file).
-          and_raise(Aws::S3::Errors::SlowDown.new(spy,
-                                                  spy(status: 503, body: "")))
+        err = Aws::S3::Errors::SlowDown.new(spy, spy(status: 503, body: ""))
+        if s3_uses_transfer_manager?
+          allow_any_instance_of(Aws::S3::TransferManager).to receive(:upload_file).and_raise(err)
+        else
+          allow_any_instance_of(Aws::S3::Object).to receive(:upload_file).and_raise(err)
+        end
         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)
@@ -987,9 +1012,13 @@ describe Paperclip::Storage::S3 do
       context "and saved" do
         before do
           object = double
-          allow(@dummy.avatar).to receive(:s3_object).and_return(object)
+          if s3_uses_transfer_manager?
+            allow(@dummy.avatar).to receive(:s3_transfer_manager).and_return(object)
+          else
+            allow(@dummy.avatar).to receive(:s3_object).and_return(object)
+          end
           expect(object).to receive(:upload_file).
-            with(anything, { content_type: "image/png", acl: :"public-read" })
+            with(anything, hash_including(content_type: "image/png", acl: :"public-read"))
           @dummy.save
         end
 
@@ -1146,16 +1175,19 @@ describe Paperclip::Storage::S3 do
       context "and saved" do
         before do
           object = double
-          allow(@dummy.avatar).to receive(:s3_object).and_return(object)
-
+          if s3_uses_transfer_manager?
+            allow(@dummy.avatar).to receive(:s3_transfer_manager).and_return(object)
+          else
+            allow(@dummy.avatar).to receive(:s3_object).and_return(object)
+          end
           expect(object).to receive(:upload_file).
             with(
               anything,
-              {
+              hash_including(
                 content_type: "image/png",
                 acl: :"public-read",
                 cache_control: "max-age=31557600",
-              },
+              ),
             )
           @dummy.save
         end
@@ -1191,16 +1223,20 @@ describe Paperclip::Storage::S3 do
       context "and saved" do
         before do
           object = double
-          allow(@dummy.avatar).to receive(:s3_object).and_return(object)
+          if s3_uses_transfer_manager?
+            allow(@dummy.avatar).to receive(:s3_transfer_manager).and_return(object)
+          else
+            allow(@dummy.avatar).to receive(:s3_object).and_return(object)
+          end
 
           expect(object).to receive(:upload_file).
             with(
               anything,
-              {
+              hash_including(
                  content_type: "image/png",
                  acl: :"public-read",
                  metadata: { "color" => "red" },
-              },
+              ),
             )
           @dummy.save
         end
@@ -1236,16 +1272,20 @@ describe Paperclip::Storage::S3 do
       context "and saved" do
         before do
           object = double
-          allow(@dummy.avatar).to receive(:s3_object).and_return(object)
+          if s3_uses_transfer_manager?
+            allow(@dummy.avatar).to receive(:s3_transfer_manager).and_return(object)
+          else
+            allow(@dummy.avatar).to receive(:s3_object).and_return(object)
+          end
 
           expect(object).to receive(:upload_file).
             with(
               anything,
-              {
+              hash_including(
                  content_type: "image/png",
                  acl: :"public-read",
                  metadata: { "color" => "red" },
-              },
+              ),
             )
           @dummy.save
         end
@@ -1282,16 +1322,20 @@ describe Paperclip::Storage::S3 do
         context "and saved" do
           before do
             object = double
-            allow(@dummy.avatar).to receive(:s3_object).and_return(object)
+            if s3_uses_transfer_manager?
+              allow(@dummy.avatar).to receive(:s3_transfer_manager).and_return(object)
+            else
+              allow(@dummy.avatar).to receive(:s3_object).and_return(object)
+            end
 
             expect(object).to receive(:upload_file).
               with(
                 anything,
-                {
+                hash_including(
                    content_type: "image/png",
                    acl: :"public-read",
                    storage_class: "reduced_redundancy",
-                },
+                ),
               )
             @dummy.save
           end
@@ -1333,7 +1377,11 @@ describe Paperclip::Storage::S3 do
           before do
             object = double
             [:thumb, :original].each do |style|
-              allow(@dummy.avatar).to receive(:s3_object).with(style).and_return(object)
+              if s3_uses_transfer_manager?
+                allow(@dummy.avatar).to receive(:s3_transfer_manager).and_return(object)
+              else
+                allow(@dummy.avatar).to receive(:s3_object).and_return(object)
+              end
 
               expected_options = {
                 content_type: "image/png",
@@ -1342,7 +1390,7 @@ describe Paperclip::Storage::S3 do
               expected_options.merge!(storage_class: :reduced_redundancy) if style == :thumb
 
               expect(object).to receive(:upload_file).
-                with(anything, expected_options)
+                with(anything, hash_including(expected_options))
             end
             @dummy.save
           end
@@ -1382,16 +1430,20 @@ describe Paperclip::Storage::S3 do
           before do
             object = double
             [:thumb, :original].each do |style|
-              allow(@dummy.avatar).to receive(:s3_object).with(style).and_return(object)
+              if s3_uses_transfer_manager?
+                allow(@dummy.avatar).to receive(:s3_transfer_manager).and_return(object)
+              else
+                allow(@dummy.avatar).to receive(:s3_object).and_return(object)
+              end
 
               expect(object).to receive(:upload_file).
                 with(
                   anything,
-                  {
+                  hash_including(
                     content_type: "image/png",
                     acl: :"public-read",
                     storage_class: :reduced_redundancy,
-                  },
+                  ),
                 )
             end
             @dummy.save
@@ -1432,10 +1484,14 @@ describe Paperclip::Storage::S3 do
         context "and saved" do
           before do
             object = double
-            allow(@dummy.avatar).to receive(:s3_object).and_return(object)
+            if s3_uses_transfer_manager?
+              allow(@dummy.avatar).to receive(:s3_transfer_manager).and_return(object)
+            else
+              allow(@dummy.avatar).to receive(:s3_object).and_return(object)
+            end
 
             expect(object).to receive(:upload_file).
-              with(anything, { content_type: "image/png", acl: :"public-read" })
+              with(anything, hash_including(content_type: "image/png", acl: :"public-read"))
             @dummy.save
           end
 
@@ -1471,16 +1527,20 @@ describe Paperclip::Storage::S3 do
       context "and saved" do
         before do
           object = double
-          allow(@dummy.avatar).to receive(:s3_object).and_return(object)
+          if s3_uses_transfer_manager?
+            allow(@dummy.avatar).to receive(:s3_transfer_manager).and_return(object)
+          else
+            allow(@dummy.avatar).to receive(:s3_object).and_return(object)
+          end
 
           expect(object).to receive(:upload_file).
             with(
               anything,
-              {
+              hash_including(
                 content_type: "image/png",
                 acl: :"public-read",
                 server_side_encryption: "AES256",
-              },
+              ),
             )
           @dummy.save
         end
@@ -1516,16 +1576,20 @@ describe Paperclip::Storage::S3 do
       context "and saved" do
         before do
           object = double
-          allow(@dummy.avatar).to receive(:s3_object).and_return(object)
+          if s3_uses_transfer_manager?
+            allow(@dummy.avatar).to receive(:s3_transfer_manager).and_return(object)
+          else
+            allow(@dummy.avatar).to receive(:s3_object).and_return(object)
+          end
 
           expect(object).to receive(:upload_file).
             with(
               anything,
-              {
+              hash_including(
                 content_type: "image/png",
                 acl: :"public-read",
                 storage_class: :reduced_redundancy,
-              },
+              ),
             )
           @dummy.save
         end
@@ -1667,10 +1731,14 @@ describe Paperclip::Storage::S3 do
         context "and saved" do
           before do
             object = double
-            allow(@dummy.avatar).to receive(:s3_object).and_return(object)
+            if s3_uses_transfer_manager?
+              allow(@dummy.avatar).to receive(:s3_transfer_manager).and_return(object)
+            else
+              allow(@dummy.avatar).to receive(:s3_object).and_return(object)
+            end
 
             expect(object).to receive(:upload_file).
-              with(anything, { content_type: "image/png", acl: :"public-read" })
+              with(anything, hash_including(content_type: "image/png", acl: :"public-read"))
             @dummy.save
           end
 
@@ -1705,10 +1773,14 @@ describe Paperclip::Storage::S3 do
         context "and saved" do
           before do
             object = double
-            allow(@dummy.avatar).to receive(:s3_object).and_return(object)
+            if s3_uses_transfer_manager?
+              allow(@dummy.avatar).to receive(:s3_transfer_manager).and_return(object)
+            else
+              allow(@dummy.avatar).to receive(:s3_object).and_return(object)
+            end
 
             expect(object).to receive(:upload_file).
-              with(anything, { content_type: "image/png", acl: :private })
+              with(anything, hash_including(content_type: "image/png", acl: :private))
             @dummy.save
           end
 
@@ -1748,16 +1820,21 @@ describe Paperclip::Storage::S3 do
 
         context "and saved" do
           before do
-            [:thumb, :original].each do |style|
-              object = double
-              allow(@dummy.avatar).to receive(:s3_object).with(style).and_return(object)
+            object = double
+            allow(@dummy.avatar).to receive(:s3_transfer_manager).and_return(object) if s3_uses_transfer_manager?
 
+            [:thumb, :original].each do |style|
+              expected_args = { content_type: "image/png", acl: style == :thumb ? :public_read : :private }
+              if s3_uses_transfer_manager?
+                expected_args = expected_args.merge({bucket: "testing", key: "avatars/#{style}/5k.png"})
+              else
+                allow(@dummy.avatar).to receive(:s3_object).with(style).and_return(object)
+              end
               expect(object).to receive(:upload_file).
-                with(anything,
-                     {
-                       content_type: "image/png",
-                       acl: style == :thumb ? :public_read : :private
-                     })
+                with(
+                  anything,
+                  hash_including(expected_args)
+                )
             end
             @dummy.save
           end
@@ -1821,18 +1898,24 @@ describe Paperclip::Storage::S3 do
 
       context "and saved" do
         before do
-          [:thumb, :original].each do |style|
-            object = double
-            allow(@dummy.avatar).to receive(:s3_object).with(style).and_return(object)
+          object = double
+          allow(@dummy.avatar).to receive(:s3_transfer_manager).and_return(object) if s3_uses_transfer_manager?
 
+          [:thumb, :original].each do |style|
+            expected_args = {
+              content_type: "image/png",
+              acl: :"public-read",
+              content_disposition: 'attachment; filename="Custom Avatar Name.png"'
+            }
+            if s3_uses_transfer_manager?
+              expected_args = expected_args.merge({bucket: "testing", key: "avatars/#{style}/5k.png"})
+            else
+              allow(@dummy.avatar).to receive(:s3_object).with(style).and_return(object)
+            end
             expect(object).to receive(:upload_file).
               with(
                 anything,
-                {
-                  content_type: "image/png",
-                  acl: :"public-read",
-                  content_disposition: 'attachment; filename="Custom Avatar Name.png"',
-                },
+                hash_including(expected_args)
               )
           end
           @dummy.save

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kt-paperclip
 version: !ruby/object:Gem::Version
-  version: 7.2.2
+  version: 7.3.0
 platform: ruby
 authors:
 - Surendra Singhi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-19 00:00:00.000000000 Z
+date: 2026-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -372,7 +372,7 @@ files:
 - CONTRIBUTING.md
 - Gemfile
 - LICENSE
-- NEWS
+- OLD_NEWS
 - README.md
 - RELEASING.md
 - Rakefile
@@ -434,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/fr.yml
 - lib/paperclip/locales/gd.yml
 - lib/paperclip/logger.rb
 - lib/paperclip/matchers.rb