alchemy_cms 6.0.0.pre.rc6 → 6.0.1

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

@@ -7,7 +7,7 @@ module Alchemy
 
       helper "alchemy/pages"
 
-      before_action :load_resource, except: [:index, :flush, :new, :order, :create, :copy_language_tree, :link, :sort]
+      before_action :load_resource, except: [:index, :flush, :new, :order, :create, :copy_language_tree, :link]
 
       authorize_resource class: Alchemy::Page, except: [:index, :tree]
 
@@ -21,11 +21,9 @@ module Alchemy
         except: [:show]
 
       before_action :set_root_page,
-        only: [:index, :show, :sort, :order]
+        only: [:index, :show, :order]
 
-      before_action :run_on_page_layout_callbacks,
-        if: :run_on_page_layout_callbacks?,
-        only: [:show]
+      before_action :set_preview_mode, only: [:show]
 
       before_action :load_languages_and_layouts,
         unless: -> { @page_root },
@@ -35,6 +33,10 @@ module Alchemy
 
       before_action :set_page_version, only: [:show, :edit]
 
+      before_action :run_on_page_layout_callbacks,
+        if: :run_on_page_layout_callbacks?,
+        only: [:show]
+
       def index
         @query = @current_language.pages.contentpages.ransack(search_filter_params[:q])
 
@@ -64,7 +66,6 @@ module Alchemy
       # Used by page preview iframe in Page#edit view.
       #
       def show
-        @preview_mode = true
         Page.current_preview = @page
         # Setting the locale to pages language, so the page content has it's correct translations.
         ::I18n.locale = @page.language.locale
@@ -123,6 +124,7 @@ module Alchemy
       # * fetches page via before filter
       #
       def update
+        @old_parent_id = @page.parent_id
         if @page.update(page_params)
           @notice = Alchemy.t("Page saved", name: @page.name)
           @while_page_edit = request.referer.include?("edit")
@@ -167,9 +169,7 @@ module Alchemy
       def fold
         # @page is fetched via before filter
         @page.fold!(current_alchemy_user.id, !@page.folded?(current_alchemy_user.id))
-        respond_to do |format|
-          format.js
-        end
+        render json: serialized_page_tree
       end
 
       # Leaves the page editing mode and unlocks the page for other users
@@ -180,9 +180,12 @@ module Alchemy
         @pages_locked_by_user = Page.from_current_site.locked_by(current_alchemy_user)
         respond_to do |format|
           format.js
-          format.html {
-            redirect_to params[:redirect_to].blank? ? admin_pages_path : params[:redirect_to]
-          }
+          format.html do
+            redirect_to(
+              params[:redirect_to].presence || admin_pages_path,
+              allow_other_host: true,
+            )
+          end
         end
       end
 
@@ -202,10 +205,6 @@ module Alchemy
         redirect_to admin_pages_path
       end
 
-      def sort
-        @sorting = true
-      end
-
       # Receives a JSON object representing a language tree to be ordered
       # and updates all pages in that language structure to their correct indexes
       def order
@@ -387,9 +386,11 @@ module Alchemy
       end
 
       def serialized_page_tree
-        PageTreeSerializer.new(@page, ability: current_ability,
-                                      user: current_alchemy_user,
-                                      full: params[:full] == "true")
+        PageTreeSerializer.new(
+          @page,
+          ability: current_ability,
+          user: current_alchemy_user,
+        )
       end
 
       def load_languages_and_layouts
@@ -397,6 +398,10 @@ module Alchemy
         @languages_with_page_tree = Language.on_current_site.with_root_page
         @page_layouts = PageLayout.layouts_for_select(@language.id)
       end
+
+      def set_preview_mode
+        @preview_mode = true
+      end
     end
   end
 end

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

@@ -5,17 +5,18 @@ module Alchemy
     layout false
     respond_to :json
 
-    rescue_from CanCan::AccessDenied,         with: :render_not_authorized
+    rescue_from CanCan::AccessDenied, with: :render_not_authorized
     rescue_from ActiveRecord::RecordNotFound, with: :render_not_found
+    rescue_from ActionController::RoutingError, with: :render_not_found
 
     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

@@ -46,11 +46,7 @@ module Alchemy
     private
 
     def content_includes
-      [
-        {
-          essence: :ingredient_association,
-        },
-      ]
+      %i[essence]
     end
   end
 end

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

@@ -47,18 +47,14 @@ module Alchemy
         {
           nested_elements: [
             {
-              contents: {
-                essence: :ingredient_association,
-              },
+              contents: :essence,
               ingredients: :related_object,
             },
             :tags,
           ],
         },
         {
-          contents: {
-            essence: :ingredient_association,
-          },
+          contents: :essence,
           ingredients: :related_object,
         },
         :tags,

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

@@ -8,6 +8,7 @@ module Alchemy
     def index
       @nodes = Node.all
       @nodes = @nodes.includes(:parent)
+      @nodes = @nodes.where(language_id: params[:language_id]) if params[:language_id]
       @nodes = @nodes.ransack(params[:filter]).result
 
       if params[:page]

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

@@ -2,17 +2,19 @@
 
 module Alchemy
   class Api::PagesController < Api::BaseController
+    serialization_scope :current_ability
     before_action :load_page, only: [:show]
 
     # Returns all pages as json object
     #
     def index
       # Fix for cancancan not able to merge multiple AR scopes for logged in users
-      if cannot? :edit_content, Alchemy::Page
-        @pages = Alchemy::Page.accessible_by(current_ability, :index)
-        @pages = @pages.where(language: Language.current)
+      if can? :edit_content, Alchemy::Page
+        @pages = Alchemy::Page.all
       else
-        @pages = Language.current&.pages.presence || Alchemy::Page.none
+        language = Alchemy::Language.find_by(id: params[:language_id]) || Alchemy::Language.current
+        @pages = Alchemy::Page.accessible_by(current_ability, :index)
+        @pages = @pages.where(language: language)
       end
       @pages = @pages.includes(*page_includes)
       @pages = @pages.ransack(params[:q]).result
@@ -49,6 +51,14 @@ module Alchemy
       respond_with @page
     end
 
+    def move
+      @page = Page.find(params[:id])
+      authorize! :update, @page
+      target_parent_page = Page.find(params[:target_parent_id])
+      @page.move_to_child_with_index(target_parent_page, params[:new_position])
+      render json: @page, serializer: PageSerializer
+    end
+
     private
 
     def load_page
@@ -102,17 +112,13 @@ module Alchemy
             {
               nested_elements: [
                 {
-                  contents: {
-                    essence: :ingredient_association,
-                  },
+                  contents: :essence,
                 },
                 :tags,
               ],
             },
             {
-              contents: {
-                essence: :ingredient_association,
-              },
+              contents: :essence,
             },
             :tags,
           ],

data/app/controllers/alchemy/base_controller.rb

@@ -9,6 +9,13 @@ module Alchemy
     include Alchemy::ControllerActions
     include Alchemy::Modules
 
+    # Include Turbolinks explicitly in case Alchemy is embedded into a
+    # larger application that doesn't work with Turbolinks. The app
+    # can then set config.turbolinks.auto_include = false so that
+    # Turbolinks is not included in the app controllers.
+    include Turbolinks::Controller
+    ::ActionDispatch::Assertions.include ::Turbolinks::Assertions
+
     protect_from_forgery
 
     before_action :mailer_set_url_options

data/app/controllers/alchemy/messages_controller.rb

@@ -62,7 +62,6 @@ module Alchemy
       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
@@ -122,8 +121,6 @@ module Alchemy
       if @page.blank?
         raise "Page for page_layout #{mailer_config["page_layout_name"]} not found"
       end
-
-      @root_page = @page.get_language_root
     end
 
     def message_params

data/app/controllers/alchemy/pages_controller.rb

@@ -32,9 +32,6 @@ module Alchemy
       if: :locale_prefix_missing?,
       only: [:index, :show]
 
-    # We only need to set the +@root_page+ if we are sure that no more redirects happen.
-    before_action :set_root_page, only: [:index, :show]
-
     # Page layout callbacks need to run after all other callbacks
     before_action :run_on_page_layout_callbacks,
       if: :run_on_page_layout_callbacks?,
@@ -199,10 +196,6 @@ module Alchemy
       end
     end
 
-    def set_root_page
-      @root_page ||= Language.current_root_page
-    end
-
     def signup_required?
       if Alchemy.user_class.respond_to?(:admins)
         Alchemy.user_class.admins.empty? && @page.nil?

data/app/helpers/alchemy/elements_helper.rb

@@ -70,7 +70,7 @@ module Alchemy
     #   A class instance that will return elements that get rendered.
     #   Use this for your custom element loading logic in views.
     #
-    def render_elements(options = {})
+    def render_elements(options = {}, &blk)
       options = {
         from_page: @page,
         render_format: "html",
@@ -86,11 +86,12 @@ module Alchemy
 
       elements = finder.elements(page_version: page_version)
 
-      buff = []
-      elements.each_with_index do |element, i|
-        buff << render_element(element, options, i + 1)
-      end
-      buff.join(options[:separator]).html_safe
+      default_rendering = ->(element, i) { render_element(element, options, i + 1) }
+      if block_given?
+        elements.map.with_index(&blk)
+      else
+        elements.map.with_index(&default_rendering)
+      end.join(options[:separator]).html_safe
     end
 
     # This helper renders a {Alchemy::Element} view partial.
@@ -125,7 +126,7 @@ module Alchemy
     #
     # == Usage
     #
-    #   <%= render_element(Alchemy::Element.available.named(:headline).first) %>
+    #   <%= render_element(Alchemy::Element.published.named(:headline).first) %>
     #
     # @param [Alchemy::Element] element
     #   The element you want to render the view for
@@ -146,11 +147,15 @@ module Alchemy
 
       element.store_page(@page)
 
-      render element, {
-        element: element,
-        counter: counter,
-        options: options,
-      }.merge(options.delete(:locals) || {})
+      render(
+        partial: options[:partial] || element.to_partial_path,
+        object: element,
+        locals: {
+          element: element,
+          counter: counter,
+          options: options.except(:locals, :partial),
+        }.merge(options[:locals] || {}),
+      )
     rescue ActionView::MissingTemplate => e
       warning(%(
         Element view partial not found for #{element.name}.\n

data/app/models/alchemy/element.rb

@@ -70,7 +70,7 @@ module Alchemy
       dependent: :destroy
 
     has_many :nested_elements,
-      -> { order(:position).available },
+      -> { order(:position).published },
       class_name: "Alchemy::Element",
       foreign_key: :parent_element_id,
       dependent: :destroy,
@@ -159,7 +159,7 @@ module Alchemy
       end
 
       def all_from_clipboard(clipboard)
-        return [] if clipboard.nil?
+        return none if clipboard.nil?
 
         where(id: clipboard.collect { |e| e["id"] })
       end
@@ -167,12 +167,19 @@ module Alchemy
       # All elements in clipboard that could be placed on page
       #
       def all_from_clipboard_for_page(clipboard, page)
-        return [] if clipboard.nil? || page.nil?
+        return none if clipboard.nil? || page.nil?
 
-        all_from_clipboard(clipboard).select { |ce|
-          page.available_element_names.include?(ce.name)
-        }
+        all_from_clipboard(clipboard).where(name: page.available_element_names)
       end
+
+      # All elements in clipboard that could be placed as a child of `parent_element`
+      def all_from_clipboard_for_parent_element(clipboard, parent_element)
+        return none if clipboard.nil? || parent_element.nil?
+
+        all_from_clipboard(clipboard).where(name: parent_element.definition["nestable_elements"])
+      end
+
+      deprecate available: :published, deprecator: Alchemy::Deprecation
     end
 
     # Returns next public element from same page.

data/app/models/alchemy/ingredient.rb

@@ -6,12 +6,17 @@ module Alchemy
 
     include Hints
 
+    # MariaDB needs to be told explicitly to use `data` as a JSON store. All other databases
+    # can do this natively.
+    store :data, coder: JSON
+
     self.table_name = "alchemy_ingredients"
 
     belongs_to :element, touch: true, class_name: "Alchemy::Element", inverse_of: :ingredients
     belongs_to :related_object, polymorphic: true, optional: true
 
-    before_validation(on: :create) { self.value ||= default_value }
+    after_initialize :set_default_value,
+      if: -> { definition.key?(:default) && value.nil? }
 
     validates :type, presence: true
     validates :role, presence: true
@@ -161,6 +166,10 @@ module Alchemy
       role
     end
 
+    def set_default_value
+      self.value = default_value
+    end
+
     # Returns the default value from ingredient definition
     #
     # If the value is a symbol it gets passed through i18n

data/app/models/alchemy/ingredient_validator.rb

@@ -88,7 +88,7 @@ module Alchemy
 
     def duplicates
       ingredient.class
-        .joins(:element).merge(Alchemy::Element.available)
+        .joins(:element).merge(Alchemy::Element.published)
         .where(Alchemy::Element.table_name => { name: ingredient.element.name })
         .where(value: ingredient.value)
         .where.not(id: ingredient.id)

data/app/models/alchemy/language.rb

@@ -38,7 +38,7 @@ module Alchemy
 
     validates :language_code,
       presence: true,
-      uniqueness: { scope: [:site_id, :country_code] },
+      uniqueness: { scope: [:site_id, :country_code], case_sensitive: false },
       format: { with: /\A[a-z]{2}\z/, if: -> { language_code.present? } }
 
     validates :country_code,

data/app/models/alchemy/page/page_elements.rb

@@ -15,8 +15,8 @@ module Alchemy
           source: :elements,
         ) do
           has_many :all_elements
-          has_many :elements, -> { not_nested.unfixed.available }
-          has_many :fixed_elements, -> { fixed.available }
+          has_many :elements, -> { not_nested.unfixed.published }
+          has_many :fixed_elements, -> { fixed.published }
         end
 
         has_many :contents, through: :elements

data/app/models/alchemy/page/page_naming.rb

@@ -15,7 +15,7 @@ module Alchemy
         validates :name,
           presence: true
         validates :urlname,
-          uniqueness: { scope: [:language_id, :layoutpage], if: -> { urlname.present? } },
+          uniqueness: { scope: [:language_id, :layoutpage], if: -> { urlname.present? }, case_sensitive: false },
           exclusion: { in: RESERVED_URLNAMES },
           length: { minimum: 3, if: -> { urlname.present? } }
 

data/app/models/alchemy/page.rb

@@ -117,7 +117,7 @@ module Alchemy
     has_many :nodes, class_name: "Alchemy::Node", inverse_of: :page
     has_many :versions, class_name: "Alchemy::PageVersion", inverse_of: :page, dependent: :destroy
     has_one :draft_version, -> { drafts }, class_name: "Alchemy::PageVersion"
-    has_one :public_version, -> { published }, class_name: "Alchemy::PageVersion"
+    has_one :public_version, -> { published }, class_name: "Alchemy::PageVersion", autosave: -> { persisted? }
 
     before_validation :set_language,
       if: -> { language.nil? }

data/app/models/alchemy/picture/transformations.rb

@@ -30,7 +30,7 @@ module Alchemy
     # Returns the rendered resized image using imagemagick directly.
     #
     def resize(size, upsample = false)
-      image_file.thumb(upsample ? size : "#{size}>")
+      image_file.thumbnail(upsample ? size : "#{size}>")
     end
 
     # Returns true if picture's width is greater than it's height
@@ -119,7 +119,7 @@ module Alchemy
       if is_smaller_than?(dimensions) && upsample == false
         dimensions = reduce_to_image(dimensions)
       end
-      image_file.thumb("#{dimensions_to_string(dimensions)}#")
+      image_file.thumbnail("#{dimensions_to_string(dimensions)}#")
     end
 
     # Use imagemagick to custom crop an image. Uses -thumbnail for better performance when resizing.

data/app/models/alchemy/picture.rb

@@ -28,7 +28,7 @@ module Alchemy
       large: "240x180",
     }.with_indifferent_access.freeze
 
-    CONVERTIBLE_FILE_FORMATS = %w(gif jpg jpeg png).freeze
+    CONVERTIBLE_FILE_FORMATS = %w[gif jpg jpeg png webp].freeze
 
     TRANSFORMATION_OPTIONS = [
       :crop,

data/app/models/alchemy/picture_variant.rb

@@ -13,6 +13,8 @@ module Alchemy
     include Alchemy::Logger
     include Alchemy::Picture::Transformations
 
+    ANIMATED_IMAGE_FORMATS = %w[gif webp]
+
     attr_reader :picture, :render_format
 
     def_delegators :@picture,
@@ -86,7 +88,7 @@ module Alchemy
       end
 
       options = {
-        flatten: render_format != "gif" && picture.image_file_format == "gif",
+        flatten: !render_format.in?(ANIMATED_IMAGE_FORMATS) && picture.image_file_format == "gif",
       }.with_indifferent_access.merge(options)
 
       encoding_options = []

data/app/models/alchemy/site.rb

@@ -18,7 +18,7 @@ module Alchemy
   class Site < BaseRecord
     # validations
     validates_presence_of :host
-    validates_uniqueness_of :host
+    validates_uniqueness_of :host, case_sensitive: false
 
     # associations
     has_many :languages

data/app/serializers/alchemy/page_serializer.rb

@@ -14,8 +14,14 @@ module Alchemy
       :created_at,
       :updated_at,
       :status,
-      :url_path
+      :url_path,
+      :parent_id
 
     has_many :elements
+
+    with_options if: -> { scope.can?(:edit_content, object) } do
+      belongs_to :site
+      belongs_to :language
+    end
   end
 end

data/app/serializers/alchemy/page_tree_serializer.rb

@@ -3,13 +3,13 @@
 module Alchemy
   class PageTreeSerializer < BaseSerializer
     def attributes
-      {"pages" => nil}
+      { "pages" => nil }
     end
 
     def pages
       tree = []
-      path = [{id: object.parent_id, children: tree}]
-      page_list = object.self_and_descendants
+      path = [{ id: object.parent_id, children: tree }]
+      page_list = object.self_and_descendants.includes(:public_version, { language: :site })
       base_level = object.level - 1
       # Load folded pages in advance
       folded_user_pages = FoldedPage.folded_for_user(opts[:user]).pluck(:page_id)

data/app/views/alchemy/admin/clipboard/insert.js.erb

@@ -14,3 +14,16 @@
   Alchemy.growl('<%= j Alchemy.t("item copied to clipboard", name: @item.class.name == "Alchemy::Element" ? @item.display_name_with_preview_text : @item.name) %>')
 <% end -%>
 $('#clipboard_button .icon').removeClass('fa-clipboard').addClass('fa-paste');
+
+<%# Update add nested element forms for any elements that accept ONLY this as a nested element %>
+<% if @item.class == Alchemy::Element %>
+  if (window.location.pathname == "<%= edit_admin_page_path(@item.page.id) %>") {
+    <%
+      @item.page.draft_version.elements.expanded.select do |element|
+        element.definition["nestable_elements"] == [@item.name]
+      end.each do |element|
+    %>
+      $(".add-nested-element[data-element-id='<%= element.id %>']").replaceWith('<%= j render "alchemy/admin/elements/add_nested_element_form", element: element %>')
+    <% end %>
+  }
+<% end %>

data/app/views/alchemy/admin/elements/_add_nested_element_form.html.erb

@@ -0,0 +1,27 @@
+<%= content_tag :div, class: 'add-nested-element', data: { element_id: element.id } do %>
+  <% if element.expanded? || element.fixed? %>
+    <% if element.nestable_elements.length == 1 && 
+      (nestable_element = element.nestable_elements.first) && 
+      Alchemy::Element.all_from_clipboard_for_parent_element(get_clipboard("elements"), element).none?
+    %>
+      <%= form_for [:admin, Alchemy::Element.new(name: nestable_element)],
+        remote: true, html: { class: 'add-nested-element-form', id: nil } do |f| %>
+        <%= f.hidden_field :name %>
+        <%= f.hidden_field :page_version_id, value: element.page_version_id %>
+        <%= f.hidden_field :parent_element_id, value: element.id %>
+        <button class="button add-nestable-element-button" data-alchemy-button>
+          <%= Alchemy.t(:add_nested_element, name: Alchemy.t(nestable_element, scope: 'element_names')) %>
+        </button>
+      <% end %>
+    <% else %>
+      <%= link_to_dialog (nestable_element ? Alchemy.t(:add_nested_element, name: Alchemy.t(nestable_element, scope: 'element_names')) : Alchemy.t("New Element")),
+        alchemy.new_admin_element_path(
+          parent_element_id: element.id,
+          page_version_id: element.page_version_id
+        ), {
+          size: "320x125",
+          title: Alchemy.t("New Element")
+        }, class: "button add-nestable-element-button" %>
+    <% end %>
+  <% end %>
+<% end %>

data/app/views/alchemy/admin/elements/_element.html.erb

@@ -55,29 +55,7 @@
         } %>
       <% end %>
 
-      <% if element.expanded? || element.fixed? %>
-        <% if element.nestable_elements.length == 1 %>
-          <% nestable_element = element.nestable_elements.first %>
-          <%= form_for [:admin, Alchemy::Element.new(name: nestable_element)],
-            remote: true, html: { class: 'add-nested-element-form', id: nil } do |f| %>
-            <%= f.hidden_field :name %>
-            <%= f.hidden_field :page_version_id, value: element.page_version_id %>
-            <%= f.hidden_field :parent_element_id, value: element.id %>
-            <button class="button add-nestable-element-button" data-alchemy-button>
-              <%= Alchemy.t(:add_nested_element) % { name: Alchemy.t(nestable_element, scope: 'element_names') } %>
-            </button>
-          <% end %>
-        <% else %>
-          <%= link_to_dialog Alchemy.t("New Element"),
-            alchemy.new_admin_element_path(
-              parent_element_id: element.id,
-              page_version_id: element.page_version_id
-            ), {
-              size: "320x125",
-              title: Alchemy.t("New Element")
-            }, class: "button add-nestable-element-button" %>
-        <% end %>
-      <% end %>
+      <%= render "alchemy/admin/elements/add_nested_element_form", element: element %>
     </div>
   <% end %>
 <% end %>

data/app/views/alchemy/admin/elements/_form.html.erb

@@ -9,7 +9,11 @@
       label: Alchemy.t(:element_of_type),
       collection: elements_for_select(@elements),
       prompt: Alchemy.t(:select_element),
-      input_html: {class: 'alchemy_selectbox', autofocus: true} %>
+      selected: (@elements.first if @elements.count == 1),
+      input_html: {class: 'alchemy_selectbox', autofocus: true, disabled: @elements.count == 1} %>
+    <% if @elements.count == 1 %>
+      <%= form.hidden_field :name, value: @elements.first[:name] %>
+    <% end %>
     <%= form.hidden_field :parent_element_id, value: @parent_element.try(:id) %>
     <%= form.submit Alchemy.t(:add) %>
   <%- end -%>