kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Active Storage: don't crash if mini_mime doesn't recognize content_type

Browse source 
Fixes https://github.com/rails/rails/issues/41777
This commit is contained in:
Alex Ghiculescu 2021-05-14 11:25:30 -05:00
parent 10d74dbe86
commit fbcac360b2
2 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
activestorage/app/models/active_storage/blob/representable.rb
View file

@ -113,7 +113,7 @@ module ActiveStorage::Blob::Representable
if filename.extension.present? && MiniMime.lookup_by_extension(filename.extension)&.content_type == content_type
filename.extension
else
MiniMime.lookup_by_content_type(content_type).extension
MiniMime.lookup_by_content_type(content_type)&.extension
end
end

14
activestorage/test/models/variant_test.rb
View file

@ -187,6 +187,20 @@ class ActiveStorage::VariantTest < ActiveSupport::TestCase
end
end
test "doesn't crash content_type not recognized by mini_mime" do
blob = create_file_blob(filename: "racecar.jpg")
# image/jpg is not recognised by mini_mime (image/jpeg is correct)
blob.update(content_type: "image/jpg")
assert_nothing_raised do
blob.variant(resize: "100x100")
end
assert_nil blob.send(:format)
assert_equal :png, blob.send(:default_variant_format)
end
private
def process_variants_with(processor)
previous_processor, ActiveStorage.variant_processor = ActiveStorage.variant_processor, processor