alchemy_cms 4.6.7 → 5.0.0.beta1

data/app/models/alchemy/essence_node.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Alchemy
+  class EssenceNode < BaseRecord
+    acts_as_essence(
+      ingredient_column: :node,
+      preview_text_column: :node_name,
+      belongs_to: {
+        class_name: "Alchemy::Node",
+        foreign_key: :node_id,
+        inverse_of: :essence_nodes,
+        optional: true,
+      },
+    )
+
+    delegate :name, to: :node, prefix: true, allow_nil: true
+  end
+end

data/app/models/alchemy/essence_page.rb

@@ -2,28 +2,15 @@
 
 module Alchemy
   class EssencePage < BaseRecord
-    PAGE_ID = /\A\d+\z/
-
     acts_as_essence(
       ingredient_column: :page,
       preview_text_method: :name,
       belongs_to: {
-        class_name: 'Alchemy::Page',
+        class_name: "Alchemy::Page",
         foreign_key: :page_id,
         inverse_of: :essence_pages,
-        optional: true
-      }
+        optional: true,
+      },
     )
-
-    def ingredient=(page)
-      case page
-      when PAGE_ID
-        self.page = Alchemy::Page.new(id: page)
-      when Alchemy::Page
-        self.page = page
-      else
-        super
-      end
-    end
   end
 end

data/app/models/alchemy/essence_picture.rb

@@ -14,8 +14,6 @@
 #  link_title      :string
 #  css_class       :string
 #  link_target     :string
-#  creator_id      :integer
-#  updater_id      :integer
 #  created_at      :datetime         not null
 #  updated_at      :datetime         not null
 #  crop_from       :string
@@ -26,10 +24,10 @@
 module Alchemy
   class EssencePicture < BaseRecord
     acts_as_essence ingredient_column: :picture, belongs_to: {
-      class_name: 'Alchemy::Picture',
+      class_name: "Alchemy::Picture",
       foreign_key: :picture_id,
       inverse_of: :essence_pictures,
-      optional: true
+      optional: true,
     }
 
     delegate :image_file_width, :image_file_height, :image_file, to: :picture
@@ -80,7 +78,7 @@ module Alchemy
         format: picture.default_render_format,
         crop_from: crop_from.presence,
         crop_size: crop_size.presence,
-        size: content.settings[:size]
+        size: content.settings[:size],
       }.with_indifferent_access
     end
 
@@ -90,11 +88,11 @@ module Alchemy
     # image displayed in the frontend.
     #
     # @return [String]
-    def thumbnail_url(options = {})
+    def thumbnail_url
       return if picture.nil?
 
-      crop = crop_values_present? || content.settings_value(:crop, options)
-      size = render_size || content.settings_value(:size, options)
+      crop = crop_values_present? || content.settings[:crop]
+      size = render_size || content.settings[:size]
 
       options = {
         size: thumbnail_size(size, crop),
@@ -102,7 +100,7 @@ module Alchemy
         crop_from: crop_from.presence,
         crop_size: crop_size.presence,
         flatten: true,
-        format: picture.image_file_format
+        format: picture.image_file_format,
       }
 
       picture.url(options)
@@ -116,6 +114,7 @@ module Alchemy
     # @return [String]
     def preview_text(max = 30)
       return "" if picture.nil?
+
       picture.name.to_s[0..max - 1]
     end
 
@@ -124,6 +123,7 @@ module Alchemy
     # @return [Hash]
     def cropping_mask
       return if crop_from.blank? || crop_size.blank?
+
       crop_from = point_from_string(read_attribute(:crop_from))
       crop_size = sizes_from_string(read_attribute(:crop_size))
 
@@ -137,12 +137,12 @@ module Alchemy
       picture_url(content.settings)
     end
 
-    # Show image cropping link for content and options?
-    def allow_image_cropping?(options = {})
-      content && content.settings_value(:crop, options) && picture &&
+    # Show image cropping link for content
+    def allow_image_cropping?
+      content && content.settings[:crop] && picture &&
         picture.can_be_cropped_to(
-          content.settings_value(:size, options),
-          content.settings_value(:upsample, options)
+          content.settings[:size],
+          content.settings[:upsample],
         )
     end
 
@@ -161,16 +161,17 @@ module Alchemy
     end
 
     def normalize_crop_value(crop_value)
-      self[crop_value].split('x').map { |n| normalize_number(n) }.join('x')
+      self[crop_value].split("x").map { |n| normalize_number(n) }.join("x")
     end
 
     def normalize_number(number)
       number = number.to_f.round
-      number < 0 ? 0 : number
+      number.negative? ? 0 : number
     end
 
     def replace_newlines
       return nil if caption.nil?
+
       caption.gsub!(/(\r\n|\r|\n)/, "<br/>")
     end
   end

data/app/models/alchemy/essence_picture_view.rb

@@ -13,7 +13,7 @@ module Alchemy
       show_caption: true,
       disable_link: false,
       srcset: [],
-      sizes: []
+      sizes: [],
     }.with_indifferent_access
 
     def initialize(content, options = {}, html_options = {})
@@ -33,12 +33,12 @@ module Alchemy
         output = link_to(output, url_for(essence.link), {
           title: essence.link_title.presence,
           target: essence.link_target == "blank" ? "_blank" : nil,
-          data: {link_target: essence.link_target.presence}
+          data: { link_target: essence.link_target.presence },
         })
       end
 
       if caption
-        content_tag(:figure, output, {class: essence.css_class.presence}.merge(html_options))
+        content_tag(:figure, output, { class: essence.css_class.presence }.merge(html_options))
       else
         output
       end
@@ -48,6 +48,7 @@ module Alchemy
 
     def caption
       return unless show_caption?
+
       @_caption ||= content_tag(:figcaption, essence.caption)
     end
 
@@ -57,8 +58,8 @@ module Alchemy
           alt: essence.alt_tag.presence,
           title: essence.title.presence,
           class: caption ? nil : essence.css_class.presence,
-          srcset: srcset.join(', ').presence,
-          sizes: options[:sizes].join(', ').presence
+          srcset: srcset.join(", ").presence,
+          sizes: options[:sizes].join(", ").presence,
         }.merge(caption ? {} : html_options)
       )
     end
@@ -74,7 +75,7 @@ module Alchemy
     def srcset
       options[:srcset].map do |size|
         url = essence.picture_url(size: size)
-        width, height = size.split('x')
+        width, height = size.split("x")
         width.present? ? "#{url} #{width}w" : "#{url} #{height}h"
       end
     end

data/app/models/alchemy/essence_richtext.rb

@@ -8,15 +8,13 @@
 #  body          :text
 #  stripped_body :text
 #  public        :boolean
-#  creator_id    :integer
-#  updater_id    :integer
 #  created_at    :datetime         not null
 #  updated_at    :datetime         not null
 #
 
 module Alchemy
   class EssenceRichtext < BaseRecord
-    acts_as_essence preview_text_column: 'stripped_body'
+    acts_as_essence preview_text_column: "stripped_body"
 
     before_save :strip_content
 

data/app/models/alchemy/essence_select.rb

@@ -8,13 +8,11 @@
 #  value      :string
 #  created_at :datetime         not null
 #  updated_at :datetime         not null
-#  creator_id :integer
-#  updater_id :integer
 #
 
 # Provides a select box that stores string values.
 module Alchemy
   class EssenceSelect < BaseRecord
-    acts_as_essence ingredient_column: 'value'
+    acts_as_essence ingredient_column: "value"
   end
 end

data/app/models/alchemy/essence_text.rb

@@ -11,8 +11,6 @@
 #  link_class_name :string
 #  public          :boolean          default(FALSE)
 #  link_target     :string
-#  creator_id      :integer
-#  updater_id      :integer
 #  created_at      :datetime         not null
 #  updated_at      :datetime         not null
 #

data/app/models/alchemy/folded_page.rb

@@ -17,6 +17,7 @@ module Alchemy
 
     def self.folded_for_user(user)
       return none unless Alchemy.user_class < ActiveRecord::Base
+
       where(user: user, folded: true)
     end
   end

data/app/models/alchemy/language/code.rb

@@ -4,7 +4,7 @@ module Alchemy::Language::Code
   extend ActiveSupport::Concern
 
   def code
-    [language_code, country_code].select(&:present?).join('-')
+    [language_code, country_code].select(&:present?).join("-")
   end
 
   def code=(code)
@@ -13,11 +13,11 @@ module Alchemy::Language::Code
 
   module ClassMethods
     def find_by_code(code)
-      codes = code.split('-')
-      codes << '' if codes.length == 1
+      codes = code.split("-")
+      codes << "" if codes.length == 1
       on_current_site.find_by(
         language_code: codes[0],
-        country_code: codes[1]
+        country_code: codes[1],
       )
     end
   end

data/app/models/alchemy/language.rb

@@ -20,15 +20,18 @@
 #  locale         :string
 #
 
-require_dependency 'alchemy/site'
+require_dependency "alchemy/site"
 
 module Alchemy
   class Language < BaseRecord
     belongs_to :site
-    has_many :pages
+    has_many :pages, inverse_of: :language
+    has_many :nodes, inverse_of: :language
 
     before_validation :set_locale, if: -> { locale.blank? }
 
+    has_one :root_page, -> { where(parent: nil, layoutpage: false) }, class_name: "Alchemy::Page"
+
     validates :name, presence: true
     validates :page_layout, presence: true
     validates :frontpage_name, presence: true
@@ -54,11 +57,13 @@ module Alchemy
     after_update :unpublish_pages,
       if: :should_unpublish_pages?
 
-    before_destroy :check_for_default
-    after_destroy :delete_language_root_page
+    before_destroy if: -> { pages.any? } do
+      errors.add(:pages, :still_present)
+      throw(:abort)
+    end
 
-    scope :published,       -> { where(public: true) }
-    scope :with_root_page,  -> { joins(:pages).where(Page.table_name => {language_root: true}) }
+    scope :published, -> { where(public: true) }
+    scope :with_root_page, -> { joins(:pages).where(Page.table_name => { language_root: true }) }
 
     class << self
       def on_site(site)
@@ -81,6 +86,8 @@ module Alchemy
 
       # The root page of the current language.
       def current_root_page
+        return unless current
+
         current.pages.language_roots.first
       end
 
@@ -100,16 +107,6 @@ module Alchemy
 
     include Alchemy::Language::Code
 
-    # Root page
-    def root_page
-      @root_page ||= pages.language_roots.first
-    end
-
-    # Layout root page
-    def layout_root_page
-      @layout_root_page ||= Page.layout_root_for(id)
-    end
-
     # All available locales matching this language
     #
     # Matching either the code (+language_code+ + +country_code+) or the +language_code+
@@ -118,10 +115,14 @@ module Alchemy
     #
     def matching_locales
       @_matching_locales ||= ::I18n.available_locales.select do |locale|
-        locale.to_s.split('-')[0] == language_code
+        locale.to_s.split("-")[0] == language_code
       end
     end
 
+    def available_menu_names
+      Alchemy::Node.available_menu_names - nodes.reject(&:parent_id).map(&:menu_type)
+    end
+
     private
 
     def set_locale
@@ -157,36 +158,21 @@ module Alchemy
     def remove_old_default
       lang = Language.on_site(site).default
       return true if lang.nil?
+
       lang.default = false
       lang.save(validate: false)
     end
 
     def should_set_pages_language?
-      if active_record_5_1?
-        saved_change_to_language_code? || saved_change_to_country_code?
-      else
-        language_code_changed? || country_code_changed?
-      end
+      saved_change_to_language_code? || saved_change_to_country_code?
     end
 
     def set_pages_language
       pages.update_all language_code: code
     end
 
-    def check_for_default
-      raise DefaultLanguageNotDeletable if default?
-    end
-
-    def delete_language_root_page
-      root_page.try(:destroy) && layout_root_page.try(:destroy)
-    end
-
     def should_unpublish_pages?
-      if active_record_5_1?
-        saved_changes[:public] == [true, false]
-      else
-        changes[:public] == [true, false]
-      end
+      saved_changes[:public] == [true, false]
     end
 
     def unpublish_pages

data/app/models/alchemy/legacy_page_url.rb

@@ -13,7 +13,7 @@
 
 class Alchemy::LegacyPageUrl < ActiveRecord::Base
   belongs_to :page,
-    class_name: 'Alchemy::Page',
+    class_name: "Alchemy::Page",
     required: true
 
   validates :urlname,

data/app/models/alchemy/message.rb

@@ -22,17 +22,17 @@ module Alchemy
 
     attr_accessor :contact_form_id, :ip
 
-    config['fields'].each do |field|
+    config["fields"].each do |field|
       attr_accessor field.to_sym
     end
 
-    config['validate_fields'].each do |field|
+    config["validate_fields"].each do |field|
       validates_presence_of field
 
       case field.to_sym
       when /email/
         validates_format_of field,
-          with: Alchemy::Config.get('format_matchers')['email'],
+          with: Alchemy::Config.get("format_matchers")["email"],
           if: -> { send(field).present? }
       when :email_confirmation
         validates_confirmation_of :email

data/app/models/alchemy/node.rb

@@ -4,13 +4,22 @@ module Alchemy
   class Node < BaseRecord
     VALID_URL_REGEX = /\A(\/|\D[a-z\+\d\.\-]+:)/
 
+    before_destroy :check_if_related_essence_nodes_present
+
     acts_as_nested_set scope: "language_id", touch: true
-    stampable stamper_class_name: Alchemy.user_class.name
+    stampable stamper_class_name: Alchemy.user_class_name
 
-    belongs_to :site, class_name: "Alchemy::Site"
     belongs_to :language, class_name: "Alchemy::Language"
     belongs_to :page, class_name: "Alchemy::Page", optional: true, inverse_of: :nodes
 
+    has_one :site, through: :language
+
+    has_many :essence_nodes, class_name: "Alchemy::EssenceNode", foreign_key: :node_id, inverse_of: :ingredient_association
+
+    before_validation :translate_root_menu_name, if: -> { root? }
+    before_validation :set_menu_type_from_root, unless: -> { root? }
+
+    validates :menu_type, presence: true
     validates :name, presence: true, if: -> { page.nil? }
     validates :url, format: { with: VALID_URL_REGEX }, unless: -> { url.nil? }
 
@@ -62,11 +71,25 @@ module Alchemy
     end
 
     def to_partial_path
-      "#{view_folder_name}/wrapper"
+      "alchemy/menus/#{menu_type}/node"
+    end
+
+    private
+
+    def check_if_related_essence_nodes_present
+      dependent_essence_nodes = self_and_descendants.flat_map(&:essence_nodes)
+      if dependent_essence_nodes.any?
+        errors.add(:base, :essence_nodes_present, page_names: dependent_essence_nodes.map(&:page).map(&:name).to_sentence)
+        throw(:abort)
+      end
+    end
+
+    def translate_root_menu_name
+      self.name ||= Alchemy.t(menu_type, scope: :menu_names)
     end
 
-    def view_folder_name
-      "alchemy/menus/#{name.parameterize.underscore}"
+    def set_menu_type_from_root
+      self.menu_type = root.menu_type
     end
   end
 end

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

@@ -15,7 +15,6 @@ module Alchemy
   #       fixed_attributes:
   #         - public_on: nil
   #         - public_until: nil
-  #         - visible: false
   #
   class Page::FixedAttributes
     attr_reader :page
@@ -31,7 +30,7 @@ module Alchemy
     # @return Hash
     #
     def attributes
-      @_attributes ||= page.definition.fetch('fixed_attributes', {}).symbolize_keys
+      @_attributes ||= page.definition.fetch("fixed_attributes", {}).symbolize_keys
     end
     alias_method :all, :attributes
 
@@ -52,6 +51,7 @@ module Alchemy
     #
     def fixed?(name)
       return false if name.nil?
+
       attributes.key?(name.to_sym)
     end
 
@@ -59,6 +59,7 @@ module Alchemy
     #
     def [](name)
       return nil if name.nil?
+
       attributes[name.to_sym]
     end
   end