alchemy_cms 4.6.0 → 5.0.0.rc2

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

@@ -19,7 +19,7 @@ module Alchemy
       # Returns one element definition by given name.
       #
       def definition_by_name(name)
-        definitions.detect { |d| d['name'] == name }
+        definitions.detect { |d| d["name"] == name }
       end
 
       private
@@ -30,21 +30,21 @@ module Alchemy
         if ::File.exist?(definitions_file_path)
           ::YAML.safe_load(ERB.new(File.read(definitions_file_path)).result, YAML_WHITELIST_CLASSES, [], true) || []
         else
-          raise LoadError, "Could not find elements.yml file! Please run `rails generate alchemy:scaffold`"
+          raise LoadError, "Could not find elements.yml file! Please run `rails generate alchemy:install`"
         end
       end
 
       # Returns the +elements.yml+ file path
       #
       def definitions_file_path
-        Rails.root.join 'config/alchemy/elements.yml'
+        Rails.root.join "config/alchemy/elements.yml"
       end
     end
 
     # The definition of this element.
     #
     def definition
-      if definition = self.class.definitions.detect { |d| d['name'] == name }
+      if definition = self.class.definitions.detect { |d| d["name"] == name }
         definition
       else
         log_warning "Could not find element definition for #{name}. Please check your elements.yml file!"

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

@@ -47,6 +47,7 @@ module Alchemy
     #
     def update_contents(contents_attributes)
       return true if contents_attributes.nil?
+
       contents.each do |content|
         content_hash = contents_attributes[content.id.to_s] || next
         content.update_essence(content_hash) || errors.add(:base, :essence_validation_failed)
@@ -72,7 +73,7 @@ module Alchemy
     #       rss_title: true
     #
     def content_for_rss_title
-      content_for_rss_meta('title')
+      content_for_rss_meta("title")
     end
 
     # Returns the content that is marked as rss description.
@@ -86,13 +87,14 @@ module Alchemy
     #       rss_description: true
     #
     def content_for_rss_description
-      content_for_rss_meta('description')
+      content_for_rss_meta("description")
     end
 
     # Returns the array with the hashes for all element contents in the elements.yml file
     def content_definitions
       return nil if definition.blank?
-      definition['contents']
+
+      definition["contents"]
     end
 
     # Returns the definition for given content_name
@@ -101,7 +103,7 @@ module Alchemy
         log_warning "Element #{name} is missing the content definition for #{content_name}"
         nil
       else
-        content_definitions.detect { |d| d['name'] == content_name.to_s }
+        content_definitions.detect { |d| d["name"] == content_name.to_s }
       end
     end
 
@@ -136,12 +138,13 @@ module Alchemy
     def content_for_rss_meta(type)
       definition = content_definitions.detect { |c| c["rss_#{type}"] }
       return if definition.blank?
-      contents.detect { |content| content.name == definition['name'] }
+
+      contents.detect { |content| content.name == definition["name"] }
     end
 
     # creates the contents for this element as described in the elements.yml
     def create_contents
-      definition.fetch('contents', []).each do |attributes|
+      definition.fetch("contents", []).each do |attributes|
         Content.create(attributes.merge(element: self))
       end
     end

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

@@ -6,6 +6,7 @@ module Alchemy
     def ingredient(name)
       content = content_by_name(name)
       return nil if content.blank?
+
       content.ingredient
     end
 
@@ -96,12 +97,12 @@ module Alchemy
         errors.each do |error|
           messages << Alchemy.t(
             "#{name}.#{content_name}.#{error}",
-            scope: 'content_validations',
+            scope: "content_validations",
             default: [
               "fields.#{content_name}.#{error}".to_sym,
-              "errors.#{error}".to_sym
+              "errors.#{error}".to_sym,
             ],
-            field: Content.translated_label_for(content_name, name)
+            field: Content.translated_label_for(content_name, name),
           )
         end
       end

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

@@ -23,7 +23,7 @@ module Alchemy
       # If no translation is found a humanized name is used.
       #
       def display_name_for(name)
-        Alchemy.t(name, scope: 'element_names', default: name.to_s.humanize)
+        Alchemy.t(name, scope: "element_names", default: name.to_s.humanize)
       end
     end
 
@@ -32,7 +32,7 @@ module Alchemy
     # @see Alchemy::Element::Presenters#display_name_for
     #
     def display_name
-      self.class.display_name_for(definition['name'] || name)
+      self.class.display_name_for(definition["name"] || name)
     end
 
     # Returns a preview text for element.
@@ -97,6 +97,7 @@ module Alchemy
 
     def preview_text_from_nested_elements(maxlength)
       return if all_nested_elements.empty?
+
       all_nested_elements.first.preview_text(maxlength)
     end
 

data/app/models/alchemy/element_to_page.rb

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

data/app/models/alchemy/essence_boolean.rb

@@ -8,14 +8,12 @@
 #  value      :boolean
 #  created_at :datetime         not null
 #  updated_at :datetime         not null
-#  creator_id :integer
-#  updater_id :integer
 #
 
 # Stores boolean values.
 # Provides a checkbox in the editor views.
 module Alchemy
   class EssenceBoolean < BaseRecord
-    acts_as_essence ingredient_column: 'value'
+    acts_as_essence ingredient_column: "value"
   end
 end

data/app/models/alchemy/essence_date.rb

@@ -6,19 +6,18 @@
 #
 #  id         :integer          not null, primary key
 #  date       :datetime
-#  creator_id :integer
-#  updater_id :integer
 #  created_at :datetime         not null
 #  updated_at :datetime         not null
 #
 
 module Alchemy
   class EssenceDate < BaseRecord
-    acts_as_essence ingredient_column: 'date'
+    acts_as_essence ingredient_column: "date"
 
     # Returns self.date for the Element#preview_text method.
     def preview_text(_maxlength = nil)
       return "" if date.blank?
+
       ::I18n.l(date, format: :'alchemy.essence_date')
     end
   end

data/app/models/alchemy/essence_file.rb

@@ -8,8 +8,6 @@
 #  attachment_id :integer
 #  title         :string
 #  css_class     :string
-#  creator_id    :integer
-#  updater_id    :integer
 #  created_at    :datetime         not null
 #  updated_at    :datetime         not null
 #  link_text     :string
@@ -18,19 +16,21 @@
 module Alchemy
   class EssenceFile < BaseRecord
     belongs_to :attachment, optional: true
-    acts_as_essence ingredient_column: 'attachment'
+    acts_as_essence ingredient_column: "attachment"
 
     def attachment_url
       return if attachment.nil?
+
       routes.download_attachment_path(
         id: attachment.id,
         name: attachment.urlname,
-        format: attachment.suffix
+        format: attachment.suffix,
       )
     end
 
     def preview_text(max = 30)
       return "" if attachment.blank?
+
       attachment.name.to_s[0..max - 1]
     end
 

data/app/models/alchemy/essence_html.rb

@@ -6,15 +6,13 @@
 #
 #  id         :integer          not null, primary key
 #  source     :text
-#  creator_id :integer
-#  updater_id :integer
 #  created_at :datetime         not null
 #  updated_at :datetime         not null
 #
 
 module Alchemy
   class EssenceHtml < BaseRecord
-    acts_as_essence ingredient_column: 'source'
+    acts_as_essence ingredient_column: "source"
 
     # Returns the first x (default = 30) (HTML escaped) characters from self.source for the Element#preview_text method.
     def preview_text(maxlength = 30)

data/app/models/alchemy/essence_link.rb

@@ -11,12 +11,10 @@
 #  link_class_name :string
 #  created_at      :datetime         not null
 #  updated_at      :datetime         not null
-#  creator_id      :integer
-#  updater_id      :integer
 #
 
 module Alchemy
   class EssenceLink < BaseRecord
-    acts_as_essence ingredient_column: 'link'
+    acts_as_essence ingredient_column: "link"
   end
 end

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