alchemy_cms 3.2.1 → 3.3.0.rc1

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

@@ -0,0 +1,41 @@
+module Alchemy
+  module Admin
+    module UploaderResponses
+      extend ActiveSupport::Concern
+
+      def succesful_uploader_response(file:)
+        message = Alchemy.t(:upload_success,
+          scope: [:uploader, file.class.model_name.i18n_key],
+          name: file.name
+        )
+
+        {
+          json: uploader_response(file: file, message: message),
+          status: :created
+        }
+      end
+
+      def failed_uploader_response(file:)
+        message = Alchemy.t(:upload_failure,
+          scope: [:uploader, file.class.model_name.i18n_key],
+          error: file.errors[:file].join,
+          name: file.name
+        )
+
+        {
+          json: uploader_response(file: file, message: message),
+          status: :unprocessable_entity
+        }
+      end
+
+      private
+
+      def uploader_response(file:, message:)
+        {
+          files: [file.to_jq_upload],
+          growl_message: message
+        }
+      end
+    end
+  end
+end

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

@@ -0,0 +1,56 @@
+module Alchemy
+  # Handles Legacy page redirects
+  #
+  # If the page could not be found via its urlname we try to find
+  # a legacy page url for requested url to redirect to.
+  #
+  module LegacyPageRedirects
+    extend ActiveSupport::Concern
+
+    included do
+      before_action :redirect_to_legacy_url,
+        if: :redirect_to_legacy_url?,
+        only: [:show]
+    end
+
+    private
+
+    def redirect_to_legacy_url
+      redirect_permanently_to legacy_page_redirect_url
+    end
+
+    def redirect_to_legacy_url?
+      (@page.nil? || request.format.nil?) && last_legacy_url
+    end
+
+    # Use the bare minimum to redirect to legacy page
+    #
+    # Don't use query string of legacy urlname.
+    # This drops the given query string.
+    #
+    def legacy_page_redirect_url
+      page = last_legacy_url.page
+      return unless page
+
+      alchemy.show_page_path(
+        locale: prefix_locale? ? page.language_code : nil,
+        urlname: page.urlname
+      )
+    end
+
+    def legacy_urls
+      # /slug/tree => slug/tree
+      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
+        }
+      )
+    end
+
+    def last_legacy_url
+      @_last_legacy_url ||= legacy_urls.last
+    end
+  end
+end

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

@@ -0,0 +1,38 @@
+module Alchemy
+  # Handles locale redirects
+  #
+  # If the current URL has a locale prefix, but should not have one it redirects
+  # to url without locale prefix.
+  #
+  # Situations we don't want a locale prefix:
+  #
+  # 1. If only one language is published
+  # 2. If the requested locale is the current default locale
+  #
+  module LocaleRedirects
+    extend ActiveSupport::Concern
+
+    included do
+      before_action :enforce_no_locale,
+        if: :locale_prefix_not_allowed?,
+        only: [:index, :show]
+    end
+
+    private
+
+    # Redirects to requested action without locale prefixed
+    def enforce_no_locale
+      redirect_permanently_to additional_params.merge(locale: nil)
+    end
+
+    # Is the requested locale allowed?
+    #
+    # If Alchemy is not in multi language mode or the requested locale is the default locale,
+    # then we want to redirect to a non prefixed url.
+    #
+    def locale_prefix_not_allowed?
+      params[:locale].present? && !multi_language? ||
+        params[:locale].presence == ::I18n.default_locale.to_s
+    end
+  end
+end

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

@@ -0,0 +1,80 @@
+module Alchemy
+  # Handles page redirect urls
+  #
+  # Lots of reasons exist to redirect to another URL than the requested one.
+  # These module holds the logic behind these needs.
+  #
+  module PageRedirects
+    extend ActiveSupport::Concern
+
+    included do
+      # We need a +@page+ to work with
+      before_action :page_not_found!,
+        if: -> { @page.blank? },
+        only: [:show]
+    end
+
+    private
+
+    # Returns an URL to redirect the request to.
+    #
+    # == Lookup:
+    #
+    # 1. If the page is not published and we have a published child,
+    #    we return the url top that page. (Configurable through +redirect_to_public_child+).
+    # 2. If the page layout of the page found has a controller and action configured,
+    #    we return the url to that route. (Configure controller and action in `page_layouts.yml`).
+    # 3. If the current page URL has no locale prefixed, but we should have one,
+    #    we return the prefixed URL.
+    # 4. If no redirection is needed returns nil.
+    #
+    # @return String
+    # @return NilClass
+    #
+    def redirect_url
+      @_redirect_url ||= public_child_redirect_url || controller_and_action_url ||
+                         locale_prefixed_url || nil
+    end
+
+    def locale_prefixed_url
+      return unless locale_prefix_missing?
+
+      page_redirect_url(locale: Language.current.code)
+    end
+
+    def public_child_redirect_url
+      return unless redirect_to_public_child?
+
+      @page = @page.self_and_descendants.published.not_restricted.first
+      @page ? page_redirect_url : page_not_found!
+    end
+
+    def controller_and_action_url
+      return unless @page.has_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
+      }.merge(options)
+
+      alchemy.show_page_path additional_params.merge(options)
+    end
+
+    def default_locale?
+      Language.current.code.to_sym == ::I18n.default_locale.to_sym
+    end
+
+    def locale_prefix_missing?
+      multi_language? && params[:locale].blank? && !default_locale?
+    end
+
+    def redirect_to_public_child?
+      configuration(:redirect_to_public_child) && !@page.public?
+    end
+  end
+end

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

@@ -0,0 +1,22 @@
+module Alchemy
+  module SiteRedirects
+    extend ActiveSupport::Concern
+
+    included do
+      before_action :enforce_primary_host_for_site,
+        if: :needs_redirect_to_primary_host?
+    end
+
+    private
+
+    def enforce_primary_host_for_site
+      redirect_to url_for(host: current_alchemy_site.host), status: :moved_permanently
+    end
+
+    def needs_redirect_to_primary_host?
+      current_alchemy_site.redirect_to_primary_host? &&
+        current_alchemy_site.host != '*' &&
+        current_alchemy_site.host != request.host
+    end
+  end
+end

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

@@ -4,9 +4,8 @@ module Alchemy
       include Alchemy::Admin::BaseHelper
 
       def mime_to_human(mime)
-        I18n.t(mime, scope: 'mime_types', default: _t(:document))
+        Alchemy.t(mime, scope: 'mime_types', default: Alchemy.t(:document))
       end
-
     end
   end
 end

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

@@ -1,6 +1,5 @@
 module Alchemy
   module Admin
-
     # This module contains helper methods for rendering dialogs, toolbar buttons and confirmation windows.
     #
     # The most important helpers for module developers are:
@@ -22,7 +21,7 @@ module Alchemy
       def current_alchemy_user_name
         name = current_alchemy_user.try(:alchemy_display_name)
         if name.present?
-          content_tag :span, "#{_t('Logged in as')} #{name}", class: 'current-user-name'
+          content_tag :span, "#{Alchemy.t('Logged in as')} #{name}", class: 'current-user-name'
         end
       end
 
@@ -50,7 +49,7 @@ module Alchemy
       # @option options [Boolean] :modal (true)
       #    Show as modal window.
       #
-      def link_to_dialog(content, url, options={}, html_options={})
+      def link_to_dialog(content, url, options = {}, html_options = {})
         default_options = {modal: true}
         options = default_options.merge(options)
         link_to content, url,
@@ -60,7 +59,7 @@ module Alchemy
       # Used for translations selector in Alchemy cockpit user settings.
       def translations_for_select
         Alchemy::I18n.available_locales.map do |locale|
-          [_t(locale, :scope => :translations), locale]
+          [Alchemy.t(locale, scope: :translations), locale]
         end
       end
 
@@ -104,8 +103,8 @@ module Alchemy
         content_tag(:div, class: 'js_filter_field_box') do
           concat text_field_tag(nil, nil, options)
           concat render_icon(:search)
-          concat link_to('', '', class: 'js_filter_field_clear', title: _t(:click_to_show_all))
-          concat content_tag(:label, _t(:search), for: options[:id])
+          concat link_to('', '', class: 'js_filter_field_clear', title: Alchemy.t(:click_to_show_all))
+          concat content_tag(:label, Alchemy.t(:search), for: options[:id])
         end
       end
 
@@ -124,23 +123,23 @@ module Alchemy
       # @param [Hash] html_options
       #   HTML options get passed to the link
       #
-      # @option html_options [String] :title (_t(:please_confirm))
+      # @option html_options [String] :title (Alchemy.t(:please_confirm))
       #   The dialog title
       # @option html_options [String] :message (message)
       #   The message displayed in the dialog
-      # @option html_options [String] :ok_label (_t("Yes"))
+      # @option html_options [String] :ok_label (Alchemy.t("Yes"))
       #   The label for the ok button
-      # @option html_options [String] :cancel_label (_t("No"))
+      # @option html_options [String] :cancel_label (Alchemy.t("No"))
       #   The label for the cancel button
       #
       def link_to_confirm_dialog(link_string = "", message = "", url = "", html_options = {})
         link_to(link_string, url,
           html_options.merge(
             'data-alchemy-confirm-delete' => {
-              title: _t(:please_confirm),
+              title: Alchemy.t(:please_confirm),
               message: message,
-              ok_label: _t("Yes"),
-              cancel_label: _t("No")
+              ok_label: Alchemy.t("Yes"),
+              cancel_label: Alchemy.t("No")
             }.to_json
           )
         )
@@ -167,10 +166,10 @@ module Alchemy
       #
       def button_with_confirm(value = "", url = "", options = {}, html_options = {})
         options = {
-          message: _t(:confirm_to_proceed),
-          ok_label: _t("Yes"),
-          title: _t(:please_confirm),
-          cancel_label: _t("No")
+          message: Alchemy.t(:confirm_to_proceed),
+          ok_label: Alchemy.t("Yes"),
+          title: Alchemy.t(:please_confirm),
+          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)
@@ -188,8 +187,8 @@ module Alchemy
       #
       def delete_button(url, options = {}, html_options = {})
         options = {
-          title: _t('Delete'),
-          message: _t('Are you sure?'),
+          title: Alchemy.t('Delete'),
+          message: Alchemy.t('Are you sure?'),
           icon: 'destroy'
         }.merge(options)
         button_with_confirm(
@@ -209,7 +208,7 @@ module Alchemy
         if content_for?(:title)
           title = content_for(:title)
         else
-          title = _t(controller_name, :scope => :modules)
+          title = Alchemy.t(controller_name, scope: :modules)
         end
         "Alchemy CMS - #{title}"
       end
@@ -283,7 +282,7 @@ module Alchemy
       #
       # == Example
       #
-      #   <% label_title = _t("Create #{resource_name}", default: _t('Create')) %>
+      #   <% label_title = Alchemy.t("Create #{resource_name}", default: Alchemy.t('Create')) %>
       #   <% toolbar(
       #     buttons: [
       #       {
@@ -308,43 +307,19 @@ module Alchemy
       #
       def toolbar(options = {})
         defaults = {
-          :buttons => [],
-          :search => true
+          buttons: [],
+          search: true
         }
         options = defaults.merge(options)
         content_for(:toolbar) do
           content = <<-CONTENT
-#{options[:buttons].map { |button_options| toolbar_button(button_options) }.join()}
-          #{render('alchemy/admin/partials/search_form', :url => options[:search_url]) if options[:search]}
+#{options[:buttons].map { |button_options| toolbar_button(button_options) }.join}
+          #{render('alchemy/admin/partials/search_form', url: options[:search_url]) if options[:search]}
           CONTENT
           content.html_safe
         end
       end
 
-      # Renders the row for a resource record in the resources table.
-      #
-      # This helper has a nice fallback. If you create a partial for your record then this partial will be rendered.
-      #
-      # Otherwise the default +app/views/alchemy/admin/resources/_resource.html.erb+ partial gets rendered.
-      #
-      # == Example
-      #
-      # For a resource named +Comment+ you can create a partial named +_comment.html.erb+
-      #
-      #   # app/views/admin/comments/_comment.html.erb
-      #   <tr>
-      #     <td><%= comment.title %></td>
-      #     <td><%= comment.body %></td>
-      #   </tr>
-      #
-      # NOTE: Alchemy gives you a local variable named like your resource
-      #
-      def render_resources
-        render :partial => resource_name, :collection => resources_instance_variable
-      rescue ActionView::MissingTemplate
-        render :partial => 'resource', :collection => resources_instance_variable
-      end
-
       # (internal) Used by upload form
       def new_asset_path_with_session_information(asset_type)
         session_key = Rails.application.config.session_options[:key]
@@ -375,7 +350,7 @@ module Alchemy
       # @option html_options [String] :value (object.send(method.to_sym).nil? ? nil : l(object.send(method.to_sym), :format => :datepicker))
       #   The value the input displays
       #
-      def alchemy_datepicker(object, method, html_options={})
+      def alchemy_datepicker(object, method, html_options = {})
         value = nil
         if object.send(method.to_sym).present?
           value = l(object.send(method.to_sym), format: :datepicker)
@@ -392,42 +367,42 @@ module Alchemy
       end
 
       # Merges the params-hash with the given hash
-      def merge_params(p={})
-        params.merge(p).delete_if { |k, v| v.blank? }
+      def merge_params(p = {})
+        params.merge(p).delete_if { |_k, v| v.blank? }
       end
 
       # Deletes one or several params from the params-hash and merges some new params in
-      def merge_params_without(excludes, p={})
+      def merge_params_without(excludes, p = {})
         current_params = params.clone.symbolize_keys
         if excludes.is_a?(Array)
           excludes.map { |i| current_params.delete(i.to_sym) }
         else
           current_params.delete(excludes.to_sym)
         end
-        current_params.merge(p).delete_if { |k, v| v.blank? }
+        current_params.merge(p).delete_if { |_k, v| v.blank? }
       end
 
       # Deletes all params from the params-hash except the given ones and merges some new params in
-      def merge_params_only(includes, p={})
+      def merge_params_only(includes, p = {})
         current_params = params.clone.symbolize_keys
         if includes.is_a?(Array)
           symbolized_includes = includes.map(&:to_sym)
-          current_params.delete_if { |k, v| !symbolized_includes.include?(k) }
+          current_params.delete_if { |k, _v| !symbolized_includes.include?(k) }
         else
-          current_params.delete_if { |k, v| k != includes.to_sym }
+          current_params.delete_if { |k, _v| k != includes.to_sym }
         end
-        current_params.merge(p).delete_if { |k, v| v.blank? }
+        current_params.merge(p).delete_if { |_k, v| v.blank? }
       end
 
       def render_hint_for(element)
         return unless element.has_hint?
-        link_to '#', :class => 'hint' do
-          render_icon(:hint) + content_tag(:span, element.hint.html_safe, :class => 'bubble')
+        link_to '#', class: 'hint' do
+          render_icon(:hint) + content_tag(:span, element.hint.html_safe, class: 'bubble')
         end
       end
 
       # Appends the current controller and action to body as css class.
-      def body_class
+      def alchemy_body_class
         "#{controller_name} #{action_name}"
       end
 
@@ -462,10 +437,9 @@ 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
   end
 end