decidim-core 0.26.8 → 0.27.0.rc1

data/lib/decidim/component_manifest.rb

@@ -12,18 +12,18 @@ module Decidim
   # `Decidim.register_component`.
   class ComponentManifest
     include ActiveModel::Model
-    include Virtus.model
+    include Decidim::AttributeObject::Model
 
-    attribute :admin_engine, Rails::Engine
-    attribute :engine, Rails::Engine
+    attribute :admin_engine, Rails::Engine, **{}
+    attribute :engine, Rails::Engine, **{}
 
     attribute :name, Symbol
-    attribute :hooks, Hash[Symbol => Array[Proc]], default: {}
+    attribute(:hooks, { Symbol => Array[Proc] }, default: {})
 
     attribute :query_type, String, default: "Decidim::Core::ComponentType"
 
     # An array with the name of the classes that will be exported with
-    # the data portability feature for this component. For example, `Decidim::<MyModule>::<MyClass>``
+    # the download your data feature for this component. For example, `Decidim::<MyModule>::<MyClass>``
     attribute :data_portable_entities, Array, default: []
 
     # An array with the name of the classes to know the participants

data/lib/decidim/component_validator.rb

@@ -13,10 +13,10 @@ class ComponentValidator < ActiveModel::EachValidator
   # over all the validators.
   def validate_each(record, attribute, component)
     unless component
-      record.errors[attribute] << :blank
+      record.errors.add(attribute, :blank)
       return
     end
 
-    record.errors[attribute] << :invalid if component.manifest_name.to_s != options[:manifest].to_s
+    record.errors.add(attribute, :invalid) if component.manifest_name.to_s != options[:manifest].to_s
   end
 end

data/lib/decidim/content_block_manifest.rb

@@ -20,7 +20,7 @@ module Decidim
   # be unique per scope.
   class ContentBlockManifest
     include ActiveModel::Model
-    include Virtus.model
+    include Decidim::AttributeObject::Model
 
     attribute :name, Symbol
     attribute :public_name_key, String

data/lib/decidim/content_parsers/hashtag_parser.rb

@@ -18,14 +18,14 @@ module Decidim
 
       # Matches a hashtag if it starts with a letter or number
       # and only contains letters, numbers or underscores.
-      HASHTAG_REGEX = /(?:\A|\s\K)\B#([[:alnum:]](?:[[:alnum:]]|_)*)\b/i.freeze
+      HASHTAG_REGEX = /\s\K\B#([[:alnum:]](?:[[:alnum:]]|_)*)\b/i
 
       # Replaces hashtags name with new or existing hashtags models global ids.
       #
       # @return [String] the content with the hashtags replaced by global ids
       def rewrite
         content.gsub(HASHTAG_REGEX) do |match|
-          "#{hashtag(match[1..-1]).to_global_id}/#{(extra_hashtags? ? "_" : "")}#{match[1..-1]}"
+          "#{hashtag(match[1..-1]).to_global_id}/#{extra_hashtags? ? "_" : ""}#{match[1..-1]}"
         end
       end
 

data/lib/decidim/content_parsers/resource_parser.rb

@@ -11,7 +11,7 @@ module Decidim
       URL_REGEX_CONTENT = '[\w.-]+[\w\-\._~:\/?#\[\]@!\$&\'\(\)\*\+,;=.]+'
       URL_REGEX_END_CHAR = '[\d]'
       # Matches a mentioned resource ID (~(d)+ expression)
-      ID_REGEX = /~(\d+)/.freeze
+      ID_REGEX = /~(\d+)/
 
       # Replaces found mentions matching an existing
       # Resource with a global id for that Resource. Other mentions found that doesn't

data/lib/decidim/content_parsers/user_group_parser.rb

@@ -16,7 +16,7 @@ module Decidim
       Metadata = Struct.new(:groups)
 
       # Matches a nickname if contains letters, numbers or underscores.
-      MENTION_REGEX = /\B@(\w*)\b/.freeze
+      MENTION_REGEX = /\B@(\w*)\b/
 
       # Replaces found mentions matching a nickname of an existing
       # group in the current organization with a global id. Other

data/lib/decidim/content_parsers/user_parser.rb

@@ -16,7 +16,7 @@ module Decidim
       Metadata = Struct.new(:users)
 
       # Matches a nickname if contains letters, numbers or underscores.
-      MENTION_REGEX = /\B@(\w*)\b/.freeze
+      MENTION_REGEX = /\B@(\w*)\b/
 
       # Replaces found mentions matching a nickname of an existing
       # user in the current organization with a global id. Other
@@ -26,7 +26,7 @@ module Decidim
       # @return [String] the content with the valid mentions replaced by a global id
       def rewrite
         content.gsub(MENTION_REGEX) do |match|
-          users[match[1..-1]]&.to_global_id&.to_s || match
+          users[match[1..-1].downcase]&.to_global_id&.to_s || match
         end
       end
 
@@ -43,11 +43,11 @@ module Decidim
       end
 
       def existing_users
-        @existing_users ||= Decidim::User.where(organization: current_organization, nickname: content_nicknames)
+        @existing_users ||= Decidim::User.where("decidim_organization_id = ? AND LOWER(nickname) IN (?)", current_organization.id, content_nicknames)
       end
 
       def content_nicknames
-        @content_nicknames ||= content.scan(MENTION_REGEX).flatten.uniq
+        @content_nicknames ||= content.scan(MENTION_REGEX).flatten.uniq.map!(&:downcase)
       end
 
       def current_organization

data/lib/decidim/content_renderers/hashtag_renderer.rb

@@ -10,7 +10,7 @@ module Decidim
     # @see BaseRenderer Examples of how to use a content renderer
     class HashtagRenderer < BaseRenderer
       # Matches a global id representing a Decidim::Hashtag
-      GLOBAL_ID_REGEX = %r{gid://[\w-]*/Decidim::Hashtag/(\d+)/?(_?)([[:alnum:]](?:[[:alnum:]]|_)*)?\b}.freeze
+      GLOBAL_ID_REGEX = %r{gid://[\w-]*/Decidim::Hashtag/(\d+)/?(_?)([[:alnum:]](?:[[:alnum:]]|_)*)?\b}
 
       # Replaces found Global IDs matching an existing hashtag with
       # a link to their detail page. The Global IDs representing an

data/lib/decidim/content_renderers/link_renderer.rb

@@ -45,12 +45,12 @@ module Decidim
 
       private
 
-      AUTO_LINK_RE = %r{(?: ((?:ftp|http|https):)// | www\. )[^\s<\u00A0"]+}ix.freeze
+      AUTO_LINK_RE = %r{(?: ((?:ftp|http|https):)// | www\. )[^\s<\u00A0"]+}ix
 
       # # regexps for determining context, used high-volume
       AUTO_LINK_CRE = [/<[^>]+$/, /^[^>]*>/, /<a\b.*?>/i, %r{</a>}i].freeze
 
-      PUNCTUATION_RE = %r{[^\p{Word}/=&]$}.freeze
+      PUNCTUATION_RE = %r{[^\p{Word}/=&]$}
 
       BRACKETS = { "]" => "[", ")" => "(", "}" => "{" }.freeze
 

data/lib/decidim/content_renderers/user_group_renderer.rb

@@ -10,7 +10,7 @@ module Decidim
     # @see BaseRenderer Examples of how to use a content renderer
     class UserGroupRenderer < BaseRenderer
       # Matches a global id representing a Decidim::UserGroup
-      GLOBAL_ID_REGEX = %r{gid://[\w-]+/Decidim::UserGroup/\d+}.freeze
+      GLOBAL_ID_REGEX = %r{gid://[\w-]+/Decidim::UserGroup/\d+}
 
       # Replaces found Global IDs matching an existing user with
       # a link to their profile. The Global IDs representing an

data/lib/decidim/content_renderers/user_renderer.rb

@@ -10,7 +10,7 @@ module Decidim
     # @see BaseRenderer Examples of how to use a content renderer
     class UserRenderer < BaseRenderer
       # Matches a global id representing a Decidim::User
-      GLOBAL_ID_REGEX = %r{gid://[\w-]+/Decidim::User/\d+}.freeze
+      GLOBAL_ID_REGEX = %r{gid://[\w-]+/Decidim::User/\d+}
 
       # Replaces found Global IDs matching an existing user with
       # a link to their profile. The Global IDs representing an

data/lib/decidim/controller_helpers.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+# Copyright (c) 2016 Andy Pike - The MIT license
+#
+# This file has been copied from https://github.com/andypike/rectify/blob/master/lib/rectify/controller_helpers.rb
+# We have done this so we can decouple Decidim from any Virtus dependency, which is a dead project
+# Please follow Decidim discussion to understand more https://github.com/decidim/decidim/discussions/7234
+module Decidim
+  module ControllerHelpers
+    def self.included(base_class)
+      base_class.helper_method(:presenter)
+    end
+
+    def present(presenter, options = {})
+      presenter_type = options.fetch(:for, :template)
+
+      presenter.attach_controller(self)
+      rectify_presenters[presenter_type] = presenter
+    end
+
+    def presenter(presenter_type = :template)
+      rectify_presenters[presenter_type]
+    end
+
+    def expose(presentation_data)
+      presentation_data.each do |attribute, value|
+        if presenter.respond_to?("#{attribute}=")
+          presenter.public_send("#{attribute}=", value)
+        else
+          instance_variable_set("@#{attribute}", value)
+        end
+      end
+    end
+
+    private
+
+    def rectify_presenters
+      @rectify_presenters ||= {}
+    end
+  end
+end

data/lib/decidim/core/engine.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "rails"
+require "decidim/rails"
 require "active_support/all"
 require "action_view/railtie"
 
@@ -13,7 +13,6 @@ require "devise-i18n"
 require "devise_invitable"
 require "foundation_rails_helper"
 require "active_link_to"
-require "rectify"
 require "carrierwave"
 require "rails-i18n"
 require "date_validator"
@@ -39,7 +38,7 @@ require "mime-types"
 require "diffy"
 require "social-share-button"
 require "ransack"
-require "searchlight"
+require "wisper"
 require "webpacker"
 
 # Needed for the assets:precompile task, for configuring webpacker instance
@@ -49,9 +48,6 @@ require "decidim/api"
 require "decidim/middleware/strip_x_forwarded_host"
 require "decidim/middleware/current_organization"
 
-# Backport cookie handling extensions for Rails 6.0
-require "decidim/middleware/rails_cookies"
-
 module Decidim
   module Core
     # Decidim's core Rails Engine.
@@ -67,6 +63,10 @@ module Decidim
         end
       end
 
+      initializer "decidim.action_mailer" do |app|
+        app.config.action_mailer.deliver_later_queue_name = :mailers
+      end
+
       initializer "decidim.middleware" do |app|
         app.config.middleware.insert_before Warden::Manager, Decidim::Middleware::CurrentOrganization
         app.config.middleware.insert_before Warden::Manager, Decidim::Middleware::StripXForwardedHost
@@ -92,6 +92,17 @@ module Decidim
         Decidim::Api.add_orphan_type Decidim::Core::UserGroupType
       end
 
+      initializer "decidim.ransack" do
+        Ransack.configure do |config|
+          # Avoid turning parameter values such as user_id[]=1&user_id[]=2 into
+          # { user_id: [true, "2"] }. This option allows us to handle the type
+          # convertions manually instead for each case.
+          # See: https://github.com/activerecord-hackery/ransack/issues/593
+          # See: https://github.com/activerecord-hackery/ransack/pull/742
+          config.sanitize_custom_scope_booleans = false
+        end
+      end
+
       initializer "decidim.i18n_exceptions" do
         ActionView::Base.raise_on_missing_translations = true unless Rails.env.production?
       end
@@ -122,16 +133,15 @@ module Decidim
         next if Decidim.maps.present?
         next if Decidim.geocoder.blank?
 
-        legacy_api_key ||= begin
-          if Decidim.geocoder[:here_api_key].present?
-            Decidim.geocoder.fetch(:here_api_key)
-          elsif Decidim.geocoder[:here_app_id].present?
-            [
-              Decidim.geocoder.fetch(:here_app_id),
-              Decidim.geocoder.fetch(:here_app_code)
-            ]
-          end
-        end
+        legacy_api_key ||= if Decidim.geocoder[:here_api_key].present?
+                             Decidim.geocoder.fetch(:here_api_key)
+                           elsif Decidim.geocoder[:here_app_id].present?
+                             [
+                               Decidim.geocoder.fetch(:here_app_id),
+                               Decidim.geocoder.fetch(:here_app_code)
+                             ]
+                           end
+
         next unless legacy_api_key
 
         ActiveSupport::Deprecation.warn(
@@ -167,6 +177,7 @@ module Decidim
 
         Decidim.stats.register :processes_count, priority: StatsRegistry::HIGH_PRIORITY do |organization, start_at, end_at|
           processes = ParticipatoryProcesses::OrganizationPrioritizedParticipatoryProcesses.new(organization)
+
           processes = processes.where("created_at >= ?", start_at) if start_at.present?
           processes = processes.where("created_at <= ?", end_at) if end_at.present?
           processes.count
@@ -221,9 +232,9 @@ module Decidim
                         decidim.user_interests_path,
                         position: 1.4
 
-          menu.add_item :data_portability,
+          menu.add_item :download_your_data,
                         t("my_data", scope: "layouts.decidim.user_profile"),
-                        decidim.data_portability_path,
+                        decidim.download_your_data_path,
                         position: 1.5
 
           menu.add_item :delete_account,
@@ -254,7 +265,7 @@ module Decidim
         Cell::ViewModel.view_paths << File.expand_path("#{Decidim::Core::Engine.root}/app/views") # for partials
       end
 
-      initializer "doorkeeper", before: "doorkeeper.params.filter" do
+      initializer "doorkeeper" do
         Doorkeeper.configure do
           orm :active_record
 
@@ -531,6 +542,11 @@ module Decidim
       end
 
       initializer "decidim.core.add_badges" do
+        Decidim::Gamification.register_badge(:invitations) do |badge|
+          badge.levels = [1, 5, 10, 30, 50]
+          badge.reset = ->(user) { Decidim::User.where(invited_by: user.id).count }
+        end
+
         Decidim::Gamification.register_badge(:followers) do |badge|
           badge.levels = [1, 15, 30, 60, 100]
           badge.reset = ->(user) { user.followers.count }

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

@@ -17,8 +17,8 @@ FactoryBot.define do
     "#{Faker::Lorem.sentence(word_count: 3)} #{n}".delete("'")
   end
 
-  sequence(:name) do |n|
-    "#{Faker::Name.name} #{n}".delete("'")
+  sequence(:name) do |_|
+    Faker::Name.name.delete("'")
   end
 
   sequence(:nickname) do |n|
@@ -125,8 +125,6 @@ FactoryBot.define do
 
   factory :user, class: "Decidim::User" do
     email { generate(:email) }
-    password { "decidim123456" }
-    password_confirmation { password }
     name { generate(:name) }
     nickname { generate(:nickname) }
     organization
@@ -137,8 +135,10 @@ FactoryBot.define do
     about { "<script>alert(\"ABOUT\");</script>#{Faker::Lorem.paragraph(sentence_count: 2)}" }
     confirmation_sent_at { Time.current }
     accepted_tos_version { organization.tos_version }
-    email_on_notification { true }
+    notifications_sending_frequency { "real_time" }
     email_on_moderations { true }
+    password_updated_at { Time.current }
+    previous_passwords { [] }
     extended_data { {} }
 
     trait :confirmed do
@@ -148,7 +148,7 @@ FactoryBot.define do
     trait :blocked do
       blocked { true }
       blocked_at { Time.current }
-      extended_data { { "user_name": generate(:name) } }
+      extended_data { { user_name: generate(:name) } }
       name { "Blocked user" }
     end
 
@@ -183,6 +183,14 @@ FactoryBot.define do
       officialized_at { Time.current }
       officialized_as { generate_localized_title }
     end
+
+    after(:build) do |user, evaluator|
+      # We have specs that call e.g. `create(:user, admin: true)` where we need
+      # to do this to ensure the user creation does not fail due to the short
+      # password.
+      user.password ||= evaluator.password || "decidim123456789"
+      user.password_confirmation ||= evaluator.password_confirmation || user.password
+    end
   end
 
   factory :participatory_space_private_user, class: "Decidim::ParticipatorySpacePrivateUser" do
@@ -226,20 +234,13 @@ FactoryBot.define do
       confirmed_at { Time.current }
     end
 
-    trait :blocked do
-      blocked { true }
-      blocked_at { Time.current }
-      extended_data { { user_name: generate(:name) } }
-      name { "Blocked user group" }
-    end
-
     after(:build) do |user_group, evaluator|
-      user_group.extended_data = user_group.extended_data.merge({
-                                                                  document_number: evaluator.document_number,
-                                                                  phone: evaluator.phone,
-                                                                  rejected_at: evaluator.rejected_at,
-                                                                  verified_at: evaluator.verified_at
-                                                                })
+      user_group.extended_data = {
+        document_number: evaluator.document_number,
+        phone: evaluator.phone,
+        rejected_at: evaluator.rejected_at,
+        verified_at: evaluator.verified_at
+      }
     end
 
     after(:create) do |user_group, evaluator|
@@ -721,8 +722,8 @@ FactoryBot.define do
 
   factory :user_report, class: "Decidim::UserReport" do
     reason { "spam" }
-    moderation { build(:user_moderation) }
-    user { build(:user, organization: moderation.organization) }
+    moderation { create(:user_moderation, user: user) }
+    user { build(:user) }
   end
 
   factory :user_moderation, class: "Decidim::UserModeration" do
@@ -763,4 +764,36 @@ FactoryBot.define do
     author { create(:user, :admin, :confirmed, organization: organization) }
     file { Decidim::Dev.test_file("city.jpeg", "image/jpeg") }
   end
+
+  factory :reminder, class: "Decidim::Reminder" do
+    user { build(:user) }
+    component { build(:dummy_component, organization: user.organization) }
+  end
+
+  factory :reminder_record, class: "Decidim::ReminderRecord" do
+    reminder { create(:reminder) }
+    remindable { build(:dummy_resource) }
+  end
+
+  factory :reminder_delivery, class: "Decidim::ReminderDelivery" do
+    reminder { create(:reminder) }
+  end
+
+  factory :short_link, class: "Decidim::ShortLink" do
+    target { create(:component, manifest_name: "dummy") }
+    route_name { nil }
+    params { {} }
+
+    before(:create) do |object|
+      object.organization ||= object.target if object.target.is_a?(Decidim::Organization)
+      object.organization ||= object.target.try(:organization) || create(:organization)
+      object.identifier ||= Decidim::ShortLink.unique_identifier_within(object.organization)
+      object.mounted_engine_name ||=
+        if object.target.respond_to?(:participatory_space)
+          "decidim_#{object.target.participatory_space.underscored_name}_dummy"
+        else
+          "decidim"
+        end
+    end
+  end
 end

data/lib/decidim/core/test/shared_examples/admin_resource_gallery_examples.rb

@@ -4,8 +4,14 @@ shared_examples "admin creates resource gallery" do
   context "when uploading images" do
     let(:uploaded_photos) do
       [
-        Decidim::Dev.test_file("city.jpeg", "image/jpeg"),
-        Decidim::Dev.test_file("city2.jpeg", "image/jpeg")
+        {
+          title: "Picture of the city",
+          file: ActiveStorage::Blob.create_and_upload!(io: Decidim::Dev.test_file("city.jpeg", "image/jpeg"), filename: "city.jpeg").signed_id
+        },
+        {
+          title: "Picture of another city",
+          file: ActiveStorage::Blob.create_and_upload!(io: Decidim::Dev.test_file("city2.jpeg", "image/jpeg"), filename: "city2.jpeg").signed_id
+        }
       ]
     end
     let(:photos) { [] }
@@ -33,8 +39,14 @@ shared_examples "admin manages resource gallery" do
   context "when managing images" do
     let(:uploaded_photos) do
       [
-        Decidim::Dev.test_file("city.jpeg", "image/jpeg"),
-        Decidim::Dev.test_file("city2.jpeg", "image/jpeg")
+        {
+          title: "Picture of the city",
+          file: ActiveStorage::Blob.create_and_upload!(io: Decidim::Dev.test_file("city.jpeg", "image/jpeg"), filename: "city.jpeg").signed_id
+        },
+        {
+          title: "Picture of another city",
+          file: ActiveStorage::Blob.create_and_upload!(io: Decidim::Dev.test_file("city2.jpeg", "image/jpeg"), filename: "city2.jpeg").signed_id
+        }
       ]
     end
     let(:photos) { [] }

data/lib/decidim/core/test/shared_examples/amendable/amendment_form_examples.rb

@@ -21,7 +21,7 @@ shared_examples "an amendment form" do
 
     it "only adds errors to this field" do
       subject.valid?
-      expect(subject.errors.keys).to eq [:title]
+      expect(subject.errors.attribute_names).to eq [:title]
     end
   end
 

data/lib/decidim/core/test/shared_examples/authorable_interface_examples.rb

@@ -25,7 +25,7 @@ shared_examples_for "authorable interface" do
         model.update(author: author, user_group: nil)
       end
 
-      it "includes the user's ID" do
+      it "includes the user's name" do
         expect(response["author"]["name"]).to eq(author.name)
       end
     end
@@ -38,9 +38,22 @@ shared_examples_for "authorable interface" do
         model.update(user_group: user_group, author: nil)
       end
 
-      it "includes the user's ID" do
+      it "includes the user group's name" do
         expect(response["author"]["name"]).to eq(user_group.name)
       end
     end
+
+    describe "with an organization" do
+      let(:organization) { model.participatory_space.organization }
+      let(:query) { "{ author { name } }" }
+
+      before do
+        model.update(author: organization, user_group: nil)
+      end
+
+      it "does not return a main author" do
+        expect(response["author"]).to eq(nil)
+      end
+    end
   end
 end

data/lib/decidim/core/test/shared_examples/coauthorable_interface_examples.rb

@@ -65,7 +65,7 @@ shared_examples_for "coauthorable interface" do
           expect(response["authors"]).to include("name" => coauthor.name)
         end
 
-        it "do not return a main author" do
+        it "does not return a main author" do
           expect(response["author"]).to eq(nil)
         end
       end
@@ -82,7 +82,7 @@ shared_examples_for "coauthorable interface" do
           expect(response["authors"]).to include("name" => coauthor.name)
         end
 
-        it "do not return a main author" do
+        it "does not return a main author" do
           expect(response["author"]).to eq(nil)
         end
       end