alchemy_cms 8.3.3 → 8.3.4

data/app/stylesheets/alchemy/admin/forms.scss

@@ -66,7 +66,7 @@ form {
     &.boolean {
       height: var(--form-field-height);
 
-      input,
+      input[type="checkbox"],
       label {
         grid-column: 2;
         grid-row: 1;
@@ -75,23 +75,24 @@ form {
         margin: var(--form-field-margin);
       }
 
-      input {
+      input[type="checkbox"] {
         margin-left: var(--spacing-0);
       }
 
-      label {
+      input[type="checkbox"] + label {
         margin-left: var(--spacing-6);
       }
     }
 
-    label.checkbox {
+    label.checkbox,
+    label.boolean {
       display: flex;
       align-items: baseline;
       gap: var(--spacing-1);
       margin: var(--spacing-1) 0;
       width: max-content;
 
-      input {
+      input[type="checkbox"] {
         align-self: center;
         margin: 0 var(--spacing-0) 0 1px;
       }
@@ -278,12 +279,12 @@ form {
     label.checkbox {
       display: flex;
       align-items: center;
-      gap: var(--spacing-0);
+      gap: var(--spacing-1);
       width: max-content;
       grid-column: 2;
       grid-row: 1;
 
-      input {
+      input[type="checkbox"] {
         margin-left: var(--spacing-0);
       }
     }

data/app/views/alchemy/admin/pictures/index.html.erb

@@ -77,7 +77,8 @@
     import { on } from "alchemy_admin/utils/events";
 
     pictureSelector();
-    on("click", "#picture_archive", ".thumbnail_background", (event) => {
+    // A keyboard activated click targets the link, not the thumbnail inside it.
+    on("click", "#picture_archive", ".picture_thumbnail > a", (event) => {
       const url = event.target.closest("a")?.href;
       const overlay = new ImageOverlay(url, {
         size: `${window.clientWidth}x${window.clientHeight}`,

data/app/views/alchemy/admin/styleguide/index.html.erb

@@ -89,7 +89,7 @@
     </alchemy-char-counter>
 
     <div class="input check_boxes">
-      <label class="control-label">Check Boxes</label>
+      <label class="control-label">Check Box Group</label>
       <div class="control_group">
         <label class="checkbox">
           <input type="checkbox" value="1" checked>
@@ -101,6 +101,15 @@
         </label>
       </div>
     </div>
+
+    <div class="input boolean">
+      <input type="hidden" value="0">
+      <label class="boolean control-label">
+        <input class="boolean" type="checkbox" value="1">
+        Single Checkbox
+      </label>
+    </div>
+
     <alchemy-char-counter max-chars="160">
       <div class="input text">
         <label class="text control-label" for="textarea_with_counter">Textarea with char counter</label>

data/lib/alchemy/tasks/reorient_pictures.rb

@@ -0,0 +1,119 @@
+# frozen_string_literal: true
+
+require "alchemy/shell"
+
+module Alchemy
+  # Bakes the EXIF orientation into legacy picture masters.
+  #
+  # Masters uploaded before auto orientation landed still carry an EXIF
+  # orientation tag. Clients honor it for the original image, but not once it is
+  # converted to WebP, which renders such variants rotated in Chrome and Firefox.
+  class ReorientPictures
+    extend Shell
+
+    # Also covers "" and "Undefined", i.e. no orientation tag at all.
+    UPRIGHT_ORIENTATIONS = ["", "Undefined", "TopLeft"].freeze
+
+    class << self
+      def call(dry_run: false, picture_ids: nil)
+        unless Alchemy.storage_adapter.dragonfly?
+          log "Auto orientation only applies to the Dragonfly storage adapter", :skip
+          return []
+        end
+
+        log "Dry run - no changes will be made", :message if dry_run
+
+        affected = []
+        skipped = 0
+        # Dragonfly and ActiveJob log every shell command and enqueued job, which
+        # floods the output. Silence them for the duration of the run.
+        with_quiet_logging do
+          # "." upright, "f" needs reorienting (report), "o" reoriented,
+          # "s" master file missing.
+          scope(picture_ids).find_each do |picture|
+            next unless picture.has_convertible_format?
+
+            if UPRIGHT_ORIENTATIONS.include?(orientation_of(picture))
+              print_progress "."
+              next
+            end
+
+            affected << picture.id
+            reorient!(picture) unless dry_run
+            print_progress(dry_run ? "f" : "o")
+          rescue *Array(Alchemy.storage_adapter.rescuable_errors)
+            affected.delete(picture.id)
+            skipped += 1
+            print_progress "s"
+          end
+        end
+        finish_progress
+
+        log "#{dry_run ? "Found" : "Reoriented"} #{affected.size} picture(s) that need reorienting"
+        log "Skipped #{skipped} picture(s) whose master file is missing", :error if skipped.positive?
+        if dry_run && affected.any?
+          log "Reorient them with: rake alchemy:pictures:reorient PICTURE_IDS=#{affected.join(",")}"
+        end
+        affected
+      end
+
+      def report(picture_ids: nil)
+        call(dry_run: true, picture_ids:)
+      end
+
+      private
+
+      def scope(picture_ids)
+        picture_ids.present? ? Alchemy::Picture.where(id: picture_ids) : Alchemy::Picture.all
+      end
+
+      def reorient!(picture)
+        picture.image_file.auto_orient!
+        # Saving the baked master rewrites the element and page caches that embed it.
+        picture.save!
+        # The variant signature does not change, so drop the stale variants
+        # before regenerating them from the now upright master.
+        picture.thumbs.destroy_all
+        regenerate_variants(picture)
+      end
+
+      # Rerenders the frontend variants in the sizes the ingredients use, so the
+      # corrected images are served right away instead of on first request.
+      def regenerate_variants(picture)
+        picture.related_ingredients.each do |ingredient|
+          ingredient.picture_url
+          ingredient.settings.fetch(:srcset, []).each { |src| ingredient.picture_url(src) }
+        rescue => e
+          log "Could not regenerate variants for ingredient ##{ingredient.id}: #{e.message}", :error
+        end
+      end
+
+      def orientation_of(picture)
+        picture.image_file.identify("-format '%[orientation]'").to_s.strip
+      end
+
+      def with_quiet_logging
+        null_logger = ::Logger.new(IO::NULL)
+        dragonfly_logger = ::Dragonfly.logger
+        active_job_logger = ActiveJob::Base.logger
+        ::Dragonfly.logger = null_logger
+        ActiveJob::Base.logger = null_logger
+        yield
+      ensure
+        ::Dragonfly.logger = dragonfly_logger
+        ActiveJob::Base.logger = active_job_logger
+      end
+
+      def print_progress(char)
+        return if Alchemy::Shell.silenced?
+
+        print char
+        $stdout.flush
+      end
+
+      def finish_progress
+        puts unless Alchemy::Shell.silenced?
+      end
+    end
+  end
+end

data/lib/alchemy/version.rb

@@ -3,7 +3,7 @@
 module Alchemy
   extend self
 
-  VERSION = "8.3.3"
+  VERSION = "8.3.4"
 
   def version
     VERSION

data/lib/tasks/alchemy/pictures.rake

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require "alchemy/tasks/reorient_pictures"
+
+namespace :alchemy do
+  namespace :pictures do
+    # Limit any of the tasks below to a subset of pictures:
+    #   rake alchemy:pictures:report PICTURE_IDS=1,2,3
+    def alchemy_picture_ids
+      ENV["PICTURE_IDS"]&.split(",")&.map(&:strip).presence
+    end
+
+    desc "Reports picture masters that still carry a non upright EXIF orientation (Dragonfly only)."
+    task report: [:environment] do
+      Alchemy::ReorientPictures.report(picture_ids: alchemy_picture_ids)
+    end
+
+    desc "Bakes the EXIF orientation into existing picture masters (Dragonfly only)."
+    task reorient: [:environment] do
+      Alchemy::ReorientPictures.call(picture_ids: alchemy_picture_ids)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 8.3.3
+  version: 8.3.4
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -1382,6 +1382,7 @@ files:
 - lib/alchemy/sprockets/skip_builds_compression.rb
 - lib/alchemy/svg_scrubber.rb
 - lib/alchemy/taggable.rb
+- lib/alchemy/tasks/reorient_pictures.rb
 - lib/alchemy/tasks/tidy.rb
 - lib/alchemy/tasks/usage.rb
 - lib/alchemy/test_support.rb
@@ -1462,6 +1463,7 @@ files:
 - lib/tasks/alchemy/assets.rake
 - lib/tasks/alchemy/db.rake
 - lib/tasks/alchemy/install.rake
+- lib/tasks/alchemy/pictures.rake
 - lib/tasks/alchemy/sitemap.rake
 - lib/tasks/alchemy/thumbnails.rake
 - lib/tasks/alchemy/tidy.rake
@@ -1530,7 +1532,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - ImageMagick (libmagick), v6.6 or greater.
-rubygems_version: 4.0.10
+rubygems_version: 4.0.16
 specification_version: 4
 summary: A powerful, userfriendly and flexible CMS for Rails
 test_files: []