decidim-core 0.31.2 → 0.32.1

data/lib/decidim/command.rb

@@ -8,6 +8,7 @@
 module Decidim
   class Command
     include ::Wisper::Publisher
+
     delegate :locale, to: :I18n
 
     def self.call(*, **, &)
@@ -53,7 +54,7 @@ module Decidim
     protected
 
     def event_arguments
-      raise "#{self.class} must implement #event_arguments"
+      raise "#{self.class} must implement #event_arguments (passed to #{event_namespace})"
     end
 
     def event_namespace

data/lib/decidim/content_parsers/blob_parser.rb

@@ -34,8 +34,8 @@ module Decidim
           # Group 6: Variation key for representations
           /(?<variation_part>[\w.=-]+)
         )?
-        # Group 7: Filename
-        /([\w.=-]+)
+        # Group 7: Filename (supports apostrophes inside names but not as HTML quote delimiters)
+        /((?:[^\s/"<>']|'(?=[^\s/"<>']))+)
       }x
 
       def rewrite
@@ -55,7 +55,7 @@ module Decidim
           blob =
             if type_part == "disk"
               # Disk service URL
-              decoded = ActiveStorage.verifier.verified(key_part, purpose: :blob_key).with_indifferent_access
+              decoded = ActiveStorage.verifier.verified(key_part, purpose: :blob_key)&.with_indifferent_access
               ActiveStorage::Blob.find_by(key: decoded[:key]) if decoded
             else
               # Representation or blob

data/lib/decidim/content_processor.rb

@@ -39,7 +39,7 @@ module Decidim
     # @!attribute rewrite
     #   @return [String] the rewritten content
     # @!attribute metadata
-    #   @return [Hash<Symbol, Metadata>] a hash where the keys are the parsers
+    #   @return [Hash{Symbol => Metadata}] a hash where the keys are the parsers
     #     names, and the values are the Metadata object returned by the parser
     Result = Struct.new(:rewrite, :metadata)
 

data/lib/decidim/content_renderers/base_renderer.rb

@@ -12,6 +12,16 @@ module Decidim
     class BaseRenderer
       include Decidim::ContentProcessor::Common
 
+      ReplacementContext = Struct.new(:placement, :node_name, :attribute_name, :ancestor_names) do
+        def text?
+          placement == :text
+        end
+
+        def attribute?
+          placement == :attribute
+        end
+      end
+
       # @return [String] the content to be formatted
       attr_reader :content
 
@@ -34,6 +44,108 @@ module Decidim
       def render(_options = nil)
         content
       end
+
+      protected
+
+      def replace_pattern_by_context(text, pattern, skip_ancestor_tags: %w(code pre script style), on_missing: "")
+        return text unless text.respond_to?(:gsub)
+
+        skip_ancestor_tags = Array(skip_ancestor_tags).map(&:to_s)
+
+        has_match = pattern.is_a?(String) ? text.include?(pattern) : pattern.match?(text)
+        return text unless has_match
+
+        fragment = html_fragment(text)
+        attr_modified = replace_pattern_in_attributes(fragment, pattern, skip_ancestor_tags:, on_missing:) do |match, context|
+          yield(match, context)
+        end
+        text_modified = replace_pattern_in_text_nodes(fragment, pattern, skip_ancestor_tags:, on_missing:) do |match, context|
+          yield(match, context)
+        end
+
+        return text unless attr_modified || text_modified
+
+        fragment.to_s
+      end
+
+      private
+
+      def replace_pattern_in_attributes(fragment, pattern, skip_ancestor_tags:, on_missing:)
+        modified = false
+        fragment.xpath(".//*").each do |node|
+          next if skip_replacement_for_node?(node, skip_ancestor_tags)
+
+          node.attribute_nodes.each do |attribute|
+            replaced_value = attribute.value.gsub(pattern) do |match|
+              replace_match(match, replacement_context(node, placement: :attribute, attribute_name: attribute.name), on_missing:) do |resolved_match, context|
+                yield(resolved_match, context)
+              end
+            end
+            unless replaced_value == attribute.value
+              attribute.value = replaced_value
+              modified = true
+            end
+          end
+        end
+        modified
+      end
+
+      def replace_pattern_in_text_nodes(fragment, pattern, skip_ancestor_tags:, on_missing:)
+        modified = false
+        fragment.xpath(".//text()").each do |node|
+          parent = node.parent
+          next if skip_replacement_for_node?(parent, skip_ancestor_tags)
+
+          original_text = node.text
+          has_node_match = pattern.is_a?(String) ? original_text.include?(pattern) : pattern.match?(original_text)
+          next unless has_node_match
+
+          doc = node.document
+          context = replacement_context(parent, placement: :text)
+          last_pos = 0
+
+          original_text.scan(pattern) do
+            m = Regexp.last_match
+            node.add_previous_sibling(Nokogiri::XML::Text.new(original_text[last_pos...m.begin(0)], doc)) if m.begin(0) > last_pos
+
+            replacement = replace_match(m[0], context, on_missing:) do |resolved_match, ctx|
+              yield(resolved_match, ctx)
+            end
+
+            Loofah.fragment(replacement.to_s).children.to_a.each do |child|
+              node.add_previous_sibling(child)
+            end
+
+            last_pos = m.end(0)
+          end
+
+          node.add_previous_sibling(Nokogiri::XML::Text.new(original_text[last_pos..], doc)) if last_pos < original_text.length
+          node.remove
+          modified = true
+        end
+        modified
+      end
+
+      def replace_match(match, context, on_missing:)
+        yield(match, context)
+      rescue ActiveRecord::RecordNotFound
+        on_missing.respond_to?(:call) ? on_missing.call(match, context) : on_missing
+      end
+
+      def replacement_context(node, placement:, attribute_name: nil)
+        ReplacementContext.new(
+          placement:,
+          node_name: node&.name,
+          attribute_name:,
+          ancestor_names: node ? node.ancestors.map(&:name) : []
+        )
+      end
+
+      def skip_replacement_for_node?(node, skip_ancestor_tags)
+        return false unless node
+
+        ([node.name] + node.ancestors.map(&:name)).any? { |name| skip_ancestor_tags.include?(name) }
+      end
     end
   end
 end

data/lib/decidim/content_renderers/blob_renderer.rb

@@ -18,8 +18,8 @@ module Decidim
     #
     # @see BaseRenderer Examples of how to use a content renderer
     class BlobRenderer < BaseRenderer
-      # Matches a global id representing a Decidim::User
-      GLOBAL_ID_REGEX = %r{(gid://[\w-]+/ActiveStorage::Blob/\d+)(/([\w=-]+))?}
+      # Matches a global id representing an ActiveStorage::Blob (optionally with a variant key)
+      GLOBAL_ID_REGEX = %r{(gid://[\w-]+/ActiveStorage::Blob/\d+)(/([\w=-]+))?(?:[^\s"'<>]*)}
 
       # Replaces found Global IDs matching an existing blob with a URL to
       # that blob. The Global IDs representing an invalid ActiveStorage::Blob
@@ -33,11 +33,10 @@ module Decidim
       protected
 
       def replace_pattern(text, pattern)
-        return text unless text.respond_to?(:gsub)
-
-        text.gsub(pattern) do
-          blob_gid = Regexp.last_match(1)
-          variation_key = Regexp.last_match(3)
+        replace_pattern_by_context(text, pattern) do |match, _context|
+          match_data = match.match(GLOBAL_ID_REGEX)
+          blob_gid = match_data[1]
+          variation_key = match_data[3]
 
           blob = GlobalID::Locator.locate(blob_gid)
           if variation_key
@@ -50,8 +49,6 @@ module Decidim
           else
             blob_url(blob)
           end
-        rescue ActiveRecord::RecordNotFound => _e
-          ""
         end
       end
 

data/lib/decidim/content_renderers/mention_resource_renderer.rb

@@ -27,17 +27,15 @@ module Decidim
       protected
 
       def replace_pattern(text, pattern, editor:)
-        return text unless text.respond_to?(:gsub)
-
-        text.gsub(pattern) do |resource_gid|
+        replace_pattern_by_context(text, pattern) do |resource_gid, context|
           resource = GlobalID::Locator.locate(resource_gid)
-          if editor
+          if context.attribute?
+            render_resource_url(resource, editor:)
+          elsif editor
             render_editor(resource_gid, resource)
           else
             render_resource_link(resource)
           end
-        rescue ActiveRecord::RecordNotFound => _e
-          ""
         end
       end
 
@@ -50,6 +48,12 @@ module Decidim
         link_to mention_title(resource), resource_path(resource)
       end
 
+      def render_resource_url(resource, editor:)
+        return resource_path(resource) if editor
+
+        Decidim::ResourceLocatorPresenter.new(resource).url
+      end
+
       def mention_title(resource)
         title = presenter_for(resource).title
 

data/lib/decidim/content_renderers/resource_renderer.rb

@@ -11,17 +11,26 @@ module Decidim
       #
       # @return [String] the content ready to display (contains HTML)
       def render(_options = nil)
-        return content unless content.respond_to?(:gsub)
-
-        content.gsub(regex) do |resource_gid|
+        replace_pattern_by_context(content, regex, on_missing: proc { |match, _| "~#{match.split("/").last}" }) do |resource_gid, context|
           resource = GlobalID::Locator.locate(resource_gid)
-          resource.presenter.display_mention
-        rescue ActiveRecord::RecordNotFound
-          resource_id = resource_gid.split("/").last
-          "~#{resource_id}"
+
+          if context.attribute?
+            resource_attribute_value(resource)
+          else
+            resource.presenter.display_mention
+          end
         end
       end
 
+      protected
+
+      def resource_attribute_value(resource)
+        presenter = resource.presenter
+        return presenter.profile_path if presenter.respond_to?(:profile_path)
+
+        Decidim::ResourceLocatorPresenter.new(resource).path
+      end
+
       def regex
         raise "Not implemented"
       end

data/lib/decidim/content_renderers/user_renderer.rb

@@ -24,17 +24,15 @@ module Decidim
       protected
 
       def replace_pattern(text, pattern, editor:)
-        return text unless text.respond_to?(:gsub)
-
-        text.gsub(pattern) do |mentionable_gid|
-          mentionable = GlobalID::Locator.locate(mentionable_gid)
-          if editor
-            render_editor(mentionable)
+        replace_pattern_by_context(text, pattern) do |user_gid, context|
+          user = GlobalID::Locator.locate(user_gid)
+          if context.attribute?
+            render_profile_path(user)
+          elsif editor
+            render_editor(user)
           else
-            render_text(mentionable)
+            render_text(user)
           end
-        rescue ActiveRecord::RecordNotFound => _e
-          ""
         end
       end
 
@@ -55,6 +53,10 @@ module Decidim
           presenter_for(user).display_mention
         end
       end
+
+      def render_profile_path(user)
+        presenter_for(user).profile_path
+      end
     end
   end
 end

data/lib/decidim/core/api.rb

@@ -18,6 +18,7 @@ module Decidim
     autoload :AreaTypeType, "decidim/api/types/area_type_type"
     autoload :AttachmentType, "decidim/api/types/attachment_type"
     autoload :AttachmentCollectionType, "decidim/api/types/attachment_collection_type"
+    autoload :BadgeScoreType, "decidim/api/types/badge_score_type"
     autoload :CategoryType, "decidim/api/types/category_type"
     autoload :TaxonomyType, "decidim/api/types/taxonomy_type"
     autoload :ComponentType, "decidim/api/types/component_type"
@@ -26,6 +27,7 @@ module Decidim
     autoload :FingerprintType, "decidim/api/types/fingerprint_type"
     autoload :LocalizedStringType, "decidim/api/types/localized_string_type"
     autoload :OrganizationType, "decidim/api/types/organization_type"
+    autoload :ParticipantDetailsType, "decidim/api/types/participant_details_type"
     autoload :ParticipatorySpaceType, "decidim/api/types/participatory_space_type"
     autoload :ParticipatorySpaceLinkType, "decidim/api/types/participatory_space_link_type"
     autoload :ParticipatorySpaceManifestType, "decidim/api/types/participatory_space_manifest_type"
@@ -36,6 +38,12 @@ module Decidim
     autoload :TraceVersionType, "decidim/api/types/trace_version_type"
     autoload :TranslatedFieldType, "decidim/api/types/translated_field_type"
     autoload :UserType, "decidim/api/types/user_type"
+    autoload :UserModerationType, "decidim/api/types/user_moderation_type"
+    autoload :ModerationType, "decidim/api/types/moderation_type"
+    autoload :ReportableUserType, "decidim/api/types/reportable_user_type"
+    autoload :ReportableType, "decidim/api/types/reportable_type"
+    autoload :StaticPageType, "decidim/api/types/static_page_type"
+    autoload :StaticPageTopicType, "decidim/api/types/static_page_topic_type"
 
     autoload :BaseInputFilter, "decidim/api/input_filters/base_input_filter"
     autoload :CategoryInputFilter, "decidim/api/input_filters/category_input_filter"

data/lib/decidim/core/content_blocks/registry_manager.rb

@@ -26,12 +26,6 @@ module Decidim
             content_block.default!
           end
 
-          Decidim.content_blocks.register(:homepage, :global_menu) do |content_block|
-            content_block.cell = "decidim/content_blocks/global_menu"
-            content_block.public_name_key = "decidim.content_blocks.global_menu.name"
-            content_block.default!
-          end
-
           Decidim.content_blocks.register(:homepage, :sub_hero) do |content_block|
             content_block.cell = "decidim/content_blocks/sub_hero"
             content_block.public_name_key = "decidim.content_blocks.sub_hero.name"
@@ -51,11 +45,11 @@ module Decidim
             ]
 
             content_block.settings do |settings|
-              settings.attribute :title, type: :text, translated: true
+              settings.attribute :title, type: :text, translated: true, required: true
               settings.attribute :short_description, type: :text, translated: true
-              settings.attribute :action_button_title, type: :text, translated: true
-              settings.attribute :action_button_subtitle, type: :text, translated: true
-              settings.attribute :action_button_url, type: :text
+              settings.attribute :action_button_title, type: :text, translated: true, required: true
+              settings.attribute :action_button_subtitle, type: :text, translated: true, required: true
+              settings.attribute :action_button_url, type: :text, required: true
             end
 
             content_block.default!

data/lib/decidim/core/engine.rb

@@ -241,31 +241,11 @@ module Decidim
         ENV["SHAKAPACKER_CONFIG"] = Decidim::Shakapacker.configuration.configuration_file
       end
 
-      # Rails 7.0 default is vips, but
-      # The `:mini_magick` option is not deprecated; it is fine to keep using it.
-      # And we are going to use it while migrating rails application
-      initializer "decidim_core.active_storage_variant_processor" do |app|
-        app.config.active_storage.variant_processor = :mini_magick
-      end
-
       initializer "decidim_core.setup_i18n" do |app|
         app.config.i18n.available_locales = Decidim.available_locales
         app.config.i18n.default_locale = Decidim.default_locale
-      end
-
-      initializer "decidim_core.active_storage_method_patch" do |_app|
-        if Rails::VERSION::MAJOR < 8
-          # This is a manual bugfix of https://github.com/rails/rails/pull/51931
-          module Attachment
-            def named_variants
-              record.attachment_reflections[name]&.named_variants || {}
-            end
-          end
-
-          ActiveSupport.on_load(:active_storage_attachment) { prepend Attachment }
-        else
-          Decidim.deprecator.warn("Remove decidim_core.active_storage_method_patch initializer from #{__FILE__}")
-        end
+        app.config.i18n.fallbacks = true
+        app.config.i18n.raise_on_missing_translations = Rails.env.local?
       end
 
       initializer "decidim_core.action_controller" do |_app|
@@ -362,13 +342,7 @@ module Decidim
         end
       end
 
-      initializer "decidim_core.locales" do |app|
-        app.config.i18n.fallbacks = true
-      end
-
       initializer "decidim_core.graphql_api" do
-        Decidim::Api::QueryType.include Decidim::QueryExtensions
-
         Decidim::Api.add_orphan_type Decidim::Core::UserType
       end
 
@@ -396,10 +370,6 @@ module Decidim
         end
       end
 
-      initializer "decidim_core.i18n_exceptions" do |app|
-        app.config.i18n.raise_on_missing_translations = true unless Rails.env.production?
-      end
-
       initializer "decidim_core.geocoding", after: :load_config_initializers do
         Geocoder.configure(Decidim.geocoder) if Decidim.geocoder.present?
       end
@@ -471,8 +441,6 @@ module Decidim
       end
 
       initializer "decidim_core.menu" do
-        Decidim::Core::Menu.register_menu!
-        Decidim::Core::Menu.register_mobile_menu!
         Decidim::Core::Menu.register_user_menu!
       end
 
@@ -495,6 +463,14 @@ module Decidim
         end
       end
 
+      initializer "decidim_core.delete_account" do
+        config.to_prepare do
+          ActiveSupport::Notifications.subscribe("decidim.destroy_account:after") do |_event_name, data|
+            Decidim::DeleteUserMailer.delete(user_email: data[:user_email], user_name: data[:user_name], locale: data[:locale], organization: data[:organization]).deliver_later
+          end
+        end
+      end
+
       initializer "decidim_core.add_cells_view_paths" do
         Cell::ViewModel.view_paths << Rails.root.join("app/views") # for partials
         Cell::ViewModel.view_paths << File.expand_path("#{Decidim::Core::Engine.root}/app/cells")

data/lib/decidim/core/menu.rb

@@ -3,32 +3,6 @@
 module Decidim
   module Core
     class Menu
-      def self.register_menu!
-        Decidim.menu :menu do |menu|
-          menu.add_item :root,
-                        I18n.t("menu.home", scope: "decidim"),
-                        decidim.root_path,
-                        position: 1,
-                        active: :exclusive
-        end
-      end
-
-      def self.register_mobile_menu!
-        Decidim.menu :mobile_menu do |menu|
-          menu.add_item :root,
-                        I18n.t("menu.home", scope: "decidim"),
-                        decidim.root_path,
-                        position: 1,
-                        active: :exclusive
-
-          menu.add_item :help,
-                        I18n.t("menu.help", scope: "decidim"),
-                        decidim.pages_path,
-                        position: 10,
-                        active: :exclusive
-        end
-      end
-
       def self.register_user_menu!
         Decidim.menu :user_menu do |menu|
           menu.add_item :account,

data/lib/decidim/core/test/factories.rb

@@ -85,6 +85,8 @@ FactoryBot.define do
     "#{Faker::Lorem.sentence(word_count: 1, supplemental: true, random_words_to_add: 3)} #{n}"
   end
 
+  sequence(:component_position)
+
   factory :category, class: "Decidim::Category" do
     transient do
       skip_injection { false }
@@ -155,7 +157,6 @@ FactoryBot.define do
       }
     end
     file_upload_settings { Decidim::OrganizationSettings.default(:upload) }
-    enable_participatory_space_filters { true }
     content_security_policy do
       {
         "default-src" => "localhost:* #{host}:*",
@@ -200,7 +201,7 @@ FactoryBot.define do
     tos_agreement { "1" }
     avatar { Decidim::Dev.test_file("avatar.jpg", "image/jpeg") }
     personal_url { Faker::Internet.url }
-    about { generate_localized_title(:user_about, skip_injection:) }
+    about { generate_title(:user_about, skip_injection:) }
     confirmation_sent_at { Time.current }
     accepted_tos_version { organization.tos_version }
     notifications_sending_frequency { "real_time" }
@@ -284,12 +285,18 @@ FactoryBot.define do
     end
   end
 
-  factory :participatory_space_private_user, class: "Decidim::ParticipatorySpacePrivateUser" do
+  factory :badge_score, class: "Decidim::Gamification::BadgeScore" do
+    user
+    badge_name { "followers" }
+    value { 1 }
+  end
+
+  factory :member, class: "Decidim::ParticipatorySpace::Member" do
     transient do
       skip_injection { false }
     end
     user
-    privatable_to { create(:participatory_process, organization: user.organization, skip_injection:) }
+    participatory_space { create(:participatory_process, organization: user.organization, skip_injection:) }
 
     role { generate_localized_title(:role, skip_injection:) }
 
@@ -302,12 +309,13 @@ FactoryBot.define do
     end
   end
 
-  factory :assembly_private_user, class: "Decidim::ParticipatorySpacePrivateUser" do
+  factory :assembly_member, class: "Decidim::ParticipatorySpace::Member" do
     transient do
       skip_injection { false }
+      organization { create(:organization, skip_injection:) }
     end
-    user
-    privatable_to { create(:assembly, organization: user.organization, skip_injection:) }
+    user { create(:user, :confirmed, organization:, skip_injection:) }
+    participatory_space { create(:assembly, organization:, skip_injection:) }
   end
 
   factory :identity, class: "Decidim::Identity" do
@@ -463,6 +471,7 @@ FactoryBot.define do
     manifest_name { "dummy" }
     published_at { Time.current }
     deleted_at { nil }
+    weight { generate(:component_position) }
     settings do
       {
         dummy_global_translatable_text: generate_localized_title(:dummy_global_translatable_text, skip_injection:),
@@ -630,8 +639,11 @@ FactoryBot.define do
   end
 
   factory :taxonomization, class: "Decidim::Taxonomization" do
+    transient do
+      skip_injection { false }
+    end
     taxonomy { association(:taxonomy, :with_parent) }
-    taxonomizable { association(:dummy_resource) }
+    taxonomizable { association(:dummy_resource, organization: taxonomy.organization, skip_injection:) }
   end
 
   factory :taxonomy_filter, class: "Decidim::TaxonomyFilter" do
@@ -651,7 +663,7 @@ FactoryBot.define do
 
   factory :taxonomy_filter_item, class: "Decidim::TaxonomyFilterItem" do
     taxonomy_filter
-    taxonomy_item { association(:taxonomy, parent: taxonomy_filter.root_taxonomy) }
+    taxonomy_item { association(:taxonomy, organization: taxonomy_filter.root_taxonomy.organization, parent: taxonomy_filter.root_taxonomy) }
   end
 
   factory :coauthorship, class: "Decidim::Coauthorship" do
@@ -719,7 +731,7 @@ FactoryBot.define do
       skip_injection { false }
     end
     moderation
-    user { build(:user, organization: moderation.reportable.organization, skip_injection:) }
+    user { build(:user, :confirmed, organization: moderation.reportable.organization, skip_injection:) }
     reason { "spam" }
   end
 
@@ -739,6 +751,7 @@ FactoryBot.define do
     user do
       build(
         :user,
+        :confirmed,
         organization: followable.try(:organization) || build(:organization, skip_injection:)
       )
     end
@@ -775,8 +788,8 @@ FactoryBot.define do
       skip_injection { false }
     end
 
-    originator { build(:user, skip_injection:) }
-    interlocutors { [build(:user, skip_injection:)] }
+    originator { build(:user, organization: user.organization, skip_injection:) }
+    interlocutors { [build(:user, organization: originator.organization, skip_injection:)] }
     body { Faker::Lorem.sentence }
     user
 
@@ -821,8 +834,8 @@ FactoryBot.define do
 
     user { create(:user) }
     organization { user.organization }
-    user_id { user.id }
-    user_type { user.class.name }
+    user_id { user.try(:id) }
+    user_type { user.try(:class).try(:name) }
     participatory_space { build(:participatory_process, organization:, skip_injection:) }
     component { build(:component, participatory_space:, skip_injection:) }
     resource { build(:dummy_resource, component:, skip_injection:) }
@@ -939,9 +952,10 @@ FactoryBot.define do
   factory :amendment, class: "Decidim::Amendment" do
     transient do
       skip_injection { false }
+      organization { create(:organization, skip_injection:) }
     end
-    amendable { build(:dummy_resource, skip_injection:) }
-    emendation { build(:dummy_resource, skip_injection:) }
+    amendable { build(:dummy_resource, organization:, skip_injection:) }
+    emendation { build(:dummy_resource, organization:, skip_injection:) }
     amender { emendation.try(:creator_author) || emendation.try(:author) }
     state { "evaluating" }
 
@@ -974,7 +988,7 @@ FactoryBot.define do
     end
     reason { "spam" }
     moderation { create(:user_moderation, user:, skip_injection:) }
-    user { build(:user) }
+    user { build(:user, :confirmed) }
   end
 
   factory :user_moderation, class: "Decidim::UserModeration" do
@@ -1039,7 +1053,7 @@ FactoryBot.define do
       skip_injection { false }
     end
     reminder { create(:reminder, skip_injection:) }
-    remindable { build(:dummy_resource, skip_injection:) }
+    remindable { build(:dummy_resource, organization: reminder.user.organization, skip_injection:) }
 
     Decidim::ReminderRecord::STATES.keys.each do |defined_state|
       trait defined_state do