alchemy_cms 4.6.7 → 5.0.0.beta1

data/app/helpers/alchemy/pages_helper.rb

@@ -25,18 +25,19 @@ module Alchemy
     #
     def language_links(options = {})
       options = {
-        linkname: 'name',
+        linkname: "name",
         show_title: true,
-        spacer: '',
-        reverse: false
+        spacer: "",
+        reverse: false,
       }.merge(options)
-      languages = Language.on_current_site.published.with_root_page.order("name #{options[:reverse] ? 'DESC' : 'ASC'}")
+      languages = Language.on_current_site.published.with_root_page.order("name #{options[:reverse] ? "DESC" : "ASC"}")
       return nil if languages.count < 2
+
       render(
         partial: "alchemy/language_links/language",
         collection: languages,
         spacer_template: "alchemy/language_links/spacer",
-        locals: {languages: languages, options: options}
+        locals: { languages: languages, options: options },
       )
     end
 
@@ -50,7 +51,7 @@ module Alchemy
       render @page, page: @page
     rescue ActionView::MissingTemplate
       warning("PageLayout: '#{@page.page_layout}' not found. Rendering standard page_layout.")
-      render 'alchemy/page_layouts/standard', page: @page
+      render "alchemy/page_layouts/standard", page: @page
     end
 
     # Renders a partial for current site
@@ -72,182 +73,37 @@ module Alchemy
       ""
     end
 
-    # Renders the navigation.
-    # @deprecated
-    #
-    # It produces a html <ul><li></li></ul> structure with all necessary classes so you can produce every navigation the web uses today.
-    # I.E. dropdown-navigations, simple mainnavigations or even complex nested ones.
-    #
-    # === HTML output:
-    #
-    #   <ul class="navigation level_1">
-    #     <li class="first home"><a href="/home" class="active" title="Homepage" lang="en" data-page-id="1">Homepage</a></li>
-    #     <li class="contact"><a href="/contact" title="Contact" lang="en" data-page-id="2">Contact</a></li>
-    #     <li class="last imprint"><a href="/imprint" title="Imprint" lang="en" data-page-id="3">Imprint</a></li>
-    #   </ul>
-    #
-    # As you can see: Everything you need.
-    #
-    # Not pleased with the way Alchemy produces the navigation structure?
-    #
-    # Then feel free to overwrite the partials (_renderer.html.erb and _link.html.erb) found in +views/navigation/+ or pass different partials via the options +:navigation_partial+ and +:navigation_link_partial+.
-    #
-    # === Passing HTML classes and ids to the renderer
-    #
-    # A second hash can be passed as html_options to the navigation renderer partial.
-    #
-    # ==== Example:
-    #
-    #   <%= render_navigation({from_page: 'subnavi'}, {class: 'navigation', id: 'subnavigation'}) %>
-    #
-    #
-    # @option options submenu [Boolean] (false)
-    #   Do you want a nested <ul> <li> structure for the deeper levels of your navigation, or not?
-    #   Used to display the subnavigation within the mainnaviagtion. I.e. for dropdown menues.
-    #
-    # @option options all_sub_menues [Boolean] (false)
-    #   Renders the whole page tree.
-    #
-    # @option options from_page [Alchemy::Page] (@root_page)
-    #   Do you want to render a navigation from a different page then the current page?
-    #   Then pass an Page instance or a Alchemy::PageLayout name as string.
-    #
-    # @option options spacer [String] (nil)
-    #   A spacer for the entries can be passed.
-    #   Simple string, or even a complex html structure.
-    #   I.e: "<span class='spacer'>|</spacer>".
-    #
-    # @option options navigation_partial [String] ("navigation/renderer")
-    #   Pass a different partial to be taken for the navigation rendering.
-    #   Alternatively you could override the +app/views/alchemy/navigation/renderer+ partial in your app.
-    #
-    # @option options navigation_link_partial [String] ("navigation/link")
-    #   Alchemy places an <a> html link in <li> tags.
-    #   The tag automatically has an active css class if necessary.
-    #   So styling is everything. But maybe you don't want this.
-    #   So feel free to make you own partial and pass the filename here.
-    #   Alternatively you could override the +app/views/alchemy/navigation/link+ partial in your app.
-    #
-    # @option options show_nonactive [Boolean] (false)
-    #   Commonly Alchemy only displays the submenu of the active page (if submenu: true).
-    #   If you want to display all child pages then pass true (together with submenu: true of course).
-    #   I.e. for css-driven drop down menues.
-    #
-    # @option options show_title [Boolean] (true)
-    #   For our beloved SEOs :)
-    #   Appends a title attribute to all links and places the +page.title+ content into it.
-    #
-    # @option options restricted_only [Boolean] (false)
-    #   Render only restricted pages. I.E for members only navigations.
-    #
-    # @option options reverse [Boolean] (false)
-    #   Reverse the output of the pages
-    #
-    # @option options reverse_children [Boolean] (false)
-    #   Like reverse option, but only reverse the children of the first level
-    #
-    # @option options deepness [Fixnum] (nil)
-    #   Show only pages up to this depth.
-    #
-    def render_navigation(options = {}, html_options = {})
-      options = {
-        submenu: false,
-        all_sub_menues: false,
-        from_page: @root_page || Language.current_root_page,
-        spacer: nil,
-        navigation_partial: 'alchemy/navigation/renderer',
-        navigation_link_partial: 'alchemy/navigation/link',
-        show_nonactive: false,
-        restricted_only: false,
-        show_title: true,
-        reverse: false,
-        reverse_children: false
-      }.merge(options)
-      page = page_or_find(options[:from_page])
-      return nil if page.blank?
-      pages = page.children.accessible_by(current_ability, :see)
-      pages = pages.restricted if options.delete(:restricted_only)
-      if depth = options[:deepness]
-        pages = pages.where('depth <= ?', depth)
-      end
-      if options[:reverse]
-        pages.reverse!
-      end
-      render options[:navigation_partial],
-        options: options,
-        pages: pages,
-        html_options: html_options
-    end
-    deprecate render_navigation: 'Create a menu and use render_menu instead', deprecator: Alchemy::Deprecation
-
     # Renders a menu partial
     #
     # Menu partials are placed in the `app/views/alchemy/menus` folder
     # Use the `rails g alchemy:menus` generator to create the partials
     #
-    # @param [String] - Name of the menu
+    # @param [String] - Type of the menu
     # @param [Hash] - A set of options available in your menu partials
-    def render_menu(name, options = {})
-      root_node = Alchemy::Node.roots.find_by(name: name, site: Alchemy::Site.current)
+    def render_menu(menu_type, options = {})
+      root_node = Alchemy::Node.roots.find_by(
+        menu_type: menu_type,
+        language: Alchemy::Language.current,
+      )
       if root_node.nil?
-        warning("Menu with name #{name} not found!")
+        warning("Menu with type #{menu_type} not found!")
         return
       end
 
-      options = {
-        node_partial_name: "#{root_node.view_folder_name}/node"
-      }.merge(options)
-
-      render(root_node.to_partial_path, menu: root_node, node: root_node, options: options)
+      render("alchemy/menus/#{menu_type}/wrapper", menu: root_node, options: options)
     rescue ActionView::MissingTemplate => e
       warning <<~WARN
-        Menu partial not found for #{name}.
+        Menu partial not found for #{menu_type}.
         #{e}
       WARN
     end
 
-    # Renders navigation the children and all siblings of the given page (standard is the current page).
-    #
-    # Use this helper if you want to render the subnavigation independent from the mainnavigation. I.E. to place it in a different area on your website.
-    #
-    # This helper passes all its options to the the render_navigation helper.
-    #
-    # === Options:
-    #
-    #   from_page: @page                              # The page to render the navigation from
-    #   submenu: true                                 # Shows the nested children
-    #   level: 2                                      # Normally there is no need to change the level parameter, just in a few special cases
-    #
-    def render_subnavigation(options = {}, html_options = {})
-      default_options = {
-        from_page: @page,
-        submenu: true,
-        level: 2
-      }
-      options = default_options.merge(options)
-      if !options[:from_page].nil?
-        while options[:from_page].level > options[:level]
-          options[:from_page] = options[:from_page].parent
-        end
-        render_navigation(options, html_options)
-      else
-        return nil
-      end
-    end
-    deprecate :render_subnavigation, deprecator: Alchemy::Deprecation
-
     # Returns true if page is in the active branch
     def page_active?(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+.
-    def external_page_css_class(page)
-      return nil if !page.definition['redirects_to_external']
-      request.path.split('/').delete_if(&:blank?).first == page.urlname.gsub(/^\//, '') ? 'active' : nil
-    end
-
     # Returns page links in a breadcrumb beginning from root to current page.
     #
     # === Options:
@@ -264,11 +120,11 @@ module Alchemy
         page: @page,
         restricted_only: false,
         reverse: false,
-        link_active_page: false
+        link_active_page: false,
       }.merge(options)
 
-      pages = Page.
-        ancestors_for(options[:page]).
+      pages = options[:page].
+        self_and_ancestors.contentpages.
         accessible_by(current_ability, :see)
 
       if options.delete(:restricted_only)
@@ -276,7 +132,7 @@ module Alchemy
       end
 
       if options.delete(:reverse)
-        pages = pages.reorder('lft DESC')
+        pages = pages.reorder("lft DESC")
       end
 
       if options[:without].present?
@@ -284,7 +140,7 @@ module Alchemy
         pages = pages.where.not(id: without.try(:collect, &:id) || without.id)
       end
 
-      render 'alchemy/breadcrumb/wrapper', pages: pages, options: options
+      render "alchemy/breadcrumb/wrapper", pages: pages, options: options
     end
 
     # Returns current page title
@@ -296,10 +152,11 @@ module Alchemy
     #
     def page_title(options = {})
       return "" if @page.title.blank?
+
       options = {
         prefix: "",
         suffix: "",
-        separator: ""
+        separator: "",
       }.update(options)
       title_parts = [options[:prefix]]
       if response.status == 200
@@ -320,14 +177,7 @@ module Alchemy
     end
 
     def meta_robots
-      "#{@page.robot_index? ? '' : 'no'}index, #{@page.robot_follow? ? '' : 'no'}follow"
-    end
-
-    # @deprecated
-    def render_cell(name, _options = {})
-      render_elements(only: name, fixed: true)
+      "#{@page.robot_index? ? "" : "no"}index, #{@page.robot_follow? ? "" : "no"}follow"
     end
-    deprecate render_cell: 'Use render_elements(only: <cell-name>, fixed: true) instead',
-      deprecator: Alchemy::Deprecation
   end
 end

data/app/helpers/alchemy/url_helper.rb

@@ -18,7 +18,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?
+      raise ArgumentError, "Page is nil" if page.nil?
+
       url_params = {urlname: page.urlname}.update(optional_params)
       prefix_locale? ? url_params.update(locale: page.language_code) : url_params
     end

data/app/mailers/alchemy/base_mailer.rb

@@ -2,7 +2,7 @@
 
 module Alchemy
   begin
-    base_class = Object.const_get('::ApplicationMailer')
+    base_class = Object.const_get("::ApplicationMailer")
   rescue NameError
     base_class = ActionMailer::Base
   end

data/app/mailers/alchemy/messages_mailer.rb

@@ -8,7 +8,7 @@ module Alchemy
         from: mail_from,
         to: mail_to,
         reply_to: message.try(:email),
-        subject: subject
+        subject: subject,
       )
     end
   end

data/app/models/alchemy/attachment.rb

@@ -22,15 +22,15 @@ module Alchemy
     include Alchemy::Filetypes
     include Alchemy::NameConversions
     include Alchemy::Taggable
-    include Alchemy::ContentTouching
+    include Alchemy::TouchElements
 
     dragonfly_accessor :file, app: :alchemy_attachments do
       after_assign { |f| write_attribute(:file_mime_type, f.mime_type) }
     end
 
-    stampable stamper_class_name: Alchemy.user_class.name
+    stampable stamper_class_name: Alchemy.user_class_name
 
-    has_many :essence_files, class_name: 'Alchemy::EssenceFile', foreign_key: 'attachment_id'
+    has_many :essence_files, class_name: "Alchemy::EssenceFile", foreign_key: "attachment_id"
     has_many :contents, through: :essence_files
     has_many :elements, through: :contents
     has_many :pages, through: :elements
@@ -42,24 +42,25 @@ module Alchemy
       end
 
       def allowed_filetypes
-        Config.get(:uploader).fetch('allowed_filetypes', {}).fetch('alchemy/attachments', [])
+        Config.get(:uploader).fetch("allowed_filetypes", {}).fetch("alchemy/attachments", [])
       end
 
       def file_types_for_select
         file_types = Alchemy::Attachment.pluck(:file_mime_type).uniq.map do |type|
-          [Alchemy.t(type, scope: 'mime_types'), type]
+          [Alchemy.t(type, scope: "mime_types"), type]
         end
         file_types.sort_by(&:first)
       end
     end
 
     validates_presence_of :file
-    validates_size_of :file, maximum: Config.get(:uploader)['file_size_limit'].megabytes
-    validates_property :ext, of: :file,
+    validates_size_of :file, maximum: Config.get(:uploader)["file_size_limit"].megabytes
+    validates_property :ext,
+      of: :file,
       in: allowed_filetypes,
       case_sensitive: false,
       message: Alchemy.t("not a valid file"),
-      unless: -> { self.class.allowed_filetypes.include?('*') }
+      unless: -> { self.class.allowed_filetypes.include?("*") }
 
     before_save :set_name, if: :file_name_changed?
 
@@ -71,13 +72,13 @@ module Alchemy
       {
         "name" => read_attribute(:file_name),
         "size" => read_attribute(:file_size),
-        'error' => errors[:file].join
+        "error" => errors[:file].join,
       }
     end
 
     # An url save filename without format suffix
     def urlname
-      CGI.escape(file_name.gsub(/\.#{extension}$/, '').tr('.', ' '))
+      CGI.escape(file_name.gsub(/\.#{extension}$/, "").tr(".", " "))
     end
 
     # Checks if the attachment is restricted, because it is attached on restricted pages only
@@ -89,6 +90,7 @@ module Alchemy
     def extension
       file_name.split(".").last
     end
+
     alias_method :suffix, :extension
 
     # Returns a css class name for kind of file
@@ -96,23 +98,23 @@ module Alchemy
     def icon_css_class
       case file_mime_type
       when "application/pdf"
-        then "file-pdf"
+        "file-pdf"
       when "application/msword"
-        then "file-word"
+        "file-word"
       when *TEXT_FILE_TYPES
-        then "file-alt"
+        "file-alt"
       when *EXCEL_FILE_TYPES
-        then "file-excel"
+        "file-excel"
       when *VCARD_FILE_TYPES
-        then "address-card"
+        "address-card"
       when *ARCHIVE_FILE_TYPES
-        then "file-archive"
+        "file-archive"
       when *AUDIO_FILE_TYPES
-        then "file-audio"
+        "file-audio"
       when *IMAGE_FILE_TYPES
-        then "file-image"
+        "file-image"
       when *VIDEO_FILE_TYPES
-        then "file-video"
+        "file-video"
       else
         "file"
       end

data/app/models/alchemy/base_record.rb

@@ -1,13 +1,10 @@
+# frozen_string_literal: true
 module Alchemy
   def self.table_name_prefix
-    'alchemy_'
+    "alchemy_"
   end
 
   class BaseRecord < ActiveRecord::Base
     self.abstract_class = true
-
-    def active_record_5_1?
-      ActiveRecord.gem_version >= Gem::Version.new('5.1.0')
-    end
   end
 end

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

@@ -22,10 +22,13 @@ module Alchemy
         if definition.blank?
           raise ContentDefinitionError, "No definition found in elements.yml for #{attributes.inspect} and #{element.inspect}"
         end
-        super(name: definition['name'], element_id: element.id)
+
+        super(
+          name: definition[:name],
+          essence_type: normalize_essence_type(definition[:type]),
+          element_id: element.id
+        ).tap(&:build_essence)
       end
-      alias_method :build, :new
-      deprecate build: :new, deprecator: Alchemy::Deprecation
 
       # Creates a new content from elements definition in the +elements.yml+ file.
       #
@@ -34,20 +37,11 @@ module Alchemy
       #
       # @return [Alchemy::Content]
       #
-      def create(*args)
-        attributes = args.last || {}
-        if args.length > 1
-          Alchemy::Deprecation.warn 'Passing an element as first argument to Alchemy::Content.create is deprecated! Pass an attribute hash with element inside instead.'
-          element = args.first
-        else
-          element = attributes[:element]
-        end
-        new(attributes.merge(element: element)).tap do |content|
-          content.create_essence!(attributes[:essence_type])
+      def create(attributes = {})
+        new(attributes).tap do |content|
+          content.essence.save && content.save
         end
       end
-      alias_method :create_from_scratch, :create
-      deprecate create_from_scratch: :create, deprecator: Alchemy::Deprecation
 
       # Creates a copy of source and also copies the associated essence.
       #
@@ -62,11 +56,11 @@ module Alchemy
         new_content = Content.new(
           source.attributes.
             except(*SKIPPED_ATTRIBUTES_ON_COPY).
-            merge(differences.with_indifferent_access)
+            merge(differences.with_indifferent_access),
         )
         new_essence = source.essence.class.create!(
           source.essence.attributes.
-            except(*SKIPPED_ATTRIBUTES_ON_COPY)
+            except(*SKIPPED_ATTRIBUTES_ON_COPY),
         )
         new_content.tap do |content|
           content.essence = new_essence
@@ -77,7 +71,7 @@ module Alchemy
       # Returns all content definitions from elements.yml
       #
       def definitions
-        definitions = Element.definitions.flat_map { |e| e['contents'] }
+        definitions = Element.definitions.flat_map { |e| e["contents"] }
         definitions.compact!
         definitions
       end
@@ -119,12 +113,22 @@ module Alchemy
       element.content_definition_for(name) || {}
     end
 
+    # Build essence from definition.
+    #
+    # If an optional type is passed, this type of essence gets created.
+    #
+    def build_essence(type = essence_type)
+      self.essence = essence_class(type).new({
+        ingredient: default_value,
+      })
+    end
+
     # Creates essence from definition.
     #
     # If an optional type is passed, this type of essence gets created.
     #
     def create_essence!(type = nil)
-      self.essence = essence_class(type).create!(prepared_attributes_for_essence)
+      build_essence(type).save!
       save!
     end
 
@@ -135,18 +139,7 @@ module Alchemy
     # If an optional type is passed, this type of essence gets constantized.
     #
     def essence_class(type = nil)
-      Content.normalize_essence_type(type || definition['type']).constantize
-    end
-
-    # Prepares the attributes for creating the essence.
-    #
-    # 1. It sets a default text if given in +elements.yml+
-    #
-    def prepared_attributes_for_essence
-      attributes = {
-        ingredient: default_text(definition['default'])
-      }
-      attributes
+      Content.normalize_essence_type(type || definition["type"]).constantize
     end
   end
 end