Merge pull request #2692 from tvdeyen/admin-thumbnail-quality

Set admin picture thumbnail quality to 90

app/models/alchemy/picture.rb

@@ -22,6 +22,8 @@
 
 module Alchemy
   class Picture < BaseRecord
+    THUMBNAIL_QUALITY = 90
+
     THUMBNAIL_SIZES = {
       small: "80x60",
       medium: "160x120",
@@ -192,6 +194,23 @@ def url(options = {})
       nil
     end
 
+    # Returns an url for the thumbnail representation of the picture
+    #
+    # @param [String] size - The size of the thumbnail
+    # @param [Integer] quality - The quality of the thumbnail
+    #
+    # @return [String]
+    def thumbnail_url(size: "160x120", quality: THUMBNAIL_QUALITY)
+      return if image_file.nil?
+
+      url(
+        flatten: true,
+        format: "webp",
+        quality: quality,
+        size: size
+      )
+    end
+
     # Updates name and tag_list attributes.
     #
     # Used by +Admin::PicturesController#update_multiple+

app/models/concerns/alchemy/picture_thumbnails.rb

@@ -84,7 +84,8 @@ def thumbnail_url_options
         crop_from: crop && crop_from.presence || default_crop_from&.join("x"),
         crop_size: crop && crop_size.presence || default_crop_size&.join("x"),
         flatten: true,
-        format: "webp"
+        format: "webp",
+        quality: Alchemy::Picture::THUMBNAIL_QUALITY
       }
     end
 

app/views/alchemy/admin/crop.html.erb

@@ -8,7 +8,7 @@
     <%= simple_format Alchemy.t(:explain_cropping) %>
   <% end %>
   <div class="thumbnail_background">
-    <%= image_tag @picture.url(size: '800x600', flatten: true, format: "webp"), id: 'imageToCrop' %>
+    <%= image_tag @picture.thumbnail_url(size: '800x600'), id: 'imageToCrop' %>
   </div>
   <form>
     <%= button_tag Alchemy.t(:apply), type: 'submit' %>

app/views/alchemy/admin/pictures/_picture.html.erb

@@ -20,7 +20,7 @@
     </sl-tooltip>
   </span>
   <% end %>
-  <% picture_url = picture.url(size: preview_size(@size), flatten: true, format: "webp") %>
+  <% picture_url = picture.thumbnail_url(size: preview_size(@size)) %>
   <% image = image_tag(picture_url || "alchemy/missing-image.svg", alt: picture.name) %>
   <% if can?(:edit, picture) && picture_url %>
     <%= link_to(

app/views/alchemy/admin/pictures/_picture_to_assign.html.erb

@@ -2,7 +2,7 @@
   <sl-tooltip content="<%= Alchemy.t(:assign_image) %>">
     <%= link_to(
       image_tag(
-        picture_to_assign.url(size: preview_size(size), flatten: true, format: "webp") || "alchemy/missing-image.svg",
+        picture_to_assign.thumbnail_url(size: preview_size(size)) || "alchemy/missing-image.svg",
         alt: picture_to_assign.name
       ),
       alchemy.assign_admin_picture_path(

lib/alchemy/test_support/having_picture_thumbnails_examples.rb

@@ -382,6 +382,7 @@
           crop_size: nil,
           flatten: true,
           format: "webp",
+          quality: Alchemy::Picture::THUMBNAIL_QUALITY,
           size: "160x120"
         )
       end
@@ -401,6 +402,7 @@
             crop_size: nil,
             flatten: true,
             format: "webp",
+            quality: Alchemy::Picture::THUMBNAIL_QUALITY,
             size: "160x120"
           )
         end

spec/models/alchemy/picture_spec.rb

@@ -310,6 +310,67 @@ module Alchemy
       end
     end
 
+    describe "#thumbnail_url" do
+      subject(:thumbnail_url) { picture.thumbnail_url }
+
+      let(:picture) do
+        build(:alchemy_picture, image_file: image)
+      end
+
+      context "with no image file present" do
+        let(:image) { nil }
+
+        it { is_expected.to be_nil }
+      end
+
+      context "with image file present" do
+        let(:image) do
+          fixture_file_upload(
+            File.expand_path("../../fixtures/500x500.png", __dir__),
+            "image/png"
+          )
+        end
+
+        it "returns the url to the thumbnail" do
+          expect(picture).to receive(:url).with(
+            flatten: true,
+            format: "webp",
+            quality: Alchemy::Picture::THUMBNAIL_QUALITY,
+            size: "160x120"
+          )
+          thumbnail_url
+        end
+
+        context "with size given" do
+          subject(:thumbnail_url) { picture.thumbnail_url(size: "800x600") }
+
+          it "returns the url to the thumbnail" do
+            expect(picture).to receive(:url).with(
+              flatten: true,
+              format: "webp",
+              quality: Alchemy::Picture::THUMBNAIL_QUALITY,
+              size: "800x600"
+            )
+            thumbnail_url
+          end
+        end
+
+        context "with quality given" do
+          subject(:thumbnail_url) { picture.thumbnail_url(quality: 50) }
+
+          it "returns the url to the thumbnail" do
+            expect(picture).to receive(:url).with(
+              flatten: true,
+              format: "webp",
+              quality: 50,
+              size: "160x120"
+            )
+            thumbnail_url
+          end
+        end
+      end
+    end
+
     describe "#urlname" do
       subject { picture.urlname }