alchemy_cms 4.6.7 → 5.0.0.beta1

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'csv'
-require 'alchemy/resource'
-require 'alchemy/resources_helper'
+require "csv"
+require "alchemy/resource"
+require "alchemy/resources_helper"
 
 module Alchemy
   module Admin
@@ -22,6 +22,7 @@ module Alchemy
 
       def index
         @query = resource_handler.model.ransack(search_filter_params[:q])
+        @query.sorts = default_sort_order if @query.sorts.empty?
         items = @query.result
 
         if contains_relations?
@@ -52,7 +53,7 @@ module Alchemy
       end
 
       def show
-        render action: 'edit'
+        render action: "edit"
       end
 
       def edit; end
@@ -63,7 +64,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
 
@@ -72,14 +73,17 @@ 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
 
       def destroy
         resource_instance_variable.destroy
+        if resource_instance_variable.errors.any?
+          flash[:error] = resource_instance_variable.errors.full_messages.join(", ")
+        end
         flash_notice_for_resource_action
-        do_redirect_to resource_url_proxy.url_for(search_filter_params.merge(action: 'index'))
+        do_redirect_to resource_url_proxy.url_for(search_filter_params.merge(action: "index"))
       end
 
       def resource_handler
@@ -92,6 +96,7 @@ module Alchemy
       # The key should look like "Modelname successfully created|updated|destroyed."
       def flash_notice_for_resource_action(action = params[:action])
         return if resource_instance_variable.errors.any?
+
         case action.to_sym
         when :create
           verb = "created"
@@ -104,11 +109,11 @@ module Alchemy
       end
 
       def is_alchemy_module?
-        !alchemy_module.nil? && !alchemy_module['engine_name'].nil?
+        !alchemy_module.nil? && !alchemy_module["engine_name"].nil?
       end
 
       def alchemy_module
-        @alchemy_module ||= module_definition_for(controller: params[:controller], action: 'index')
+        @alchemy_module ||= module_definition_for(controller: params[:controller], action: "index")
       end
 
       def load_resource
@@ -143,16 +148,14 @@ module Alchemy
 
       def common_search_filter_includes
         [
-          # contrary to Rails' documentation passing an empty hash to permit all keys does not work
-          {options: options_from_params.keys},
           {q: [
             resource_handler.search_field_name,
-            :s
+            :s,
           ]},
           :tagged_with,
           :filter,
           :page,
-          :per_page
+          :per_page,
         ].freeze
       end
 
@@ -164,6 +167,11 @@ module Alchemy
         per_page = Alchemy::Config.get(:items_per_page)
         [per_page, per_page * 2, per_page * 4]
       end
+
+      def default_sort_order
+        name = resource_handler.attributes.detect { |attr| attr[:name] == "name" }
+        name ? "name asc" : "#{resource_handler.attributes.first[:name]} asc"
+      end
     end
   end
 end

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

@@ -3,6 +3,24 @@
 module Alchemy
   module Admin
     class SitesController < ResourcesController
+      def create
+        @site = Alchemy::Site.new(resource_params)
+        if @site.save
+          flash[:notice] = Alchemy.t("Please create a default language for this site.")
+          redirect_to alchemy.admin_languages_path(site_id: @site)
+        else
+          render :new
+        end
+      end
+
+      def destroy
+        if @site.destroy
+          flash[:notice] = Alchemy.t("Site successfully removed")
+        else
+          flash[:warning] = @site.errors.full_messages.to_sentence
+        end
+        do_redirect_to alchemy.admin_sites_path
+      end
     end
   end
 end

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

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

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

@@ -7,6 +7,7 @@ module Alchemy
 
       def index
         @query = Gutentag::Tag.ransack(search_filter_params[:q])
+        @query.sorts = default_sort_order if @query.sorts.empty?
         @tags = @query
                   .result
                   .page(params[:page] || 1)
@@ -20,7 +21,7 @@ module Alchemy
 
       def create
         @tag = Gutentag::Tag.create(tag_params)
-        render_errors_or_redirect @tag, admin_tags_path, Alchemy.t('New Tag Created')
+        render_errors_or_redirect @tag, admin_tags_path, Alchemy.t("New Tag Created")
       end
 
       def edit
@@ -31,7 +32,7 @@ module Alchemy
         if tag_params[:merge_to]
           @new_tag = Gutentag::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}
+          operation_text = Alchemy.t("Replaced Tag") % {old_tag: @tag.name, new_tag: @new_tag.name}
           @tag.destroy
         else
           @tag.update(tag_params)
@@ -65,7 +66,8 @@ module Alchemy
 
       def tags_from_term(term)
         return [] if term.blank?
-        Gutentag::Tag.where(['LOWER(name) LIKE ?', "#{term.downcase}%"])
+
+        Gutentag::Tag.where(["LOWER(name) LIKE ?", "#{term.downcase}%"])
       end
 
       def json_for_autocomplete(items, attribute)

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

@@ -25,16 +25,16 @@ module Alchemy
         [
           {
             contents: {
-              essence: :ingredient_association
+              essence: :ingredient_association,
             },
             all_nested_elements: [
               {
                 contents: {
-                  essence: :ingredient_association
-                }
-              }
-            ]
-          }
+                  essence: :ingredient_association,
+                },
+              },
+            ],
+          },
         ]
       end
     end

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

@@ -11,11 +11,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/contents_controller.rb

@@ -18,7 +18,7 @@ module Alchemy
       end
       @contents = @contents.includes(*content_includes)
 
-      render json: @contents, adapter: :json, root: 'contents'
+      render json: @contents, adapter: :json, root: "contents"
     end
 
     # Returns a json object for content
@@ -36,7 +36,7 @@ module Alchemy
       elsif params[:element_id] && params[:name]
         @content = Content.where(
           element_id: params[:element_id],
-          name: params[:name]
+          name: params[:name],
         ).includes(*content_includes).first || raise(ActiveRecord::RecordNotFound)
       end
       authorize! :show, @content
@@ -48,8 +48,8 @@ module Alchemy
     def content_includes
       [
         {
-          essence: :ingredient_association
-        }
+          essence: :ingredient_association,
+        },
       ]
     end
   end

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

@@ -22,7 +22,7 @@ module Alchemy
       end
       @elements = @elements.includes(*element_includes)
 
-      render json: @elements, adapter: :json, root: 'elements'
+      render json: @elements, adapter: :json, root: "elements"
     end
 
     # Returns a json object for element
@@ -41,18 +41,18 @@ module Alchemy
           nested_elements: [
             {
               contents: {
-                essence: :ingredient_association
-              }
+                essence: :ingredient_association,
+              },
             },
-            :tags
-          ]
+            :tags,
+          ],
         },
         {
           contents: {
-            essence: :ingredient_association
-          }
+            essence: :ingredient_association,
+          },
         },
-        :tags
+        :tags,
       ]
     end
   end

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

@@ -2,9 +2,21 @@
 
 module Alchemy
   class Api::NodesController < Api::BaseController
-    before_action :load_node
+    before_action :load_node, except: :index
     before_action :authorize_access, only: [:move, :toggle_folded]
 
+    def index
+      @nodes = Node.all
+      @nodes = @nodes.includes(:parent)
+      @nodes = @nodes.ransack(params[:filter]).result
+
+      if params[:page]
+        @nodes = @nodes.page(params[:page]).per(params[:per_page])
+      end
+
+      render json: @nodes, adapter: :json, root: "data", meta: meta_data, include: params[:include]
+    end
+
     def move
       target_parent_node = Node.find(params[:target_parent_id])
       @node.move_to_child_with_index(target_parent_node, params[:new_position])
@@ -25,5 +37,29 @@ module Alchemy
     def authorize_access
       authorize! :update, @node
     end
+
+    def meta_data
+      {
+        total_count: total_count_value,
+        per_page: per_page_value,
+        page: page_value,
+      }
+    end
+
+    def total_count_value
+      params[:page] ? @nodes.total_count : @nodes.size
+    end
+
+    def per_page_value
+      if params[:page]
+        (params[:per_page] || Kaminari.config.default_per_page).to_i
+      else
+        @nodes.size
+      end
+    end
+
+    def page_value
+      params[:page] ? params[:page].to_i : 1
+    end
   end
 end

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

@@ -13,25 +13,14 @@ module Alchemy
       else
         @pages = Page.accessible_by(current_ability, :index)
       end
-      @pages = @pages.where.not(parent_id: nil)
       @pages = @pages.includes(*page_includes)
-      if params[:page_layout].present?
-        Alchemy::Deprecation.warn <<~WARN
-          Passing page_layout parameter to Alchemy::Api::PagesController#index is deprecated.
-          Please pass a Ransack search query instead:
-              q: {
-                page_layout_eq: '#{params[:page_layout]}'
-              }
-        WARN
-        @pages = @pages.where(page_layout: params[:page_layout])
-      end
       @pages = @pages.ransack(params[:q]).result
 
       if params[:page]
         @pages = @pages.page(params[:page]).per(params[:per_page])
       end
 
-      render json: @pages, adapter: :json, root: 'pages', meta: meta_data
+      render json: @pages, adapter: :json, root: "pages", meta: meta_data
     end
 
     # Returns all pages as nested json object for tree views
@@ -71,9 +60,11 @@ module Alchemy
     end
 
     def load_page_by_urlname
+      return unless Language.current
+
       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
 
@@ -81,7 +72,7 @@ module Alchemy
       {
         total_count: total_count_value,
         per_page: per_page_value,
-        page: page_value
+        page: page_value,
       }
     end
 
@@ -111,20 +102,20 @@ module Alchemy
               nested_elements: [
                 {
                   contents: {
-                    essence: :ingredient_association
-                  }
+                    essence: :ingredient_association,
+                  },
                 },
-                :tags
-              ]
+                :tags,
+              ],
             },
             {
               contents: {
-                essence: :ingredient_association
-              }
+                essence: :ingredient_association,
+              },
             },
-            :tags
-          ]
-        }
+            :tags,
+          ],
+        },
       ]
     end
   end

data/app/controllers/alchemy/attachments_controller.rb

@@ -7,24 +7,24 @@ module Alchemy
 
     # sends file inline. i.e. for viewing pdfs/movies in browser
     def show
-      response.headers['Content-Length'] = @attachment.file.size.to_s
+      response.headers["Content-Length"] = @attachment.file.size.to_s
       send_file(
         @attachment.file.path,
         {
           filename: @attachment.file_name,
           type: @attachment.file_mime_type,
-          disposition: 'inline'
-        }
+          disposition: "inline",
+        },
       )
     end
 
     # sends file as attachment. aka download
     def download
-      response.headers['Content-Length'] = @attachment.file.size.to_s
+      response.headers["Content-Length"] = @attachment.file.size.to_s
       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

@@ -8,14 +8,13 @@ module Alchemy
     include Alchemy::AbilityHelper
     include Alchemy::ControllerActions
     include Alchemy::Modules
-    include Alchemy::SSLProtection
 
     protect_from_forgery
 
     before_action :mailer_set_url_options
     before_action :set_locale
 
-    helper 'alchemy/admin/form'
+    helper "alchemy/admin/form"
 
     rescue_from CanCan::AccessDenied do |exception|
       permission_denied(exception)
@@ -26,7 +25,9 @@ module Alchemy
     # Sets +I18n.locale+ to current Alchemy language.
     #
     def set_locale
-      ::I18n.locale = Language.current.locale
+      return unless Language.current
+
+      ::I18n.locale = Language.current&.locale
     end
 
     def not_found_error!(msg = "Not found \"#{request.fullpath}\"")
@@ -60,11 +61,11 @@ module Alchemy
     end
 
     def handle_redirect_for_user
-      flash[:warning] = Alchemy.t('You are not authorized')
+      flash[:warning] = Alchemy.t("You are not authorized")
       if can?(:index, :alchemy_admin_dashboard)
         redirect_or_render_notice
       else
-        redirect_to('/')
+        redirect_to("/")
       end
     end
 
@@ -75,8 +76,8 @@ module Alchemy
             render plain: flash.discard(:warning), status: 403
           end
           format.html do
-            render partial: 'alchemy/admin/partials/flash',
-              locals: {message: flash[:warning], flash_type: 'warning'}
+            render partial: "alchemy/admin/partials/flash",
+              locals: { message: flash[:warning], flash_type: "warning" }
           end
         end
       else
@@ -85,7 +86,7 @@ module Alchemy
     end
 
     def handle_redirect_for_guest
-      flash[:info] = Alchemy.t('Please log in')
+      flash[:info] = Alchemy.t("Please log in")
       if request.xhr?
         render :permission_denied
       else
@@ -98,7 +99,7 @@ module Alchemy
     def exception_logger(error)
       Rails.logger.error("\n#{error.class} #{error.message} in #{error.backtrace.first}")
       Rails.logger.error(error.backtrace[1..50].each { |line|
-        line.gsub(/#{Rails.root.to_s}/, '')
+        line.gsub(/#{Rails.root}/, "")
       }.join("\n"))
     end
   end

data/app/controllers/alchemy/messages_controller.rb

@@ -34,32 +34,23 @@ module Alchemy
   #
   # Disabling the page caching is strongly recommended!
   #
-  # The editor view for your element should have this layout:
-  #
-  #   <%= element_editor_for(element) do |el| %>
-  #     <%= el.edit :mail_from %>
-  #     <%= el.edit :mail_to %>
-  #     <%= el.edit :subject %>
-  #     <%= el.edit :success_page %>
-  #   <% end %>
-  #
   # Please have a look at the +alchemy/config/config.yml+ file for further Message settings.
   #
   class MessagesController < Alchemy::BaseController
     before_action :get_page, except: :create
 
-    helper 'alchemy/pages'
+    helper "alchemy/pages"
 
     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:
       @message = Message.new
-      render template: 'alchemy/pages/show'
+      render template: "alchemy/pages/show"
     end
 
     def create #:nodoc:
@@ -69,13 +60,14 @@ module Alchemy
       if @element.nil?
         raise ActiveRecord::RecordNotFound, "Contact form id not found. Please pass the :contact_form_id in a hidden field. Example: <%= f.hidden_field :contact_form_id, value: element.id %>"
       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
       else
-        render template: 'alchemy/pages/show'
+        render template: "alchemy/pages/show"
       end
     end
 
@@ -86,29 +78,29 @@ module Alchemy
     end
 
     def mail_to
-      @element.ingredient(:mail_to) || mailer_config['mail_to']
+      @element.ingredient(:mail_to) || mailer_config["mail_to"]
     end
 
     def mail_from
-      @element.ingredient(:mail_from) || mailer_config['mail_from']
+      @element.ingredient(:mail_from) || mailer_config["mail_from"]
     end
 
     def subject
-      @element.ingredient(:subject) || mailer_config['subject']
+      @element.ingredient(:subject) || mailer_config["subject"]
     end
 
     def redirect_to_success_page
-      flash[:notice] = Alchemy.t(:success, scope: 'contactform.messages')
+      flash[:notice] = Alchemy.t(:success, scope: "contactform.messages")
       if success_page
         urlname = 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
+      elsif mailer_config["forward_to_page"] && mailer_config["mail_success_page"]
+        urlname = Page.find_by(urlname: mailer_config["mail_success_page"]).urlname
       else
         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
 
@@ -126,15 +118,16 @@ module Alchemy
     end
 
     def get_page
-      @page = Language.current.pages.find_by(page_layout: mailer_config['page_layout_name'])
+      @page = Language.current.pages.find_by(page_layout: mailer_config["page_layout_name"])
       if @page.blank?
-        raise "Page for page_layout #{mailer_config['page_layout_name']} not found"
+        raise "Page for page_layout #{mailer_config["page_layout_name"]} not found"
       end
+
       @root_page = @page.get_language_root
     end
 
     def message_params
-      params.require(:message).permit(*mailer_config['fields'])
+      params.require(:message).permit(*mailer_config["fields"])
     end
   end
 end

data/app/controllers/alchemy/pages_controller.rb

@@ -3,10 +3,10 @@
 module Alchemy
   class PagesController < Alchemy::BaseController
     SHOW_PAGE_PARAMS_KEYS = [
-      'action',
-      'controller',
-      'urlname',
-      'locale'
+      "action",
+      "controller",
+      "urlname",
+      "locale",
     ]
 
     include OnPageLayout::CallbacksRunner
@@ -78,7 +78,7 @@ module Alchemy
     def sitemap
       @pages = Page.sitemap
       respond_to do |format|
-        format.xml { render layout: 'alchemy/sitemap' }
+        format.xml { render layout: "alchemy/sitemap" }
       end
     end
 
@@ -95,7 +95,7 @@ module Alchemy
     #
     def load_index_page
       @page ||= Language.current_root_page
-      render template: 'alchemy/welcome', layout: false if signup_required?
+      render template: "alchemy/welcome", layout: false if signup_required?
     end
 
     # == Loads page by urlname
@@ -108,9 +108,11 @@ module Alchemy
     # @return NilClass
     #
     def load_page
+      page_not_found! unless Language.current
+
       @page ||= Language.current.pages.contentpages.find_by(
         urlname: params[:urlname],
-        language_code: params[:locale] || Language.current.code
+        language_code: params[:locale] || Language.current.code,
       )
     end
 
@@ -148,7 +150,7 @@ module Alchemy
           if @page.contains_feed?
             render action: :show, layout: false, handlers: [:builder]
           else
-            render xml: {error: 'Not found'}, status: 404
+            render xml: { error: "Not found" }, status: 404
           end
         end
       end
@@ -191,9 +193,9 @@ module Alchemy
     #
     def render_fresh_page?
       must_not_cache? || stale?(etag: page_etag,
-        last_modified: @page.published_at,
-        public: !@page.restricted,
-        template: 'pages/show')
+                                last_modified: @page.published_at,
+                                public: !@page.restricted,
+                                template: "pages/show")
     end
 
     # don't cache pages if we have flash message to display or the page has caching disabled