alchemy_cms 3.2.0.beta → 3.2.0.rc1

data/app/controllers/alchemy/pictures_controller.rb

@@ -11,6 +11,7 @@ module Alchemy
     def show
       @size = params[:size]
       expires_in 1.month, public: !@picture.restricted?
+
       respond_to { |format| send_image(processed_image, format) }
     end
 
@@ -28,8 +29,7 @@ module Alchemy
     end
 
     def zoom
-      image_file = @picture.image_file
-      respond_to { |format| send_image(image_file, format) }
+      respond_to { |format| send_image(@picture.image_file, format) }
     end
 
     private

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

@@ -64,6 +64,13 @@ module Alchemy
         end
       end
 
+      # Used for site selector in Alchemy cockpit.
+      def sites_for_select
+        Alchemy::Site.all.map do |site|
+          [site.name, site.id]
+        end
+      end
+
       # Returns a javascript driven live filter for lists.
       #
       # The items must have a html +name+ attribute that holds the filterable value.

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

@@ -54,30 +54,30 @@ module Alchemy
         end
       end
 
-      # Returns all elements that could be placed on that page because of the pages layout.
+      # Returns all elements that can be placed on the current page.
       # The elements will be grouped by cell.
+      #
+      # @param [Array] elements
+      #   collection of element objects
+      # @param [String] object_method
+      #   method that is called on the element objects used for the select option value
+      #
       def grouped_elements_for_select(elements, object_method = 'name')
-        return "" if elements.blank?
+        return [] if elements.blank?
         cells_definition = @page.cell_definitions
-        return "" if cells_definition.blank?
+        return [] if cells_definition.blank?
         options = {}
-        celled_elements = []
         cells_definition.each do |cell|
-          cell_elements = elements.select { |e| cell['elements'].include?(e.class.name == 'Element' ? e.name : e['name']) }
-          celled_elements += cell_elements
+          cell_elements = elements_for_cell(elements, cell)
           optgroup_label = Cell.translated_label_for(cell['name'])
           options[optgroup_label] = cell_elements.map do |e|
             element_array_for_options(e, object_method, cell)
           end
         end
-        other_elements = elements - celled_elements
-        unless other_elements.blank?
-          options[_t(:main_content)] = other_elements.map do |e|
-            element_array_for_options(e, object_method)
-          end
+        options[_t(:main_content)] = elements_for_main_content(elements).map do |e|
+          element_array_for_options(e, object_method)
         end
-        # We don't want to show empty cells
-        options.delete_if { |cell, elements| elements.blank? }
+        options.delete_if { |_cell, elements| elements.blank? } # Throw out empty cells
       end
 
       def element_array_for_options(e, object_method, cell = nil)
@@ -105,14 +105,30 @@ module Alchemy
       #
       def update_essence_select_elements(page, element)
         elements = page.elements.not_trashed.joins(:contents)
-          .where("alchemy_contents.element_id != #{element.id}")
-          .where("alchemy_contents.essence_type" => "Alchemy::EssenceSelect")
+          .where(["#{Content.table_name}.element_id != ?", element.id])
+          .where(Content.table_name => {essence_type: "Alchemy::EssenceSelect"})
         return if elements.blank?
         elements.collect do |element|
           render 'alchemy/admin/elements/refresh_editor', element: element
         end.join.html_safe
       end
 
+      private
+
+      def elements_for_main_content(elements)
+        page_definition = @page.definition['elements']
+        elements.select do |e|
+          page_definition.include?(e.class.name == 'Element' ? e.name : e['name'])
+        end
+      end
+
+      def elements_for_cell(elements, cell)
+        cell_elements = cell['elements']
+        elements.select do |e|
+          cell_elements.include?(e.class.name == 'Element' ? e.name : e['name'])
+        end
+      end
+
     end
   end
 end

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

@@ -48,6 +48,23 @@ module Alchemy
         end.delete_if(&:blank?).join("<br>").html_safe
       end
 
+      # Renders a label for page's page layout
+      #
+      # If the page layout description of the page is missing, it displays a warning.
+      #
+      def page_layout_label(page)
+        if page.persisted? && page.layout_description.blank?
+          [
+            content_tag(:span, '',
+              class: 'inline warning icon',
+              title: _t(:page_layout_description_missing)
+            ),
+            _t(:page_type)
+          ].join('&nbsp;').html_safe
+        else
+          _t(:page_type)
+        end
+      end
     end
   end
 end

data/app/helpers/alchemy/base_helper.rb

@@ -54,33 +54,6 @@ module Alchemy
       end
     end
 
-    # Returns an array of all pages in the same branch from current.
-    # I.e. used to find the active page in navigation.
-    def breadcrumb(current)
-      return [] if current.nil?
-      current.self_and_ancestors.where("parent_id IS NOT NULL")
-    end
-
-    # Returns the Alchemy configuration.
-    #
-    # *DO NOT REMOVE THIS HERE.*
-    #
-    # We need this, if an external engine or app includes this module into actionview.
-    #
-    def configuration(name)
-      Alchemy::Config.get(name)
-    end
-
-    # Returns true if Alchemy is in multi language mode
-    #
-    # *DO NOT REMOVE THIS HERE.*
-    #
-    # We need this, if an external engine or app includes this module into actionview.
-    #
-    def multi_language?
-      Alchemy::Language.published.count > 1
-    end
-
     # Renders the flash partial (+alchemy/admin/partials/flash+)
     #
     # @param [String] notice The notice you want to display
@@ -104,6 +77,5 @@ module Alchemy
         page
       end
     end
-
   end
 end

data/app/helpers/alchemy/pages_helper.rb

@@ -207,8 +207,8 @@ module Alchemy
 
     # Returns true if page is in the active branch
     def page_active?(page)
-      @breadcrumb ||= breadcrumb(@page)
-      @breadcrumb.include?(page)
+      @_page_ancestors ||= Page.ancestors_for(@page)
+      @_page_ancestors.include?(page)
     end
 
     # Returns +'active'+ if the given external page is in the current url path or +nil+.
@@ -229,15 +229,25 @@ module Alchemy
     #
     def render_breadcrumb(options={})
       options = {
-        separator: %(<span class="separator">&gt;</span>),
+        separator: ">",
         page: @page,
         restricted_only: false,
         reverse: false,
         link_active_page: false
       }.merge(options)
-      pages = breadcrumb(options[:page]).accessible_by(current_ability, :see)
-      pages = pages.restricted if options.delete(:restricted_only)
-      pages.to_a.reverse! if options[:reverse]
+
+      pages = Page.
+        ancestors_for(options[:page]).
+        accessible_by(current_ability, :see)
+
+      if options.delete(:restricted_only)
+        pages = pages.restricted
+      end
+
+      if options.delete(:reverse)
+        pages.to_a.reverse!
+      end
+
       if options[:without].present?
         if options[:without].class == Array
           pages = pages.to_a - options[:without]
@@ -245,12 +255,8 @@ module Alchemy
           pages.to_a.delete(options[:without])
         end
       end
-      render(
-        partial: 'alchemy/breadcrumb/page',
-        collection: pages,
-        spacer_template: 'alchemy/breadcrumb/spacer',
-        locals: {pages: pages, options: options}
-      )
+
+      render 'alchemy/breadcrumb/wrapper', pages: pages, options: options
     end
 
     # Returns current page title

data/app/helpers/alchemy/url_helper.rb

@@ -53,8 +53,8 @@ module Alchemy
     # Returns the correct params-hash for passing to show_page_path
     def show_page_path_params(page, optional_params={})
       raise ArgumentError, 'Page is nil' if page.nil?
-      url_params = {:urlname => page.urlname}.update(optional_params)
-      multi_language? ? url_params.update(:lang => page.language_code) : url_params
+      url_params = {urlname: page.urlname}.update(optional_params)
+      multi_language? ? url_params.update(locale: page.language_code) : url_params
     end
 
     # Returns the path for downloading an alchemy attachment

data/app/models/alchemy/cell.rb

@@ -56,7 +56,7 @@ module Alchemy
     private
 
       def read_yml_file
-        ::YAML.load_file(yml_file_path) || []
+        ::YAML.load(ERB.new(File.read(yml_file_path)).result) || []
       end
 
       def yml_file_path

data/app/models/alchemy/content/factory.rb

@@ -122,19 +122,26 @@ module Alchemy
       # Returns a normalized Essence type
       #
       # Adds Alchemy module name in front of given essence type
+      # unless there is a Class with the specified name that is an essence.
       #
       # @param [String]
       #   the essence type to normalize
       #
       def normalize_essence_type(essence_type)
         essence_type = essence_type.classify
-        if essence_type.match(/\AAlchemy::/)
-          essence_type
-        else
-          essence_type.gsub!(/\AEssence/, 'Alchemy::Essence')
-        end
+        return essence_type if is_an_essence?(essence_type)
+
+        "Alchemy::#{essence_type}"
       end
 
+      private
+
+      def is_an_essence?(essence_type)
+        klass = Module.const_get(essence_type)
+        klass.is_a?(Class) && klass.new.acts_as_essence?
+      rescue NameError
+        false
+      end
     end # end class methods
 
     # Instance Methods
@@ -179,6 +186,5 @@ module Alchemy
       }
       attributes
     end
-
   end
 end

data/app/models/alchemy/element.rb

@@ -37,7 +37,7 @@ module Alchemy
     belongs_to :page
     has_and_belongs_to_many :touchable_pages, -> { uniq },
       class_name: 'Alchemy::Page',
-      join_table: 'alchemy_elements_alchemy_pages'
+      join_table: ElementToPage.table_name
 
     validates_presence_of :name, :on => :create
     validates_format_of :name, :on => :create, :with => /\A[a-z0-9_-]+\z/
@@ -57,7 +57,7 @@ module Alchemy
     scope :excluded,          ->(names) { where(arel_table[:name].not_in(names)) }
     scope :not_in_cell,       -> { where(cell_id: nil) }
     scope :in_cell,           -> { where("#{self.table_name}.cell_id IS NOT NULL") }
-    scope :from_current_site, -> { where(alchemy_languages: {site_id: Site.current || Site.default}).joins(page: 'language') }
+    scope :from_current_site, -> { where(Language.table_name => {site_id: Site.current || Site.default}).joins(page: 'language') }
 
     delegate :restricted?, to: :page, allow_nil: true
 
@@ -402,7 +402,7 @@ module Alchemy
     # Returns an array of all EssenceRichtext contents ids
     #
     def richtext_contents_ids
-      contents.essence_richtexts.pluck('alchemy_contents.id')
+      contents.essence_richtexts.pluck("#{Content.table_name}.id")
     end
 
     # The names of all cells from given page this element could be placed in.

data/app/models/alchemy/element/definitions.rb

@@ -23,7 +23,7 @@ module Alchemy
       #
       def read_definitions_file
         if ::File.exists?(definitions_file_path)
-          ::YAML.load_file(definitions_file_path) || []
+          ::YAML.load(ERB.new(File.read(definitions_file_path)).result) || []
         else
           raise LoadError, "Could not find elements.yml file! Please run `rails generate alchemy:scaffold`"
         end

data/app/models/alchemy/element_to_page.rb

@@ -0,0 +1,7 @@
+module Alchemy
+  class ElementToPage
+    def self.table_name
+      [Element.table_name, Page.table_name].join('_')
+    end
+  end
+end

data/app/models/alchemy/language.rb

@@ -37,7 +37,7 @@ module Alchemy
     before_save :remove_old_default, if: proc { |m| m.default_changed? && m != Language.default }
 
     scope :published,      -> { where(public: true) }
-    scope :with_root_page, -> { joins(:pages).where(alchemy_pages: {language_root: true}) }
+    scope :with_root_page, -> { joins(:pages).where(Page.table_name => {language_root: true}) }
     scope :on_site,        ->(s) { s.present? ? where(site_id: s) : all }
     default_scope { on_site(Site.current) }
 

data/app/models/alchemy/page.rb

@@ -199,7 +199,14 @@ module Alchemy
         options
       end
 
-    private
+      # Returns an array of all pages in the same branch from current.
+      # I.e. used to find the active page in navigation.
+      def ancestors_for(current)
+        return [] if current.nil?
+        current.self_and_ancestors.contentpages
+      end
+
+      private
 
       # Aggregates the attributes from given source for copy of page.
       #

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

@@ -36,9 +36,9 @@ module Alchemy
       cells.any?
     end
 
-    # Returns the cell definitions from page's page_layout defintion.
+    # Returns the cell definitions from page definition.
     def cell_definitions
-      cell_names = self.layout_description['cells']
+      cell_names = definition['cells']
       return [] if cell_names.blank?
       Cell.all_definitions_for(cell_names)
     end

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

@@ -8,7 +8,9 @@ module Alchemy
 
       has_many :elements, -> { order(:position) }
       has_many :contents, :through => :elements
-      has_and_belongs_to_many :to_be_sweeped_elements, -> { uniq }, class_name: 'Alchemy::Element', join_table: 'alchemy_elements_alchemy_pages'
+      has_and_belongs_to_many :to_be_sweeped_elements, -> { uniq },
+        class_name: 'Alchemy::Element',
+        join_table: ElementToPage.table_name
 
       after_create :autogenerate_elements, :unless => proc { systempage? || do_not_autogenerate }
       after_update :trash_not_allowed_elements, :if => :page_layout_changed?
@@ -85,19 +87,35 @@ module Alchemy
       element_definitions_by_name(element_definition_names)
     end
 
-    # All names of elements that are defined in the page's page_layout definition.
+    # All names of elements that are defined in the corresponding
+    # page and cell definition.
     #
-    # Define elements in +config/alchemy/page_layout.yml+ file
+    # Assign elements to a page in +config/alchemy/page_layouts.yml+ and/or
+    # +config/alchemy/cells.yml+ file.
     #
-    # == Example:
+    # == Example of page_layouts.yml:
     #
     #   - name: contact
+    #     cells: [right_column]
     #     elements: [headline, contactform]
     #
+    # == Example of cells.yml:
+    #
+    #   - name: right_column
+    #     elements: [teaser]
+    #
     def element_definition_names
+      element_names_from_page_definition | element_names_from_cell_definition
+    end
+
+    def element_names_from_page_definition
       definition['elements'] || []
     end
 
+    def element_names_from_cell_definition
+      cell_definitions.map { |d| d['elements'] }.flatten
+    end
+
     # Returns Element definitions with given name(s)
     #
     # @param [Array || String]
@@ -169,7 +187,7 @@ module Alchemy
     # Returns an array of all EssenceRichtext contents ids
     #
     def richtext_contents_ids
-      contents.essence_richtexts.pluck('alchemy_contents.id')
+      contents.essence_richtexts.pluck("#{Content.table_name}.id")
     end
 
     private

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

@@ -62,8 +62,8 @@ module Alchemy
       I18n.t(self.status[status_type].to_s, scope: "page_states.#{status_type}")
     end
 
-    # Returns the self#page_layout description from config/alchemy/page_layouts.yml file.
-    def layout_description
+    # Returns the self#page_layout definition from config/alchemy/page_layouts.yml file.
+    def definition
       return {} if self.systempage?
       description = PageLayout.get(self.page_layout)
       if description.nil?
@@ -72,7 +72,7 @@ module Alchemy
       end
       description
     end
-    alias_method :definition, :layout_description
+    alias_method :layout_description, :definition
 
     # Returns translated name of the pages page_layout value.
     # Page layout names are defined inside the config/alchemy/page_layouts.yml file.