Merge pull request #2728 from schinery/main

Use Marcel::Magic.new(content_type).extensions instead of Marcel::TYPES[content_type]
carrierwaveuploader · Mar 2, 2024 · 78845ea · 78845ea
1 parent 4c65b39
commit 78845ea
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/lib/carrierwave/downloader/remote_file.rb b/lib/carrierwave/downloader/remote_file.rb
@@ -33,9 +33,9 @@ def headers
 
       def original_filename
         filename = filename_from_header || filename_from_uri
-        mime_type = Marcel::TYPES[content_type]
-        unless File.extname(filename).present? || mime_type.blank?
-          extension = mime_type[0].first
+        extensions = Marcel::Magic.new(content_type).extensions
+        unless File.extname(filename).present? || extensions.blank?
+          extension = extensions.first
           filename = "#{filename}.#{extension}"
         end
         filename

diff --git a/spec/processing/rmagick_spec.rb b/spec/processing/rmagick_spec.rb
@@ -243,7 +243,7 @@ def foo=(value); raise; end
         instance.manipulate! :read => {
           :foo => "1"
         }
-      end.to raise_error NoMethodError, /private method `foo=' called/
+      end.to raise_error NoMethodError, /private method .foo=. called/
     end
   end