alchemy_cms 7.0.0.pre.a → 7.0.0.pre.b

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

@@ -159,9 +159,9 @@ module Alchemy
               scope: "ingredient_validations",
               default: [
                 "fields.#{role}.#{error}".to_sym,
-                "errors.#{error}".to_sym,
+                "errors.#{error}".to_sym
               ],
-              field: Alchemy::Ingredient.translated_label_for(role, name),
+              field: Alchemy::Ingredient.translated_label_for(role, name)
             )
           end
         end
@@ -175,7 +175,7 @@ module Alchemy
         ingredient_definitions.each do |attributes|
           ingredients.build(
             role: attributes[:role],
-            type: Alchemy::Ingredient.normalize_type(attributes[:type]),
+            type: Alchemy::Ingredient.normalize_type(attributes[:type])
           )
         end
       end

data/app/models/alchemy/element.rb

@@ -41,7 +41,7 @@ module Alchemy
       "taggable",
       "compact",
       "message",
-      "deprecated",
+      "deprecated"
     ].freeze
 
     # All Elements that share the same page version and parent element and are fixed or not are considered a list.
@@ -100,7 +100,7 @@ module Alchemy
     scope :excluded, ->(names) { where.not(name: names) }
     scope :fixed, -> { where(fixed: true) }
     scope :unfixed, -> { where(fixed: false) }
-    scope :from_current_site, -> { where(Language.table_name => { 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") }
     scope :folded, -> { where(folded: true) }
     scope :expanded, -> { where(folded: false) }
     scope :not_nested, -> { where(parent_element_id: nil) }

data/app/models/alchemy/elements_repository.rb

@@ -102,7 +102,7 @@ module Alchemy
     # Elements off setted by
     # @return [Alchemy::ElementRepository]
     def offset(offset)
-      self.class.new elements[offset.to_i..-1]
+      self.class.new elements[offset.to_i..]
     end
 
     # Elements limitted by

data/app/models/alchemy/image_cropper_settings.rb

@@ -21,7 +21,7 @@ module Alchemy
         min_size: large_enough? ? min_size : false,
         ratio: ratio,
         default_box: default_box,
-        image_size: [image_width, image_height],
+        image_size: [image_width, image_height]
       }.freeze
     end
 
@@ -80,7 +80,7 @@ module Alchemy
         default_crop_from[0],
         default_crop_from[1],
         default_crop_from[0] + default_crop_size[0],
-        default_crop_from[1] + default_crop_size[1],
+        default_crop_from[1] + default_crop_size[1]
       ]
     end
   end

data/app/models/alchemy/ingredient.rb

@@ -19,7 +19,7 @@ module Alchemy
       if: -> { definition.key?(:default) && value.nil? }
 
     validates :type, presence: true
-    validates :role, presence: true, uniqueness: { scope: :element_id, case_sensitive: false }
+    validates :role, presence: true, uniqueness: {scope: :element_id, case_sensitive: false}
 
     validates_with Alchemy::IngredientValidator, on: :update, if: :has_validations?
 
@@ -75,7 +75,7 @@ module Alchemy
         Alchemy.t(
           role,
           scope: "ingredient_roles.#{element_name}",
-          default: Alchemy.t("ingredient_roles.#{role}", default: role.humanize),
+          default: Alchemy.t("ingredient_roles.#{role}", default: role.humanize)
         )
       end
 
@@ -100,16 +100,6 @@ module Alchemy
       definition[:settings] || {}
     end
 
-    # Fetches value from settings
-    #
-    # @param key [Symbol]               - The hash key you want to fetch the value from
-    # @param options [Hash]             - An optional Hash that can override the settings.
-    #                                     Normally passed as options hash into the ingredient
-    #                                     editor view.
-    def settings_value(key, options = {})
-      settings.merge(options || {})[key.to_sym]
-    end
-
     # Definition hash for this ingredient from +elements.yml+ file.
     #
     def definition
@@ -165,8 +155,20 @@ module Alchemy
       !!definition[:as_element_title]
     end
 
+    # The view component of the ingredient with mapped options.
+    #
+    # @param options [Hash] - Passed to the view component as keyword arguments
+    # @param html_options [Hash] - Passed to the view component
+    def as_view_component(options: {}, html_options: {})
+      view_component_class.new(self, **options, html_options: html_options)
+    end
+
     private
 
+    def view_component_class
+      @_view_component_class ||= "#{self.class.name}View".constantize
+    end
+
     def hint_translation_attribute
       role
     end

data/app/models/alchemy/ingredient_validator.rb

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

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

@@ -15,7 +15,7 @@ module Alchemy
       def preview_text(_maxlength = nil)
         return "" unless value
 
-        ::I18n.l(value, format: :'alchemy.ingredient_date')
+        ::I18n.l(value, format: :"alchemy.ingredient_date")
       end
     end
   end

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

@@ -13,11 +13,11 @@ module Alchemy
         :title
 
       allow_settings %i[
-          css_classes
-          except
-          link_text
-          only
-        ]
+        css_classes
+        except
+        link_text
+        only
+      ]
 
       related_object_alias :attachment, class_name: "Alchemy::Attachment"
 

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

@@ -13,10 +13,10 @@ module Alchemy
         :size
 
       allow_settings %i[
-          anchor
-          levels
-          sizes
-        ]
+        anchor
+        levels
+        sizes
+      ]
 
       before_create :set_level_and_size
 

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

@@ -28,15 +28,15 @@ module Alchemy
       related_object_alias :picture, class_name: "Alchemy::Picture"
 
       allow_settings %i[
-          crop
-          css_classes
-          fixed_ratio
-          linkable
-          size
-          sizes
-          srcset
-          upsample
-        ]
+        crop
+        css_classes
+        fixed_ratio
+        linkable
+        size
+        sizes
+        srcset
+        upsample
+      ]
 
       # The first 30 characters of the pictures name
       #
@@ -47,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

@@ -10,10 +10,10 @@ module Alchemy
         :sanitized_body
 
       allow_settings %i[
-          plain_text
-          sanitizer
-          tinymce
-        ]
+        plain_text
+        sanitizer
+        tinymce
+      ]
 
       before_save :strip_content
       before_save :sanitize_content
@@ -28,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
@@ -53,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/text.rb

@@ -17,12 +17,12 @@ module Alchemy
         :link_class_name
 
       allow_settings %i[
-          anchor
-          disable_link
-          display_inline
-          input_type
-          linkable
-        ]
+        anchor
+        disable_link
+        display_inline
+        input_type
+        linkable
+      ]
     end
   end
 end

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,7 +2,7 @@
 
 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_node_ingredients_present
 
@@ -24,7 +24,7 @@ module Alchemy
 
     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
     #

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

@@ -12,7 +12,7 @@ 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 }
@@ -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
@@ -72,11 +72,11 @@ module Alchemy
       #
       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
@@ -160,7 +160,7 @@ module Alchemy
       #
       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_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

@@ -58,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])
@@ -185,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
 
@@ -248,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)
@@ -276,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
@@ -450,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?
@@ -491,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

@@ -59,7 +59,7 @@ module Alchemy
       y = 0 if y.nil?
       {
         x: x,
-        y: y,
+        y: y
       }
     end
 
@@ -108,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

@@ -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