alchemy_cms 8.4.3 → 8.4.4

data/app/assets/builds/alchemy/preview.min.js

@@ -1 +1 @@
-!function(){"use strict";const e={outline:"","outline-offset":"",cursor:""},t={outline:"2px dashed #f0b437","outline-offset":"4px",cursor:"pointer"},n={outline:"2px dashed #90b9d0","outline-offset":"4px"};let o=[],s=null;function a(e){i(e),s=e,Object.assign(e.style,n),e.scrollIntoView({behavior:"smooth",block:"start"})}function i(t){o.forEach(n=>{n!==t&&Object.assign(n.style,e)}),s=null}function c(e){const t=(n=e.element_id,o.find(e=>e.dataset.alchemyElement===n.toString()));var n;t?a(t):console.warn("Could not focus element with id",e.element_id)}function l(n){n.addEventListener("mouseover",()=>{n!==s&&Object.assign(n.style,t)}),n.addEventListener("mouseout",()=>{n!==s&&Object.assign(n.style,e)})}function d(e){const t=e.target.closest("[data-alchemy-element]");return t&&(a(t),function(e){window.parent.postMessage({message:"Alchemy.focusElementEditor",element_id:e.dataset.alchemyElement},window.location.origin)}(t)),t}function r(e){(function(e){if(e.closest("a"))return!0;const t=e.closest("button, input");return Boolean(t?.form)&&["submit","image"].includes(t.type)})(e.target)&&d(e)&&(e.stopPropagation(),e.preventDefault())}function u(){window.addEventListener("message",e=>{switch(e.data.message){case"Alchemy.blurElements":i();break;case"Alchemy.focusElement":c(e.data);break;default:console.info("Received unknown message!",e.data)}}),window.addEventListener("click",r,{capture:!0}),window.addEventListener("click",d),o=Array.from(document.querySelectorAll("[data-alchemy-element]")),o.forEach(l),window.parent.postMessage({message:"Alchemy.previewReady"},window.location.origin)}"loading"===document.readyState?document.addEventListener("DOMContentLoaded",u,{once:!0}):u()}();
+!function(){"use strict";const e={outline:"","outline-offset":"",cursor:""},t={outline:"2px dashed #f0b437","outline-offset":"4px",cursor:"pointer"},n={outline:"2px dashed #90b9d0","outline-offset":"4px"};let o=[],s=null;function a(e){i(e),s=e,Object.assign(e.style,n),e.scrollIntoView({behavior:"smooth",block:"start"})}function i(t){o.forEach(n=>{n!==t&&Object.assign(n.style,e)}),s=null}function c(e){const t=(n=e.element_id,o.find(e=>e.dataset.alchemyElement===n.toString()));var n;t?a(t):console.warn("Could not focus element with id",e.element_id)}function l(n){n.addEventListener("mouseover",()=>{n!==s&&Object.assign(n.style,t)}),n.addEventListener("mouseout",()=>{n!==s&&Object.assign(n.style,e)})}function d(e){const t=e.target.closest("[data-alchemy-element]");return t&&(a(t),function(e){window.parent.postMessage({message:"Alchemy.focusElementEditor",element_id:e.dataset.alchemyElement},window.location.origin)}(t)),t}function r(e){(function(e){if(e.closest("a"))return!0;const t=e.closest("button, input");return Boolean(t?.form)&&["submit","image"].includes(t.type)})(e.target)&&(d(e),e.stopPropagation(),e.preventDefault())}function u(){window.addEventListener("message",e=>{switch(e.data.message){case"Alchemy.blurElements":i();break;case"Alchemy.focusElement":c(e.data);break;default:console.info("Received unknown message!",e.data)}}),window.addEventListener("click",r,{capture:!0}),window.addEventListener("click",d),window.addEventListener("turbo:before-visit",e=>e.preventDefault()),o=Array.from(document.querySelectorAll("[data-alchemy-element]")),o.forEach(l),window.parent.postMessage({message:"Alchemy.previewReady"},window.location.origin)}"loading"===document.readyState?document.addEventListener("DOMContentLoaded",u,{once:!0}):u()}();

data/app/components/alchemy/ingredients/picture_view.rb

@@ -43,7 +43,7 @@ module Alchemy
       end
 
       def call
-        return if picture.blank?
+        return if picture.blank? || src.nil?
 
         output = caption ? img_tag + caption : img_tag
 
@@ -72,7 +72,9 @@ module Alchemy
       end
 
       def src
-        ingredient.picture_url(picture_options)
+        return @_src if defined?(@_src)
+
+        @_src = ingredient.picture_url(picture_options)
       end
 
       def img_tag

data/app/javascript/preview.js

@@ -101,7 +101,8 @@ function navigates(target) {
 // Client side routers navigate from click handlers on the link itself, so
 // navigating clicks have to be taken before the event reaches the page.
 function onNavigatingClick(event) {
-  if (navigates(event.target) && selectClickedElement(event)) {
+  if (navigates(event.target)) {
+    selectClickedElement(event)
     event.stopPropagation()
     event.preventDefault()
   }
@@ -123,6 +124,10 @@ function init() {
 
   window.addEventListener("click", onNavigatingClick, { capture: true })
   window.addEventListener("click", selectClickedElement)
+  // Turbo.visit can be called from any click handler, not only from links.
+  window.addEventListener("turbo:before-visit", (event) =>
+    event.preventDefault()
+  )
 
   elements = Array.from(document.querySelectorAll("[data-alchemy-element]"))
   elements.forEach(observeElement)

data/app/jobs/alchemy/invalidate_elements_cache_job.rb

@@ -11,6 +11,7 @@ module Alchemy
 
       all_element_ids = get_all_element_ids(elements, element_ids)
       Element.where(id: all_element_ids).touch_all
+      PageVersion.scheduled.where(id: elements.select(:page_version_id)).touch_all
 
       page_ids = elements.joins(page_version: :page).distinct.pluck("alchemy_pages.id")
       Page.where(id: page_ids).touch_all

data/app/models/alchemy/page.rb

@@ -453,14 +453,17 @@ module Alchemy
     # Returns true if the draft version has changes not yet published.
     #
     # Compares the updated_at timestamp of the draft_version against the
-    # updated_at timestamp of the public_version. If there's no public_version,
-    # the page has never been published and always has unpublished changes.
+    # page's published_at timestamp. The public_version's updated_at is not
+    # used, because it gets touched to invalidate caches. It only serves as
+    # fallback for public versions created without publishing (via +public_on=+).
+    # If there's no public_version, the page has never been published and
+    # always has unpublished changes.
     #
     # @return [Boolean]
     def has_unpublished_changes?
       return true unless public_version
 
-      draft_version.updated_at > public_version.updated_at
+      draft_version.updated_at > (published_at || public_version.updated_at)
     end
 
     # Sets the public_on date on the published version

data/app/models/alchemy/storage_adapter/active_storage.rb

@@ -158,6 +158,12 @@ module Alchemy
         picture.image_file&.variable?
       end
 
+      # @param [String, Symbol] format file extension
+      # @return [TrueClass, FalseClass]
+      def can_convert_to?(format)
+        Marcel::MimeType.for(extension: format.to_s).in?(::ActiveStorage.variable_content_types)
+      end
+
       # @param [Alchemy::Picture]
       # @return [String]
       def image_file_basename(picture)

data/app/models/alchemy/storage_adapter/dragonfly.rb

@@ -164,6 +164,12 @@ module Alchemy
         image_file_extension(picture).in?(CONVERTIBLE_FILE_FORMATS)
       end
 
+      # @param [String, Symbol] format file extension
+      # @return [TrueClass, FalseClass]
+      def can_convert_to?(format)
+        format.to_s.in?(CONVERTIBLE_FILE_FORMATS)
+      end
+
       # @param [Alchemy::Picture]
       # @return [String]
       def image_file_basename(picture)

data/app/models/alchemy/storage_adapter.rb

@@ -15,6 +15,7 @@ module Alchemy
       :file_mime_type,
       :file_name,
       :file_size,
+      :can_convert_to?,
       :has_convertible_format?,
       :image_file_basename,
       :image_file_extension,

data/app/models/concerns/alchemy/picture_thumbnails.rb

@@ -33,11 +33,13 @@ module Alchemy
     # @option options crop [Boolean]
     #   If set to true the picture will be cropped to fit the size value.
     #
-    # @return [String]
+    # @return [String, nil] +nil+ if no picture is assigned or the url could not be generated
     def picture_url(options = {})
       return if picture.nil?
 
-      picture.url(picture_url_options(options)) || "missing-image.png"
+      url = picture.url(picture_url_options(options))
+      Logger.warn("Could not generate url for picture #{picture.id}") if url.nil?
+      url
     end
 
     # Picture rendering options
@@ -47,7 +49,7 @@ module Alchemy
     #
     # The render format is taken from the +format+ option, the +format+ setting
     # of the ingredient definition or the +default_render_format+ of the picture.
-    # A format is only applied if the picture can be converted.
+    # A format is only applied if the picture can be converted into it.
     #
     # @param options [Hash] Options that override the defaults (i.e. +size+ or +format+ of a srcset entry)
     #
@@ -157,7 +159,8 @@ module Alchemy
     private
 
     def picture_render_format(format)
-      if format.present? && picture.has_convertible_format?
+      if format.present? && picture.has_convertible_format? &&
+          Alchemy.storage_adapter.can_convert_to?(format)
         format.to_s
       else
         picture.default_render_format

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

@@ -138,7 +138,7 @@ form {
     }
   }
 
-  input:invalid:focus {
+  input:user-invalid:focus {
     @extend %field-with-error;
   }
 

data/lib/alchemy/test_support/having_picture_thumbnails_examples.rb

@@ -103,8 +103,9 @@ RSpec.shared_examples_for "having picture thumbnails" do
         expect(picture).to receive(:url) { nil }
       end
 
-      it "returns missing image url" do
-        is_expected.to eq "missing-image.png"
+      it "returns nil and logs a warning" do
+        expect(Alchemy::Logger).to receive(:warn).with(/Could not generate url for picture/)
+        is_expected.to be_nil
       end
     end
   end
@@ -204,6 +205,17 @@ RSpec.shared_examples_for "having picture thumbnails" do
             expect(picture_url_options[:format]).to eq "png"
           end
         end
+
+        context "with format the picture can not be converted to" do
+          before do
+            allow(record).to receive(:settings) { {format: "svg"} }
+            allow(picture).to receive(:default_render_format) { "webp" }
+          end
+
+          it "includes the pictures default render format" do
+            expect(picture_url_options[:format]).to eq "webp"
+          end
+        end
       end
 
       context "with picture not having a convertible format" do

data/lib/alchemy/version.rb

@@ -3,7 +3,7 @@
 module Alchemy
   extend self
 
-  VERSION = "8.4.3"
+  VERSION = "8.4.4"
 
   def version
     VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 8.4.3
+  version: 8.4.4
 platform: ruby
 authors:
 - Thomas von Deyen