From 78845ea09e2ded1024e58083580f8ff2d7555e7d Mon Sep 17 00:00:00 2001
From: Mitsuhiro Shibuya <mit.shibuya@gmail.com>
Date: Sat, 2 Mar 2024 14:20:25 +0900
Subject: [PATCH] Merge pull request #2728 from schinery/main

Use Marcel::Magic.new(content_type).extensions instead of Marcel::TYPES[content_type]
---
 lib/carrierwave/downloader/remote_file.rb | 6 +++---
 spec/processing/rmagick_spec.rb           | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/carrierwave/downloader/remote_file.rb b/lib/carrierwave/downloader/remote_file.rb
index 8b8d6bfe1..851b31dfd 100644
--- 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
index ae21149ac..aa5390f2f 100644
--- 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