alchemy_cms 7.0.0.pre.a → 7.0.0.pre.c

data/app/controllers/alchemy/base_controller.rb

@@ -9,13 +9,6 @@ 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
@@ -84,7 +77,7 @@ module Alchemy
           end
           format.html do
             render partial: "alchemy/admin/partials/flash",
-              locals: { message: flash[:warning], flash_type: "warning" }
+              locals: {message: flash[:warning], flash_type: "warning"}
           end
         end
       else

data/app/controllers/alchemy/messages_controller.rb

@@ -41,19 +41,19 @@ module Alchemy
 
     helper "alchemy/pages"
 
-    def index #:nodoc:
+    def index # :nodoc:
       redirect_to show_page_path(
         urlname: @page.urlname,
-        locale: prefix_locale? ? @page.language_code : nil,
+        locale: prefix_locale? ? @page.language_code : nil
       )
     end
 
-    def new #:nodoc:
+    def new # :nodoc:
       @message = Message.new
       render template: "alchemy/pages/show"
     end
 
-    def create #:nodoc:
+    def create # :nodoc:
       @message = Message.new(message_params)
       @message.ip = request.remote_ip
       @element = Element.find_by(id: @message.contact_form_id)
@@ -90,16 +90,16 @@ module Alchemy
 
     def redirect_to_success_page
       flash[:notice] = Alchemy.t(:success, scope: "contactform.messages")
-      if success_page
-        urlname = success_page_urlname
+      urlname = if success_page
+        success_page_urlname
       elsif mailer_config["forward_to_page"] && mailer_config["mail_success_page"]
-        urlname = Page.find_by(urlname: mailer_config["mail_success_page"]).urlname
+        Page.find_by(urlname: mailer_config["mail_success_page"]).urlname
       else
-        urlname = Language.current_root_page.urlname
+        Language.current_root_page.urlname
       end
       redirect_to show_page_path(
         urlname: urlname,
-        locale: prefix_locale? ? Language.current.code : nil,
+        locale: prefix_locale? ? Language.current.code : nil
       )
     end
 

data/app/controllers/alchemy/pages_controller.rb

@@ -6,7 +6,7 @@ module Alchemy
       "action",
       "controller",
       "urlname",
-      "locale",
+      "locale"
     ]
 
     include OnPageLayout::CallbacksRunner
@@ -104,13 +104,7 @@ module Alchemy
     # If no index page and no admin users are present we show the "Welcome to Alchemy" page.
     #
     def load_index_page
-      @page ||= Alchemy::Page
-        .contentpages
-        .language_roots
-        .where(language: Language.current)
-        .includes(page_includes)
-        .first
-
+      @page ||= Language.current_root_page
       render template: "alchemy/welcome", layout: false if signup_required?
     end
 
@@ -126,11 +120,10 @@ module Alchemy
     def load_page
       page_not_found! unless Language.current
 
-      @page ||= Alchemy::Page
-        .contentpages
-        .where(language: Language.current)
-        .includes(page_includes)
-        .find_by(urlname: params[:urlname])
+      @page ||= Language.current.pages.contentpages.find_by(
+        urlname: params[:urlname],
+        language_code: params[:locale] || Language.current.code
+      )
     end
 
     def enforce_locale
@@ -149,7 +142,7 @@ module Alchemy
     def page_locale_redirect_url(options = {})
       options = {
         locale: prefix_locale? ? @page.language_code : nil,
-        urlname: @page.urlname,
+        urlname: @page.urlname
       }.merge(options)
 
       alchemy.show_page_path additional_params.merge(options)
@@ -223,7 +216,7 @@ module Alchemy
         etag: page_etag,
         last_modified: @page.published_at,
         public: !@page.restricted,
-        template: "pages/show",
+        template: "pages/show"
       )
     end
 
@@ -235,9 +228,5 @@ module Alchemy
     def page_not_found!
       not_found_error!("Alchemy::Page not found \"#{request.fullpath}\"")
     end
-
-    def page_includes
-      Alchemy::EagerLoading.page_includes(version: :public_version)
-    end
   end
 end

data/app/controllers/concerns/alchemy/admin/archive_overlay.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Alchemy
   module Admin
     module ArchiveOverlay

data/app/controllers/concerns/alchemy/admin/uploader_responses.rb

@@ -8,12 +8,11 @@ module Alchemy
       def successful_uploader_response(file:, status: :created)
         message = Alchemy.t(:upload_success,
           scope: [:uploader, file.class.model_name.i18n_key],
-          name: file.name,
-        )
+          name: file.name)
 
         {
           json: uploader_response(file: file, message: message),
-          status: status,
+          status: status
         }
       end
 
@@ -21,12 +20,11 @@ module Alchemy
         message = Alchemy.t(:upload_failure,
           scope: [:uploader, file.class.model_name.i18n_key],
           error: file.errors[:file].join,
-          name: file.name,
-        )
+          name: file.name)
 
         {
           json: uploader_response(file: file, message: message),
-          status: :unprocessable_entity,
+          status: :unprocessable_entity
         }
       end
 
@@ -35,7 +33,7 @@ module Alchemy
       def uploader_response(file:, message:)
         {
           files: [file.to_jq_upload],
-          growl_message: message,
+          growl_message: message
         }
       end
     end

data/app/controllers/concerns/alchemy/legacy_page_redirects.rb

@@ -36,18 +36,18 @@ module Alchemy
 
       alchemy.show_page_path(
         locale: prefix_locale? ? page.language_code : nil,
-        urlname: page.urlname,
+        urlname: page.urlname
       )
     end
 
     def legacy_urls
       # /slug/tree => slug/tree
-      urlname = (request.fullpath[1..-1] if request.fullpath[0] == "/") || request.fullpath
+      urlname = (request.fullpath[1..] if request.fullpath[0] == "/") || request.fullpath
       LegacyPageUrl.joins(:page).where(
-        urlname: urlname,
+        :urlname => urlname,
         Page.table_name => {
-          language_id: Language.current.id,
-        },
+          language_id: Language.current.id
+        }
       )
     end
 

data/app/decorators/alchemy/element_editor.rb

@@ -44,7 +44,7 @@ module Alchemy
       Alchemy.t(
         group,
         scope: "element_groups.#{element.name}",
-        default: Alchemy.t("element_groups.#{group}", default: group.humanize),
+        default: Alchemy.t("element_groups.#{group}", default: group.humanize)
       )
     end
 
@@ -59,7 +59,7 @@ module Alchemy
         compact? ? "compact" : nil,
         deprecated? ? "deprecated" : nil,
         fixed? ? "is-fixed" : "not-fixed",
-        public? ? "visible" : "hidden",
+        public? ? "visible" : "hidden"
       ].join(" ")
     end
 
@@ -117,7 +117,7 @@ module Alchemy
         Alchemy.t(
           name,
           scope: :element_deprecation_notices,
-          default: Alchemy.t(:element_deprecated),
+          default: Alchemy.t(:element_deprecated)
         )
       end
     end
@@ -128,7 +128,7 @@ module Alchemy
       element.ingredients.detect { |i| i.role == definition[:role] } ||
         element.ingredients.create!(
           role: definition[:role],
-          type: Alchemy::Ingredient.normalize_type(definition[:type]),
+          type: Alchemy::Ingredient.normalize_type(definition[:type])
         )
     end
   end

data/app/decorators/alchemy/ingredient_editor.rb

@@ -27,7 +27,7 @@ module Alchemy
       Alchemy.t(
         role,
         scope: "ingredient_roles.#{element.name}",
-        default: Alchemy.t("ingredient_roles.#{role}", default: role.humanize),
+        default: Alchemy.t("ingredient_roles.#{role}", default: role.humanize)
       )
     end
 
@@ -36,17 +36,17 @@ module Alchemy
         "ingredient-editor",
         partial_name,
         deprecated? ? "deprecated" : nil,
-        respond_to?(:level_options) && level_options.many? ? "with-level-select" : nil,
-        respond_to?(:size_options) && size_options.many? ? "with-size-select" : nil,
+        (respond_to?(:level_options) && level_options.many?) ? "with-level-select" : nil,
+        (respond_to?(:size_options) && size_options.many?) ? "with-size-select" : nil,
         settings[:linkable] ? "linkable" : nil,
-        settings[:anchor] ? "with-anchor" : nil,
+        settings[:anchor] ? "with-anchor" : nil
       ].compact
     end
 
     def data_attributes
       {
         ingredient_id: id,
-        ingredient_role: role,
+        ingredient_role: role
       }
     end
 
@@ -148,7 +148,7 @@ module Alchemy
         Alchemy.t(
           role,
           scope: [:ingredient_deprecation_notices, element.name],
-          default: Alchemy.t(:ingredient_deprecated),
+          default: Alchemy.t(:ingredient_deprecated)
         )
       end
     end

data/app/helpers/alchemy/admin/attachments_helper.rb

@@ -14,7 +14,7 @@ module Alchemy
         when "image" then "600x475"
         when "audio" then "600x190"
         when "video" then "600x485"
-        when "pdf"   then "600x500"
+        when "pdf" then "600x500"
         else
           "600x145"
         end

data/app/helpers/alchemy/admin/base_helper.rb

@@ -100,7 +100,7 @@ module Alchemy
       def js_filter_field(items, options = {})
         options = {
           class: "js_filter_field",
-          data: {"alchemy-list-filter" => items},
+          data: {"alchemy-list-filter" => items}
         }.merge(options)
         content_tag(:div, class: "js_filter_field_box") do
           concat text_field_tag(nil, nil, options)
@@ -140,10 +140,9 @@ module Alchemy
               title: Alchemy.t(:please_confirm),
               message: message,
               ok_label: Alchemy.t("Yes"),
-              cancel_label: Alchemy.t("No"),
-            }.to_json,
-          )
-        )
+              cancel_label: Alchemy.t("No")
+            }.to_json
+          ))
       end
 
       # Returns a form and a button that opens a modal confirm dialog.
@@ -170,7 +169,7 @@ module Alchemy
           message: Alchemy.t(:confirm_to_proceed),
           ok_label: Alchemy.t("Yes"),
           title: Alchemy.t(:please_confirm),
-          cancel_label: Alchemy.t("No"),
+          cancel_label: Alchemy.t("No")
         }.merge(options)
         form_tag url, {method: html_options.delete(:method), class: "button-with-confirm"} do
           button_tag value, html_options.merge("data-alchemy-confirm" => options.to_json)
@@ -190,26 +189,26 @@ module Alchemy
         options = {
           title: Alchemy.t("Delete"),
           message: Alchemy.t("Are you sure?"),
-          icon: :minus,
+          icon: :minus
         }.merge(options)
         button_with_confirm(
           render_icon(options[:icon]),
           url, {
-            message: options[:message],
+            message: options[:message]
           }, {
             method: "delete",
             title: options[:title],
-            class: "icon_button #{html_options.delete(:class)}".strip,
+            class: "icon_button #{html_options.delete(:class)}".strip
           }.merge(html_options)
         )
       end
 
       # (internal) Renders translated Module Names for html title element.
       def render_alchemy_title
-        if content_for?(:title)
-          title = content_for(:title)
+        title = if content_for?(:title)
+          content_for(:title)
         else
-          title = Alchemy.t(controller_name, scope: :modules)
+          Alchemy.t(controller_name, scope: :modules)
         end
         "Alchemy CMS - #{title}"
       end
@@ -259,11 +258,11 @@ module Alchemy
           active: false,
           link_options: {},
           dialog_options: {},
-          loading_indicator: false,
+          loading_indicator: false
         }.merge(options.symbolize_keys)
         button = render(
           "alchemy/admin/partials/toolbar_button",
-          options: options,
+          options: options
         )
         if options[:skip_permission_check] || can?(*permission_from_options(options))
           button
@@ -321,10 +320,10 @@ module Alchemy
         type = html_options.delete(:type) || "date"
         date = html_options.delete(:value) || object.send(method.to_sym).presence
         date = Time.zone.parse(date) if date.is_a?(String)
-        value = date ? date.iso8601 : nil
+        value = date&.iso8601
 
         text_field object.class.name.demodulize.underscore.to_sym,
-          method.to_sym, {type: "text", class: type, "data-datepicker-type" => type, value: value}.merge(html_options)
+          method.to_sym, {:type => "text", :class => type, "data-datepicker-type" => type, :value => value}.merge(html_options)
       end
 
       # Render a hint icon with tooltip for given object.
@@ -344,17 +343,17 @@ module Alchemy
           controller_name,
           action_name,
           content_for(:main_menu_style),
-          content_for(:alchemy_body_class),
+          content_for(:alchemy_body_class)
         ].compact
       end
 
       # (internal) Returns options for the clipboard select tag
       def clipboard_select_tag_options(items)
         options = items.map do |item|
-          if item.respond_to?(:display_name_with_preview_text)
-            name = item.display_name_with_preview_text
+          name = if item.respond_to?(:display_name_with_preview_text)
+            item.display_name_with_preview_text
           else
-            name = item.name
+            item.name
           end
           [name, item.id]
         end
@@ -386,7 +385,7 @@ module Alchemy
       # that explains the user that the page layout is missing
       def page_layout_missing_warning
         hint_with_tooltip(
-          Alchemy.t(:page_definition_missing),
+          Alchemy.t(:page_definition_missing)
         )
       end
 
@@ -404,7 +403,7 @@ module Alchemy
         action_controller = options[:url].gsub(/\A\//, "").split("/")
         [
           action_controller.last.to_sym,
-          action_controller[0..action_controller.length - 2].join("_").to_sym,
+          action_controller[0..action_controller.length - 2].join("_").to_sym
         ]
       end
     end

data/app/helpers/alchemy/admin/elements_helper.rb

@@ -16,7 +16,7 @@ module Alchemy
         elements.collect do |e|
           [
             Element.display_name_for(e["name"]),
-            e["name"],
+            e["name"]
           ]
         end
       end

data/app/helpers/alchemy/admin/form_helper.rb

@@ -19,7 +19,7 @@ module Alchemy
         options[:remote] = request.xhr?
         options[:html] = {
           id: options.delete(:id),
-          class: ["alchemy", options.delete(:class)].compact.join(" "),
+          class: ["alchemy", options.delete(:class)].compact.join(" ")
         }
         simple_form_for(object, *(args << options), &block)
       end

data/app/helpers/alchemy/admin/navigation_helper.rb

@@ -14,7 +14,7 @@ module Alchemy
         render(
           "alchemy/admin/partials/main_navigation_entry",
           alchemy_module: alchemy_module,
-          navigation: alchemy_module["navigation"],
+          navigation: alchemy_module["navigation"]
         )
       end
 
@@ -37,7 +37,7 @@ module Alchemy
       def navigate_module(navigation)
         [
           navigation["action"].to_sym,
-          navigation["controller"].to_s.gsub(/\A\//, "").gsub(/\//, "_").to_sym,
+          navigation["controller"].to_s.gsub(/\A\//, "").tr("/", "_").to_sym
         ]
       end
 
@@ -47,7 +47,7 @@ module Alchemy
         [
           "main_navi_entry",
           admin_mainnavi_active?(navigation) ? "active" : nil,
-          navigation.key?("sub_navigation") ? "has_sub_navigation" : nil,
+          navigation.key?("sub_navigation") ? "has_sub_navigation" : nil
         ].compact
       end
 
@@ -75,7 +75,7 @@ module Alchemy
       def url_for_module(alchemy_module)
         route_from_engine_or_main_app(
           alchemy_module["engine_name"],
-          url_options_for_module(alchemy_module),
+          url_options_for_module(alchemy_module)
         )
       end
 
@@ -94,7 +94,7 @@ module Alchemy
 
         route_from_engine_or_main_app(
           alchemy_module["engine_name"],
-          url_options_for_navigation_entry(navigation),
+          url_options_for_navigation_entry(navigation)
         )
       end
 
@@ -126,7 +126,7 @@ module Alchemy
       #
       def route_from_engine_or_main_app(engine_name, url_options)
         if engine_name.present?
-          eval(engine_name).url_for(url_options)
+          eval(engine_name).url_for(url_options) # rubocop:disable Security/Eval
         else
           main_app.url_for(url_options)
         end
@@ -151,7 +151,7 @@ module Alchemy
           controller: entry["controller"],
           action: entry["action"],
           only_path: true,
-          params: entry["params"],
+          params: entry["params"]
         }.delete_if { |_k, v| v.nil? }
       end
 

data/app/helpers/alchemy/admin/pages_helper.rb

@@ -15,7 +15,7 @@ module Alchemy
           [Alchemy.t("480", scope: "preview_sizes"), 480],
           [Alchemy.t("768", scope: "preview_sizes"), 768],
           [Alchemy.t("1024", scope: "preview_sizes"), 1024],
-          [Alchemy.t("1280", scope: "preview_sizes"), 1280],
+          [Alchemy.t("1280", scope: "preview_sizes"), 1280]
         ])
       end
 
@@ -27,7 +27,7 @@ module Alchemy
         if page.persisted? && page.definition.blank?
           [
             page_layout_missing_warning,
-            Alchemy.t(:page_type),
+            Alchemy.t(:page_type)
           ].join(" ").html_safe
         else
           Alchemy.t(:page_type)

data/app/helpers/alchemy/admin/tags_helper.rb

@@ -20,10 +20,10 @@ module Alchemy
               "#{tag.name} (#{tag.taggings_count})",
               url_for(
                 search_filter_params.except(:page, :tagged_with).merge(
-                  tagged_with: tags_for_filter(current: tag).presence,
-                ),
+                  tagged_with: tags_for_filter(current: tag).presence
+                )
               ),
-              remote: request.xhr?,
+              remote: request.xhr?
             )
           end
         end.join.html_safe

data/app/helpers/alchemy/base_helper.rb

@@ -34,7 +34,7 @@ module Alchemy
         "fa#{options[:style].first}",
         options[:size] ? "fa-#{options[:size]}" : nil,
         options[:transform] ? "fa-#{options[:transform]}" : nil,
-        options[:class],
+        options[:class]
       ].compact
       content_tag("i", nil, class: classes)
     end
@@ -51,7 +51,7 @@ module Alchemy
     #
     def render_message(type = :info, msg = nil, &blk)
       icon_class = message_icon_class(type)
-      if block_given?
+      if blk
         content_tag :div, render_icon(icon_class) + capture(&blk), class: "#{type} message"
       else
         content_tag :div, render_icon(icon_class) + msg, class: "#{type} message"

data/app/helpers/alchemy/elements_block_helper.rb

@@ -32,10 +32,12 @@ module Alchemy
         renderable = element.ingredient_by_role(name)
         return if renderable.nil?
 
-        helpers.render(renderable, {
-          options: options,
-          html_options: html_options,
-        })
+        helpers.render(
+          renderable.as_view_component(
+            options: options,
+            html_options: html_options
+          )
+        )
       end
 
       # Returns the value of one of the element's ingredients.
@@ -102,7 +104,7 @@ module Alchemy
         tag: :div,
         id: element.dom_id,
         class: element.name,
-        tags_formatter: ->(tags) { tags.join(" ") },
+        tags_formatter: ->(tags) { tags.join(" ") }
       }.merge(options)
 
       # capture inner template block
@@ -111,12 +113,12 @@ module Alchemy
       end
 
       # wrap output in a useful DOM element
-      if tag = options.delete(:tag)
+      if (tag = options.delete(:tag))
         # add preview attributes
         options.merge!(element_preview_code_attributes(element))
 
         # add tags
-        if tags_formatter = options.delete(:tags_formatter)
+        if (tags_formatter = options.delete(:tags_formatter))
           options.merge!(element_tags_attributes(element, formatter: tags_formatter))
         end
 

data/app/helpers/alchemy/elements_helper.rb

@@ -73,22 +73,22 @@ module Alchemy
     def render_elements(options = {}, &blk)
       options = {
         from_page: @page,
-        render_format: "html",
+        render_format: "html"
       }.update(options)
 
       finder = options[:finder] || Alchemy::ElementsFinder.new(options)
 
       page_version = if @preview_mode
-          options[:from_page]&.draft_version
-        else
-          options[:from_page]&.public_version
-        end
+        options[:from_page]&.draft_version
+      else
+        options[:from_page]&.public_version
+      end
 
       elements = finder.elements(page_version: page_version)
 
       default_rendering = ->(element, i) { render_element(element, options, i + 1) }
       capture do
-        if block_given?
+        if blk
           elements.map.with_index(&blk)
         else
           elements.map.with_index(&default_rendering)
@@ -143,7 +143,7 @@ module Alchemy
     def render_element(element, options = {}, counter = 1)
       if element.nil?
         warning("Element is nil")
-        render "alchemy/elements/view_not_found", { name: "nil" }
+        render "alchemy/elements/view_not_found", {name: "nil"}
         return
       end
 
@@ -155,8 +155,8 @@ module Alchemy
         locals: {
           element: element,
           counter: counter,
-          options: options.except(:locals, :partial),
-        }.merge(options[:locals] || {}),
+          options: options.except(:locals, :partial)
+        }.merge(options[:locals] || {})
       )
     rescue ActionView::MissingTemplate => e
       warning(%(
@@ -175,7 +175,7 @@ module Alchemy
     def element_preview_code_attributes(element)
       return {} unless element.present? && @preview_mode && element.page == @page
 
-      { "data-alchemy-element" => element.id }
+      {"data-alchemy-element" => element.id}
     end
 
     # Returns the element's tags information as a string. Parameters and options
@@ -203,12 +203,12 @@ module Alchemy
     #
     def element_tags_attributes(element, options = {})
       options = {
-        formatter: lambda { |tags| tags.join(" ") },
+        formatter: lambda { |tags| tags.join(" ") }
       }.merge(options)
 
       return {} if !element.taggable? || element.tag_list.blank?
 
-      { "data-element-tags" => options[:formatter].call(element.tag_list) }
+      {"data-element-tags" => options[:formatter].call(element.tag_list)}
     end
   end
 end