例外処理を他の箇所に移動させる

fjordllc · Mar 20, 2024 · a97a765 · a97a765
1 parent 06d2513
commit a97a765
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/app/models/image_resizer.rb b/app/models/image_resizer.rb
@@ -9,9 +9,7 @@ def initialize(attachment, resize_side: { width: 600, height: 600 })
   def resize
     @image_side = fetch_image_side
     resize_size = fetch_resize_size_fit_and_crop
-    @attachment.variant(resize_to_fit: resize_size[:fit], crop: [*resize_size[:crop], @resize_side[:width], @resize_side[:height]]).processed.url
-  rescue Vips::Error
-    image_url default_image_path
+    @attachment.variant(resize_to_fit: resize_size[:fit], crop: [*resize_size[:crop], @resize_side[:width], @resize_side[:height]])
   end
 
   private

diff --git a/app/models/user.rb b/app/models/user.rb
@@ -593,11 +593,11 @@ def avatar_url
 
     if avatar.attached?
       image_resizer = ImageResizer.new(avatar, resize_side: { width: 120, height: 120 })
-      image_resizer.resize
+      image_resizer.resize.processed.url
     else
       image_url default_image_path
     end
-  rescue ActiveStorage::FileNotFoundError, ActiveStorage::InvariableError
+  rescue ActiveStorage::FileNotFoundError, ActiveStorage::InvariableError, Vips::Error
     image_url default_image_path
   end