decidim-core 0.27.5 → 0.27.6

data/lib/decidim/acts_as_tree.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 module Decidim
+  # Adapted from https://hashrocket.com/blog/posts/recursive-sql-in-activerecord
   module ActsAsTree
     extend ActiveSupport::Concern
 
@@ -15,10 +16,22 @@ module Decidim
         @parent_item_foreign_key = name
       end
 
+      def parent_item_polymorphic_type_key(name = nil)
+        return @parent_item_polymorphic_type_key unless name
+
+        @parent_item_polymorphic_type_key = name
+      end
+
       def tree_for(item)
         where(Arel.sql("#{table_name}.id IN (#{tree_sql_for(item)})")).order("#{table_name}.id")
       end
 
+      def polymorphic_condition(item)
+        return "" if parent_item_polymorphic_type_key.blank?
+
+        "AND #{table_name}.#{parent_item_polymorphic_type_key} = '#{item.class.name}'"
+      end
+
       def tree_sql_for(item)
         <<-SQL.squish
         WITH RECURSIVE search_tree(id, path) AS (
@@ -28,7 +41,7 @@ module Decidim
             UNION ALL
           SELECT #{table_name}.id, path || #{table_name}.id
             FROM search_tree
-          JOIN #{table_name} ON #{table_name}.#{parent_item_foreign_key} = search_tree.id
+          JOIN #{table_name} ON #{table_name}.#{parent_item_foreign_key} = search_tree.id #{polymorphic_condition(item)}
             WHERE NOT #{table_name}.id = ANY(path)
         )
         SELECT id FROM search_tree ORDER BY path

data/lib/decidim/asset_router/storage.rb

@@ -19,13 +19,17 @@ module Decidim
       #
       # @param options The options for the URL that are the normal route options
       #   Rails route helpers accept
+      # rubocop:disable Style/CaseLikeIf
       def url(**options)
         if asset.is_a? ActiveStorage::Attached
           routes.rails_blob_url(asset.blob, **default_options.merge(options))
+        elsif asset.is_a? ActiveStorage::Blob
+          routes.rails_blob_url(asset, **default_options.merge(options))
         else
           routes.rails_representation_url(asset, **default_options.merge(options))
         end
       end
+      # rubocop:enable Style/CaseLikeIf
 
       private
 

data/lib/decidim/attribute_encryptor.rb

@@ -19,10 +19,12 @@ module Decidim
     end
 
     def self.cryptor
-      key = ActiveSupport::KeyGenerator.new("attribute").generate_key(
-        Rails.application.secrets.secret_key_base, ActiveSupport::MessageEncryptor.key_len
-      )
-      ActiveSupport::MessageEncryptor.new(key)
+      @cryptor ||= begin
+        key = ActiveSupport::KeyGenerator.new("attribute").generate_key(
+          Rails.application.secrets.secret_key_base, ActiveSupport::MessageEncryptor.key_len
+        )
+        ActiveSupport::MessageEncryptor.new(key)
+      end
     end
   end
 end

data/lib/decidim/core/engine.rb

@@ -246,9 +246,13 @@ module Decidim
       end
 
       initializer "decidim.notifications" do
-        config.to_prepare do
-          Decidim::EventsManager.subscribe(/^decidim\.events\./) do |event_name, data|
-            EventPublisherJob.perform_later(event_name, data)
+        if Rails.autoloaders.zeitwerk_enabled?
+          config.after_initialize do
+            Decidim::EventsManager.subscribe_events!
+          end
+        else
+          config.to_prepare do
+            Decidim::EventsManager.subscribe_events!
           end
         end
       end