Support setting #aws_acl to nil for bucket-level ACL compatibility

Closes #175
carrierwaveuploader · Jul 23, 2023 · 7a3747c · 7a3747c
1 parent 226b420
commit 7a3747c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/lib/carrierwave-aws.rb b/lib/carrierwave-aws.rb
@@ -40,6 +40,8 @@ def self.aws_acl=(acl)
       end
 
       def self.normalized_acl(acl)
+        return nil if acl.nil?
+
         normalized = acl.to_s.downcase.sub('_', '-')
 
         unless ACCEPTED_ACL.include?(normalized)

diff --git a/spec/carrierwave-aws_spec.rb b/spec/carrierwave-aws_spec.rb
@@ -20,14 +20,21 @@
   end
 
   describe '#aws_acl' do
-    it 'allows known acess control values' do
+    it 'allows known access control values' do
       expect do
         uploader.aws_acl = 'private'
         uploader.aws_acl = 'public-read'
         uploader.aws_acl = 'authenticated-read'
       end.not_to raise_exception
     end
 
+    it 'allows nil' do
+      uploader.aws_acl = 'public-read'
+      expect do
+        uploader.aws_acl = nil
+      end.to change { uploader.aws_acl }.from('public-read').to(nil)
+    end
+
     it 'does not allow unknown control values' do
       expect do
         uploader.aws_acl = 'everybody'