alchemy_cms 6.0.0.pre.rc7 → 6.0.2

data/app/models/alchemy/picture.rb

@@ -28,7 +28,7 @@ module Alchemy
       large: "240x180",
     }.with_indifferent_access.freeze
 
-    CONVERTIBLE_FILE_FORMATS = %w(gif jpg jpeg png).freeze
+    CONVERTIBLE_FILE_FORMATS = %w[gif jpg jpeg png webp].freeze
 
     TRANSFORMATION_OPTIONS = [
       :crop,

data/app/models/alchemy/picture_variant.rb

@@ -13,6 +13,8 @@ module Alchemy
     include Alchemy::Logger
     include Alchemy::Picture::Transformations
 
+    ANIMATED_IMAGE_FORMATS = %w[gif webp]
+
     attr_reader :picture, :render_format
 
     def_delegators :@picture,
@@ -86,7 +88,7 @@ module Alchemy
       end
 
       options = {
-        flatten: render_format != "gif" && picture.image_file_format == "gif",
+        flatten: !render_format.in?(ANIMATED_IMAGE_FORMATS) && picture.image_file_format == "gif",
       }.with_indifferent_access.merge(options)
 
       encoding_options = []

data/app/models/alchemy/site.rb

@@ -18,7 +18,7 @@ module Alchemy
   class Site < BaseRecord
     # validations
     validates_presence_of :host
-    validates_uniqueness_of :host
+    validates_uniqueness_of :host, case_sensitive: false
 
     # associations
     has_many :languages

data/app/views/alchemy/admin/clipboard/insert.js.erb

@@ -14,3 +14,16 @@
   Alchemy.growl('<%= j Alchemy.t("item copied to clipboard", name: @item.class.name == "Alchemy::Element" ? @item.display_name_with_preview_text : @item.name) %>')
 <% end -%>
 $('#clipboard_button .icon').removeClass('fa-clipboard').addClass('fa-paste');
+
+<%# Update add nested element forms for any elements that accept ONLY this as a nested element %>
+<% if @item.class == Alchemy::Element %>
+  if (window.location.pathname == "<%= edit_admin_page_path(@item.page.id) %>") {
+    <%
+      @item.page.draft_version.elements.expanded.select do |element|
+        element.definition["nestable_elements"] == [@item.name]
+      end.each do |element|
+    %>
+      $(".add-nested-element[data-element-id='<%= element.id %>']").replaceWith('<%= j render "alchemy/admin/elements/add_nested_element_form", element: element %>')
+    <% end %>
+  }
+<% end %>

data/app/views/alchemy/admin/elements/_add_nested_element_form.html.erb

@@ -0,0 +1,27 @@
+<%= content_tag :div, class: 'add-nested-element', data: { element_id: element.id } do %>
+  <% if element.expanded? || element.fixed? %>
+    <% if element.nestable_elements.length == 1 && 
+      (nestable_element = element.nestable_elements.first) && 
+      Alchemy::Element.all_from_clipboard_for_parent_element(get_clipboard("elements"), element).none?
+    %>
+      <%= form_for [:admin, Alchemy::Element.new(name: nestable_element)],
+        remote: true, html: { class: 'add-nested-element-form', id: nil } do |f| %>
+        <%= f.hidden_field :name %>
+        <%= f.hidden_field :page_version_id, value: element.page_version_id %>
+        <%= f.hidden_field :parent_element_id, value: element.id %>
+        <button class="button add-nestable-element-button" data-alchemy-button>
+          <%= Alchemy.t(:add_nested_element, name: Alchemy.t(nestable_element, scope: 'element_names')) %>
+        </button>
+      <% end %>
+    <% else %>
+      <%= link_to_dialog (nestable_element ? Alchemy.t(:add_nested_element, name: Alchemy.t(nestable_element, scope: 'element_names')) : Alchemy.t("New Element")),
+        alchemy.new_admin_element_path(
+          parent_element_id: element.id,
+          page_version_id: element.page_version_id
+        ), {
+          size: "320x125",
+          title: Alchemy.t("New Element")
+        }, class: "button add-nestable-element-button" %>
+    <% end %>
+  <% end %>
+<% end %>

data/app/views/alchemy/admin/elements/_element.html.erb

@@ -55,29 +55,7 @@
         } %>
       <% end %>
 
-      <% if element.expanded? || element.fixed? %>
-        <% if element.nestable_elements.length == 1 %>
-          <% nestable_element = element.nestable_elements.first %>
-          <%= form_for [:admin, Alchemy::Element.new(name: nestable_element)],
-            remote: true, html: { class: 'add-nested-element-form', id: nil } do |f| %>
-            <%= f.hidden_field :name %>
-            <%= f.hidden_field :page_version_id, value: element.page_version_id %>
-            <%= f.hidden_field :parent_element_id, value: element.id %>
-            <button class="button add-nestable-element-button" data-alchemy-button>
-              <%= Alchemy.t(:add_nested_element) % { name: Alchemy.t(nestable_element, scope: 'element_names') } %>
-            </button>
-          <% end %>
-        <% else %>
-          <%= link_to_dialog Alchemy.t("New Element"),
-            alchemy.new_admin_element_path(
-              parent_element_id: element.id,
-              page_version_id: element.page_version_id
-            ), {
-              size: "320x125",
-              title: Alchemy.t("New Element")
-            }, class: "button add-nestable-element-button" %>
-        <% end %>
-      <% end %>
+      <%= render "alchemy/admin/elements/add_nested_element_form", element: element %>
     </div>
   <% end %>
 <% end %>

data/app/views/alchemy/admin/elements/_form.html.erb

@@ -9,7 +9,11 @@
       label: Alchemy.t(:element_of_type),
       collection: elements_for_select(@elements),
       prompt: Alchemy.t(:select_element),
-      input_html: {class: 'alchemy_selectbox', autofocus: true} %>
+      selected: (@elements.first if @elements.count == 1),
+      input_html: {class: 'alchemy_selectbox', autofocus: true, disabled: @elements.count == 1} %>
+    <% if @elements.count == 1 %>
+      <%= form.hidden_field :name, value: @elements.first[:name] %>
+    <% end %>
     <%= form.hidden_field :parent_element_id, value: @parent_element.try(:id) %>
     <%= form.submit Alchemy.t(:add) %>
   <%- end -%>

data/app/views/alchemy/admin/partials/_routes.html.erb

@@ -5,6 +5,10 @@
       return '<%= alchemy.admin_picture_path(id: 1) %>'.replace(/1/, id);
     },
 
+    url_admin_picture_path: function(id) {
+      return '<%= alchemy.url_admin_picture_path(id: 1) %>'.replace(/1/, id);
+    },
+
     fold_admin_element_path: function(id) {
       return '<%= alchemy.fold_admin_element_path(id: 1) %>'.replace(/1/, id);
     },

data/app/views/alchemy/admin/resources/_form.html.erb

@@ -8,6 +8,11 @@
         input_html: {class: 'alchemy_selectbox'} %>
     <% elsif attribute[:type].in? %i[date time datetime] %>
       <%= f.datepicker attribute[:name], resource_attribute_field_options(attribute) %>
+    <% elsif attribute[:enum].present? %>
+      <%= f.input attribute[:name],
+        collection: attribute[:enum],
+        include_blank: Alchemy.t(:blank, scope: 'resources.relation_select'),
+        input_html: {class: 'alchemy_selectbox'} %>
     <% else %>
       <%= f.input attribute[:name], resource_attribute_field_options(attribute) %>
     <% end %>

data/app/views/alchemy/essences/_essence_node_editor.html.erb

@@ -17,7 +17,7 @@
   }) %>
   $('#<%= essence_node_editor.form_field_id %>').alchemyNodeSelect({
     placeholder: "<%= Alchemy.t(:search_node) %>",
-    url: "<%= alchemy.api_nodes_path %>",
+    url: "<%= alchemy.api_nodes_path(language_id: essence_node_editor.page&.language_id) %>",
     query_params: <%== query_params.to_json %>,
     <% if essence_node_editor.essence.node %>
     <% serialized_node = ActiveModelSerializers::SerializableResource.new(essence_node_editor.essence.node, include: :ancestors) %>

data/config/alchemy/config.yml

@@ -173,6 +173,7 @@ uploader:
     - gif
     - png
     - svg
+    - webp
 
 # === Link Target Options
 #

data/config/initializers/dragonfly.rb

@@ -2,6 +2,7 @@
 require "dragonfly_svg"
 require "alchemy/dragonfly/processors/crop_resize"
 require "alchemy/dragonfly/processors/auto_orient"
+require "alchemy/dragonfly/processors/thumbnail"
 
 # Logger
 Dragonfly.logger = Rails.logger
@@ -18,4 +19,5 @@ Dragonfly::ImageMagick::Processors::Encode::WHITELISTED_ARGS << "flatten"
 Rails.application.config.after_initialize do
   Dragonfly.app(:alchemy_pictures).add_processor(:crop_resize, Alchemy::Dragonfly::Processors::CropResize.new)
   Dragonfly.app(:alchemy_pictures).add_processor(:auto_orient, Alchemy::Dragonfly::Processors::AutoOrient.new)
+  Dragonfly.app(:alchemy_pictures).add_processor(:thumbnail, Alchemy::Dragonfly::Processors::Thumbnail.new)
 end

data/lib/alchemy/config.rb

@@ -55,7 +55,11 @@ module Alchemy
       # If it does not exist, or its empty, it returns an empty Hash.
       #
       def read_file(file)
-        YAML.safe_load(ERB.new(File.read(file)).result, YAML_WHITELIST_CLASSES, [], true) || {}
+        YAML.safe_load(
+          ERB.new(File.read(file)).result,
+          permitted_classes: YAML_PERMITTED_CLASSES,
+          aliases: true,
+        ) || {}
       rescue Errno::ENOENT
         {}
       end

data/lib/alchemy/controller_actions.rb

@@ -75,7 +75,8 @@ module Alchemy
 
     def load_alchemy_language_from_params
       if params[:locale].present?
-        Language.find_by_code(params[:locale])
+        Language.find_by_code(params[:locale]) ||
+          raise(ActionController::RoutingError, "Language not found")
       end
     end
 

data/lib/alchemy/dragonfly/processors/thumbnail.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require "dragonfly/image_magick/processors/thumb"
+
+module Alchemy
+  module Dragonfly
+    module Processors
+      class Thumbnail < ::Dragonfly::ImageMagick::Processors::Thumb
+        def call(content, geometry, opts = {})
+          # store content into an instance variable to use it in args_for_geometry - method
+          @content = content
+          super
+        end
+
+        ##
+        # due to a missing ImageMagick parameter animated GIFs were broken with the default
+        # Dragonfly Thumb processor
+        def args_for_geometry(geometry)
+          # resize all frames in a GIF
+          # @link https://imagemagick.org/script/command-line-options.php#coalesce
+          # @link https://imagemagick.org/script/command-line-options.php#deconstruct
+          @content&.mime_type == "image/gif" ? "-coalesce #{super} -deconstruct" : super
+        end
+      end
+    end
+  end
+end

data/lib/alchemy/element_definition.rb

@@ -50,9 +50,8 @@ module Alchemy
         if File.exist?(definitions_file_path)
           YAML.safe_load(
             ERB.new(File.read(definitions_file_path)).result,
-            YAML_WHITELIST_CLASSES,
-            [],
-            true
+            permitted_classes: YAML_PERMITTED_CLASSES,
+            aliases: true,
           ) || []
         else
           raise LoadError,

data/lib/alchemy/elements_finder.rb

@@ -54,8 +54,7 @@ module Alchemy
     def find_elements(page_version)
       return Alchemy::ElementsRepository.none unless page_version
 
-      elements = Alchemy::ElementsRepository.new(page_version.elements.available)
-      elements = elements.not_nested
+      elements = page_version.element_repository.visible.not_nested
       elements = options[:fixed] ? elements.fixed : elements.unfixed
 
       if options[:only]

data/lib/alchemy/engine.rb

@@ -37,7 +37,7 @@ module Alchemy
       end
     end
 
-    initializer "alchemy.userstamp" do
+    config.after_initialize do
       if Alchemy.user_class
         ActiveSupport.on_load(:active_record) do
           Alchemy.user_class.model_stamper
@@ -45,5 +45,16 @@ module Alchemy
         end
       end
     end
+
+    initializer "alchemy.webp-mime_type" do
+      # Rails does not know anything about webp even in 2022
+      unless Mime::Type.lookup_by_extension(:webp)
+        Mime::Type.register("image/webp", :webp)
+      end
+      # Dragonfly uses Rack to read the mime type and guess what
+      unless Rack::Mime::MIME_TYPES[".webp"]
+        Rack::Mime::MIME_TYPES[".webp"] = "image/webp"
+      end
+    end
   end
 end

data/lib/alchemy/essence.rb

@@ -3,18 +3,6 @@
 require "active_record"
 
 module Alchemy #:nodoc:
-  # A bogus association that skips eager loading for essences not having an ingredient association
-  class IngredientAssociation < ActiveRecord::Associations::BelongsToAssociation
-    # Skip eager loading if called by Rails' preloader
-    def klass
-      if caller.any? { |line| line =~ /preloader\.rb/ }
-        nil
-      else
-        super
-      end
-    end
-  end
-
   module Essence #:nodoc:
     def self.included(base)
       base.extend(ClassMethods)
@@ -43,8 +31,6 @@ module Alchemy #:nodoc:
           ingredient_column: "body",
         }.update(options)
 
-        @_classes_with_ingredient_association ||= []
-
         class_eval <<-RUBY, __FILE__, __LINE__ + 1
           attr_writer :validation_errors
           include Alchemy::Essence::InstanceMethods
@@ -55,7 +41,7 @@ module Alchemy #:nodoc:
           has_one :element, through: :content, class_name: "Alchemy::Element"
           has_one :page,    through: :element, class_name: "Alchemy::Page"
 
-          scope :available,    -> { joins(:element).merge(Alchemy::Element.available) }
+          scope :available,    -> { joins(:element).merge(Alchemy::Element.published) }
           scope :from_element, ->(name) { joins(:element).where(Element.table_name => { name: name }) }
 
           delegate :restricted?, to: :page,    allow_nil: true
@@ -87,18 +73,6 @@ module Alchemy #:nodoc:
             alias_method :#{configuration[:ingredient_column]}, :ingredient_association
             alias_method :#{configuration[:ingredient_column]}=, :ingredient_association=
           RUBY
-
-          @_classes_with_ingredient_association << self
-        end
-      end
-
-      # Overwrite ActiveRecords method to return a bogus association class that skips eager loading
-      # for essence classes that do not have an ingredient association
-      def _reflect_on_association(name)
-        if name == :ingredient_association && !in?(@_classes_with_ingredient_association)
-          OpenStruct.new(association_class: Alchemy::IngredientAssociation)
-        else
-          super
         end
       end
 

data/lib/alchemy/page_layout.rb

@@ -151,7 +151,11 @@ module Alchemy
       #
       def read_definitions_file
         if File.exist?(layouts_file_path)
-          YAML.safe_load(ERB.new(File.read(layouts_file_path)).result, YAML_WHITELIST_CLASSES, [], true) || []
+          YAML.safe_load(
+            ERB.new(File.read(layouts_file_path)).result,
+            permitted_classes: YAML_PERMITTED_CLASSES,
+            aliases: true,
+          ) || []
         else
           raise LoadError, "Could not find page_layouts.yml file! Please run `rails generate alchemy:install`"
         end

data/lib/alchemy/permissions.rb

@@ -41,7 +41,7 @@ module Alchemy
           c.public? && !c.restricted?
         end
 
-        can :read, Alchemy::Element, Alchemy::Element.available.not_restricted do |e|
+        can :read, Alchemy::Element, Alchemy::Element.published.not_restricted do |e|
           e.public? && !e.restricted?
         end
 
@@ -68,7 +68,7 @@ module Alchemy
           c.public?
         end
 
-        can :read, Alchemy::Element, Alchemy::Element.available do |e|
+        can :read, Alchemy::Element, Alchemy::Element.published do |e|
           e.public?
         end
 

data/lib/alchemy/resource.rb

@@ -169,10 +169,25 @@ module Alchemy
           name: col.name,
           type: resource_column_type(col),
           relation: resource_relation(col.name),
-        }.delete_if { |_k, v| v.nil? }
+          enum: enum_values_collection_for_select(col.name),
+        }.delete_if { |_k, v| v.blank? }
       end.compact
     end
 
+    def enum_values_collection_for_select(column_name)
+      enum = model.defined_enums[column_name]
+      return if enum.blank?
+
+      enum.keys.map do |key|
+        [
+          ::I18n.t(key, scope: [
+            :activerecord, :attributes, model.model_name.i18n_key, "#{column_name}_values"
+          ], default: key.humanize),
+          key,
+        ]
+      end
+    end
+
     def sorted_attributes
       @_sorted_attributes ||= attributes.
         sort_by  { |attr| attr[:name] == "name" ? 0 : 1 }.

data/lib/alchemy/test_support/essence_shared_examples.rb

@@ -7,18 +7,6 @@ RSpec.shared_examples_for "an essence" do
   let(:content) { Alchemy::Content.new(name: "foo") }
   let(:content_definition) { { "name" => "foo" } }
 
-  describe "eager loading" do
-    before do
-      2.times { described_class.create! }
-    end
-
-    it "does not throw error if eager loaded" do
-      expect {
-        described_class.all.includes(:ingredient_association).to_a
-      }.to_not raise_error
-    end
-  end
-
   it "touches the element after save" do
     element = FactoryBot.create(:alchemy_element)
     content = FactoryBot.create(:alchemy_content, element: element, essence: essence, essence_type: essence.class.name)

data/lib/alchemy/upgrader/tasks/ingredients_migrator.rb

@@ -16,7 +16,7 @@ module Alchemy::Upgrader::Tasks
           # eager load all elements that have ingredients defined but no ingredient records yet.
           all_elements = Alchemy::Element
             .named(elements_with_ingredients.map { |d| d[:name] })
-            .includes(contents: { essence: :ingredient_association })
+            .includes(contents: :essence)
             .left_outer_joins(:ingredients).where(alchemy_ingredients: { id: nil })
             .to_a
           elements_with_ingredients.map do |element_definition|

data/lib/alchemy/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Alchemy
-  VERSION = "6.0.0-rc7"
+  VERSION = "6.0.2"
 
   def self.version
     VERSION

data/lib/alchemy.rb

@@ -3,7 +3,7 @@
 require "alchemy/admin/preview_url"
 
 module Alchemy
-  YAML_WHITELIST_CLASSES = %w(Symbol Date Regexp)
+  YAML_PERMITTED_CLASSES = %w[Symbol Date Regexp]
 
   # Define page preview sources
   #
@@ -35,9 +35,7 @@ module Alchemy
   #           acme/preview_source: Acme Vorschau
   #
   def self.preview_sources
-    @_preview_sources ||= begin
-      Set.new << Alchemy::Admin::PreviewUrl
-    end
+    @_preview_sources ||= Set.new << Alchemy::Admin::PreviewUrl
   end
 
   # Define page publish targets

data/lib/generators/alchemy/base.rb

@@ -17,8 +17,8 @@ module Alchemy
           # source and destination file names to use that engine.
           if ext != template_engine.to_s
             say_status :warning, "View uses unexpected template engine '#{ext}'.", :cyan
-            destination.gsub!(/#{template_engine}$/, ext)
-            source.gsub!(/#{template_engine}$/, ext)
+            destination = destination.gsub(/#{template_engine}$/, ext)
+            source = source.gsub(/#{template_engine}$/, ext)
           end
         end
 
@@ -33,7 +33,11 @@ module Alchemy
       end
 
       def load_alchemy_yaml(name)
-        YAML.safe_load(ERB.new(File.read("#{Rails.root}/config/alchemy/#{name}")).result, YAML_WHITELIST_CLASSES, [], true)
+        YAML.safe_load(
+          ERB.new(File.read(Rails.root.join("config", "alchemy", name))).result,
+          permitted_classes: YAML_PERMITTED_CLASSES,
+          aliases: true,
+        )
       rescue Errno::ENOENT
         puts "\nERROR: Could not read config/alchemy/#{name} file. Please run: `rails generate alchemy:install`"
       end

data/lib/generators/alchemy/install/install_generator.rb

@@ -98,7 +98,10 @@ module Alchemy
       end
 
       def copy_alchemy_entry_point
-        webpack_config = YAML.load_file(app_root.join("config", "webpacker.yml"))[Rails.env]
+        webpack_config = YAML.safe_load(
+          File.read(app_root.join("config", "webpacker.yml")),
+          aliases: true
+        )[Rails.env]
         copy_file "alchemy_admin.js",
           app_root.join(webpack_config["source_path"], webpack_config["source_entry_path"], "alchemy/admin.js")
       end

data/package/src/image_loader.js

@@ -40,9 +40,9 @@ export default class ImageLoader {
   }
 
   onError(evt) {
-    const message = `Could not load ${this.image.src}`
+    const message = `Could not load "${this.image.src}"`
     this.removeSpinner()
-    this.parent.innerHTML = `<span class="icon fas fa-exclamation-triangle" title="${message}" />`
+    this.parent.innerHTML = `<span class="icon error fas fa-exclamation-triangle" title="${message}" />`
     console.error(message, evt)
     this.unbind()
   }

data/package/src/picture_editors.js

@@ -5,7 +5,6 @@ import ImageLoader from "./image_loader"
 
 const UPDATE_DELAY = 125
 const IMAGE_PLACEHOLDER = '<i class="icon far fa-image fa-fw"></i>'
-const EMPTY_IMAGE = '<img src="" class="img_paddingtop" />'
 const THUMBNAIL_SIZE = "160x120"
 
 class PictureEditor {
@@ -62,7 +61,7 @@ class PictureEditor {
     this.image.removeAttribute("alt")
     this.image.removeAttribute("src")
     this.imageLoader.load(true)
-    get(`/admin/pictures/${this.pictureId}/url`, {
+    get(Alchemy.routes.url_admin_picture_path(this.pictureId), {
       crop: this.imageCropperEnabled,
       crop_from: this.cropFrom,
       crop_size: this.cropSize,
@@ -83,9 +82,10 @@ class PictureEditor {
   ensureImage() {
     if (this.image) return
 
-    this.thumbnailBackground.innerHTML = EMPTY_IMAGE
-    this.image = this.container.querySelector("img")
-    this.imageLoader = new ImageLoader(this.image)
+    const img = new Image()
+    this.thumbnailBackground.replaceChildren(img)
+    this.image = img
+    this.imageLoader = new ImageLoader(img)
   }
 
   removeImage() {

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alchemy_cms/admin",
-  "version": "6.0.0-rc7",
+  "version": "6.0.2",
   "description": "AlchemyCMS",
   "browser": "package/admin.js",
   "files": [