alchemy_cms 4.6.0 → 5.0.0.rc2

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

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Alchemy
   module Admin
     module ArchiveOverlay
@@ -11,8 +12,8 @@ module Alchemy
         @content = Content.find_by(id: params[:content_id])
 
         respond_to do |format|
-          format.html { render partial: 'archive_overlay' }
-          format.js   { render action:  'archive_overlay' }
+          format.html { render partial: "archive_overlay" }
+          format.js   { render action:  "archive_overlay" }
         end
       end
     end

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

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Alchemy
+  module Admin
+    module CurrentLanguage
+      extend ActiveSupport::Concern
+
+      included do
+        before_action :load_current_language
+      end
+
+      private
+
+      def load_current_language
+        @current_language = Alchemy::Language.current
+        if @current_language.nil?
+          flash[:warning] = Alchemy.t("Please create a language first.")
+          redirect_to admin_languages_path
+        end
+      end
+    end
+  end
+end

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

@@ -8,12 +8,12 @@ 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 +21,12 @@ 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 +35,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..-1] if request.fullpath[0] == "/") || request.fullpath
       LegacyPageUrl.joins(:page).where(
         urlname: urlname,
         Page.table_name => {
-          language_id: Language.current.id
-        }
+          language_id: Language.current.id,
+        },
       )
     end
 

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

@@ -27,8 +27,7 @@ module Alchemy
     # @return NilClass
     #
     def redirect_url
-      @_redirect_url ||= public_child_redirect_url || controller_and_action_url ||
-                         locale_prefixed_url || nil
+      @_redirect_url ||= public_child_redirect_url || locale_prefixed_url || nil
     end
 
     def locale_prefixed_url
@@ -48,17 +47,11 @@ module Alchemy
       end
     end
 
-    def controller_and_action_url
-      return unless @page.definition['controller']
-
-      main_app.url_for(@page.controller_and_action)
-    end
-
     # Page url with or without locale while keeping all additional params
     def page_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)

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

@@ -16,8 +16,8 @@ module Alchemy
     end
 
     def needs_redirect_to_primary_host?
-      current_alchemy_site.redirect_to_primary_host? &&
-        current_alchemy_site.host != '*' &&
+      current_alchemy_site&.redirect_to_primary_host? &&
+        current_alchemy_site.host != "*" &&
         current_alchemy_site.host != request.host
     end
   end

data/app/decorators/alchemy/element_editor.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Alchemy
+  class ElementEditor < SimpleDelegator
+    alias_method :element, :__getobj__
+
+    def to_partial_path
+      "alchemy/admin/elements/element"
+    end
+
+    # CSS classes for the element editor partial.
+    def css_classes
+      [
+        "element-editor",
+        content_definitions.present? ? "with-contents" : "without-contents",
+        nestable_elements.any? ? "nestable" : "not-nestable",
+        taggable? ? "taggable" : "not-taggable",
+        folded ? "folded" : "expanded",
+        compact? ? "compact" : nil,
+        fixed? ? "is-fixed" : "not-fixed",
+      ].join(" ")
+    end
+
+    # Tells us, if we should show the element footer and form inputs.
+    def editable?
+      return false if folded?
+
+      content_definitions.present? || taggable?
+    end
+
+    # Fixes Rails partial renderer calling to_model on the object
+    # which reveals the delegated element instead of this decorator.
+    def respond_to?(method_name)
+      return false if method_name == :to_model
+
+      super
+    end
+  end
+end

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

@@ -6,17 +6,17 @@ module Alchemy
       include Alchemy::Admin::BaseHelper
 
       def mime_to_human(mime)
-        Alchemy.t(mime, scope: 'mime_types', default: Alchemy.t(:document))
+        Alchemy.t(mime, scope: "mime_types", default: Alchemy.t(:document))
       end
 
       def attachment_preview_size(attachment)
         case attachment.icon_css_class
-        when 'image' then '600x475'
-        when 'audio' then '600x190'
-        when 'video' then '600x485'
-        when 'pdf'   then '600x500'
+        when "image" then "600x475"
+        when "audio" then "600x190"
+        when "video" then "600x485"
+        when "pdf"   then "600x500"
         else
-          '600x145'
+          "600x145"
         end
       end
     end

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

@@ -23,7 +23,7 @@ module Alchemy
       def current_alchemy_user_name
         name = current_alchemy_user.try(:alchemy_display_name)
         if name.present?
-          content_tag :span, "#{Alchemy.t('Logged in as')} #{name}", class: 'current-user-name'
+          content_tag :span, "#{Alchemy.t("Logged in as")} #{name}", class: "current-user-name"
         end
       end
 
@@ -55,7 +55,7 @@ module Alchemy
         default_options = {modal: true}
         options = default_options.merge(options)
         link_to content, url,
-          html_options.merge('data-alchemy-dialog' => options.to_json)
+          html_options.merge("data-alchemy-dialog" => options.to_json)
       end
 
       # Used for translations selector in Alchemy cockpit user settings.
@@ -99,13 +99,13 @@ module Alchemy
       #
       def js_filter_field(items, options = {})
         options = {
-          class: 'js_filter_field',
-          data: {'alchemy-list-filter' => items}
+          class: "js_filter_field",
+          data: {"alchemy-list-filter" => items},
         }.merge(options)
-        content_tag(:div, class: 'js_filter_field_box') do
+        content_tag(:div, class: "js_filter_field_box") do
           concat text_field_tag(nil, nil, options)
           concat render_icon(:search)
-          concat link_to(render_icon(:times, size: 'xs'), '', class: 'js_filter_field_clear', title: Alchemy.t(:click_to_show_all))
+          concat link_to(render_icon(:times, size: "xs"), "", class: "js_filter_field_clear", title: Alchemy.t(:click_to_show_all))
         end
       end
 
@@ -136,12 +136,12 @@ module Alchemy
       def link_to_confirm_dialog(link_string = "", message = "", url = "", html_options = {})
         link_to(link_string, url,
           html_options.merge(
-            'data-alchemy-confirm-delete' => {
+            "data-alchemy-confirm-delete" => {
               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
@@ -170,10 +170,10 @@ 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)
+        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)
         end
       end
 
@@ -188,18 +188,18 @@ module Alchemy
       #
       def delete_button(url, options = {}, html_options = {})
         options = {
-          title: Alchemy.t('Delete'),
-          message: Alchemy.t('Are you sure?'),
-          icon: :minus
+          title: Alchemy.t("Delete"),
+          message: Alchemy.t("Are you sure?"),
+          icon: :minus,
         }.merge(options)
         button_with_confirm(
           render_icon(options[:icon]),
           url, {
-            message: options[:message]
+            message: options[:message],
           }, {
-            method: 'delete',
+            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
@@ -259,11 +259,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
+          "alchemy/admin/partials/toolbar_button",
+          options: options,
         )
         if options[:skip_permission_check] || can?(*permission_from_options(options))
           button
@@ -302,13 +302,13 @@ module Alchemy
       def toolbar(options = {})
         defaults = {
           buttons: [],
-          search: true
+          search: true,
         }
         options = defaults.merge(options)
         content_for(:toolbar) do
           content = <<-CONTENT.strip_heredoc
             #{options[:buttons].map { |button_options| toolbar_button(button_options) }.join}
-            #{render('alchemy/admin/partials/search_form', url: options[:search_url]) if options[:search]}
+            #{render("alchemy/admin/partials/search_form", url: options[:search_url]) if options[:search]}
           CONTENT
           content.html_safe
         end
@@ -360,7 +360,7 @@ module Alchemy
       #   The value the input displays. If you pass a String its parsed with +Time.parse+
       #
       def alchemy_datepicker(object, method, html_options = {})
-        type = html_options.delete(:type) || 'date'
+        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
@@ -373,9 +373,10 @@ module Alchemy
       # The model class needs to include the hints module
       def render_hint_for(element)
         return unless element.has_hint?
-        content_tag :span, class: 'hint-with-icon' do
-          render_icon('question-circle') +
-            content_tag(:span, element.hint.html_safe, class: 'hint-bubble')
+
+        content_tag :span, class: "hint-with-icon" do
+          render_icon("question-circle") +
+            content_tag(:span, element.hint.html_safe, class: "hint-bubble")
         end
       end
 
@@ -385,7 +386,7 @@ module Alchemy
           controller_name,
           action_name,
           content_for(:main_menu_style),
-          content_for(:alchemy_body_class)
+          content_for(:alchemy_body_class),
         ].compact
       end
 
@@ -404,7 +405,7 @@ module Alchemy
 
       # Returns the regular expression used for external url validation in link dialog.
       def link_url_regexp
-        Alchemy::Config.get(:format_matchers)['link_url'] || /^(mailto:|\/|[a-z]+:\/\/)/
+        Alchemy::Config.get(:format_matchers)["link_url"] || /^(mailto:|\/|[a-z]+:\/\/)/
       end
 
       # Renders a hint with tooltip
@@ -417,9 +418,9 @@ module Alchemy
       # @param icon: 'exclamation-triangle' [String] - Icon name
       #
       # @return [String]
-      def hint_with_tooltip(text, icon: 'exclamation-triangle')
-        content_tag :span, class: 'hint-with-icon' do
-          render_icon(icon) + content_tag(:span, text, class: 'hint-bubble')
+      def hint_with_tooltip(text, icon: "exclamation-triangle")
+        content_tag :span, class: "hint-with-icon" do
+          render_icon(icon) + content_tag(:span, text, class: "hint-bubble")
         end
       end
 
@@ -427,7 +428,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
 
@@ -442,10 +443,10 @@ module Alchemy
       end
 
       def permission_array_from_url(options)
-        action_controller = options[:url].gsub(/\A\//, '').split('/')
+        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