alchemy_cms 6.0.3 → 6.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2114b22cab5252062e853e2b3ea4e2d30ca37f10d1cc49a321644495af52ac3d
-  data.tar.gz: 58ece5a7be8ea335944ac21c4004bcd917b88860bef2337fbbe6fa705242651d
+  metadata.gz: e9bfd92678d3b4ae867e8c3938a0277d7698fb6fbcfb80a0210f0c4371990486
+  data.tar.gz: ce854781846eadaecdbe717ab435a38d357cda54863707b2c62a61cf4730884b
 SHA512:
-  metadata.gz: 5c604a56a67a92d16c53e10bd4264394a81a7f6c57fb2fec160ff27f4c70711b4231f7347bf977e2556da43761b3e81a32b2ab090cd9c48d7be0624024fd267a
-  data.tar.gz: 07b5bde2ada318c77aa0b20d89e96b128da675f07d779c44c28d8dfebc292f7cde24971606958ae3fa3e9d7a9f248358097284efda5f65a6fc5af84107276c00
+  metadata.gz: 51391e56da530c900189d8c16b756d9084fac351cfc50ebc2ee9b7181d7148c826daf39bdd284100261aa6e4ae5c1a4f28eb266c1a31d9fd1ad31f21e2cda398
+  data.tar.gz: 244eb43ca4783a572c5885c69571264a50d4154a5ccfc8b5af806f1343497cc38a8157a1b8c039262d60ea8f4cd6a3a19777943ca9b1c0654a6cd473d3f9f025

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 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))

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.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/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/version.rb

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

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alchemy_cms/admin",
-  "version": "6.0.3",
+  "version": "6.0.4",
   "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.3
+  version: 6.0.4
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -13,7 +13,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-02 00:00:00.000000000 Z
+date: 2022-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer