alchemy_cms 4.6.1 → 5.0.0.beta1

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

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