alchemy_cms 6.0.2 → 6.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7302c6c464ed0c57f1b2113a1d7334eb4234e80ee75a68f43579895207c8c406
-  data.tar.gz: 26bd58edc3af02af5c418f082584cbfa897a16f26a670db08f147072df827a71
+  metadata.gz: c5eb21e30df422e1b214dd34d5d6166d8aaf195d393590efdf1e6a16a1247910
+  data.tar.gz: aa579d8246cfc7952a2f2491c86a78e272733eb7c21d993d4302201ee2b1a3f3
 SHA512:
-  metadata.gz: edc87ff799f4940275d70cfc24f89c4af6dd7ef4f5e77eb3982d6a85a221cf158afa05874f7c996f7c2326fef6b4131a5b15b167daea7ae6b4c39a060ecbd28d
-  data.tar.gz: b2a2d119a9c10c098b579a03548f9c26d49e61104be1d3058cd1d8e7329f432078258ee5f7f5e67f62d78bdf661588a72232f28e12e48ee9cb33568ae2625bfc
+  metadata.gz: 4b92efbc92492ccbc49ff95249672d5083499898d6ce70644b68a44fdc49720a716986c138211c308c1e3cf3a7b614db6d04a9463399c81c8167b31622aa1f5c
+  data.tar.gz: 4d297aea832eeea8b51183b234bcad0cacc168283e07f1d83ca180e1a59fb02601756869e74c3348f10b14308a62e660d6dd2b0a04251da51b4c574435e4518a

data/.github/workflows/ci.yml

@@ -20,6 +20,7 @@ jobs:
         database:
           - mysql
           - postgresql
+          - mariadb
         exclude:
           - rails: "6.0"
             ruby: "3.1"
@@ -27,12 +28,18 @@ jobs:
           - rails: "6.0"
             ruby: "3.1"
             database: postgresql
+          - rails: "6.0"
+            ruby: "3.1"
+            database: mariadb
           - rails: "7.0"
             ruby: "2.6"
             database: mysql
           - rails: "7.0"
             ruby: "2.6"
             database: postgresql
+          - rails: "7.0"
+            ruby: "2.6"
+            database: mariadb
     env:
       DB: ${{ matrix.database }}
       DB_USER: alchemy_user
@@ -58,6 +65,15 @@ jobs:
           MYSQL_DATABASE: alchemy_cms_dummy_test
           MYSQL_ROOT_PASSWORD: password
         options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=5
+      mariadb:
+        image: mariadb:latest
+        ports: ["3307:3306"]
+        env:
+          MARIADB_USER: alchemy_user
+          MARIADB_PASSWORD: password
+          MARIADB_DATABASE: alchemy_cms_dummy_test
+          MARIADB_ROOT_PASSWORD: password
+        options: --health-cmd="mariadb-admin ping" --health-interval=10s --health-timeout=5s --health-retries=5
     steps:
       - uses: actions/checkout@v2.3.4
       - name: Set up Ruby
@@ -81,7 +97,7 @@ jobs:
           sudo apt install -qq --fix-missing libpq-dev -o dir::cache::archives="/home/runner/apt/cache"
           sudo chown -R runner /home/runner/apt/cache
       - name: Install MySQL headers
-        if: matrix.database == 'mysql'
+        if: matrix.database == 'mysql' || matrix.database == 'mariadb'
         run: |
           mkdir -p /home/runner/apt/cache
           sudo apt update -qq

data/CHANGELOG.md

@@ -1,3 +1,20 @@
+## 6.0.5 (2022-05-11)
+
+- Extract element ingredient migrator [#2337](https://github.com/AlchemyCMS/alchemy_cms/pull/2337) ([tvdeyen](https://github.com/tvdeyen))
+
+## 6.0.4 (2022-05-06)
+
+- Add support for Rails' recycable cache keys [#2334](https://github.com/AlchemyCMS/alchemy_cms/pull/2334) ([tvdeyen](https://github.com/tvdeyen))
+- Make Alchemy::Content::Factory reloadable [#2333](https://github.com/AlchemyCMS/alchemy_cms/pull/2333) ([tvdeyen](https://github.com/tvdeyen))
+- Wrap the result of rendering into an ActiveSupport::SafeBuffer [#2332](https://github.com/AlchemyCMS/alchemy_cms/pull/2332) ([mamhoff](https://github.com/mamhoff))
+- Override Alchemy::Page.ransackable_scopes [#2328](https://github.com/AlchemyCMS/alchemy_cms/pull/2328) ([mamhoff](https://github.com/mamhoff))
+- Default Link Format matcher: Allow tel: protocol [#2327](https://github.com/AlchemyCMS/alchemy_cms/pull/2327) ([mamhoff](https://github.com/mamhoff))
+
+## 6.0.3 (2022-05-02)
+
+- Add Support for MariaDB [#2326](https://github.com/AlchemyCMS/alchemy_cms/pull/2326) ([mamhoff](https://github.com/mamhoff))
+- Fix Alchemy::Content::Factory module definition [#2325](https://github.com/AlchemyCMS/alchemy_cms/pull/2325) ([tvdeyen](https://github.com/tvdeyen))
+
 ## 6.0.2 (2022-04-27)
 
 - Remove JSON decode from ingredient data store [#2323](https://github.com/AlchemyCMS/alchemy_cms/pull/2323) ([tvdeyen](https://github.com/tvdeyen))

data/Gemfile

@@ -17,7 +17,9 @@ end
 if ENV["DB"].nil? || ENV["DB"] == "sqlite"
   gem "sqlite3", "~> 1.4.1"
 end
-gem "mysql2", "~> 0.5.1" if ENV["DB"] == "mysql"
+if ENV["DB"] == "mysql" || ENV["DB"] == "mariadb"
+  gem "mysql2", "~> 0.5.1"
+end
 gem "pg", "~> 1.0" if ENV["DB"] == "postgresql"
 
 group :development, :test do

data/app/helpers/alchemy/elements_helper.rb

@@ -87,11 +87,13 @@ module Alchemy
       elements = finder.elements(page_version: page_version)
 
       default_rendering = ->(element, i) { render_element(element, options, i + 1) }
-      if block_given?
-        elements.map.with_index(&blk)
-      else
-        elements.map.with_index(&default_rendering)
-      end.join(options[:separator]).html_safe
+      capture do
+        if block_given?
+          elements.map.with_index(&blk)
+        else
+          elements.map.with_index(&default_rendering)
+        end.join(options[:separator]).html_safe
+      end
     end
 
     # This helper renders a {Alchemy::Element} view partial.

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

@@ -3,139 +3,141 @@
 module Alchemy
   # Holds everything concerning the building and creating of contents and the related essence object.
   #
-  module Content::Factory
-    extend ActiveSupport::Concern
+  class Content < BaseRecord
+    module Factory
+      extend ActiveSupport::Concern
+
+      module ClassMethods
+        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.
+        #
+        # @param [Hash]
+        #   The content definition used for finding the content in +elements.yml+ file
+        #
+        def new(attributes = {})
+          element = attributes[:element] || Element.find_by(id: attributes[:element_id])
+          return super if attributes.empty? || element.nil?
+
+          definition = element.content_definition_for(attributes[:name])
+          if definition.blank? && attributes[:essence_type].nil?
+            raise ContentDefinitionError, "No definition found in elements.yml for #{attributes.inspect} and #{element.inspect}"
+          end
+
+          super(
+            name: attributes[:name],
+            essence_type: attributes[:essence_type] || normalize_essence_type(definition[:type]),
+            element: element,
+          ).tap(&:build_essence)
+        end
 
-    module ClassMethods
-      SKIPPED_ATTRIBUTES_ON_COPY = %w(position created_at updated_at creator_id updater_id element_id id)
+        # Creates a new content from elements definition in the +elements.yml+ file.
+        #
+        # 1. It builds the content
+        # 2. It creates the essence record (content object gets saved)
+        #
+        # @return [Alchemy::Content]
+        #
+        def create(attributes = {})
+          new(attributes).tap do |content|
+            content.essence.save && content.save
+          end
+        end
 
-      # Builds a new content as descriped in the elements.yml file.
-      #
-      # @param [Hash]
-      #   The content definition used for finding the content in +elements.yml+ file
-      #
-      def new(attributes = {})
-        element = attributes[:element] || Element.find_by(id: attributes[:element_id])
-        return super if attributes.empty? || element.nil?
+        # Creates a copy of source and also copies the associated essence.
+        #
+        # You can pass a differences hash to update the attributes of the copy.
+        #
+        # === Example
+        #
+        #   @copy = Alchemy::Content.copy(@content, {element_id: 3})
+        #   @copy.element_id # => 3
+        #
+        def copy(source, differences = {})
+          Content.new(
+            source.attributes.with_indifferent_access.
+              except(*SKIPPED_ATTRIBUTES_ON_COPY).
+              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
 
-        definition = element.content_definition_for(attributes[:name])
-        if definition.blank? && attributes[:essence_type].nil?
-          raise ContentDefinitionError, "No definition found in elements.yml for #{attributes.inspect} and #{element.inspect}"
+        # Returns all content definitions from elements.yml
+        #
+        def definitions
+          definitions = Element.definitions.flat_map { |e| e["contents"] }
+          definitions.compact!
+          definitions
         end
 
-        super(
-          name: attributes[:name],
-          essence_type: attributes[:essence_type] || normalize_essence_type(definition[:type]),
-          element: element
-        ).tap(&:build_essence)
-      end
+        # Returns a normalized Essence type
+        #
+        # Adds Alchemy module name in front of given essence type
+        # unless there is a Class with the specified name that is an essence.
+        #
+        # @param [String]
+        #   the essence type to normalize
+        #
+        def normalize_essence_type(essence_type)
+          essence_type = essence_type.classify
+          return essence_type if is_an_essence?(essence_type)
+
+          "Alchemy::#{essence_type}"
+        end
 
-      # Creates a new content from elements definition in the +elements.yml+ file.
-      #
-      # 1. It builds the content
-      # 2. It creates the essence record (content object gets saved)
-      #
-      # @return [Alchemy::Content]
-      #
-      def create(attributes = {})
-        new(attributes).tap do |content|
-          content.essence.save && content.save
+        private
+
+        def is_an_essence?(essence_type)
+          klass = Module.const_get(essence_type)
+          klass.is_a?(Class) && klass.new.acts_as_essence?
+        rescue NameError
+          false
         end
       end
 
-      # Creates a copy of source and also copies the associated essence.
-      #
-      # You can pass a differences hash to update the attributes of the copy.
-      #
-      # === Example
-      #
-      #   @copy = Alchemy::Content.copy(@content, {element_id: 3})
-      #   @copy.element_id # => 3
+      # Instance Methods
+
+      # Returns the definition hash from +elements.yml+ file.
       #
-      def copy(source, differences = {})
-        Content.new(
-          source.attributes.with_indifferent_access.
-            except(*SKIPPED_ATTRIBUTES_ON_COPY).
-            merge(differences.with_indifferent_access)
-        ).tap do |new_content|
-          new_content.build_essence(
-            source.essence.attributes.
-              except(*SKIPPED_ATTRIBUTES_ON_COPY)
-          )
-          new_content.save
+      def definition
+        if element.blank?
+          log_warning "Content with id #{id} is missing its Element."
+          return {}
         end
+        element.content_definition_for(name) || {}
       end
 
-      # Returns all content definitions from elements.yml
+      # Build essence from definition.
       #
-      def definitions
-        definitions = Element.definitions.flat_map { |e| e["contents"] }
-        definitions.compact!
-        definitions
+      # If an optional type is passed, this type of essence gets created.
+      #
+      def build_essence(attributes = {})
+        self.essence = essence_class.new(
+          { content: self, ingredient: default_value }.merge(attributes)
+        )
       end
 
-      # Returns a normalized Essence type
-      #
-      # Adds Alchemy module name in front of given essence type
-      # unless there is a Class with the specified name that is an essence.
+      # Creates essence from definition.
       #
-      # @param [String]
-      #   the essence type to normalize
+      # If an optional type is passed, this type of essence gets created.
       #
-      def normalize_essence_type(essence_type)
-        essence_type = essence_type.classify
-        return essence_type if is_an_essence?(essence_type)
-
-        "Alchemy::#{essence_type}"
+      def create_essence!(attrs = {})
+        build_essence(attrs).save!
+        save!
       end
 
       private
 
-      def is_an_essence?(essence_type)
-        klass = Module.const_get(essence_type)
-        klass.is_a?(Class) && klass.new.acts_as_essence?
-      rescue NameError
-        false
-      end
-    end
-
-    # Instance Methods
-
-    # Returns the definition hash from +elements.yml+ file.
-    #
-    def definition
-      if element.blank?
-        log_warning "Content with id #{id} is missing its Element."
-        return {}
+      # Returns a class constant from definition's type field or the essence_type column
+      #
+      def essence_class
+        (essence_type || Content.normalize_essence_type(definition["type"])).constantize
       end
-      element.content_definition_for(name) || {}
-    end
-
-    # Build essence from definition.
-    #
-    # If an optional type is passed, this type of essence gets created.
-    #
-    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!(attrs = {})
-      build_essence(attrs).save!
-      save!
-    end
-
-    private
-
-    # Returns a class constant from definition's type field or the essence_type column
-    #
-    def essence_class
-      (essence_type || Content.normalize_essence_type(definition["type"])).constantize
     end
   end
 end

data/app/models/alchemy/content.rb

@@ -16,13 +16,15 @@
 #  updater_id   :integer
 #
 
+require_dependency "alchemy/content/factory"
+
 module Alchemy
   class Content < BaseRecord
     include Alchemy::Logger
     include Alchemy::Hints
 
     # Concerns
-    include Alchemy::Content::Factory
+    include Factory
 
     belongs_to :essence, polymorphic: true, dependent: :destroy, inverse_of: :content
     belongs_to :element, touch: true, inverse_of: :contents

data/app/models/alchemy/ingredient.rb

@@ -8,6 +8,8 @@ module Alchemy
 
     self.table_name = "alchemy_ingredients"
 
+    attribute :data, :json
+
     belongs_to :element, touch: true, class_name: "Alchemy::Element", inverse_of: :ingredients
     belongs_to :related_object, polymorphic: true, optional: true
 

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

@@ -103,17 +103,17 @@ module Alchemy
         page_layout.parameterize.underscore
       end
 
-      # Returns the key that's taken for cache path.
+      # Returns the version that's taken for Rails' recycable cache key.
       #
       # Uses the +published_at+ value that's updated when the user publishes the page.
       #
-      # If the page is the current preview it uses the updated_at value as cache key.
+      # If the page is the current preview it uses the +updated_at+ value as cache key.
       #
-      def cache_key
+      def cache_version
         if Page.current_preview == id
-          "alchemy/pages/#{id}-#{updated_at}"
+          updated_at.to_s
         else
-          "alchemy/pages/#{id}-#{published_at}"
+          published_at.to_s
         end
       end
 

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

@@ -122,6 +122,10 @@ module Alchemy
             )
           SQL
         end
+
+        def ransackable_scopes(_auth_object)
+          [:published, :from_current_site, :searchables, :layoutpages]
+        end
       end
     end
   end

data/config/alchemy/config.yml

@@ -200,7 +200,7 @@ link_target_options: [blank]
 format_matchers:
   email: !ruby/regexp '/\A[^@\s]+@([^@\s]+\.)+[^@\s]+\z/'
   url: !ruby/regexp '/\A[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(:[0-9]{1,5})?(\/.*)?\z/ix'
-  link_url: !ruby/regexp '/^(mailto:|\/|[a-z]+:\/\/)/'
+  link_url: !ruby/regexp '/^(tel:|mailto:|\/|[a-z]+:\/\/)/'
 
 # The layout used for rendering the +alchemy/admin/pages#show+ action.
 admin_page_preview_layout: application

data/lib/alchemy/upgrader/tasks/ingredients_migrator.rb

@@ -24,31 +24,8 @@ module Alchemy::Upgrader::Tasks
             if elements.any?
               puts "-- Creating ingredients for #{elements.count} #{element_definition[:name]}(s)"
               elements.each do |element|
-                Alchemy::Element.transaction do
-                  element_definition[:ingredients].each do |ingredient_definition|
-                    content = element.content_by_name(ingredient_definition[:role])
-                    next unless content
-
-                    essence = content.essence
-                    ingredient = element.ingredients.build(
-                      role: ingredient_definition[:role],
-                      type: Alchemy::Ingredient.normalize_type(ingredient_definition[:type]),
-                    )
-                    belongs_to_associations = essence.class.reflect_on_all_associations(:belongs_to)
-                    if belongs_to_associations.any?
-                      ingredient.related_object = essence.public_send(belongs_to_associations.first.name)
-                    else
-                      ingredient.value = content.ingredient
-                    end
-                    data = ingredient.class.stored_attributes.fetch(:data, []).each_with_object({}) do |attr, d|
-                      d[attr] = essence.public_send(attr)
-                    end
-                    ingredient.data = data
-                    print "."
-                    ingredient.save!
-                    content.destroy!
-                  end
-                end
+                MigrateElementIngredients.call(element)
+                print "."
               end
               puts "\n"
             else
@@ -58,5 +35,38 @@ module Alchemy::Upgrader::Tasks
         end
       end
     end
+
+    class MigrateElementIngredients
+      def self.call(element)
+        Alchemy::Element.transaction do
+          element.definition[:ingredients].each do |ingredient_definition|
+            ingredient = element.ingredients.build(
+              role: ingredient_definition[:role],
+              type: Alchemy::Ingredient.normalize_type(ingredient_definition[:type]),
+            )
+
+            content = element.content_by_name(ingredient_definition[:role])
+            if content
+              essence = content.essence
+              if essence
+                belongs_to_associations = essence.class.reflect_on_all_associations(:belongs_to)
+                if belongs_to_associations.any?
+                  ingredient.related_object = essence.public_send(belongs_to_associations.first.name)
+                else
+                  ingredient.value = content.ingredient
+                end
+                data = ingredient.class.stored_attributes.fetch(:data, []).each_with_object({}) do |attr, d|
+                  d[attr] = essence.public_send(attr)
+                end
+                ingredient.data = data
+              end
+              content.destroy!
+            end
+
+            ingredient.save!
+          end
+        end
+      end
+    end
   end
 end

data/lib/alchemy/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Alchemy
-  VERSION = "6.0.2"
+  VERSION = "6.0.5"
 
   def self.version
     VERSION

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alchemy_cms/admin",
-  "version": "6.0.2",
+  "version": "6.0.5",
   "description": "AlchemyCMS",
   "browser": "package/admin.js",
   "files": [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 6.0.2
+  version: 6.0.5
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -13,7 +13,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-27 00:00:00.000000000 Z
+date: 2022-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer