alchemy_cms 5.2.1 → 6.0.0.pre.b4

data/app/helpers/alchemy/pages_helper.rb

@@ -66,8 +66,8 @@ module Alchemy
     #
     # renders +app/views/alchemy/site_layouts/_default_site.html.erb+ for the site named "Default Site".
     #
-    def render_site_layout
-      render current_alchemy_site
+    def render_site_layout(&block)
+      render current_alchemy_site, &block
     rescue ActionView::MissingTemplate
       warning("Site layout for #{current_alchemy_site.try(:name)} not found. Please run `rails g alchemy:site_layouts`")
       ""
@@ -98,14 +98,6 @@ module Alchemy
       WARN
     end
 
-    # Returns true if page is in the active branch
-    def page_active?(page)
-      Alchemy::Deprecation.warn("page_active? helper is deprecated and will be removed from Alchemy 6.0")
-
-      @_page_ancestors ||= @page.self_and_ancestors.contentpages
-      @_page_ancestors.include?(page)
-    end
-
     # Returns page links in a breadcrumb beginning from root to current page.
     #
     # === Options:
@@ -127,7 +119,7 @@ module Alchemy
 
       pages = options[:page].
         self_and_ancestors.contentpages.
-        accessible_by(current_ability, :see)
+        published
 
       if options.delete(:restricted_only)
         pages = pages.restricted

data/app/jobs/alchemy/base_job.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Alchemy
+  class BaseJob < ActiveJob::Base
+    # Automatically retry jobs that encountered a deadlock
+    # retry_on ActiveRecord::Deadlocked
+
+    # Most jobs are safe to ignore if the underlying records are no longer available
+    # discard_on ActiveJob::DeserializationError
+  end
+end

data/app/jobs/alchemy/publish_page_job.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Alchemy
+  class PublishPageJob < BaseJob
+    queue_as :default
+
+    def perform(page, public_on:)
+      Alchemy::Page::Publisher.new(page).publish!(public_on: public_on)
+    end
+  end
+end

data/app/models/alchemy/attachment.rb

@@ -35,6 +35,10 @@ module Alchemy
     has_many :elements, through: :contents
     has_many :pages, through: :elements
 
+    scope :by_file_type, ->(file_type) { where(file_mime_type: file_type) }
+    scope :recent, -> { where("#{table_name}.created_at > ?", Time.current - 24.hours).order(:created_at) }
+    scope :without_tag, -> { left_outer_joins(:taggings).where(gutentag_taggings: { id: nil }) }
+
     # We need to define this method here to have it available in the validations below.
     class << self
       # The class used to generate URLs for attachments
@@ -51,6 +55,26 @@ module Alchemy
         @_url_class = klass
       end
 
+      def alchemy_resource_filters
+        [
+          {
+            name: :by_file_type,
+            values: distinct.pluck(:file_mime_type).map { |type| [Alchemy.t(type, scope: "mime_types"), type] }.sort_by(&:first),
+          },
+          {
+            name: :misc,
+            values: %w(recent last_upload without_tag),
+          },
+        ]
+      end
+
+      def last_upload
+        last_id = Attachment.maximum(:id)
+        return Attachment.all unless last_id
+
+        where(id: last_id)
+      end
+
       def searchable_alchemy_resource_attributes
         %w(name file_name)
       end
@@ -58,13 +82,6 @@ module Alchemy
       def allowed_filetypes
         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]
-        end
-        file_types.sort_by(&:first)
-      end
     end
 
     validates_presence_of :file

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

@@ -7,7 +7,7 @@ module Alchemy
     extend ActiveSupport::Concern
 
     module ClassMethods
-      SKIPPED_ATTRIBUTES_ON_COPY = %w(position created_at updated_at creator_id updater_id id)
+      SKIPPED_ATTRIBUTES_ON_COPY = %w(position created_at updated_at creator_id updater_id element_id id)
 
       # Builds a new content as descriped in the elements.yml file.
       #
@@ -19,14 +19,14 @@ module Alchemy
         return super if attributes.empty? || element.nil?
 
         definition = element.content_definition_for(attributes[:name])
-        if definition.blank?
+        if definition.blank? && attributes[:essence_type].nil?
           raise ContentDefinitionError, "No definition found in elements.yml for #{attributes.inspect} and #{element.inspect}"
         end
 
         super(
-          name: definition[:name],
-          essence_type: normalize_essence_type(definition[:type]),
-          element_id: element.id
+          name: attributes[:name],
+          essence_type: attributes[:essence_type] || normalize_essence_type(definition[:type]),
+          element: element
         ).tap(&:build_essence)
       end
 
@@ -53,18 +53,16 @@ module Alchemy
       #   @copy.element_id # => 3
       #
       def copy(source, differences = {})
-        new_content = Content.new(
-          source.attributes.
+        Content.new(
+          source.attributes.with_indifferent_access.
             except(*SKIPPED_ATTRIBUTES_ON_COPY).
-            merge(differences.with_indifferent_access),
-        )
-        new_essence = source.essence.class.create!(
-          source.essence.attributes.
-            except(*SKIPPED_ATTRIBUTES_ON_COPY),
-        )
-        new_content.tap do |content|
-          content.essence = new_essence
-          content.save
+            merge(differences.with_indifferent_access)
+        ).tap do |new_content|
+          new_content.build_essence(
+            source.essence.attributes.
+              except(*SKIPPED_ATTRIBUTES_ON_COPY)
+          )
+          new_content.save
         end
       end
 
@@ -117,29 +115,27 @@ module Alchemy
     #
     # 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,
-      })
+    def build_essence(attributes = {})
+      self.essence = essence_class.new(
+        { content: self, ingredient: default_value }.merge(attributes)
+      )
     end
 
     # Creates essence from definition.
     #
     # If an optional type is passed, this type of essence gets created.
     #
-    def create_essence!(type = nil)
-      build_essence(type).save!
+    def create_essence!(attrs = {})
+      build_essence(attrs).save!
       save!
     end
 
     private
 
-    # Returns a class constant from definition's type field.
+    # Returns a class constant from definition's type field or the essence_type column
     #
-    # 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
+    def essence_class
+      (essence_type || Content.normalize_essence_type(definition["type"])).constantize
     end
   end
 end

data/app/models/alchemy/content.rb

@@ -39,19 +39,14 @@ module Alchemy
     scope :essence_selects, -> { where(essence_type: "Alchemy::EssenceSelect") }
     scope :essence_texts, -> { where(essence_type: "Alchemy::EssenceText") }
     scope :named, ->(name) { where(name: name) }
-    scope :available, -> { published.not_trashed }
+    scope :available, -> { published }
     scope :published, -> { joins(:element).merge(Element.published) }
-    scope :not_trashed, -> { joins(:element).merge(Element.not_trashed) }
     scope :not_restricted, -> { joins(:element).merge(Element.not_restricted) }
 
     delegate :restricted?, to: :page, allow_nil: true
-    delegate :trashed?, to: :element, allow_nil: true
-    deprecate :trashed?, deprecator: Alchemy::Deprecation
     delegate :public?, to: :element, allow_nil: true
 
     class << self
-      deprecate :not_trashed, deprecator: Alchemy::Deprecation
-
       # Returns the translated label for a content name.
       #
       # Translate it in your locale yml file:

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

@@ -1,37 +1,39 @@
 # frozen_string_literal: true
 
 module Alchemy
-  # Module concerning element definitions
-  #
-  module Element::Definitions
-    extend ActiveSupport::Concern
+  class Element < BaseRecord
+    # Module concerning element definitions
+    #
+    module Definitions
+      extend ActiveSupport::Concern
 
-    module ClassMethods
-      # Returns the definitions from elements.yml file.
-      #
-      # Place a +elements.yml+ file inside your apps +config/alchemy+ folder to define
-      # your own set of elements
-      #
-      def definitions
-        ElementDefinition.all
-      end
+      module ClassMethods
+        # Returns the definitions from elements.yml file.
+        #
+        # Place a +elements.yml+ file inside your apps +config/alchemy+ folder to define
+        # your own set of elements
+        #
+        def definitions
+          ElementDefinition.all
+        end
 
-      # Returns one element definition by given name.
-      #
-      def definition_by_name(name)
-        ElementDefinition.get(name)
+        # Returns one element definition by given name.
+        #
+        def definition_by_name(name)
+          ElementDefinition.get(name)
+        end
       end
-    end
 
-    # The definition of this element.
-    #
-    def definition
-      if definition = self.class.definition_by_name(name)
-        definition
-      else
-        log_warning "Could not find element definition for #{name}. " \
-                    "Please check your elements.yml file!"
-        {}
+      # The definition of this element.
+      #
+      def definition
+        if definition = self.class.definition_by_name(name)
+          definition
+        else
+          log_warning "Could not find element definition for #{name}. " \
+                      "Please check your elements.yml file!"
+          {}
+        end
       end
     end
   end

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

@@ -1,151 +1,160 @@
 # frozen_string_literal: true
 
-# Methods concerning contents for elements
-#
 module Alchemy
-  module Element::ElementContents
-    # Find first content from element by given name.
-    def content_by_name(name)
-      contents_by_name(name).first
-    end
+  class Element < BaseRecord
+    # Methods concerning contents for elements
+    #
+    module ElementContents
+      # Find first content from element by given name.
+      def content_by_name(name)
+        contents_by_name(name).first
+      end
 
-    # Find first content from element by given essence type.
-    def content_by_type(essence_type)
-      contents_by_type(essence_type).first
-    end
+      # Find first content from element by given essence type.
+      def content_by_type(essence_type)
+        contents_by_type(essence_type).first
+      end
 
-    # All contents from element by given name.
-    def contents_by_name(name)
-      contents.select { |content| content.name == name.to_s }
-    end
-    alias_method :all_contents_by_name, :contents_by_name
+      # All contents from element by given name.
+      def contents_by_name(name)
+        contents.select { |content| content.name == name.to_s }
+      end
+
+      alias_method :all_contents_by_name, :contents_by_name
 
-    # All contents from element by given essence type.
-    def contents_by_type(essence_type)
-      contents.select do |content|
-        content.essence_type == Content.normalize_essence_type(essence_type)
+      # All contents from element by given essence type.
+      def contents_by_type(essence_type)
+        contents.select do |content|
+          content.essence_type == Content.normalize_essence_type(essence_type)
+        end
       end
-    end
-    alias_method :all_contents_by_type, :contents_by_type
 
-    # Updates all related contents by calling +update_essence+ on each of them.
-    #
-    # @param contents_attributes [Hash]
-    #   Hash of contents attributes.
-    #   The keys has to be the #id of the content to update.
-    #   The values a Hash of attribute names and values
-    #
-    # @return [Boolean]
-    #   True if +errors+ are blank or +contents_attributes+ hash is nil
-    #
-    # == Example
-    #
-    #   @element.update_contents(
-    #     "1" => {ingredient: "Title"},
-    #     "2" => {link: "https://google.com"}
-    #   )
-    #
-    def update_contents(contents_attributes)
-      return true if contents_attributes.nil?
+      alias_method :all_contents_by_type, :contents_by_type
+
+      # Updates all related contents by calling +update_essence+ on each of them.
+      #
+      # @param contents_attributes [Hash]
+      #   Hash of contents attributes.
+      #   The keys has to be the #id of the content to update.
+      #   The values a Hash of attribute names and values
+      #
+      # @return [Boolean]
+      #   True if +errors+ are blank or +contents_attributes+ hash is nil
+      #
+      # == Example
+      #
+      #   @element.update_contents(
+      #     "1" => {ingredient: "Title"},
+      #     "2" => {link: "https://google.com"}
+      #   )
+      #
+      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)
+        end
+        errors.blank?
+      end
 
-      contents.each do |content|
-        content_hash = contents_attributes[content.id.to_s] || next
-        content.update_essence(content_hash) || errors.add(:base, :essence_validation_failed)
+      # Copy current content's contents to given target element
+      def copy_contents_to(element)
+        contents.map do |content|
+          Content.copy(content, element_id: element.id)
+        end
       end
-      errors.blank?
-    end
 
-    # Copy current content's contents to given target element
-    def copy_contents_to(element)
-      contents.map do |content|
-        Content.copy(content, element_id: element.id)
+      # Returns the content that is marked as rss title.
+      #
+      # Mark a content as rss title in your +elements.yml+ file:
+      #
+      #   - name: news
+      #     contents:
+      #     - name: headline
+      #       type: EssenceText
+      #       rss_title: true
+      #
+      def content_for_rss_title
+        content_for_rss_meta("title")
       end
-    end
 
-    # Returns the content that is marked as rss title.
-    #
-    # Mark a content as rss title in your +elements.yml+ file:
-    #
-    #   - name: news
-    #     contents:
-    #     - name: headline
-    #       type: EssenceText
-    #       rss_title: true
-    #
-    def content_for_rss_title
-      content_for_rss_meta("title")
-    end
+      # Returns the content that is marked as rss description.
+      #
+      # Mark a content as rss description in your +elements.yml+ file:
+      #
+      #   - name: news
+      #     contents:
+      #     - name: body
+      #       type: EssenceRichtext
+      #       rss_description: true
+      #
+      def content_for_rss_description
+        content_for_rss_meta("description")
+      end
 
-    # Returns the content that is marked as rss description.
-    #
-    # Mark a content as rss description in your +elements.yml+ file:
-    #
-    #   - name: news
-    #     contents:
-    #     - name: body
-    #       type: EssenceRichtext
-    #       rss_description: true
-    #
-    def content_for_rss_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?
 
-    # 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"]
+      end
 
-      definition["contents"]
-    end
+      # Returns the definition for given content_name
+      def content_definition_for(content_name)
+        if content_definitions.blank?
+          log_warning "Element #{name} is missing the content definition for #{content_name}"
+          nil
+        else
+          content_definitions.detect { |d| d["name"] == content_name.to_s }
+        end
+      end
 
-    # Returns the definition for given content_name
-    def content_definition_for(content_name)
-      if content_definitions.blank?
-        log_warning "Element #{name} is missing the content definition for #{content_name}"
-        nil
-      else
-        content_definitions.detect { |d| d["name"] == content_name.to_s }
+      # Returns an array of all EssenceRichtext contents ids from elements
+      #
+      # This is used to re-initialize the TinyMCE editor in the element editor.
+      #
+      def richtext_contents_ids
+        # This is not very efficient SQL wise I know, but we need to iterate
+        # recursivly through all descendent elements and I don't know how to do this
+        # in pure SQL. Anyone with a better idea is welcome to submit a patch.
+        ids = contents.select(&:has_tinymce?).collect(&:id)
+        expanded_nested_elements = nested_elements.expanded
+        if expanded_nested_elements.present?
+          ids += expanded_nested_elements.collect(&:richtext_contents_ids)
+        end
+        ids.flatten
       end
-    end
 
-    # Returns an array of all EssenceRichtext contents ids from elements
-    #
-    # This is used to re-initialize the TinyMCE editor in the element editor.
-    #
-    def richtext_contents_ids
-      # This is not very efficient SQL wise I know, but we need to iterate
-      # recursivly through all descendent elements and I don't know how to do this
-      # in pure SQL. Anyone with a better idea is welcome to submit a patch.
-      ids = contents.select(&:has_tinymce?).collect(&:id)
-      expanded_nested_elements = nested_elements.expanded
-      if expanded_nested_elements.present?
-        ids += expanded_nested_elements.collect(&:richtext_contents_ids)
+      # True, if any of the element's contents has essence validations defined.
+      def has_validations?
+        !contents.detect(&:has_validations?).blank?
       end
-      ids.flatten
-    end
 
-    # True, if any of the element's contents has essence validations defined.
-    def has_validations?
-      !contents.detect(&:has_validations?).blank?
-    end
+      # All element contents where the essence validation has failed.
+      def contents_with_errors
+        contents.select(&:essence_validation_failed?)
+      end
 
-    # All element contents where the essence validation has failed.
-    def contents_with_errors
-      contents.select(&:essence_validation_failed?)
-    end
+      private
 
-    private
+      def content_for_rss_meta(type)
+        definition = content_definitions.detect { |c| c["rss_#{type}"] }
+        return if definition.blank?
 
-    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"] }
+      end
 
-      contents.detect { |content| content.name == definition["name"] }
-    end
+      # creates the contents for this element as described in the elements.yml
+      #
+      # If ingredients are defined as well no contents get created,
+      # ingredients get created instead.
+      def create_contents
+        return if definition.fetch(:ingredients, []).any?
 
-    # creates the contents for this element as described in the elements.yml
-    def create_contents
-      definition.fetch("contents", []).each do |attributes|
-        Content.create(attributes.merge(element: self))
+        definition.fetch("contents", []).each do |attributes|
+          Content.create(attributes.merge(element: self))
+        end
       end
     end
   end