alchemy_cms 6.0.0 → 6.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1db98328d1be1d96ee705e68f64b757f33d0997e4f622626ca86e4e42511079
-  data.tar.gz: 563c9f02b864e170ac88a9d3f405c61b46da38fec41d0f4dfba0ff0c179407ba
+  metadata.gz: 2114b22cab5252062e853e2b3ea4e2d30ca37f10d1cc49a321644495af52ac3d
+  data.tar.gz: 58ece5a7be8ea335944ac21c4004bcd917b88860bef2337fbbe6fa705242651d
 SHA512:
-  metadata.gz: 524ab50512e3a7c377f3619f20c6ec812e1c12a933b94fb56d8bbc5b94b843cd9708451b77b96af8be7776bb0c733c90af549da76820109a0163a0338b8599dc
-  data.tar.gz: 7c8346e5b07d35e2ef471cb90aff4fe8e62e2050ef13d03436cb2492e0cb5a6d9a2003eefa0f4f55d0a61cfdcbda48596788956908964c71333ca0ebdfa1565d
+  metadata.gz: 5c604a56a67a92d16c53e10bd4264394a81a7f6c57fb2fec160ff27f4c70711b4231f7347bf977e2556da43761b3e81a32b2ab090cd9c48d7be0624024fd267a
+  data.tar.gz: 07b5bde2ada318c77aa0b20d89e96b128da675f07d779c44c28d8dfebc292f7cde24971606958ae3fa3e9d7a9f248358097284efda5f65a6fc5af84107276c00

data/.github/workflows/ci.yml

@@ -16,16 +16,30 @@ jobs:
           - "2.6"
           - "2.7"
           - "3.0"
+          - "3.1"
         database:
           - mysql
           - postgresql
+          - mariadb
         exclude:
+          - rails: "6.0"
+            ruby: "3.1"
+            database: mysql
+          - rails: "6.0"
+            ruby: "3.1"
+            database: postgresql
+          - rails: "6.0"
+            ruby: "3.1"
+            database: mariadb
           - rails: "7.0"
             ruby: "2.6"
             database: mysql
           - rails: "7.0"
             ruby: "2.6"
             database: postgresql
+          - rails: "7.0"
+            ruby: "2.6"
+            database: mariadb
     env:
       DB: ${{ matrix.database }}
       DB_USER: alchemy_user
@@ -51,6 +65,15 @@ jobs:
           MYSQL_DATABASE: alchemy_cms_dummy_test
           MYSQL_ROOT_PASSWORD: password
         options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=5
+      mariadb:
+        image: mariadb:latest
+        ports: ["3307:3306"]
+        env:
+          MARIADB_USER: alchemy_user
+          MARIADB_PASSWORD: password
+          MARIADB_DATABASE: alchemy_cms_dummy_test
+          MARIADB_ROOT_PASSWORD: password
+        options: --health-cmd="mariadb-admin ping" --health-interval=10s --health-timeout=5s --health-retries=5
     steps:
       - uses: actions/checkout@v2.3.4
       - name: Set up Ruby
@@ -74,7 +97,7 @@ jobs:
           sudo apt install -qq --fix-missing libpq-dev -o dir::cache::archives="/home/runner/apt/cache"
           sudo chown -R runner /home/runner/apt/cache
       - name: Install MySQL headers
-        if: matrix.database == 'mysql'
+        if: matrix.database == 'mysql' || matrix.database == 'mariadb'
         run: |
           mkdir -p /home/runner/apt/cache
           sudo apt update -qq

data/CHANGELOG.md

@@ -1,3 +1,34 @@
+## 6.0.3 (2022-05-02)
+
+- Add Support for MariaDB [#2326](https://github.com/AlchemyCMS/alchemy_cms/pull/2326) ([mamhoff](https://github.com/mamhoff))
+- Fix Alchemy::Content::Factory module definition [#2325](https://github.com/AlchemyCMS/alchemy_cms/pull/2325) ([tvdeyen](https://github.com/tvdeyen))
+
+## 6.0.2 (2022-04-27)
+
+- Remove JSON decode from ingredient data store [#2323](https://github.com/AlchemyCMS/alchemy_cms/pull/2323) ([tvdeyen](https://github.com/tvdeyen))
+- Eagerload at the controller or job layer [#2313](https://github.com/AlchemyCMS/alchemy_cms/pull/2313) ([mamhoff](https://github.com/mamhoff))
+
+## 6.0.1 (2022-04-26)
+
+- Allow passing a different partial to `render_element` [#2322](https://github.com/AlchemyCMS/alchemy_cms/pull/2322) ([mamhoff](https://github.com/mamhoff))
+- Allow render_elements to take a block [#2321](https://github.com/AlchemyCMS/alchemy_cms/pull/2321) ([mamhoff](https://github.com/mamhoff))
+- Remove old unused root_page ivar [#2320](https://github.com/AlchemyCMS/alchemy_cms/pull/2320) ([tvdeyen](https://github.com/tvdeyen))
+- Raise on non-existing locale [#2319](https://github.com/AlchemyCMS/alchemy_cms/pull/2319) ([mamhoff](https://github.com/mamhoff))
+- chore: Remove unnecessary puts from spec [#2318](https://github.com/AlchemyCMS/alchemy_cms/pull/2318) ([tvdeyen](https://github.com/tvdeyen))
+- Fix gif resizing [#2315](https://github.com/AlchemyCMS/alchemy_cms/pull/2315) ([kulturbande](https://github.com/kulturbande))
+- Refactor: Use page version's element repository rather than a new one [#2312](https://github.com/AlchemyCMS/alchemy_cms/pull/2312) ([mamhoff](https://github.com/mamhoff))
+- Deprecate Alchemy::Element.available [#2309](https://github.com/AlchemyCMS/alchemy_cms/pull/2309) ([mamhoff](https://github.com/mamhoff))
+- Explicitly set "store" for MariaDB [#2308](https://github.com/AlchemyCMS/alchemy_cms/pull/2308) ([mamhoff](https://github.com/mamhoff))
+- Set preview mode earlier [#2307](https://github.com/AlchemyCMS/alchemy_cms/pull/2307) ([mamhoff](https://github.com/mamhoff))
+- Fix updating the public_on date on persisted pages [#2305](https://github.com/AlchemyCMS/alchemy_cms/pull/2305) ([mamhoff](https://github.com/mamhoff))
+- Allow opting out of Turbolinks in non-Alchemy controllers [#2302](https://github.com/AlchemyCMS/alchemy_cms/pull/2302) ([dssjoblom](https://github.com/dssjoblom))
+- Explicitly validate uniqueness without case sensitivity [#2300](https://github.com/AlchemyCMS/alchemy_cms/pull/2300) ([mamhoff](https://github.com/mamhoff))
+- Fix frozen string error when mixing template engines [#2299](https://github.com/AlchemyCMS/alchemy_cms/pull/2299) ([gr8bit](https://github.com/gr8bit))
+- Do not flatten gifs if converted to webp [#2293](https://github.com/AlchemyCMS/alchemy_cms/pull/2293) ([tvdeyen](https://github.com/tvdeyen))
+- Allow pasting into parent element with only one nested element type [#2292](https://github.com/AlchemyCMS/alchemy_cms/pull/2292) ([dbwinger](https://github.com/dbwinger))
+- Restrict Node select to the site/language of the page being edited [#2277](https://github.com/AlchemyCMS/alchemy_cms/pull/2277) ([dbwinger](https://github.com/dbwinger))
+- Add Ruby 3.1 support [#2229](https://github.com/AlchemyCMS/alchemy_cms/pull/2229) ([tvdeyen](https://github.com/tvdeyen))
+
 ## 6.0.0 (2022-04-11)
 
 - [ruby - main] Allow ransack version 3.0.1 [#2287](https://github.com/AlchemyCMS/alchemy_cms/pull/2287) ([depfu](https://github.com/apps/depfu))

data/Gemfile

@@ -17,7 +17,9 @@ end
 if ENV["DB"].nil? || ENV["DB"] == "sqlite"
   gem "sqlite3", "~> 1.4.1"
 end
-gem "mysql2", "~> 0.5.1" if ENV["DB"] == "mysql"
+if ENV["DB"] == "mysql" || ENV["DB"] == "mariadb"
+  gem "mysql2", "~> 0.5.1"
+end
 gem "pg", "~> 1.0" if ENV["DB"] == "postgresql"
 
 group :development, :test do
@@ -48,3 +50,15 @@ group :development, :test do
     gem "brakeman", require: false
   end
 end
+
+# Ruby 3.1 split out the net-smtp gem
+# Necessary until https://github.com/mikel/mail/pull/1439
+# got merged and released.
+if Gem.ruby_version >= Gem::Version.new("3.1.0")
+  if rails_version.to_s.match?(/6.1/)
+    # Rails 6.1 needs this as well
+    gem "net-pop", "~> 0.1.0", require: false
+    gem "net-imap", "~> 0.2.0", require: false
+  end
+  gem "net-smtp", "~> 0.3.0", require: false
+end

data/README.md

@@ -18,7 +18,7 @@ Alchemy is an open source CMS engine written in Ruby on Rails.
 
 Read more about Alchemy on the [website](https://alchemy-cms.com) and in the [guidelines](https://guides.alchemy-cms.com).
 
-**CAUTION: This main branch is a development branch that *can* contain bugs. For productive environments you should use the [current Ruby gem version](https://rubygems.org/gems/alchemy_cms), or the [latest stable branch (5.2-stable)](https://github.com/AlchemyCMS/alchemy_cms/tree/5.2-stable).**
+**CAUTION: This main branch is a development branch that *can* contain bugs. For productive environments you should use the [current Ruby gem version](https://rubygems.org/gems/alchemy_cms), or the [latest stable branch (6.0-stable)](https://github.com/AlchemyCMS/alchemy_cms/tree/6.0-stable).**
 
 
 ## ✅ Features
@@ -27,6 +27,7 @@ Read more about Alchemy on the [website](https://alchemy-cms.com) and in the [gu
 - A rich RESTful API
 - Intuitive admin interface with live preview
 - Multi language and multi domain
+- Page versioning
 - SEO friendly urls
 - User Access Control
 - Build in contact form mailer
@@ -51,9 +52,9 @@ or visit the existing demo at https://alchemy-demo.herokuapp.com
 
 ## 🚂 Rails Version
 
-**This version of AlchemyCMS runs with Rails 6.0**
+**This version of AlchemyCMS runs with Rails 7.0, 6.1 and 6.0**
 
-* For a Rails 5.2 compatible version use the [`5.2-stable` branch](https://github.com/AlchemyCMS/alchemy_cms/tree/5.2-stable).
+* For a Rails 5.2 compatible version use the [`5.3-stable` branch](https://github.com/AlchemyCMS/alchemy_cms/tree/5.3-stable).
 * For a Rails 5.0 or 5.1 compatible version use the [`4.5-stable` branch](https://github.com/AlchemyCMS/alchemy_cms/tree/4.5-stable).
 * For a Rails 4.2 compatible version use the [`3.6-stable` branch](https://github.com/AlchemyCMS/alchemy_cms/tree/3.6-stable).
 * For a Rails 4.0/4.1 compatible version use the [`3.1-stable` branch](https://github.com/AlchemyCMS/alchemy_cms/tree/3.1-stable).

data/app/controllers/alchemy/admin/elements_controller.rb

@@ -12,6 +12,7 @@ module Alchemy
         elements = @page_version.elements.order(:position).includes(*element_includes)
         @elements = elements.not_nested.unfixed
         @fixed_elements = elements.not_nested.fixed
+        load_clipboard_items
       end
 
       def new
@@ -20,8 +21,7 @@ module Alchemy
         @parent_element = Element.find_by(id: params[:parent_element_id])
         @elements = @page.available_elements_within_current_scope(@parent_element)
         @element = @page_version.elements.build
-        @clipboard = get_clipboard("elements")
-        @clipboard_items = Element.all_from_clipboard_for_page(@clipboard, @page)
+        load_clipboard_items
       end
 
       # Creates a element as discribed in config/alchemy/elements.yml on page via AJAX.
@@ -44,8 +44,7 @@ module Alchemy
         else
           @element.page_version = @page_version
           @elements = @page.available_element_definitions
-          @clipboard = get_clipboard("elements")
-          @clipboard_items = Element.all_from_clipboard_for_page(@clipboard, @page)
+          load_clipboard_items
           render :new
         end
       end
@@ -126,19 +125,27 @@ module Alchemy
         @element = Element.find(params[:id])
       end
 
+      def load_clipboard_items
+        @clipboard = get_clipboard("elements")
+        @clipboard_items = Element.all_from_clipboard_for_page(@clipboard, @page)
+      end
+
       def element_from_clipboard
         @element_from_clipboard ||= begin
-            @clipboard = get_clipboard("elements")
-            @clipboard.detect { |item| item["id"].to_i == params[:paste_from_clipboard].to_i }
-          end
+          @clipboard = get_clipboard("elements")
+          @clipboard.detect { |item| item["id"].to_i == params[:paste_from_clipboard].to_i }
+        end
       end
 
       def paste_element_from_clipboard
         @source_element = Element.find(element_from_clipboard["id"])
-        element = Element.copy(@source_element, {
-          parent_element_id: create_element_params[:parent_element_id],
-          page_version_id: @page_version.id,
-        })
+        element = Element.copy(
+          @source_element,
+          {
+            parent_element_id: create_element_params[:parent_element_id],
+            page_version_id: @page_version.id,
+          }
+        )
         if element_from_clipboard["action"] == "cut"
           @cut_element_id = @source_element.id
           @clipboard.delete_if { |item| item["id"] == @source_element.id.to_s }

data/app/controllers/alchemy/admin/pages_controller.rb

@@ -23,9 +23,7 @@ module Alchemy
       before_action :set_root_page,
         only: [:index, :show, :order]
 
-      before_action :run_on_page_layout_callbacks,
-        if: :run_on_page_layout_callbacks?,
-        only: [:show]
+      before_action :set_preview_mode, only: [:show]
 
       before_action :load_languages_and_layouts,
         unless: -> { @page_root },
@@ -35,6 +33,10 @@ module Alchemy
 
       before_action :set_page_version, only: [:show, :edit]
 
+      before_action :run_on_page_layout_callbacks,
+        if: :run_on_page_layout_callbacks?,
+        only: [:show]
+
       def index
         @query = @current_language.pages.contentpages.ransack(search_filter_params[:q])
 
@@ -64,7 +66,6 @@ module Alchemy
       # Used by page preview iframe in Page#edit view.
       #
       def show
-        @preview_mode = true
         Page.current_preview = @page
         # Setting the locale to pages language, so the page content has it's correct translations.
         ::I18n.locale = @page.language.locale
@@ -397,6 +398,10 @@ module Alchemy
         @languages_with_page_tree = Language.on_current_site.with_root_page
         @page_layouts = PageLayout.layouts_for_select(@language.id)
       end
+
+      def set_preview_mode
+        @preview_mode = true
+      end
     end
   end
 end

data/app/controllers/alchemy/api/base_controller.rb

@@ -5,17 +5,18 @@ module Alchemy
     layout false
     respond_to :json
 
-    rescue_from CanCan::AccessDenied,         with: :render_not_authorized
+    rescue_from CanCan::AccessDenied, with: :render_not_authorized
     rescue_from ActiveRecord::RecordNotFound, with: :render_not_found
+    rescue_from ActionController::RoutingError, with: :render_not_found
 
     private
 
     def render_not_authorized
-      render json: {error: "Not authorized"}, status: 403
+      render json: { error: "Not authorized" }, status: 403
     end
 
     def render_not_found
-      render json: {error: "Record not found"}, status: 404
+      render json: { error: "Record not found" }, status: 404
     end
   end
 end

data/app/controllers/alchemy/api/nodes_controller.rb

@@ -8,6 +8,7 @@ module Alchemy
     def index
       @nodes = Node.all
       @nodes = @nodes.includes(:parent)
+      @nodes = @nodes.where(language_id: params[:language_id]) if params[:language_id]
       @nodes = @nodes.ransack(params[:filter]).result
 
       if params[:page]

data/app/controllers/alchemy/base_controller.rb

@@ -9,6 +9,13 @@ module Alchemy
     include Alchemy::ControllerActions
     include Alchemy::Modules
 
+    # Include Turbolinks explicitly in case Alchemy is embedded into a
+    # larger application that doesn't work with Turbolinks. The app
+    # can then set config.turbolinks.auto_include = false so that
+    # Turbolinks is not included in the app controllers.
+    include Turbolinks::Controller
+    ::ActionDispatch::Assertions.include ::Turbolinks::Assertions
+
     protect_from_forgery
 
     before_action :mailer_set_url_options

data/app/controllers/alchemy/messages_controller.rb

@@ -62,7 +62,6 @@ module Alchemy
       end
 
       @page = @element.page
-      @root_page = @page.get_language_root
       if @message.valid?
         MessagesMailer.contact_form_mail(@message, mail_to, mail_from, subject).deliver
         redirect_to_success_page
@@ -122,8 +121,6 @@ module Alchemy
       if @page.blank?
         raise "Page for page_layout #{mailer_config["page_layout_name"]} not found"
       end
-
-      @root_page = @page.get_language_root
     end
 
     def message_params

data/app/controllers/alchemy/pages_controller.rb

@@ -32,9 +32,6 @@ module Alchemy
       if: :locale_prefix_missing?,
       only: [:index, :show]
 
-    # We only need to set the +@root_page+ if we are sure that no more redirects happen.
-    before_action :set_root_page, only: [:index, :show]
-
     # Page layout callbacks need to run after all other callbacks
     before_action :run_on_page_layout_callbacks,
       if: :run_on_page_layout_callbacks?,
@@ -199,10 +196,6 @@ module Alchemy
       end
     end
 
-    def set_root_page
-      @root_page ||= Language.current_root_page
-    end
-
     def signup_required?
       if Alchemy.user_class.respond_to?(:admins)
         Alchemy.user_class.admins.empty? && @page.nil?

data/app/helpers/alchemy/elements_helper.rb

@@ -70,7 +70,7 @@ module Alchemy
     #   A class instance that will return elements that get rendered.
     #   Use this for your custom element loading logic in views.
     #
-    def render_elements(options = {})
+    def render_elements(options = {}, &blk)
       options = {
         from_page: @page,
         render_format: "html",
@@ -86,11 +86,12 @@ module Alchemy
 
       elements = finder.elements(page_version: page_version)
 
-      buff = []
-      elements.each_with_index do |element, i|
-        buff << render_element(element, options, i + 1)
-      end
-      buff.join(options[:separator]).html_safe
+      default_rendering = ->(element, i) { render_element(element, options, i + 1) }
+      if block_given?
+        elements.map.with_index(&blk)
+      else
+        elements.map.with_index(&default_rendering)
+      end.join(options[:separator]).html_safe
     end
 
     # This helper renders a {Alchemy::Element} view partial.
@@ -125,7 +126,7 @@ module Alchemy
     #
     # == Usage
     #
-    #   <%= render_element(Alchemy::Element.available.named(:headline).first) %>
+    #   <%= render_element(Alchemy::Element.published.named(:headline).first) %>
     #
     # @param [Alchemy::Element] element
     #   The element you want to render the view for
@@ -146,11 +147,15 @@ module Alchemy
 
       element.store_page(@page)
 
-      render element, {
-        element: element,
-        counter: counter,
-        options: options.except(:locals),
-      }.merge(options[:locals] || {})
+      render(
+        partial: options[:partial] || element.to_partial_path,
+        object: element,
+        locals: {
+          element: element,
+          counter: counter,
+          options: options.except(:locals, :partial),
+        }.merge(options[:locals] || {}),
+      )
     rescue ActionView::MissingTemplate => e
       warning(%(
         Element view partial not found for #{element.name}.\n

data/app/models/alchemy/content/factory.rb

@@ -3,139 +3,141 @@
 module Alchemy
   # Holds everything concerning the building and creating of contents and the related essence object.
   #
-  module Content::Factory
-    extend ActiveSupport::Concern
+  class Content < BaseRecord
+    module Factory
+      extend ActiveSupport::Concern
+
+      module ClassMethods
+        SKIPPED_ATTRIBUTES_ON_COPY = %w(position created_at updated_at creator_id updater_id element_id id)
+
+        # Builds a new content as descriped in the elements.yml file.
+        #
+        # @param [Hash]
+        #   The content definition used for finding the content in +elements.yml+ file
+        #
+        def new(attributes = {})
+          element = attributes[:element] || Element.find_by(id: attributes[:element_id])
+          return super if attributes.empty? || element.nil?
+
+          definition = element.content_definition_for(attributes[:name])
+          if definition.blank? && attributes[:essence_type].nil?
+            raise ContentDefinitionError, "No definition found in elements.yml for #{attributes.inspect} and #{element.inspect}"
+          end
+
+          super(
+            name: attributes[:name],
+            essence_type: attributes[:essence_type] || normalize_essence_type(definition[:type]),
+            element: element,
+          ).tap(&:build_essence)
+        end
 
-    module ClassMethods
-      SKIPPED_ATTRIBUTES_ON_COPY = %w(position created_at updated_at creator_id updater_id element_id id)
+        # Creates a new content from elements definition in the +elements.yml+ file.
+        #
+        # 1. It builds the content
+        # 2. It creates the essence record (content object gets saved)
+        #
+        # @return [Alchemy::Content]
+        #
+        def create(attributes = {})
+          new(attributes).tap do |content|
+            content.essence.save && content.save
+          end
+        end
 
-      # Builds a new content as descriped in the elements.yml file.
-      #
-      # @param [Hash]
-      #   The content definition used for finding the content in +elements.yml+ file
-      #
-      def new(attributes = {})
-        element = attributes[:element] || Element.find_by(id: attributes[:element_id])
-        return super if attributes.empty? || element.nil?
+        # Creates a copy of source and also copies the associated essence.
+        #
+        # You can pass a differences hash to update the attributes of the copy.
+        #
+        # === Example
+        #
+        #   @copy = Alchemy::Content.copy(@content, {element_id: 3})
+        #   @copy.element_id # => 3
+        #
+        def copy(source, differences = {})
+          Content.new(
+            source.attributes.with_indifferent_access.
+              except(*SKIPPED_ATTRIBUTES_ON_COPY).
+              merge(differences.with_indifferent_access)
+          ).tap do |new_content|
+            new_content.build_essence(
+              source.essence.attributes.
+                except(*SKIPPED_ATTRIBUTES_ON_COPY)
+            )
+            new_content.save
+          end
+        end
 
-        definition = element.content_definition_for(attributes[:name])
-        if definition.blank? && attributes[:essence_type].nil?
-          raise ContentDefinitionError, "No definition found in elements.yml for #{attributes.inspect} and #{element.inspect}"
+        # Returns all content definitions from elements.yml
+        #
+        def definitions
+          definitions = Element.definitions.flat_map { |e| e["contents"] }
+          definitions.compact!
+          definitions
         end
 
-        super(
-          name: attributes[:name],
-          essence_type: attributes[:essence_type] || normalize_essence_type(definition[:type]),
-          element: element
-        ).tap(&:build_essence)
-      end
+        # Returns a normalized Essence type
+        #
+        # Adds Alchemy module name in front of given essence type
+        # unless there is a Class with the specified name that is an essence.
+        #
+        # @param [String]
+        #   the essence type to normalize
+        #
+        def normalize_essence_type(essence_type)
+          essence_type = essence_type.classify
+          return essence_type if is_an_essence?(essence_type)
+
+          "Alchemy::#{essence_type}"
+        end
 
-      # Creates a new content from elements definition in the +elements.yml+ file.
-      #
-      # 1. It builds the content
-      # 2. It creates the essence record (content object gets saved)
-      #
-      # @return [Alchemy::Content]
-      #
-      def create(attributes = {})
-        new(attributes).tap do |content|
-          content.essence.save && content.save
+        private
+
+        def is_an_essence?(essence_type)
+          klass = Module.const_get(essence_type)
+          klass.is_a?(Class) && klass.new.acts_as_essence?
+        rescue NameError
+          false
         end
       end
 
-      # Creates a copy of source and also copies the associated essence.
-      #
-      # You can pass a differences hash to update the attributes of the copy.
-      #
-      # === Example
-      #
-      #   @copy = Alchemy::Content.copy(@content, {element_id: 3})
-      #   @copy.element_id # => 3
+      # Instance Methods
+
+      # Returns the definition hash from +elements.yml+ file.
       #
-      def copy(source, differences = {})
-        Content.new(
-          source.attributes.with_indifferent_access.
-            except(*SKIPPED_ATTRIBUTES_ON_COPY).
-            merge(differences.with_indifferent_access)
-        ).tap do |new_content|
-          new_content.build_essence(
-            source.essence.attributes.
-              except(*SKIPPED_ATTRIBUTES_ON_COPY)
-          )
-          new_content.save
+      def definition
+        if element.blank?
+          log_warning "Content with id #{id} is missing its Element."
+          return {}
         end
+        element.content_definition_for(name) || {}
       end
 
-      # Returns all content definitions from elements.yml
+      # Build essence from definition.
       #
-      def definitions
-        definitions = Element.definitions.flat_map { |e| e["contents"] }
-        definitions.compact!
-        definitions
+      # If an optional type is passed, this type of essence gets created.
+      #
+      def build_essence(attributes = {})
+        self.essence = essence_class.new(
+          { content: self, ingredient: default_value }.merge(attributes)
+        )
       end
 
-      # Returns a normalized Essence type
-      #
-      # Adds Alchemy module name in front of given essence type
-      # unless there is a Class with the specified name that is an essence.
+      # Creates essence from definition.
       #
-      # @param [String]
-      #   the essence type to normalize
+      # If an optional type is passed, this type of essence gets created.
       #
-      def normalize_essence_type(essence_type)
-        essence_type = essence_type.classify
-        return essence_type if is_an_essence?(essence_type)
-
-        "Alchemy::#{essence_type}"
+      def create_essence!(attrs = {})
+        build_essence(attrs).save!
+        save!
       end
 
       private
 
-      def is_an_essence?(essence_type)
-        klass = Module.const_get(essence_type)
-        klass.is_a?(Class) && klass.new.acts_as_essence?
-      rescue NameError
-        false
-      end
-    end
-
-    # Instance Methods
-
-    # Returns the definition hash from +elements.yml+ file.
-    #
-    def definition
-      if element.blank?
-        log_warning "Content with id #{id} is missing its Element."
-        return {}
+      # Returns a class constant from definition's type field or the essence_type column
+      #
+      def essence_class
+        (essence_type || Content.normalize_essence_type(definition["type"])).constantize
       end
-      element.content_definition_for(name) || {}
-    end
-
-    # Build essence from definition.
-    #
-    # If an optional type is passed, this type of essence gets created.
-    #
-    def build_essence(attributes = {})
-      self.essence = essence_class.new(
-        { content: self, ingredient: default_value }.merge(attributes)
-      )
-    end
-
-    # Creates essence from definition.
-    #
-    # If an optional type is passed, this type of essence gets created.
-    #
-    def create_essence!(attrs = {})
-      build_essence(attrs).save!
-      save!
-    end
-
-    private
-
-    # Returns a class constant from definition's type field or the essence_type column
-    #
-    def essence_class
-      (essence_type || Content.normalize_essence_type(definition["type"])).constantize
     end
   end
 end

data/app/models/alchemy/element.rb

@@ -70,7 +70,7 @@ module Alchemy
       dependent: :destroy
 
     has_many :nested_elements,
-      -> { order(:position).available },
+      -> { order(:position).published },
       class_name: "Alchemy::Element",
       foreign_key: :parent_element_id,
       dependent: :destroy,
@@ -159,7 +159,7 @@ module Alchemy
       end
 
       def all_from_clipboard(clipboard)
-        return [] if clipboard.nil?
+        return none if clipboard.nil?
 
         where(id: clipboard.collect { |e| e["id"] })
       end
@@ -167,12 +167,19 @@ module Alchemy
       # All elements in clipboard that could be placed on page
       #
       def all_from_clipboard_for_page(clipboard, page)
-        return [] if clipboard.nil? || page.nil?
+        return none if clipboard.nil? || page.nil?
 
-        all_from_clipboard(clipboard).select { |ce|
-          page.available_element_names.include?(ce.name)
-        }
+        all_from_clipboard(clipboard).where(name: page.available_element_names)
       end
+
+      # All elements in clipboard that could be placed as a child of `parent_element`
+      def all_from_clipboard_for_parent_element(clipboard, parent_element)
+        return none if clipboard.nil? || parent_element.nil?
+
+        all_from_clipboard(clipboard).where(name: parent_element.definition["nestable_elements"])
+      end
+
+      deprecate available: :published, deprecator: Alchemy::Deprecation
     end
 
     # Returns next public element from same page.

data/app/models/alchemy/ingredient.rb

@@ -8,6 +8,8 @@ module Alchemy
 
     self.table_name = "alchemy_ingredients"
 
+    attribute :data, :json
+
     belongs_to :element, touch: true, class_name: "Alchemy::Element", inverse_of: :ingredients
     belongs_to :related_object, polymorphic: true, optional: true
 

data/app/models/alchemy/ingredient_validator.rb

@@ -88,7 +88,7 @@ module Alchemy
 
     def duplicates
       ingredient.class
-        .joins(:element).merge(Alchemy::Element.available)
+        .joins(:element).merge(Alchemy::Element.published)
         .where(Alchemy::Element.table_name => { name: ingredient.element.name })
         .where(value: ingredient.value)
         .where.not(id: ingredient.id)

data/app/models/alchemy/language.rb

@@ -38,7 +38,7 @@ module Alchemy
 
     validates :language_code,
       presence: true,
-      uniqueness: { scope: [:site_id, :country_code] },
+      uniqueness: { scope: [:site_id, :country_code], case_sensitive: false },
       format: { with: /\A[a-z]{2}\z/, if: -> { language_code.present? } }
 
     validates :country_code,

data/app/models/alchemy/page/page_elements.rb

@@ -15,8 +15,8 @@ module Alchemy
           source: :elements,
         ) do
           has_many :all_elements
-          has_many :elements, -> { not_nested.unfixed.available }
-          has_many :fixed_elements, -> { fixed.available }
+          has_many :elements, -> { not_nested.unfixed.published }
+          has_many :fixed_elements, -> { fixed.published }
         end
 
         has_many :contents, through: :elements

data/app/models/alchemy/page/page_naming.rb

@@ -15,7 +15,7 @@ module Alchemy
         validates :name,
           presence: true
         validates :urlname,
-          uniqueness: { scope: [:language_id, :layoutpage], if: -> { urlname.present? } },
+          uniqueness: { scope: [:language_id, :layoutpage], if: -> { urlname.present? }, case_sensitive: false },
           exclusion: { in: RESERVED_URLNAMES },
           length: { minimum: 3, if: -> { urlname.present? } }
 

data/app/models/alchemy/page.rb

@@ -117,7 +117,7 @@ module Alchemy
     has_many :nodes, class_name: "Alchemy::Node", inverse_of: :page
     has_many :versions, class_name: "Alchemy::PageVersion", inverse_of: :page, dependent: :destroy
     has_one :draft_version, -> { drafts }, class_name: "Alchemy::PageVersion"
-    has_one :public_version, -> { published }, class_name: "Alchemy::PageVersion"
+    has_one :public_version, -> { published }, class_name: "Alchemy::PageVersion", autosave: -> { persisted? }
 
     before_validation :set_language,
       if: -> { language.nil? }

data/app/models/alchemy/picture/transformations.rb

@@ -30,7 +30,7 @@ module Alchemy
     # Returns the rendered resized image using imagemagick directly.
     #
     def resize(size, upsample = false)
-      image_file.thumb(upsample ? size : "#{size}>")
+      image_file.thumbnail(upsample ? size : "#{size}>")
     end
 
     # Returns true if picture's width is greater than it's height
@@ -119,7 +119,7 @@ module Alchemy
       if is_smaller_than?(dimensions) && upsample == false
         dimensions = reduce_to_image(dimensions)
       end
-      image_file.thumb("#{dimensions_to_string(dimensions)}#")
+      image_file.thumbnail("#{dimensions_to_string(dimensions)}#")
     end
 
     # Use imagemagick to custom crop an image. Uses -thumbnail for better performance when resizing.

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/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/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/essence.rb

@@ -41,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

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/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Alchemy
-  VERSION = "6.0.0"
+  VERSION = "6.0.3"
 
   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.json

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 6.0.3
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -13,7 +13,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-11 00:00:00.000000000 Z
+date: 2022-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -1037,6 +1037,7 @@ files:
 - app/views/alchemy/admin/dashboard/help.html.erb
 - app/views/alchemy/admin/dashboard/index.html.erb
 - app/views/alchemy/admin/dashboard/info.html.erb
+- app/views/alchemy/admin/elements/_add_nested_element_form.html.erb
 - app/views/alchemy/admin/elements/_element.html.erb
 - app/views/alchemy/admin/elements/_footer.html.erb
 - app/views/alchemy/admin/elements/_form.html.erb
@@ -1303,6 +1304,7 @@ files:
 - lib/alchemy/deprecation.rb
 - lib/alchemy/dragonfly/processors/auto_orient.rb
 - lib/alchemy/dragonfly/processors/crop_resize.rb
+- lib/alchemy/dragonfly/processors/thumbnail.rb
 - lib/alchemy/element_definition.rb
 - lib/alchemy/elements_finder.rb
 - lib/alchemy/engine.rb