alchemy_cms 6.1.5 → 7.0.0.pre.b

data/app/models/alchemy/ingredients/headline.rb

@@ -12,6 +12,12 @@ module Alchemy
         :level,
         :size
 
+      allow_settings %i[
+        anchor
+        levels
+        sizes
+      ]
+
       before_create :set_level_and_size
 
       def preview_text(maxlength = 30)

data/app/models/alchemy/ingredients/link.rb

@@ -10,6 +10,8 @@ module Alchemy
         :link_target,
         :link_title
 
+      allow_settings %i[text]
+
       alias_method :link, :value
     end
   end

data/app/models/alchemy/ingredients/node.rb

@@ -9,6 +9,8 @@ module Alchemy
     class Node < Alchemy::Ingredient
       related_object_alias :node, class_name: "Alchemy::Node"
 
+      allow_settings %i[query_params]
+
       # The first 30 characters of node name
       #
       # Used by the Element#preview_text method.

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

@@ -9,6 +9,8 @@ module Alchemy
     class Page < Alchemy::Ingredient
       related_object_alias :page, class_name: "Alchemy::Page"
 
+      allow_settings %i[query_params]
+
       # The first 30 characters of page name
       #
       # Used by the Element#preview_text method.

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

@@ -27,6 +27,17 @@ module Alchemy
 
       related_object_alias :picture, class_name: "Alchemy::Picture"
 
+      allow_settings %i[
+        crop
+        css_classes
+        fixed_ratio
+        linkable
+        size
+        sizes
+        srcset
+        upsample
+      ]
+
       # The first 30 characters of the pictures name
       #
       # Used by the Element#preview_text method.
@@ -36,6 +47,24 @@ module Alchemy
       def preview_text(max_length = 30)
         picture&.name.to_s[0..max_length - 1]
       end
+
+      # The picture view component with mapped options.
+      #
+      # @param options [Hash] - Passed to the view component
+      # @param html_options [Hash] - Passed to the view component
+      #
+      # @return Alchemy::Ingredients::PictureView
+      def as_view_component(options: {}, html_options: {})
+        PictureView.new(
+          self,
+          show_caption: options.delete(:show_caption),
+          disable_link: options.delete(:disable_link),
+          srcset: options.delete(:srcset),
+          sizes: options.delete(:sizes),
+          picture_options: options,
+          html_options: html_options
+        )
+      end
     end
   end
 end

data/app/models/alchemy/ingredients/richtext.rb

@@ -9,6 +9,12 @@ module Alchemy
         :stripped_body,
         :sanitized_body
 
+      allow_settings %i[
+        plain_text
+        sanitizer
+        tinymce
+      ]
+
       before_save :strip_content
       before_save :sanitize_content
 
@@ -22,15 +28,23 @@ module Alchemy
         stripped_body.to_s[0..max_length - 1]
       end
 
-      # Returns css class names for the editor textarea.
-      def tinymce_class_name
-        "has_tinymce#{has_custom_tinymce_config? ? " #{element.name}_#{role}" : ""}"
+      def element_id
+        "tinymce_#{id}"
       end
 
       def has_tinymce?
         true
       end
 
+      # Returns true if there is a tinymce setting defined that contains settings.
+      def has_custom_tinymce_config?
+        custom_tinymce_config.is_a?(Hash)
+      end
+
+      def custom_tinymce_config
+        settings[:tinymce]
+      end
+
       private
 
       def strip_content
@@ -47,11 +61,6 @@ module Alchemy
       def sanitizer_settings
         settings[:sanitizer] || {}
       end
-
-      # Returns true if there is a tinymce setting defined that contains settings.
-      def has_custom_tinymce_config?
-        settings[:tinymce].is_a?(Hash)
-      end
     end
   end
 end

data/app/models/alchemy/ingredients/select.rb

@@ -5,6 +5,7 @@ module Alchemy
     # A text value from a select box
     #
     class Select < Alchemy::Ingredient
+      allow_settings %i[display_inline select_values]
     end
   end
 end

data/app/models/alchemy/ingredients/text.rb

@@ -15,6 +15,14 @@ module Alchemy
         :link_target,
         :link_title,
         :link_class_name
+
+      allow_settings %i[
+        anchor
+        disable_link
+        display_inline
+        input_type
+        linkable
+      ]
     end
   end
 end

data/app/models/alchemy/ingredients/video.rb

@@ -16,6 +16,8 @@ module Alchemy
         :preload,
         :width
 
+      allow_settings %i[except only]
+
       related_object_alias :attachment, class_name: "Alchemy::Attachment"
 
       delegate :name, to: :attachment, allow_nil: true

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

@@ -17,7 +17,7 @@ module Alchemy::Language::Code
       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

@@ -38,11 +38,11 @@ module Alchemy
 
     validates :language_code,
       presence: true,
-      uniqueness: { scope: [:site_id, :country_code], case_sensitive: false },
-      format: { with: /\A[a-z]{2}\z/, if: -> { language_code.present? } }
+      uniqueness: {scope: [:site_id, :country_code], case_sensitive: false},
+      format: {with: /\A[a-z]{2}\z/, if: -> { language_code.present? }}
 
     validates :country_code,
-      format: { with: /\A[a-zA-Z]{2}\z/, if: -> { country_code.present? } }
+      format: {with: /\A[a-zA-Z]{2}\z/, if: -> { country_code.present? }}
 
     validate :presence_of_default_language
     validate :publicity_of_default_language
@@ -60,7 +60,7 @@ module Alchemy
     end
 
     scope :published, -> { where(public: true) }
-    scope :with_root_page, -> { joins(:pages).where(Page.table_name => { language_root: true }) }
+    scope :with_root_page, -> { joins(:pages).where(Page.table_name => {language_root: true}) }
 
     class << self
       def on_site(site)

data/app/models/alchemy/legacy_page_url.rb

@@ -18,5 +18,5 @@ class Alchemy::LegacyPageUrl < ActiveRecord::Base
 
   validates :urlname,
     presence: true,
-    format: {with: /\A[:\.\w\-+_\/\?&%;=#]*\z/}
+    format: {with: /\A[:.\w\-+_\/?&%;=#]*\z/}
 end

data/app/models/alchemy/node.rb

@@ -2,9 +2,9 @@
 
 module Alchemy
   class Node < BaseRecord
-    VALID_URL_REGEX = /\A(\/|\D[a-z\+\d\.\-]+:)/
+    VALID_URL_REGEX = /\A(\/|\D[a-z+\d.-]+:)/
 
-    before_destroy :check_if_related_essence_nodes_present
+    before_destroy :check_if_related_node_ingredients_present
 
     acts_as_nested_set scope: "language_id", touch: true
     stampable stamper_class_name: Alchemy.user_class.name
@@ -14,14 +14,17 @@ module Alchemy
 
     has_one :site, through: :language
 
-    has_many :essence_nodes, class_name: "Alchemy::EssenceNode", foreign_key: :node_id, inverse_of: :ingredient_association
+    has_many :node_ingredients,
+      class_name: "Alchemy::Ingredients::Node",
+      foreign_key: :related_object_id,
+      inverse_of: :related_object
 
     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? }
+    validates :url, format: {with: VALID_URL_REGEX}, unless: -> { url.nil? }
 
     # Returns the name
     #
@@ -76,10 +79,10 @@ module Alchemy
 
     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)
+    def check_if_related_node_ingredients_present
+      dependent_node_ingredients = self_and_descendants.flat_map(&:node_ingredients)
+      if dependent_node_ingredients.any?
+        errors.add(:base, :node_ingredients_present, page_names: dependent_node_ingredients.map { |i| i.element&.page&.name }.to_sentence)
         throw(:abort)
       end
     end

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

@@ -12,14 +12,14 @@ module Alchemy
           class_name: "Alchemy::Element",
           through: :public_version,
           inverse_of: :page,
-          source: :elements,
+          source: :elements
         ) do
           has_many :all_elements
           has_many :elements, -> { not_nested.unfixed.published }
           has_many :fixed_elements, -> { fixed.published }
         end
 
-        has_many :contents, through: :elements
+        has_many :ingredients, through: :elements
         has_and_belongs_to_many :to_be_swept_elements, -> { distinct },
           class_name: "Alchemy::Element",
           join_table: ElementToPage.table_name
@@ -42,7 +42,7 @@ module Alchemy
               repository.not_nested.each.with_index(1) do |element, position|
                 Alchemy::DuplicateElement.new(element, repository: repository).call(
                   page_version_id: target.draft_version.id,
-                  position: position,
+                  position: position
                 )
               end
             end
@@ -58,25 +58,25 @@ module Alchemy
       #
       #   - name: headline
       #     unique: true
-      #     contents:
+      #     ingredients:
       #     - name: headline
-      #       type: EssenceText
+      #       type: Text
       #
       # == Example of limited element:
       #
       #   - name: article
       #     amount: 2
-      #     contents:
+      #     ingredients:
       #     - name: text
-      #       type: EssenceRichtext
+      #       type: Richtext
       #
       def available_element_definitions(only_element_named = nil)
         @_element_definitions ||= if only_element_named
-            definition = Element.definition_by_name(only_element_named)
-            element_definitions_by_name(definition["nestable_elements"])
-          else
-            element_definitions
-          end
+          definition = Element.definition_by_name(only_element_named)
+          element_definitions_by_name(definition["nestable_elements"])
+        else
+          element_definitions
+        end
 
         return [] if @_element_definitions.blank?
 
@@ -98,13 +98,13 @@ module Alchemy
       #
       def available_elements_within_current_scope(parent)
         @_available_elements = if parent
-            parents_unique_nested_elements = parent.nested_elements.where(unique: true).pluck(:name)
-            available_element_definitions(parent.name).reject do |e|
-              parents_unique_nested_elements.include? e["name"]
-            end
-          else
-            available_element_definitions
+          parents_unique_nested_elements = parent.nested_elements.where(unique: true).pluck(:name)
+          available_element_definitions(parent.name).reject do |e|
+            parents_unique_nested_elements.include? e["name"]
           end
+        else
+          available_element_definitions
+        end
       end
 
       # All element definitions defined for page's page layout
@@ -156,32 +156,11 @@ module Alchemy
         end
       end
 
-      # Returns all elements that should be feeded via rss.
-      #
-      # Define feedable elements in your +page_layouts.yml+:
-      #
-      #   - name: news
-      #     feed: true
-      #     feed_elements: [element_name, element_2_name]
-      #
-      def feed_elements
-        elements.named(definition["feed_elements"])
-      end
-
-      # Returns an array of all EssenceRichtext contents ids from not folded elements
-      #
-      def richtext_contents_ids
-        Alchemy::Content.joins(:element)
-          .where(Element.table_name => { page_version_id: draft_version.id, folded: false })
-          .select(&:has_tinymce?)
-          .collect(&:id)
-      end
-
       # Returns an array of all Richtext ingredients ids from not folded elements
       #
       def richtext_ingredients_ids
         Alchemy::Ingredient.richtexts.joins(:element)
-          .where(Element.table_name => { page_version_id: draft_version.id, folded: false })
+          .where(Element.table_name => {page_version_id: draft_version.id, folded: false})
           .select(&:has_tinymce?)
           .collect(&:id)
       end

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

@@ -23,20 +23,6 @@ module Alchemy
           mapped_layouts_for_select(selectable_layouts(language_id, layoutpages: layoutpages))
         end
 
-        # Returns page layouts including given layout ready for Rails' select form helper.
-        #
-        def layouts_with_own_for_select(page_layout_name, language_id, layoutpages: false)
-          layouts = selectable_layouts(language_id, layoutpages: layoutpages)
-          if layouts.detect { |l| l["name"] == page_layout_name }.nil?
-            @map_array = [[human_layout_name(page_layout_name), page_layout_name]]
-          else
-            @map_array = []
-          end
-          mapped_layouts_for_select(layouts)
-        end
-
-        deprecate :layouts_with_own_for_select, deprecator: Alchemy::Deprecation
-
         # Returns all layouts that can be used for creating a new page.
         #
         # It removes all layouts from available layouts that are unique and already taken and that are marked as hide.

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

@@ -5,7 +5,7 @@ module Alchemy
     module PageNaming
       extend ActiveSupport::Concern
       include NameConversions
-      RESERVED_URLNAMES = %w(admin messages new)
+      RESERVED_URLNAMES = %w[admin messages new]
 
       included do
         before_validation :set_urlname,
@@ -15,9 +15,9 @@ module Alchemy
         validates :name,
           presence: true
         validates :urlname,
-          uniqueness: { scope: [:language_id, :layoutpage], if: -> { urlname.present? }, case_sensitive: false },
-          exclusion: { in: RESERVED_URLNAMES },
-          length: { minimum: 3, if: -> { urlname.present? } }
+          uniqueness: {scope: [:language_id, :layoutpage], if: -> { urlname.present? }, case_sensitive: false},
+          exclusion: {in: RESERVED_URLNAMES},
+          length: {minimum: 3, if: -> { urlname.present? }}
 
         before_save :set_title,
           if: -> { title.blank? }

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

@@ -17,12 +17,6 @@ module Alchemy
         public_until ? public_until - Time.current : nil
       end
 
-      def taggable?
-        definition["taggable"] == true
-      end
-
-      deprecate :taggable?, deprecator: Alchemy::Deprecation
-
       def rootpage?
         !new_record? && parent_id.blank?
       end
@@ -33,10 +27,6 @@ module Alchemy
         folded_pages.where(user_id: user_id, folded: true).any?
       end
 
-      def contains_feed?
-        definition["feed"]
-      end
-
       # Returns an Array of Alchemy roles which are able to edit this template
       #
       #     # config/alchemy/page_layouts.yml
@@ -68,7 +58,7 @@ module Alchemy
         {
           public: public?,
           locked: locked?,
-          restricted: restricted?,
+          restricted: restricted?
         }
       end
 

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

@@ -49,9 +49,9 @@ module Alchemy
         #
         scope :published,
           -> {
-            joins(:language, :versions).
-              merge(Language.published).
-              merge(PageVersion.public_on(Time.current))
+            joins(:language, :versions)
+              .merge(Language.published)
+              .merge(PageVersion.public_on(Time.current))
           }
 
         # All pages that are a published language root
@@ -59,7 +59,7 @@ module Alchemy
         scope :public_language_roots,
           -> {
             published.language_roots.where(
-              language_code: Language.published.pluck(:language_code),
+              language_code: Language.published.pluck(:language_code)
             )
           }
 
@@ -98,7 +98,7 @@ module Alchemy
         #
         scope :from_current_site,
           -> {
-            where(Language.table_name => { site_id: Site.current || Site.default }).joins(:language)
+            where(Language.table_name => {site_id: Site.current || Site.default}).joins(:language)
           }
 
         # All pages for xml sitemap

data/app/models/alchemy/page.rb

@@ -53,10 +53,10 @@ module Alchemy
       public_on: nil,
       public_until: nil,
       locked_at: nil,
-      locked_by: nil,
+      locked_by: nil
     }
 
-    SKIPPED_ATTRIBUTES_ON_COPY = %w(
+    SKIPPED_ATTRIBUTES_ON_COPY = %w[
       id
       updated_at
       created_at
@@ -67,7 +67,7 @@ module Alchemy
       depth
       urlname
       cached_tag_list
-    )
+    ]
 
     PERMITTED_ATTRIBUTES = [
       :meta_description,
@@ -85,7 +85,7 @@ module Alchemy
       :title,
       :urlname,
       :layoutpage,
-      :menu_id,
+      :menu_id
     ]
 
     acts_as_nested_set(dependent: :destroy, scope: [:layoutpage, :language_id])
@@ -163,14 +163,6 @@ module Alchemy
     # site_name accessor
     delegate :name, to: :site, prefix: true, allow_nil: true
 
-    # Old public_on and public_until attributes for historical reasons
-    #
-    # These attributes now exist on the page versions
-    #
-    attr_readonly :legacy_public_on, :legacy_public_until
-    deprecate :legacy_public_on, deprecator: Alchemy::Deprecation
-    deprecate :legacy_public_until, deprecator: Alchemy::Deprecation
-
     # Class methods
     #
     class << self
@@ -193,12 +185,12 @@ module Alchemy
         [
           {
             name: :by_page_layout,
-            values: PageLayout.all.map { |p| [Alchemy.t(p["name"], scope: "page_layout_names"), p["name"]] },
+            values: PageLayout.all.map { |p| [Alchemy.t(p["name"], scope: "page_layout_names"), p["name"]] }
           },
           {
             name: :status,
-            values: %w[published not_public restricted],
-          },
+            values: %w[published not_public restricted]
+          }
         ]
       end
 
@@ -256,7 +248,7 @@ module Alchemy
           parent: new_parent,
           language: new_parent&.language,
           name: new_name,
-          title: new_name,
+          title: new_name
         })
         if source.children.any?
           source.copy_children_to(page)
@@ -284,7 +276,7 @@ module Alchemy
         link_target_options = Config.get(:link_target_options)
         link_target_options.each do |option|
           options << [Alchemy.t(option, scope: "link_target_options",
-                                        default: option.to_s.humanize), option]
+            default: option.to_s.humanize), option]
         end
         options
       end
@@ -458,7 +450,7 @@ module Alchemy
         new_child = Page.copy(child, {
           parent_id: new_parent.id,
           language_id: new_parent.language_id,
-          language_code: new_parent.language_code,
+          language_code: new_parent.language_code
         })
         new_child.move_to_child_of(new_parent)
         child.copy_children_to(new_child) unless child.children.blank?
@@ -499,7 +491,7 @@ module Alchemy
     #   A tree node with new lft, rgt, depth, url, parent_id and restricted indexes to be updated
     #
     def update_node!(node)
-      hash = { lft: node.left, rgt: node.right, parent_id: node.parent, depth: node.depth, restricted: node.restricted }
+      hash = {lft: node.left, rgt: node.right, parent_id: node.parent, depth: node.depth, restricted: node.restricted}
 
       if urlname != node.url
         LegacyPageUrl.create(page_id: id, urlname: urlname)

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

@@ -32,7 +32,7 @@ module Alchemy
 
         {
           width: width,
-          height: height,
+          height: height
         }
       end
 
@@ -41,7 +41,7 @@ module Alchemy
       def image_size
         {
           width: image_file_width,
-          height: image_file_height,
+          height: image_file_height
         }
       end
     end

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

@@ -33,36 +33,6 @@ module Alchemy
       image_file.thumbnail(upsample ? size : "#{size}>")
     end
 
-    # Returns true if picture's width is greater than it's height
-    #
-    def landscape_format?
-      image_file.landscape?
-    end
-
-    alias_method :landscape?, :landscape_format?
-    deprecate landscape_format?: "Use image_file.landscape? instead", deprecator: Alchemy::Deprecation
-    deprecate landscape?: "Use image_file.landscape? instead", deprecator: Alchemy::Deprecation
-
-    # Returns true if picture's width is smaller than it's height
-    #
-    def portrait_format?
-      image_file.portrait?
-    end
-
-    alias_method :portrait?, :portrait_format?
-    deprecate portrait_format?: "Use image_file.portrait? instead", deprecator: Alchemy::Deprecation
-    deprecate portrait?: "Use image_file.portrait? instead", deprecator: Alchemy::Deprecation
-
-    # Returns true if picture's width and height is equal
-    #
-    def square_format?
-      image_file.aspect_ratio == 1.0
-    end
-
-    alias_method :square?, :square_format?
-    deprecate square_format?: "Use image_file.aspect_ratio instead", deprecator: Alchemy::Deprecation
-    deprecate square?: "Use image_file.aspect_ratio instead", deprecator: Alchemy::Deprecation
-
     # Returns true if the class we're included in has a meaningful render_size attribute
     #
     def render_size?
@@ -89,7 +59,7 @@ module Alchemy
       y = 0 if y.nil?
       {
         x: x,
-        y: y,
+        y: y
       }
     end
 
@@ -138,7 +108,7 @@ module Alchemy
     def reduce_to_image(dimensions)
       {
         width: [dimensions[:width].to_i, image_file_width.to_i].min,
-        height: [dimensions[:height].to_i, image_file_height.to_i].min,
+        height: [dimensions[:height].to_i, image_file_height.to_i].min
       }
     end
   end

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

@@ -36,7 +36,7 @@ module Alchemy
         else
           uid = PictureThumb::Uid.call(signature, variant)
           ActiveRecord::Base.connected_to(role: ActiveRecord::Base.writing_role) do
-            PictureThumb.generator_class.call(variant, signature, uid)
+            PictureThumb::Create.call(variant, signature, uid)
           end
           uid
         end
@@ -44,10 +44,10 @@ module Alchemy
 
       def find_thumb_by(signature)
         @thumb = if variant.picture.thumbs.loaded?
-            variant.picture.thumbs.find { |t| t.signature == signature }
-          else
-            variant.picture.thumbs.find_by(signature: signature)
-          end
+          variant.picture.thumbs.find { |t| t.signature == signature }
+        else
+          variant.picture.thumbs.find_by(signature: signature)
+        end
       end
     end
   end