alchemy_cms 6.1.5 → 7.0.0.pre.b

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

@@ -0,0 +1,13 @@
+module Alchemy
+  module Ingredients
+    class BooleanView < BaseView
+      def call
+        Alchemy.t(value, scope: "ingredient_values.boolean")
+      end
+
+      def render?
+        !value.nil?
+      end
+    end
+  end
+end

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

@@ -0,0 +1,22 @@
+module Alchemy
+  module Ingredients
+    class DatetimeView < BaseView
+      attr_reader :date_format
+
+      # @param ingredient [Alchemy::Ingredient]
+      # @param date_format [String] The date format to use. Use either a strftime format string, a I18n format symbol or "rfc822".
+      def initialize(ingredient, date_format: nil, html_options: {})
+        super(ingredient)
+        @date_format = settings_value(:date_format, value: date_format)
+      end
+
+      def call
+        if date_format == "rfc822"
+          ingredient.value.to_s(:rfc822)
+        else
+          ::I18n.l(ingredient.value, format: date_format)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,40 @@
+module Alchemy
+  module Ingredients
+    class FileView < BaseView
+      delegate :attachment, to: :ingredient
+
+      # @param ingredient [Alchemy::Ingredient]
+      # @param link_text [String] The link text. If not given, the ingredients link_text setting or the attachments name will be used.
+      # @param html_options [Hash] Options that will be passed to the a tag.
+      def initialize(ingredient, link_text: nil, html_options: {})
+        super(ingredient, html_options: html_options)
+        @link_text = settings_value(:link_text, value: link_text, default: attachment&.name)
+      end
+
+      def call
+        link_to(
+          link_text,
+          attachment.url(
+            download: true,
+            name: attachment.slug,
+            format: attachment.suffix
+          ),
+          {
+            class: ingredient.css_class.presence,
+            title: ingredient.title.presence
+          }.merge(html_options)
+        )
+      end
+
+      def render?
+        !attachment.nil?
+      end
+
+      private
+
+      def link_text
+        ingredient.link_text.presence || @link_text
+      end
+    end
+  end
+end

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

@@ -0,0 +1,20 @@
+module Alchemy
+  module Ingredients
+    class HeadlineView < BaseView
+      def initialize(ingredient, level: nil, html_options: {})
+        super(ingredient, html_options: html_options)
+        @level = level
+      end
+
+      def call
+        content_tag "h#{@level || ingredient.level}",
+          ingredient.value,
+          id: ingredient.dom_id.presence,
+          class: [
+            ingredient.size ? "h#{ingredient.size}" : nil,
+            html_options[:class]
+          ]
+      end
+    end
+  end
+end

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

@@ -0,0 +1,9 @@
+module Alchemy
+  module Ingredients
+    class HtmlView < BaseView
+      def call
+        value.to_s.html_safe
+      end
+    end
+  end
+end

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

@@ -0,0 +1,25 @@
+module Alchemy
+  module Ingredients
+    class LinkView < BaseView
+      attr_reader :link_text
+
+      # @param ingredient [Alchemy::Ingredient]
+      # @param text [String] The link text. If not given, the ingredient's text setting or the value will be used.
+      # @param html_options [Hash] Options that will be passed to the a tag.
+      def initialize(ingredient, text: nil, html_options: {})
+        super(ingredient, html_options: html_options)
+        @link_text = settings_value(:text, value: text, default: value)
+      end
+
+      def call
+        link_to(link_text, value, {target: link_target}.merge(html_options))
+      end
+
+      private
+
+      def link_target
+        (ingredient.link_target == "blank") ? "_blank" : nil
+      end
+    end
+  end
+end

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

@@ -0,0 +1,11 @@
+module Alchemy
+  module Ingredients
+    class NodeView < BaseView
+      delegate :node, to: :ingredient
+
+      def call
+        render(node)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,15 @@
+module Alchemy
+  module Ingredients
+    class PageView < BaseView
+      delegate :page, to: :ingredient
+
+      def call
+        link_to page.name, alchemy.show_page_path(urlname: page.urlname)
+      end
+
+      def render?
+        !!page
+      end
+    end
+  end
+end

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

@@ -0,0 +1,108 @@
+# frozen_string_literal: true
+
+module Alchemy
+  module Ingredients
+    # Renders a picture ingredient view
+    class PictureView < BaseView
+      attr_reader :ingredient,
+        :show_caption,
+        :disable_link,
+        :srcset,
+        :sizes,
+        :html_options,
+        :picture_options,
+        :picture
+
+      # @param ingredient [Alchemy::Ingredient]
+      # @param show_caption [Boolean] (true) Whether to show a caption or not, even if present on the picture.
+      # @param disable_link [Boolean] (false) Whether to disable the link even if the picture has a link.
+      # @param srcset [Array<String>] An array of srcset sizes that will generate variants of the picture.
+      # @param sizes [Array<String>] An array of sizes that will be passed to the img tag.
+      # @param picture_options [Hash] Options that will be passed to the picture url. See {Alchemy::PictureVariant} for options.
+      # @param html_options [Hash] Options that will be passed to the img tag.
+      # @see Alchemy::PictureVariant
+      def initialize(
+        ingredient,
+        show_caption: nil,
+        disable_link: nil,
+        srcset: nil,
+        sizes: nil,
+        picture_options: {},
+        html_options: {}
+      )
+        super(ingredient)
+        @show_caption = settings_value(:show_caption, value: show_caption, default: true)
+        @disable_link = settings_value(:disable_link, value: disable_link, default: false)
+        @srcset = settings_value(:srcset, value: srcset, default: [])
+        @sizes = settings_value(:sizes, value: sizes, default: [])
+        @picture_options = picture_options || {}
+        @html_options = html_options || {}
+        @picture = ingredient.picture
+      end
+
+      def call
+        return if picture.blank?
+
+        output = caption ? img_tag + caption : img_tag
+
+        if is_linked?
+          output = link_to(output, url_for(ingredient.link), {
+            title: ingredient.link_title.presence,
+            target: (ingredient.link_target == "blank") ? "_blank" : nil,
+            data: {link_target: ingredient.link_target.presence}
+          })
+        end
+
+        if caption
+          content_tag(:figure, output, {class: ingredient.css_class.presence}.merge(html_options))
+        else
+          output
+        end
+      end
+
+      private
+
+      def caption
+        return unless show_caption?
+
+        @_caption ||= content_tag(:figcaption, ingredient.caption)
+      end
+
+      def src
+        ingredient.picture_url(picture_options)
+      end
+
+      def img_tag
+        @_img_tag ||= image_tag(
+          src, {
+            alt: alt_text,
+            title: ingredient.title.presence,
+            class: caption ? nil : ingredient.css_class.presence,
+            srcset: srcset_options.join(", ").presence,
+            sizes: sizes.join(", ").presence
+          }.merge(caption ? {} : html_options)
+        )
+      end
+
+      def show_caption?
+        show_caption && ingredient.caption.present?
+      end
+
+      def is_linked?
+        !disable_link && ingredient.link.present?
+      end
+
+      def srcset_options
+        srcset.map do |size|
+          url = ingredient.picture_url(size: size)
+          width, height = size.split("x")
+          width.present? ? "#{url} #{width}w" : "#{url} #{height}h"
+        end
+      end
+
+      def alt_text
+        ingredient.alt_tag.presence || html_options.delete(:alt) || ingredient.picture.name&.humanize
+      end
+    end
+  end
+end

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

@@ -0,0 +1,22 @@
+module Alchemy
+  module Ingredients
+    class RichtextView < BaseView
+      attr_reader :plain_text
+
+      # @param ingredient [Alchemy::Ingredient]
+      # @param plain_text [Boolean] (false) Whether to show as plain text or with markup
+      def initialize(ingredient, plain_text: nil, html_options: {})
+        super(ingredient)
+        @plain_text = settings_value(:plain_text, value: plain_text, default: false)
+      end
+
+      def call
+        if plain_text
+          ingredient.stripped_body
+        else
+          value.to_s.html_safe
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,6 @@
+module Alchemy
+  module Ingredients
+    class SelectView < BaseView
+    end
+  end
+end

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

@@ -0,0 +1,41 @@
+module Alchemy
+  module Ingredients
+    class TextView < BaseView
+      attr_reader :disable_link
+
+      delegate :dom_id, :link, :link_title, :link_target,
+        to: :ingredient
+
+      # @param ingredient [Alchemy::Ingredient]
+      # @param disable_link [Boolean] (false) Whether to disable the link even if the picture has a link.
+      # @param html_options [Hash] Options that will be passed to the a tag.
+      def initialize(ingredient, disable_link: nil, html_options: {})
+        super(ingredient, html_options: html_options)
+        @disable_link = settings_value(:disable_link, value: disable_link, default: false)
+      end
+
+      def call
+        if disable_link?
+          dom_id.present? ? anchor : value
+        else
+          link_to(value, url_for(link), {
+            id: dom_id.presence,
+            title: link_title,
+            target: ((link_target == "blank") ? "_blank" : nil),
+            data: {link_target: link_target}
+          }.merge(html_options))
+        end
+      end
+
+      private
+
+      def anchor
+        content_tag(:a, value, {id: dom_id}.merge(html_options))
+      end
+
+      def disable_link?
+        link.blank? || disable_link
+      end
+    end
+  end
+end

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

@@ -0,0 +1,39 @@
+module Alchemy
+  module Ingredients
+    class VideoView < BaseView
+      delegate :attachment, to: :ingredient
+
+      def call
+        content_tag(:video, html_options) do
+          tag(:source, src: src, type: attachment.file_mime_type)
+        end
+      end
+
+      def render?
+        !attachment.nil?
+      end
+
+      private
+
+      def src
+        alchemy.show_attachment_path(
+          attachment,
+          format: attachment.suffix
+        )
+      end
+
+      def html_options
+        {
+          controls: ingredient.controls,
+          autoplay: ingredient.autoplay,
+          loop: ingredient.loop,
+          muted: ingredient.muted,
+          playsinline: ingredient.playsinline,
+          preload: ingredient.preload.presence,
+          width: ingredient.width.presence,
+          height: ingredient.height.presence
+        }.merge(@html_options)
+      end
+    end
+  end
+end

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

@@ -52,7 +52,7 @@ module Alchemy
           render_errors_or_redirect(
             @attachment,
             admin_attachments_path(search_filter_params),
-            Alchemy.t("File successfully updated"),
+            Alchemy.t("File successfully updated")
           )
         end
       end
@@ -68,7 +68,7 @@ module Alchemy
         @attachment = Attachment.find(params[:id])
         send_file @attachment.file.path, {
           filename: @attachment.file_name,
-          type: @attachment.file_mime_type,
+          type: @attachment.file_mime_type
         }
       end
 
@@ -77,8 +77,7 @@ module Alchemy
       def search_filter_params
         @_search_filter_params ||= params.except(*COMMON_SEARCH_FILTER_EXCLUDES + [:attachment]).permit(
           *common_search_filter_includes + [
-            :form_field_id,
-            :content_id,
+            :form_field_id
           ]
         )
       end

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

@@ -54,7 +54,7 @@ module Alchemy
         else
           respond_to do |format|
             format.html { render "500", status: 500 }
-            format.json { render json: { message: @notice }, status: 500 }
+            format.json { render json: {message: @notice}, status: 500 }
           end
         end
       end
@@ -101,7 +101,7 @@ module Alchemy
           flash[:notice] = Alchemy.t(flash_notice)
           do_redirect_to redirect_url
         else
-          render action: (params[:action] == "update" ? "edit" : "new")
+          render action: ((params[:action] == "update") ? "edit" : "new")
         end
       end
 
@@ -138,11 +138,11 @@ module Alchemy
       #
       def current_alchemy_site
         @current_alchemy_site ||= begin
-            site_id = params[:site_id] || session[:alchemy_site_id]
-            site = Site.find_by(id: site_id) || super
-            session[:alchemy_site_id] = site&.id
-            site
-          end
+          site_id = params[:site_id] || session[:alchemy_site_id]
+          site = Site.find_by(id: site_id) || super
+          session[:alchemy_site_id] = site&.id
+          site
+        end
       end
 
       def notify_error_tracker(exception)

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

@@ -3,7 +3,7 @@
 module Alchemy
   module Admin
     class ClipboardController < Alchemy::Admin::BaseController
-      REMARKABLE_TYPES = %w(elements pages)
+      REMARKABLE_TYPES = %w[elements pages]
 
       authorize_resource class: :alchemy_admin_clipboard
       before_action :set_clipboard
@@ -20,7 +20,7 @@ module Alchemy
         unless @clipboard.detect { |item| item["id"] == remarkable_params[:remarkable_id] }
           @clipboard << {
             "id" => remarkable_params[:remarkable_id],
-            "action" => params[:remove] ? "cut" : "copy",
+            "action" => params[:remove] ? "cut" : "copy"
           }
         end
         respond_to do |format|

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

@@ -29,10 +29,11 @@ module Alchemy
         @page_version = PageVersion.find(params[:element][:page_version_id])
         @page = @page_version.page
         Element.transaction do
-          if @paste_from_clipboard = params[:paste_from_clipboard].present?
-            @element = paste_element_from_clipboard
+          @paste_from_clipboard = params[:paste_from_clipboard].present?
+          @element = if @paste_from_clipboard
+            paste_element_from_clipboard
           else
-            @element = Element.new(create_element_params)
+            Element.new(create_element_params)
           end
           if @page.definition["insert_elements_at"] == "top"
             @insert_at_top = true
@@ -49,24 +50,23 @@ module Alchemy
         end
       end
 
-      # Updates the element.
-      #
-      # And update all contents in the elements by calling update_contents.
+      # Updates the element and all ingredients in the element.
       #
       def update
         @page = @element.page
 
-        if element_params.key?(:ingredients_attributes)
-          update_element_with_ingredients
+        if @element.update(element_params)
+          @element_validated = true
         else
-          update_element_with_contents
+          element_update_error
+          @error_messages = @element.ingredient_error_messages
         end
       end
 
       def destroy
-        @richtext_ids = @element.richtext_contents_ids + @element.richtext_ingredients_ids
+        @richtext_ids = @element.richtext_ingredients_ids
         @element.destroy
-        @notice = Alchemy.t("Successfully deleted element") % { element: @element.display_name }
+        @notice = Alchemy.t("Successfully deleted element") % {element: @element.display_name}
       end
 
       def publish
@@ -81,7 +81,7 @@ module Alchemy
             # element over from another nestable element
             Element.find_by(id: element_id).update_columns(
               parent_element_id: params[:parent_element_id],
-              position: position,
+              position: position
             )
           end
           # Need to manually touch the parent because Rails does not do it
@@ -96,26 +96,38 @@ module Alchemy
         @page = @element.page
         # We do not want to trigger the touch callback or any validations
         @element.update_columns(folded: !@element.folded)
+        # Fold all nested elements if folded
+        if @element.folded?
+          ids = collapse_nested_elements_ids(@element)
+          Alchemy::Element.where(id: ids).update_all(folded: true)
+        end
       end
 
       private
 
+      def collapse_nested_elements_ids(element)
+        ids = []
+        element.all_nested_elements.includes(:all_nested_elements).reject(&:compact?).each do |nested_element|
+          ids.push nested_element.id if nested_element.expanded?
+          ids.concat collapse_nested_elements_ids(nested_element) if nested_element.all_nested_elements.reject(&:compact?).any?
+        end
+        ids
+      end
+
       def element_includes
         [
           {
-            contents: :essence,
-            ingredients: :related_object,
+            ingredients: :related_object
           },
           :tags,
           {
             all_nested_elements: [
               {
-                contents: :essence,
-                ingredients: :related_object,
+                ingredients: :related_object
               },
-              :tags,
-            ],
-          },
+              :tags
+            ]
+          }
         ]
       end
 
@@ -141,7 +153,7 @@ module Alchemy
           @source_element,
           {
             parent_element_id: create_element_params[:parent_element_id],
-            page_version_id: @page_version.id,
+            page_version_id: @page_version.id
           }
         )
         if element_from_clipboard["action"] == "cut"
@@ -152,10 +164,6 @@ module Alchemy
         element
       end
 
-      def contents_params
-        params.fetch(:contents, {}).permit!
-      end
-
       def element_params
         params.fetch(:element, {}).permit(:tag_list, ingredients_attributes: {})
       end
@@ -164,28 +172,10 @@ module Alchemy
         params.require(:element).permit(:name, :page_version_id, :parent_element_id)
       end
 
-      def update_element_with_ingredients
-        if @element.update(element_params)
-          @element_validated = true
-        else
-          element_update_error
-          @error_messages = @element.ingredient_error_messages
-        end
-      end
-
-      def update_element_with_contents
-        if @element.update_contents(contents_params)
-          @element_validated = @element.update(element_params)
-        else
-          element_update_error
-          @error_messages = @element.essence_error_messages
-        end
-      end
-
       def element_update_error
         @element_validated = false
         @notice = Alchemy.t("Validation failed")
-        @error_message = "<h2>#{@notice}</h2><p>#{Alchemy.t(:content_validations_headline)}</p>".html_safe
+        @error_message = "<h2>#{@notice}</h2><p>#{Alchemy.t(:ingredient_validations_headline)}</p>".html_safe
       end
     end
   end

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

@@ -14,7 +14,7 @@ module Alchemy
       def new
         @language = Language.new(
           site: @current_site,
-          page_layout: Config.get(:default_language)["page_layout"],
+          page_layout: Config.get(:default_language)["page_layout"]
         )
       end
 

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

@@ -12,7 +12,7 @@ module Alchemy
       def new
         @node = Node.new(
           parent_id: params[:parent_id],
-          language: @current_language,
+          language: @current_language
         )
       end
 
@@ -28,7 +28,7 @@ module Alchemy
           :url,
           :title,
           :nofollow,
-          :external,
+          :external
         )
       end
     end