alchemy_cms 4.6.2 → 4.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d09503d403038880c93066f8ff4606496ab8023f406c2fdb7fd36dd62749b3d4
-  data.tar.gz: 97518f445dadcb7fe00626ba6cd5aa78c9e04ef596abdf7229828ebf6dd9644b
+  metadata.gz: 35defab4a613fba87ec24e3ba3e9b6f6a9a079282703618c670f0ef3398caf38
+  data.tar.gz: 7e4b5c160ecfac06634f9720e4927d70e0517c9b2affa23efd14167c975b8433
 SHA512:
-  metadata.gz: 8030842fd29540fa6a7e20e5ad4b5866cb5b8d214911e11a8370c37ae71542c81f65173addcde23ffd3e7c7c01c8f77c15f3934c555c49f03d5b37da7384fd46
-  data.tar.gz: 200eb39b0a8b6517896e0b799053a1e1d179dab67933b991ac3508370e7e664c7b0eba8bcfc6dbabdaaab4301ba3f6b6e28d84aa34dcdefbf3e9e2513fe8c32b
+  metadata.gz: 1c111055665890647aa60caa158644c1405ba53343f2cc6188b6184746d15353a49124fe49a6d493cfcddce43ab2fe2c433bdfd77b6dbe7fdede4191e96d661f
+  data.tar.gz: 490f3afb8151c0e2e76cc62cc9e7e5bc3c8051b92515ee9c19ed8e757bba235e8b9d675d83c11e1331b3445c61568525a6c1b66e21a8702d8061f41e845db7b4

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 4.6.3 (2020-05-06)
+
+- Use symbols in polymorphic routes for resources [#2087](https://github.com/AlchemyCMS/alchemy_cms/pull/2087) ([tvdeyen](https://github.com/tvdeyen))
+- Fix convert:page_trees:to_menus task [#2033](https://github.com/AlchemyCMS/alchemy_cms/pull/2033) ([afdev82](https://github.com/afdev82))
+- fix 4.6 upgrader tasks [#1995](https://github.com/AlchemyCMS/alchemy_cms/pull/1995) ([afdev82](https://github.com/afdev82))
+
 ## 4.6.2 (2020-09-07)
 
 - Fix tri-Boolean check in PageNaming Module [#1931](https://github.com/AlchemyCMS/alchemy_cms/pull/1931) ([mamhoff](https://github.com/mamhoff))

data/lib/alchemy/resource.rb

@@ -131,21 +131,23 @@ 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
       @_namespaced_resources_name ||= begin
         resource_name_array = resource_array.dup
         resource_name_array.delete(engine_name) if in_engine?
-        resource_name_array.join('_')
-      end
+        resource_name_array.join("_")
+      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/version.rb

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

data/lib/tasks/alchemy/convert.rake

@@ -60,15 +60,17 @@ namespace :alchemy do
         def convert_to_nodes(children, node:)
           children.each do |page|
             has_children = page.children.any?
-            next unless page.visible || has_children
 
             Alchemy::Deprecation.silence do
+              next unless page.visible || has_children
+
               new_node = node.children.create!(
                 name: name_for_node(page),
                 page: page_for_node(page),
-                url: page.definition['redirects_to_external'] ? page.urlname : nil,
-                external: page.definition['redirects_to_external'] && Alchemy::Config.get(:open_external_links_in_new_tab),
-                language_id: page.language_id
+                url: !!page.definition['redirects_to_external'] ? page.urlname : nil,
+                external: !!page.definition['redirects_to_external'] && Alchemy::Config.get(:open_external_links_in_new_tab),
+                language_id: page.language_id,
+                site_id: page.language.site_id
               )
               print "."
               if has_children
@@ -82,9 +84,8 @@ namespace :alchemy do
         puts "\n- Converting #{menu_count} page #{'tree'.pluralize(menu_count)} into #{'menu'.pluralize(menu_count)}."
         Alchemy::BaseRecord.transaction do
           Alchemy::Language.all.each do |language|
-            locale = language.locale.presence || I18n.default_locale
-            menu_name = I18n.t('Main Navigation', scope: 'alchemy.menu_names', default: 'Main Navigation', locale: locale)
-            root_node = Alchemy::Node.create(language: language, name: menu_name)
+            menu_name = 'main_menu'
+            root_node = Alchemy::Node.create(language: language, name: menu_name, site: language.site, external: false)
             language.pages.language_roots.each do |root_page|
               convert_to_nodes(root_page.children, node: root_node)
             end

data/lib/tasks/alchemy/upgrade.rake

@@ -143,7 +143,11 @@ namespace :alchemy do
     desc "Upgrade Alchemy to v4.6"
     task "4.6" => [
       "alchemy:upgrade:prepare",
-    ]
+      "alchemy:upgrade:4.6:run",
+      "alchemy:upgrade:4.6:todo",
+    ] do
+      Alchemy::Upgrader.display_todos
+    end
 
     namespace "4.6" do
       task run: []

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 4.6.2
+  version: 4.6.3
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -10,10 +10,10 @@ authors:
 - Hendrik Mans
 - Carsten Fregin
 - Martin Meyerhoff
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-07 00:00:00.000000000 Z
+date: 2021-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -1244,9 +1244,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - ImageMagick (libmagick), v6.6 or greater.
-rubygems_version: 3.0.3
-signing_key:
+rubygems_version: 3.1.4
+signing_key: 
 specification_version: 4
 summary: A powerful, userfriendly and flexible CMS for Rails 5
 test_files: []
-...