alchemy_cms 5.2.0.rc1 → 5.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0fa742b5807adac37f8b9912eee024cdc10fcfb74a202e5a230b85109cfb7959
-  data.tar.gz: 30b3036533cdda4330ce8c89dbfad621d23980ce382aaca46f52df50294b56c4
+  metadata.gz: 80ac30c5b218ae66fdfc00afbaf2185829f52e94b32b76c4b6af8a19c5ec2ac8
+  data.tar.gz: 3da61ba5c95787cd3524ffad4e36f774b238fcf0456732a0cf69dac24dcbf0e7
 SHA512:
-  metadata.gz: 57745756593a15e0bcdf2558918ee89721f8adc6612f02043f3f066634f7b458078b0bd21c518b6dd082c396b324483691c7c2fa02c249d829c8e021f05a61cb
-  data.tar.gz: 3a9121c8ed3753b1892d098088085e7b35b81857121b0449690c045ad43c3efc6ef65892bc8969fc7750cb51b6b26a3af4862efc6c29ad903f107d518615ed1a
+  metadata.gz: 690da4b19ddbc96671c403bb616da433c37b35eeb0eee142de4f1ebe957f4f7ad9cd0da1e8e8e9e37cb773fbe1aec858166089673921b1ff463bc1dd0028bf91
+  data.tar.gz: 9f937fdb379c6df8c64976ec52ae4aef56bf597533e1d3ece0c987ef4604d91dfdb75eb246ce9aa68338d1a1814941f53d982093b378ab8089b3026f8997582b

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 5.2.0 (2021-05-06)
+
+- Backport #2049 to 5.2 [#2086](https://github.com/AlchemyCMS/alchemy_cms/pull/2086) ([rickythefox](https://github.com/rickythefox))
+- hotfix and deprecate page_active? helper [#2073](https://github.com/AlchemyCMS/alchemy_cms/pull/2073) ([robinboening](https://github.com/robinboening))
+
 ## 5.2.0.rc1 (2021-02-17)
 
 ### Changes

data/app/decorators/alchemy/element_editor.rb

@@ -8,6 +8,17 @@ module Alchemy
       "alchemy/admin/elements/element"
     end
 
+    # Returns content editor instances for defined contents
+    #
+    # Creates contents on demand if the content is not yet present on the element
+    #
+    # @return Array<Alchemy::ContentEditor>
+    def contents
+      element.definition.fetch(:contents, []).map do |content|
+        Alchemy::ContentEditor.new(find_or_create_content(content[:name]))
+      end
+    end
+
     # CSS classes for the element editor partial.
     def css_classes
       [
@@ -78,5 +89,19 @@ module Alchemy
                   default: Alchemy.t(:element_deprecated))
       end
     end
+
+    private
+
+    def find_or_create_content(name)
+      find_content(name) || create_content(name)
+    end
+
+    def find_content(name)
+      element.contents.find { |content| content.name == name }
+    end
+
+    def create_content(name)
+      Alchemy::Content.create(element: element, name: name)
+    end
   end
 end

data/app/helpers/alchemy/pages_helper.rb

@@ -100,7 +100,9 @@ module Alchemy
 
     # Returns true if page is in the active branch
     def page_active?(page)
-      @_page_ancestors ||= Page.ancestors_for(@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
 

data/app/views/alchemy/admin/elements/_element.html.erb

@@ -25,7 +25,7 @@
         <div id="element_<%= element.id %>_errors" class="element_errors"></div>
 
         <div id="element_<%= element.id %>_content" class="element-content-editors">
-          <%= render element.contents.map { |content| Alchemy::ContentEditor.new(content) } %>
+          <%= render element.contents %>
         </div>
 
         <% if element.taggable? %>

data/lib/alchemy/resource.rb

@@ -132,7 +132,9 @@ module Alchemy
     end
 
     def namespaced_resource_name
-      @_namespaced_resource_name ||= namespaced_resources_name.singularize
+      @_namespaced_resource_name ||= begin
+        namespaced_resources_name.to_s.singularize
+      end.to_sym # Rails >= 6.0.3.7 needs symbols in polymorphic routes
     end
 
     def namespaced_resources_name
@@ -140,13 +142,13 @@ module Alchemy
         resource_name_array = resource_array.dup
         resource_name_array.delete(engine_name) if in_engine?
         resource_name_array.join("_")
-      end
+      end.to_sym # Rails >= 6.0.3.7 needs symbols in polymorphic routes
     end
 
     def namespace_for_scope
       namespace_array = namespace_diff
       namespace_array.delete(engine_name) if in_engine?
-      namespace_array
+      namespace_array.map(&:to_sym) # Rails >= 6.0.3.7 needs symbols in polymorphic routes
     end
 
     # Returns an array of underscored association names

data/lib/alchemy/test_support.rb

@@ -2,10 +2,17 @@
 
 module Alchemy
   module TestSupport
-    def self.factory_paths
-      Dir[
-        ::Alchemy::Engine.root.join("lib", "alchemy", "test_support", "factories", "*_factory.rb")
-      ].map { |path| path.sub(/.rb\z/, "") }
+    class << self
+      def factory_paths
+        Dir[
+          ::Alchemy::Engine.root.join("lib", "alchemy", "test_support", "factories", "*_factory.rb")
+        ].map { |path| path.sub(/.rb\z/, "") }
+      end
+      deprecate factory_paths: :factories_path, deprecator: Alchemy::Deprecation
+
+      def factories_path
+        ::Alchemy::Engine.root.join("lib", "alchemy", "test_support", "factories")
+      end
     end
   end
 end

data/lib/alchemy/test_support/factories.rb

@@ -7,8 +7,8 @@ Alchemy::Deprecation.warn <<~MSG
 
       require 'alchemy/test_support'
 
-      FactoryBot.definition_file_paths.concat(Alchemy::TestSupport.factory_paths)
-      FactoryBot.reload
+      FactoryBot.definition_file_paths.append(Alchemy::TestSupport.factories_path)
+      FactoryBot.find_definitions
 MSG
 
 Dir["#{File.dirname(__FILE__)}/factories/*.rb"].sort.each do |file|

data/lib/alchemy/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 5.2.0.rc1
+  version: 5.2.0
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-17 00:00:00.000000000 Z
+date: 2021-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -1275,9 +1275,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements:
 - ImageMagick (libmagick), v6.6 or greater.
 rubygems_version: 3.1.4