resize_to_fillオプションを使用する

fjordllc · Mar 28, 2024 · 2f350dd · 2f350dd
1 parent b37b151
commit 2f350dd
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 102 deletions.
diff --git a/app/models/image_resizer.rb b/app/models/image_resizer.rb
diff --git a/app/models/user.rb b/app/models/user.rb
@@ -7,6 +7,7 @@ class User < ApplicationRecord
 
   authenticates_with_sorcery!
   VALID_SORT_COLUMNS = %w[id login_name company_id last_activity_at created_at report comment asc desc].freeze
+  AVATAR_SIZE = [120, 120].freeze
   RESERVED_LOGIN_NAMES = %w[adviser all graduate inactive job_seeking mentor retired student student_and_trainee trainee year_end_party].freeze
   MAX_PERCENTAGE = 100
   DEPRESSED_SIZE = 2
@@ -592,9 +593,7 @@ def avatar_url
     default_image_path = '/images/users/avatars/default.png'
 
     if avatar.attached?
-      options = { autorot: true, saver: { strip: true, quality: 60 } }
-      image_resizer = ImageResizer.new(avatar, resize_side: { width: 120, height: 120 }, options:)
-      image_resizer.resize.processed.url
+      avatar.variant(resize_to_fill: AVATAR_SIZE, autorot: true, saver: { strip: true, quality: 60 }).processed.url
     else
       image_url default_image_path
     end

diff --git a/test/fixtures/active_storage/blobs.yml b/test/fixtures/active_storage/blobs.yml
@@ -11,22 +11,22 @@ company3_logo_blob: <%= ActiveStorage::Blob.fixture filename: "companies/logos/3
 company4_logo_blob: <%= ActiveStorage::Blob.fixture filename: "companies/logos/4.jpg" %>
 
 # users
-hatsuno_avatar_blob: <%= ActiveStorage::Blob.fixture filename: "users/avatars/hatsuno.jpg", metadata: { width: 100, height: 100 } %>
+hatsuno_avatar_blob: <%= ActiveStorage::Blob.fixture filename: "users/avatars/hatsuno.jpg" %>
 
-komagata_avatar_blob: <%= ActiveStorage::Blob.fixture filename: "users/avatars/komagata.jpg", metadata: { width: 100, height: 100 } %>
+komagata_avatar_blob: <%= ActiveStorage::Blob.fixture filename: "users/avatars/komagata.jpg" %>
 
-machida_avatar_blob: <%= ActiveStorage::Blob.fixture filename: "users/avatars/machida.jpg", metadata: { width: 100, height: 100 } %>
+machida_avatar_blob: <%= ActiveStorage::Blob.fixture filename: "users/avatars/machida.jpg" %>
 
-mentormentaro_avatar_blob: <%= ActiveStorage::Blob.fixture filename: "users/avatars/mentormentaro.jpg", metadata: { width: 100, height: 100 } %>
+mentormentaro_avatar_blob: <%= ActiveStorage::Blob.fixture filename: "users/avatars/mentormentaro.jpg" %>
 
-mineo_avatar_blob: <%= ActiveStorage::Blob.fixture filename: "users/avatars/mineo.jpg", metadata: { width: 100, height: 100 } %>
+mineo_avatar_blob: <%= ActiveStorage::Blob.fixture filename: "users/avatars/mineo.jpg" %>
 
-tanaka_avatar_blob: <%= ActiveStorage::Blob.fixture filename: "users/avatars/tanaka.jpg", metadata: { width: 100, height: 100 } %>
+tanaka_avatar_blob: <%= ActiveStorage::Blob.fixture filename: "users/avatars/tanaka.jpg" %>
 
-yameo_avatar_blob: <%= ActiveStorage::Blob.fixture filename: "users/avatars/yameo.jpg", metadata: { width: 100, height: 100 } %>
+yameo_avatar_blob: <%= ActiveStorage::Blob.fixture filename: "users/avatars/yameo.jpg" %>
 
-komagata_profile_image_blob: <%= ActiveStorage::Blob.fixture filename: "users/avatars/komagata.jpg", metadata: { width: 100, height: 100 } %>
+komagata_profile_image_blob: <%= ActiveStorage::Blob.fixture filename: "users/avatars/komagata.jpg" %>
 
-machida_profile_image_blob: <%= ActiveStorage::Blob.fixture filename: "users/avatars/machida.jpg", metadata: { width: 100, height: 100 } %>
+machida_profile_image_blob: <%= ActiveStorage::Blob.fixture filename: "users/avatars/machida.jpg" %>
 
-kimuramitai_profile_image_blob: <%= ActiveStorage::Blob.fixture filename: "users/avatars/default.jpg", metadata: { width: 100, height: 100 } %>
+kimuramitai_profile_image_blob: <%= ActiveStorage::Blob.fixture filename: "users/avatars/default.jpg" %>
diff --git a/test/models/image_resizer_test.rb b/test/models/image_resizer_test.rb