From 2408ed493420a3451e4273078499d88e862de88d Mon Sep 17 00:00:00 2001 From: Stuart Chinery Date: Thu, 29 Feb 2024 14:45:25 +0000 Subject: [PATCH] Use Marcel::TYPE_EXTS instead of Marcel::TYPES --- carrierwave.gemspec | 2 +- lib/carrierwave/downloader/remote_file.rb | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/carrierwave.gemspec b/carrierwave.gemspec index 55da2d56d..0bc336a01 100644 --- a/carrierwave.gemspec +++ b/carrierwave.gemspec @@ -23,7 +23,7 @@ Gem::Specification.new do |s| s.add_dependency "activesupport", ">= 6.0.0" s.add_dependency "activemodel", ">= 6.0.0" s.add_dependency "image_processing", "~> 1.1" - s.add_dependency "marcel", "~> 1.0.0" + s.add_dependency "marcel", "~> 1.0.3" s.add_dependency "addressable", "~> 2.6" s.add_dependency "ssrf_filter", "~> 1.0" s.add_development_dependency "csv", "~> 3.0" diff --git a/lib/carrierwave/downloader/remote_file.rb b/lib/carrierwave/downloader/remote_file.rb index 8b8d6bfe1..ed31aa9a9 100644 --- a/lib/carrierwave/downloader/remote_file.rb +++ b/lib/carrierwave/downloader/remote_file.rb @@ -33,9 +33,8 @@ 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 + extension = Marcel::TYPE_EXTS[content_type] + unless File.extname(filename).present? || extension.blank? filename = "#{filename}.#{extension}" end filename