Merge pull request #1949 from alphagov/dependabot/bundler/mini_magick…

…-5.0.0

Bump mini_magick from 4.13.1 to 5.0.0

Gemfile

@@ -11,7 +11,6 @@ gem "govspeak"
 gem "govuk_app_config"
 gem "govuk_publishing_components"
 gem "govuk_sidekiq"
-gem "mini_magick"
 gem "mongo"
 gem "mongoid"
 gem "pdf-reader"

Gemfile.lock

@@ -250,7 +250,6 @@ GEM
     mime-types (3.5.2)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2024.0604)
-    mini_magick (4.13.1)
     mini_mime (1.1.5)
     mini_portile2 (2.8.7)
     minitest (5.24.1)
@@ -767,7 +766,6 @@ DEPENDENCIES
   govuk_sidekiq
   govuk_test
   listen
-  mini_magick
   mongo
   mongoid
   pdf-reader

app/validators/image_validator.rb

@@ -1,3 +1,5 @@
+require "marcel"
+
 class ImageValidator < ActiveModel::EachValidator
   MIME_TYPES = {
     "image/jpeg" => /(\.jpeg|\.jpg)$/,
@@ -8,15 +10,13 @@ class ImageValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
     return unless value.present? && File.exist?(value.path)
 
-    image = MiniMagick::Image.open(value.path)
+    mime_type = Marcel::MimeType.for(Pathname.new(value.path))
 
-    valid_extension = MIME_TYPES[image.mime_type]
+    valid_extension = MIME_TYPES[mime_type]
     if valid_extension.nil?
-      record.errors[attribute] << "is not an allowed image format"
+      record.errors.add(attribute, message: "is not an allowed image format")
     elsif !value.path.downcase.match?(valid_extension)
-      record.errors.add(attribute, message: "is of type '#{image.mime_type}', but has the extension '#{File.extname(value.path)}'")
+      record.errors.add(attribute, message: "is of type '#{mime_type}', but has the extension '#{File.extname(value.path)}'")
     end
-  rescue MiniMagick::Error, MiniMagick::Invalid
-    record.errors.add(attribute, message: "is not an image")
   end
 end