carrierwave-aws 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac60b2f92e091d9a99068561005dbf5cd44376269a0e7f101d0a64b2581cd07d
-  data.tar.gz: fdb3e1990f6c8845bfe79fb48c44f7ab4a04d5126a550dfd3d4196bb305344df
+  metadata.gz: a5f21a2f65d6fc529886cc06a0b9a796d61775b249655519c0401336b0076383
+  data.tar.gz: 7c33f49c78db4c5996e6db75e8841864184db6e9a3c70186a982735f59c5c253
 SHA512:
-  metadata.gz: d3ff06f23bfd7ad4486adbaeb788be01ccee910eb4d81a786428034031bae77d069c0088dd55873df599bf9bc148530e800607d846d66827b7cebe5659d82633
-  data.tar.gz: 4eb6671f489ca213531f3c8bb0aa34da3e6ed6658bae7ae3870d95b321614c1d54ee87f277fc237838ddab3ac9dd537c7a2f7ad817fe862a8bb615ae1fe92a3a
+  metadata.gz: d5f7d35bfc4eaae8eef5a8c314b175c1e37a0394f19896c5ef96daf38c1d16ae37f269d03cb832f66765cfeba2b05d5339d0b6ea649fc0524e4614fd280268ca
+  data.tar.gz: 7277c6e4455acfc23dc2afd4f2e23d25bd5e550606c395151de2a75c969874cfd8b77b492d631c266c28f7f737d3c2a4cd07c679a1a12e404fb3022ec8e916da

data/lib/carrierwave/aws/version.rb

@@ -2,6 +2,6 @@
 
 module Carrierwave
   module AWS
-    VERSION = '1.6.0'
+    VERSION = '1.6.1'
   end
 end

data/lib/carrierwave/storage/aws_file.rb

@@ -57,6 +57,11 @@ module CarrierWave
       def store(new_file)
         if new_file.is_a?(self.class)
           new_file.move_to(path)
+        elsif Aws::S3.const_defined?(:TransferManager)
+          options = aws_options.write_options(new_file).except(:body)
+          options[:multipart_threshold] = AWSOptions::MULTIPART_THRESHOLD
+          Aws::S3::TransferManager.new(client: connection.client).upload_file(new_file.path, bucket: bucket.name,
+                                                                                             key: path, **options)
         else
           file.upload_file(new_file.path, aws_options.write_options(new_file))
         end

data/lib/carrierwave/storage/aws_options.rb

@@ -3,7 +3,10 @@
 module CarrierWave
   module Storage
     class AWSOptions
-      MULTIPART_TRESHOLD = 15 * 1024 * 1024
+      MULTIPART_THRESHOLD = 15 * 1024 * 1024
+
+      # Backward compatibility
+      MULTIPART_TRESHOLD = MULTIPART_THRESHOLD
 
       attr_reader :uploader
 
@@ -26,7 +29,7 @@ module CarrierWave
       def move_options(file)
         {
           acl: uploader.aws_acl,
-          multipart_copy: file.size >= MULTIPART_TRESHOLD
+          multipart_copy: file.size >= MULTIPART_THRESHOLD
         }.merge(aws_attributes).merge(aws_write_options)
       end
       alias copy_options move_options

data/spec/carrierwave/storage/aws_file_spec.rb

@@ -141,9 +141,36 @@ describe CarrierWave::Storage::AWSFile do
         CarrierWave::SanitizedFile.new('spec/fixtures/image.png')
       end
 
-      it 'uploads the file using with multipart support' do
-        expect(file).to(receive(:upload_file)
-                              .with(new_file.path, an_instance_of(Hash)))
+      it 'uploads the file using TransferManager' do
+        client = instance_double('Aws::S3::Client')
+
+        allow(bucket).to receive(:name).and_return('example-com')
+        allow(connection).to receive(:client).and_return(client)
+
+        if Aws::S3.const_defined?(:TransferManager)
+          transfer_manager = instance_double('Aws::S3::TransferManager')
+          allow(Aws::S3::TransferManager).to receive(:new).with(client: client).and_return(transfer_manager)
+
+          expect(transfer_manager).to receive(:upload_file).with(
+            new_file.path,
+            bucket: 'example-com',
+            key: path,
+            acl: :'public-read',
+            content_type: new_file.content_type,
+            encryption_key: 'def',
+            multipart_threshold: CarrierWave::Storage::AWSOptions::MULTIPART_THRESHOLD
+          )
+        else
+          expect(file).to receive(:upload_file).with(
+            new_file.path,
+            hash_including(
+              acl: :'public-read',
+              content_type: new_file.content_type,
+              encryption_key: 'def'
+            )
+          )
+        end
+
         aws_file.store(new_file)
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-aws
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Parker Selbert
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-23 00:00:00.000000000 Z
+date: 2026-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
@@ -128,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: Native aws-sdk support for S3 in CarrierWave