alchemy_cms 6.1.5 → 7.0.0.pre.b

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

@@ -94,7 +94,7 @@ module Alchemy
         end
       end
 
-      # Edit the content of the page and all its elements and contents.
+      # Edit the content of the page and all its elements and ingredients.
       #
       # Locks the page to current user to prevent other users from editing it meanwhile.
       #
@@ -109,7 +109,7 @@ module Alchemy
         @preview_urls = Alchemy.preview_sources.map do |klass|
           [
             klass.model_name.human,
-            klass.new(routes: Alchemy::Engine.routes).url_for(@page),
+            klass.new(routes: Alchemy::Engine.routes).url_for(@page)
           ]
         end
         @layoutpage = @page.layoutpage?
@@ -152,10 +152,10 @@ module Alchemy
         respond_to do |format|
           format.js do
             @redirect_url = if @page.layoutpage?
-                alchemy.admin_layoutpages_path
-              else
-                alchemy.admin_pages_path
-              end
+              alchemy.admin_layoutpages_path
+            else
+              alchemy.admin_pages_path
+            end
 
             render :redirect
           end
@@ -185,7 +185,7 @@ module Alchemy
           format.html do
             redirect_to(
               params[:redirect_to].presence || admin_pages_path,
-              allow_other_host: true,
+              allow_other_host: true
             )
           end
         end
@@ -248,7 +248,7 @@ module Alchemy
         Page.copy(
           language_root_to_copy_from,
           language_id: params[:languages][:new_lang_id],
-          language_code: @current_language.code,
+          language_code: @current_language.code
         )
       end
 
@@ -322,7 +322,7 @@ module Alchemy
       #
       def process_url(ancestors_path, item)
         default_urlname = (ancestors_path.blank? ? "" : "#{ancestors_path}/") + item["slug"].to_s
-        { my_urlname: default_urlname, children_path: default_urlname }
+        {my_urlname: default_urlname, children_path: default_urlname}
       end
 
       def load_resource
@@ -333,7 +333,7 @@ module Alchemy
         request.raw_post.split("&").map do |i|
           parts = i.split("=")
           {
-            parts[0].gsub(/[^0-9]/, "") => parts[1],
+            parts[0].gsub(/[^0-9]/, "") => parts[1]
           }
         end
       end
@@ -391,7 +391,7 @@ module Alchemy
         PageTreeSerializer.new(
           @page,
           ability: current_ability,
-          user: current_alchemy_user,
+          user: current_alchemy_user
         )
       end
 

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

@@ -32,7 +32,7 @@ module Alchemy
         @query = Picture.ransack(params[:q])
         @previous = filtered_pictures.where("name < ?", @picture.name).last
         @next = filtered_pictures.where("name > ?", @picture.name).first
-        @assignments = @picture.essence_pictures.joins(content: { element: :page })
+        @assignments = @picture.picture_ingredients.joins(element: :page)
 
         render action: "show"
       end
@@ -44,7 +44,7 @@ module Alchemy
         render json: {
           url: @picture.url(options),
           alt: @picture.name,
-          title: Alchemy.t(:image_name, name: @picture.name),
+          title: Alchemy.t(:image_name, name: @picture.name)
         }
       end
 
@@ -64,15 +64,15 @@ module Alchemy
       end
 
       def update
-        if @picture.update(picture_params)
-          @message = {
+        @message = if @picture.update(picture_params)
+          {
             body: Alchemy.t(:picture_updated_successfully, name: @picture.name),
-            type: "notice",
+            type: "notice"
           }
         else
-          @message = {
+          {
             body: Alchemy.t(:picture_update_failed),
-            type: "error",
+            type: "error"
           }
         end
         render :update
@@ -103,7 +103,7 @@ module Alchemy
           if not_deletable.any?
             flash[:warn] = Alchemy.t(
               "These pictures could not be deleted, because they were in use",
-              names: not_deletable.to_sentence,
+              names: not_deletable.to_sentence
             )
           else
             flash[:notice] = Alchemy.t("Pictures deleted successfully", names: names.to_sentence)
@@ -111,7 +111,7 @@ module Alchemy
         else
           flash[:warn] = Alchemy.t("Could not delete Pictures")
         end
-      rescue StandardError => e
+      rescue => e
         flash[:error] = e.message
       ensure
         redirect_to_index
@@ -121,7 +121,7 @@ module Alchemy
         name = @picture.name
         @picture.destroy
         flash[:notice] = Alchemy.t("Picture deleted successfully", name: name)
-      rescue StandardError => e
+      rescue => e
         flash[:error] = e.message
       ensure
         redirect_to_index
@@ -153,8 +153,8 @@ module Alchemy
           end
         else
           cookies[:alchemy_pictures_per_page] = params[:per_page] ||
-                                                cookies[:alchemy_pictures_per_page] ||
-                                                pictures_per_page_for_size
+            cookies[:alchemy_pictures_per_page] ||
+            pictures_per_page_for_size
         end
       end
 
@@ -186,9 +186,9 @@ module Alchemy
       def search_filter_params
         @_search_filter_params ||= params.except(*COMMON_SEARCH_FILTER_EXCLUDES + [:picture_ids]).permit(
           *common_search_filter_includes + [
-          :size,
-          :form_field_id,
-        ],
+            :size,
+            :form_field_id
+          ]
         )
       end
 

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

@@ -8,7 +8,7 @@ require "alchemy/resource_filter"
 module Alchemy
   module Admin
     class ResourcesController < Alchemy::Admin::BaseController
-      COMMON_SEARCH_FILTER_EXCLUDES = [:id, :utf8, :_method, :_, :format].freeze
+      COMMON_SEARCH_FILTER_EXCLUDES = %i[id utf8 _method _ format].freeze
 
       include Alchemy::ResourcesHelper
 
@@ -18,7 +18,7 @@ module Alchemy
         :resource_filters_for_select
 
       before_action :load_resource,
-        only: [:show, :edit, :update, :destroy]
+        only: %i[show edit update destroy]
 
       before_action :authorize_resource
 
@@ -27,26 +27,18 @@ module Alchemy
         @query.sorts = default_sort_order if @query.sorts.empty?
         items = @query.result
 
-        if contains_relations?
-          items = items.includes(*resource_relations_names)
-        end
-
-        if search_filter_params[:tagged_with].present?
-          items = items.tagged_with(search_filter_params[:tagged_with])
-        end
-
-        if search_filter_params[:filter].present?
-          items = apply_filters(items)
-        end
+        items = items.includes(*resource_relations_names) if contains_relations?
+        items = items.tagged_with(search_filter_params[:tagged_with]) if search_filter_params[:tagged_with].present?
+        items = apply_filters(items) if search_filter_params[:filter].present?
 
         respond_to do |format|
-          format.html {
+          format.html do
             items = items.page(params[:page] || 1).per(items_per_page)
             instance_variable_set("@#{resource_handler.resources_name}", items)
-          }
-          format.csv {
+          end
+          format.csv do
             instance_variable_set("@#{resource_handler.resources_name}", items)
-          }
+          end
         end
       end
 
@@ -58,7 +50,8 @@ module Alchemy
         render action: "edit"
       end
 
-      def edit; end
+      def edit
+      end
 
       def create
         instance_variable_set("@#{resource_handler.resource_name}", resource_handler.model.new(resource_params))
@@ -66,7 +59,7 @@ module Alchemy
         render_errors_or_redirect(
           resource_instance_variable,
           resources_path(resource_instance_variable.class, search_filter_params),
-          flash_notice_for_resource_action,
+          flash_notice_for_resource_action
         )
       end
 
@@ -75,7 +68,7 @@ module Alchemy
         render_errors_or_redirect(
           resource_instance_variable,
           resources_path(resource_instance_variable.class, search_filter_params),
-          flash_notice_for_resource_action,
+          flash_notice_for_resource_action
         )
       end
 
@@ -103,7 +96,7 @@ module Alchemy
       def resource_filters
         return unless resource_has_filters
 
-        @_resource_filters ||= deprecated_resource_filters || resource_model.alchemy_resource_filters
+        @_resource_filters ||= resource_model.alchemy_resource_filters
       end
 
       def resource_filters_for_select
@@ -114,23 +107,6 @@ module Alchemy
 
       protected
 
-      def deprecated_resource_filters
-        if resource_has_deprecated_filters
-          Alchemy::Deprecation.warn(
-            "#{resource_model}.alchemy_resource_filters is using a legacy data structure. " \
-            "Please use an Array of Hashes instead. i.e. [{ name: 'foo', values: ['bar', 'baz'] }, ...] " \
-            "where values are scopes. With Alchemy 6.1 only the new structure will be supported."
-          )
-
-          @_resource_filters ||= [
-            {
-              name: :misc,
-              values: resource_model.alchemy_resource_filters,
-            },
-          ]
-        end
-      end
-
       def apply_filters(items)
         sanitize_filter_params!
 
@@ -178,7 +154,10 @@ module Alchemy
         when :destroy
           verb = "removed"
         end
-        flash[:notice] = Alchemy.t("#{resource_handler.resource_name.classify} successfully #{verb}", default: Alchemy.t("Successfully #{verb}"))
+        flash[:notice] = Alchemy.t(
+          "#{resource_handler.resource_name.classify} successfully #{verb}",
+          default: Alchemy.t("Successfully #{verb}")
+        )
       end
 
       def is_alchemy_module?
@@ -215,18 +194,20 @@ module Alchemy
 
       def common_search_filter_includes
         search_filters = [
-          { q: [
-            resource_handler.search_field_name,
-            :s,
-          ] },
+          {
+            q: [
+              resource_handler.search_field_name,
+              :s
+            ]
+          },
           :tagged_with,
           :page,
-          :per_page,
+          :per_page
         ]
 
         if resource_has_filters
           search_filters << {
-            filter: resource_filters.map { |f| f[:name] },
+            filter: resource_filters.map { |f| f[:name] }
           }
         end
 
@@ -234,7 +215,8 @@ module Alchemy
       end
 
       def items_per_page
-        cookies[:alchemy_items_per_page] = params[:per_page] || cookies[:alchemy_items_per_page] || Alchemy::Config.get(:items_per_page)
+        cookies[:alchemy_items_per_page] =
+          params[:per_page] || cookies[:alchemy_items_per_page] || Alchemy::Config.get(:items_per_page)
       end
 
       def items_per_page_options

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Alchemy
   module Admin
     class StyleguideController < BaseController

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

@@ -6,31 +6,31 @@ module Alchemy
       before_action :load_tag, only: [:edit, :update, :destroy]
 
       def index
-        @query = Gutentag::Tag.ransack(search_filter_params[:q])
+        @query = Tag.ransack(search_filter_params[:q])
         @query.sorts = default_sort_order if @query.sorts.empty?
         @tags = @query
-                  .result
-                  .page(params[:page] || 1)
-                  .per(items_per_page)
-                  .order("name ASC")
+          .result
+          .page(params[:page] || 1)
+          .per(items_per_page)
+          .order("name ASC")
       end
 
       def new
-        @tag = Gutentag::Tag.new
+        @tag = Tag.new
       end
 
       def create
-        @tag = Gutentag::Tag.create(tag_params)
+        @tag = Tag.create(tag_params)
         render_errors_or_redirect @tag, admin_tags_path, Alchemy.t("New Tag Created")
       end
 
       def edit
-        @tags = Gutentag::Tag.order("name ASC").to_a - [@tag]
+        @tags = Tag.order("name ASC").to_a - [@tag]
       end
 
       def update
         if tag_params[:merge_to]
-          @new_tag = Gutentag::Tag.find(tag_params[:merge_to])
+          @new_tag = Tag.find(tag_params[:merge_to])
           Tag.replace(@tag, @new_tag)
           operation_text = Alchemy.t("Replaced Tag") % {old_tag: @tag.name, new_tag: @new_tag.name}
           @tag.destroy
@@ -57,7 +57,7 @@ module Alchemy
       private
 
       def load_tag
-        @tag = Gutentag::Tag.find(params[:id])
+        @tag = Tag.find(params[:id])
       end
 
       def tag_params
@@ -67,7 +67,7 @@ module Alchemy
       def tags_from_term(term)
         return [] if term.blank?
 
-        Gutentag::Tag.where(["LOWER(name) LIKE ?", "#{term.downcase}%"])
+        Tag.where(["LOWER(name) LIKE ?", "#{term.downcase}%"])
       end
 
       def json_for_autocomplete(items, attribute)

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

@@ -12,11 +12,11 @@ module Alchemy
     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/elements_controller.rb

@@ -10,18 +10,18 @@ module Alchemy
     #
     def index
       # Fix for cancancan not able to merge multiple AR scopes for logged in users
-      if cannot? :manage, Alchemy::Element
-        @elements = Alchemy::Element.accessible_by(current_ability, :index)
+      @elements = if cannot? :manage, Alchemy::Element
+        Alchemy::Element.accessible_by(current_ability, :index)
       else
-        @elements = Alchemy::Element.all
+        Alchemy::Element.all
       end
 
       @elements = @elements.not_nested.joins(:page_version).merge(PageVersion.published)
 
-      if params[:page_id].present?
-        @elements = @elements.includes(:page).where(alchemy_pages: { id: params[:page_id] })
+      @elements = if params[:page_id].present?
+        @elements.includes(:page).where(alchemy_pages: {id: params[:page_id]})
       else
-        @elements = @elements.includes(*element_includes)
+        @elements.includes(*element_includes)
       end
 
       if params[:named].present?
@@ -47,17 +47,15 @@ module Alchemy
         {
           nested_elements: [
             {
-              contents: :essence,
-              ingredients: :related_object,
+              ingredients: :related_object
             },
-            :tags,
-          ],
+            :tags
+          ]
         },
         {
-          contents: :essence,
-          ingredients: :related_object,
+          ingredients: :related_object
         },
-        :tags,
+        :tags
       ]
     end
   end

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

@@ -11,7 +11,7 @@ module Alchemy
 
       if params[:page_id].present?
         @ingredients = @ingredients
-          .where(alchemy_page_versions: { page_id: params[:page_id] })
+          .where(alchemy_page_versions: {page_id: params[:page_id]})
           .merge(Alchemy::PageVersion.drafts)
           .joins(element: :page_version)
       end

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

@@ -43,7 +43,7 @@ module Alchemy
       {
         total_count: total_count_value,
         per_page: per_page_value,
-        page: page_value,
+        page: page_value
       }
     end
 

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

@@ -30,11 +30,13 @@ module Alchemy
     def nested
       @page = Page.find_by(id: params[:page_id]) || Language.current_root_page
 
-      render json: PageTreeSerializer.new(@page,
+      render json: PageTreeSerializer.new(
+        @page,
         ability: current_ability,
         user: current_alchemy_user,
         elements: params[:elements],
-        full: true)
+        full: true
+      )
     end
 
     # Returns a json object for page
@@ -70,7 +72,7 @@ module Alchemy
 
       Language.current.pages.where(
         urlname: params[:urlname],
-        language_code: params[:locale] || Language.current.code,
+        language_code: params[:locale] || Language.current.code
       ).includes(page_includes).first
     end
 
@@ -78,7 +80,7 @@ module Alchemy
       {
         total_count: total_count_value,
         per_page: per_page_value,
-        page: page_value,
+        page: page_value
       }
     end
 
@@ -95,7 +97,7 @@ module Alchemy
     end
 
     def page_value
-      params[:page] ? params[:page].to_i : nil
+      params[:page]&.to_i
     end
 
     def page_includes
@@ -107,17 +109,17 @@ module Alchemy
             {
               nested_elements: [
                 {
-                  contents: :essence,
+                  ingredients: :related_object
                 },
-                :tags,
-              ],
+                :tags
+              ]
             },
             {
-              contents: :essence,
+              ingredients: :related_object
             },
-            :tags,
-          ],
-        },
+            :tags
+          ]
+        }
       ]
     end
   end

data/app/controllers/alchemy/attachments_controller.rb

@@ -13,8 +13,8 @@ module Alchemy
         {
           filename: @attachment.file_name,
           type: @attachment.file_mime_type,
-          disposition: "inline",
-        },
+          disposition: "inline"
+        }
       )
     end
 
@@ -24,7 +24,7 @@ module Alchemy
       send_file(
         @attachment.file.path, {
           filename: @attachment.file_name,
-          type: @attachment.file_mime_type,
+          type: @attachment.file_mime_type
         }
       )
     end

data/app/controllers/alchemy/base_controller.rb

@@ -84,7 +84,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

@@ -11,15 +11,15 @@ module Alchemy
   # Make an Element with this options inside your @elements.yml file:
   #
   #   - name: contactform
-  #     contents:
-  #     - name: mail_to
-  #       type: EssenceText
-  #     - name: subject
-  #       type: EssenceText
-  #     - name: mail_from
-  #       type: EssenceText
-  #     - name: success_page
-  #       type: EssencePage
+  #     ingredients:
+  #       - role: mail_to
+  #         type: Text
+  #       - role: subject
+  #         type: Text
+  #       - role: mail_from
+  #         type: Text
+  #       - role: success_page
+  #         type: Page
   #
   # The fields +mail_to+, +mail_from+, +subject+ and +success_page+ are recommended.
   # The +Alchemy::MessagesController+ uses them to send your mails. So your customer has full controll of these values inside his contactform element.
@@ -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