Merge branch 'dependabot/bundler/image_processing-1.14.0' into develop

mysociety · Feb 17, 2025 · b7cf114 · b7cf114
2 parents 342b63d + 29ff26d
commit b7cf114
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/Gemfile b/Gemfile
@@ -99,7 +99,7 @@ gem 'friendly_id', '~> 5.5.1'
 gem 'gnuplot', '~> 2.6.0'
 gem 'htmlentities', '~> 4.3.0'
 gem 'icalendar', '~> 2.10.3'
-gem 'image_processing', '~> 1.13'
+gem 'image_processing', '~> 1.14'
 gem 'jquery-rails', '~> 4.6.0'
 gem 'jquery-ui-rails', '~> 6.0.0'
 gem 'json', '~> 2.10.1'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -297,8 +297,8 @@ GEM
       ice_cube (~> 0.16)
       ostruct
     ice_cube (0.17.0)
-    image_processing (1.13.0)
-      mini_magick (>= 4.9.5, < 5)
+    image_processing (1.14.0)
+      mini_magick (>= 4.9.5, < 6)
       ruby-vips (>= 2.0.17, < 3)
     importmap-rails (2.1.0)
       actionpack (>= 6.0.0)
@@ -350,7 +350,9 @@ GEM
       logger
       mime-types-data (~> 3.2015)
     mime-types-data (3.2024.1001)
-    mini_magick (4.13.2)
+    mini_magick (5.1.2)
+      benchmark
+      logger
     mini_mime (1.1.5)
     mini_portile2 (2.8.8)
     mini_racer (0.16.0)
@@ -529,7 +531,7 @@ GEM
       rubocop-ast (>= 1.31.1, < 2.0)
     ruby-ole (1.2.12.1)
     ruby-progressbar (1.13.0)
-    ruby-vips (2.2.2)
+    ruby-vips (2.2.3)
       ffi (~> 1.12)
       logger
     rubyXL (3.4.33)
@@ -673,7 +675,7 @@ DEPENDENCIES
   htmlentities (~> 4.3.0)
   i18n (~> 1.14.7)
   icalendar (~> 2.10.3)
-  image_processing (~> 1.13)
+  image_processing (~> 1.14)
   importmap-rails (~> 2.1.0)
   iso_country_codes (~> 0.7.8)
   jquery-rails (~> 4.6.0)

diff --git a/app/models/profile_photo.rb b/app/models/profile_photo.rb
@@ -112,9 +112,9 @@ def convert_data_to_image
       return
     end
 
-    begin
-      converted = MiniMagick::Image.read(data)
-    rescue MiniMagick::Invalid
+    converted = MiniMagick::Image.read(data)
+
+    unless converted.valid?
       self.image = nil
       return
     end