decidim-core 0.23.1 → 0.24.0.rc2

data/lib/decidim/content_parsers/user_group_parser.rb

@@ -38,11 +38,8 @@ module Decidim
       private
 
       def groups
-        @groups ||= Hash[
-          existing_groups.map do |group|
-            [group.nickname, group]
-          end
-        ]
+        @groups ||=
+          existing_groups.index_by(&:nickname)
       end
 
       def existing_groups

data/lib/decidim/content_parsers/user_parser.rb

@@ -38,11 +38,8 @@ module Decidim
       private
 
       def users
-        @users ||= Hash[
-          existing_users.map do |user|
-            [user.nickname, user]
-          end
-        ]
+        @users ||=
+          existing_users.index_by(&:nickname)
       end
 
       def existing_users

data/lib/decidim/content_processor.rb

@@ -116,7 +116,7 @@ module Decidim
       return content if content.blank?
 
       Decidim.content_processors.reduce(content) do |result, type|
-        renderer_klass(type).constantize.new(result).render(options)
+        renderer_klass(type).constantize.new(result).render(**options)
       end
     end
 

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}.freeze
 
       # Replaces found Global IDs matching an existing hashtag with
       # a link to their detail page. The Global IDs representing an
@@ -47,11 +47,8 @@ module Decidim
       private
 
       def hashtags
-        @hashtags ||= Hash[
-          existing_hashtags.map do |hashtag|
-            [hashtag.id, hashtag]
-          end
-        ]
+        @hashtags ||=
+          existing_hashtags.index_by(&:id)
       end
 
       def existing_hashtags

data/lib/decidim/core.rb

@@ -20,6 +20,7 @@ module Decidim
   autoload :Traceable, "decidim/traceable"
   autoload :Loggable, "decidim/loggable"
   autoload :Reportable, "decidim/reportable"
+  autoload :UserReportable, "decidim/user_reportable"
   autoload :Authorable, "decidim/authorable"
   autoload :Coauthorable, "decidim/coauthorable"
   autoload :Participable, "decidim/participable"
@@ -92,6 +93,8 @@ module Decidim
   autoload :HasUploadValidations, "decidim/has_upload_validations"
   autoload :FileValidatorHumanizer, "decidim/file_validator_humanizer"
   autoload :ShareableWithToken, "decidim/shareable_with_token"
+  autoload :RecordEncryptor, "decidim/record_encryptor"
+  autoload :AttachmentAttributes, "decidim/attachment_attributes"
 
   include ActiveSupport::Configurable
   # Loads seeds from all engines.
@@ -115,7 +118,7 @@ module Decidim
           organization,
           manifest.name,
           Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-            Decidim::Faker::Localized.sentence(15)
+            Decidim::Faker::Localized.sentence(word_count: 15)
           end
         )
       end
@@ -149,7 +152,7 @@ module Decidim
 
   # Exposes a configuration option: The application available locales.
   config_accessor :available_locales do
-    %w(en bg ar ca cs da de el eo es es-MX es-PY et eu fi-pl fi fr fr-CA ga gl hr hu id is it ja lt lv mt nl no pl pt pt-BR ro ru sk sl sr sv tr uk)
+    %w(en bg ar ca cs da de el eo es es-MX es-PY et eu fi-pl fi fr fr-CA ga gl hr hu id is it ja ko lt lv mt nl no pl pt pt-BR ro ru sk sl sr sv tr uk vi zh-CN zh-TW)
   end
 
   # Exposes a configuration option: The application default locale.
@@ -357,6 +360,11 @@ module Decidim
     "decidim-cc"
   end
 
+  # Defines how often session_timeouter.js checks time between current moment and last request
+  config_accessor :session_timeouter_interval do
+    10_000
+  end
+
   # Public: Registers a global engine. This method is intended to be used
   # by component engines that also offer unscoped functionality
   #
@@ -556,7 +564,7 @@ module Decidim
     organization = begin
       if model.is_a?(Decidim::Organization)
         model
-      elsif model.respond_to?(:organization)
+      elsif model.respond_to?(:organization) && model.organization.present?
         model.organization
       end
     end

data/lib/decidim/core/api.rb

@@ -2,21 +2,76 @@
 
 module Decidim
   module Core
-    autoload :ParticipatorySpaceInterface, "decidim/api/participatory_space_interface"
-    autoload :ComponentInterface, "decidim/api/component_interface"
-    autoload :AuthorInterface, "decidim/api/author_interface"
-    autoload :AuthorableInterface, "decidim/api/authorable_interface"
-    autoload :CoauthorableInterface, "decidim/api/coauthorable_interface"
-    autoload :CategorizableInterface, "decidim/api/categorizable_interface"
-    autoload :ScopableInterface, "decidim/api/scopable_interface"
-    autoload :AttachableInterface, "decidim/api/attachable_interface"
-    autoload :HashtagInterface, "decidim/api/hashtag_interface"
-    autoload :ParticipatorySpaceResourceableInterface, "decidim/api/participatory_space_resourceable_interface"
-    autoload :FingerprintInterface, "decidim/api/fingerprint_interface"
-    autoload :AmendableInterface, "decidim/api/amendable_interface"
-    autoload :AmendableEntityInterface, "decidim/api/amendable_entity_interface"
-    autoload :TraceableInterface, "decidim/api/traceable_interface"
-    autoload :TimestampsInterface, "decidim/api/timestamps_interface"
-    autoload :EndorsableInterface, "decidim/api/endorsable_interface"
+    autoload :ComponentFinderBase, "decidim/api/functions/component_finder_base"
+    autoload :ComponentList, "decidim/api/functions/component_list"
+    autoload :ComponentListBase, "decidim/api/functions/component_list_base"
+    autoload :NeedsApiFilterAndOrder, "decidim/api/functions/needs_api_filter_and_order"
+    autoload :NeedsApiDefaultOrder, "decidim/api/functions/needs_api_default_order"
+    autoload :ParticipatorySpaceFinderBase, "decidim/api/functions/participatory_space_finder_base"
+    autoload :ParticipatorySpaceListBase, "decidim/api/functions/participatory_space_list_base"
+    autoload :UserEntityFinder, "decidim/api/functions/user_entity_finder"
+    autoload :UserEntityList, "decidim/api/functions/user_entity_list"
+
+    autoload :AmendmentType, "decidim/api/types/amendment_type"
+    autoload :AreaApiType, "decidim/api/types/area_api_type"
+    autoload :AreaTypeType, "decidim/api/types/area_type_type"
+    autoload :AttachmentType, "decidim/api/types/attachment_type"
+    autoload :CategoryType, "decidim/api/types/category_type"
+    autoload :ComponentType, "decidim/api/types/component_type"
+    autoload :CoordinatesType, "decidim/api/types/coordinates_type"
+    autoload :DecidimType, "decidim/api/types/decidim_type"
+    autoload :FingerprintType, "decidim/api/types/fingerprint_type"
+    autoload :HashtagType, "decidim/api/types/hashtag_type"
+    autoload :LocalizedStringType, "decidim/api/types/localized_string_type"
+    autoload :MetricHistoryType, "decidim/api/types/metric_history_type"
+    autoload :MetricType, "decidim/api/types/metric_type"
+    autoload :OrganizationType, "decidim/api/types/organization_type"
+    autoload :ParticipatorySpaceType, "decidim/api/types/participatory_space_type"
+    autoload :ParticipatorySpaceLinkType, "decidim/api/types/participatory_space_link_type"
+    autoload :ScopeApiType, "decidim/api/types/scope_api_type"
+    autoload :SessionType, "decidim/api/types/session_type"
+    autoload :StatisticType, "decidim/api/types/statistic_type"
+    autoload :TraceVersionType, "decidim/api/types/trace_version_type"
+    autoload :TranslatedFieldType, "decidim/api/types/translated_field_type"
+    autoload :UserGroupType, "decidim/api/types/user_group_type"
+    autoload :UserType, "decidim/api/types/user_type"
+
+    autoload :BaseInputFilter, "decidim/api/input_filters/base_input_filter"
+    autoload :ComponentInputFilter, "decidim/api/input_filters/component_input_filter"
+    autoload :HasHastaggableInputFilter, "decidim/api/input_filters/has_hastaggable_input_filter"
+    autoload :HasLocalizedInputFilter, "decidim/api/input_filters/has_localized_input_filter"
+    autoload :HasPublishableInputFilter, "decidim/api/input_filters/has_publishable_input_filter"
+    autoload :HasTimestampInputFilter, "decidim/api/input_filters/has_timestamp_input_filter"
+    autoload :ParticipatorySpaceInputFilter, "decidim/api/input_filters/participatory_space_input_filter"
+    autoload :UserEntityInputFilter, "decidim/api/input_filters/user_entity_input_filter"
+
+    autoload :BaseInputSort, "decidim/api/input_sorts/base_input_sort"
+    autoload :ComponentInputSort, "decidim/api/input_sorts/component_input_sort"
+    autoload :HasEndorsableInputSort, "decidim/api/input_sorts/has_endorsable_input_sort"
+    autoload :HasLocalizedInputSort, "decidim/api/input_sorts/has_localized_input_sort"
+    autoload :HasPublishableInputSort, "decidim/api/input_sorts/has_publishable_input_sort"
+    autoload :HasTimestampInputSort, "decidim/api/input_sorts/has_timestamp_input_sort"
+    autoload :ParticipatorySpaceInputSort, "decidim/api/input_sorts/participatory_space_input_sort"
+    autoload :UserEntityInputSort, "decidim/api/input_sorts/user_entity_input_sort"
+
+    autoload :ParticipatorySpaceInterface, "decidim/api/interfaces/participatory_space_interface"
+    autoload :ComponentInterface, "decidim/api/interfaces/component_interface"
+    autoload :AuthorInterface, "decidim/api/interfaces/author_interface"
+    autoload :AuthorableInterface, "decidim/api/interfaces/authorable_interface"
+    autoload :CoauthorableInterface, "decidim/api/interfaces/coauthorable_interface"
+    autoload :CategorizableInterface, "decidim/api/interfaces/categorizable_interface"
+    autoload :ScopableInterface, "decidim/api/interfaces/scopable_interface"
+    autoload :AttachableInterface, "decidim/api/interfaces/attachable_interface"
+    autoload :HashtagInterface, "decidim/api/interfaces/hashtag_interface"
+    autoload :ParticipatorySpaceResourceableInterface, "decidim/api/interfaces/participatory_space_resourceable_interface"
+    autoload :FingerprintInterface, "decidim/api/interfaces/fingerprint_interface"
+    autoload :AmendableInterface, "decidim/api/interfaces/amendable_interface"
+    autoload :AmendableEntityInterface, "decidim/api/interfaces/amendable_entity_interface"
+    autoload :TraceableInterface, "decidim/api/interfaces/traceable_interface"
+    autoload :TimestampsInterface, "decidim/api/interfaces/timestamps_interface"
+    autoload :EndorsableInterface, "decidim/api/interfaces/endorsable_interface"
+
+    autoload :DateTimeType, "decidim/api/scalars/date_time_type"
+    autoload :DateType, "decidim/api/scalars/date_type"
   end
 end

data/lib/decidim/core/engine.rb

@@ -28,6 +28,7 @@ require "omniauth-twitter"
 require "omniauth-google-oauth2"
 require "invisible_captcha"
 require "premailer/rails"
+require "premailer/adapter/decidim"
 require "geocoder"
 require "paper_trail"
 require "cells/rails"
@@ -36,7 +37,6 @@ require "kaminari"
 require "doorkeeper"
 require "doorkeeper-i18n"
 require "nobspw"
-require "kaminari"
 require "batch-loader"
 require "etherpad-lite"
 require "diffy"
@@ -88,9 +88,9 @@ module Decidim
       end
 
       initializer "decidim.graphql_api" do
-        Decidim::Api::QueryType.define do
-          Decidim::QueryExtensions.define(self)
-        end
+        # Enable them method `!` everywhere for compatibility, this line will be removed when upgrading to GraphQL 2.0
+        GraphQL::DeprecatedDSL.activate
+        Decidim::Api::QueryType.include Decidim::QueryExtensions
 
         Decidim::Api.add_orphan_type Decidim::Core::UserType
         Decidim::Api.add_orphan_type Decidim::Core::UserGroupType
@@ -109,7 +109,7 @@ module Decidim
         # that may be using the `geocoded_by` or `reverse_geocoded_by` class
         # methods injected by the Geocoder gem.
         ActiveSupport.on_load :active_record do
-          ActiveRecord::Base.send(:include, Decidim::Geocodable)
+          ActiveRecord::Base.include Decidim::Geocodable
         end
       end
 
@@ -334,6 +334,36 @@ module Decidim
           end
         end
 
+        Decidim.metrics_registry.register(:blocked_users) do |metric_registry|
+          metric_registry.manager_class = "Decidim::Metrics::BlockedUsersMetricManage"
+
+          metric_registry.settings do |settings|
+            settings.attribute :highlighted, type: :boolean, default: false
+            settings.attribute :scopes, type: :array, default: %w(home)
+            settings.attribute :weight, type: :integer, default: 1
+          end
+        end
+
+        Decidim.metrics_registry.register(:user_reports) do |metric_registry|
+          metric_registry.manager_class = "Decidim::Metrics::UserReportsMetricManage"
+
+          metric_registry.settings do |settings|
+            settings.attribute :highlighted, type: :boolean, default: false
+            settings.attribute :scopes, type: :array, default: %w(home)
+            settings.attribute :weight, type: :integer, default: 1
+          end
+        end
+
+        Decidim.metrics_registry.register(:reported_users) do |metric_registry|
+          metric_registry.manager_class = "Decidim::Metrics::ReportedUsersMetricManage"
+
+          metric_registry.settings do |settings|
+            settings.attribute :highlighted, type: :boolean, default: false
+            settings.attribute :scopes, type: :array, default: %w(home)
+            settings.attribute :weight, type: :integer, default: 1
+          end
+        end
+
         Decidim.metrics_registry.register(:participants) do |metric_registry|
           metric_registry.manager_class = "Decidim::Metrics::ParticipantsMetricManage"
 
@@ -507,8 +537,12 @@ module Decidim
         NOBSPW.configuration.use_ruby_grep = true
       end
 
+      initializer "decidim.premailer" do
+        Premailer::Adapter.use = :decidim
+      end
+
       config.to_prepare do
-        FoundationRailsHelper::FlashHelper.send(:include, Decidim::FlashHelperExtensions)
+        FoundationRailsHelper::FlashHelper.include Decidim::FlashHelperExtensions
       end
     end
   end

data/lib/decidim/core/test.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "decidim/core/test/shared_examples/acts_as_author_examples"
+require "decidim/core/test/shared_examples/admin_log_presenter_examples"
 require "decidim/core/test/shared_examples/authorable"
 require "decidim/core/test/shared_examples/coauthorable"
 require "decidim/core/test/shared_examples/publicable"
@@ -13,6 +14,7 @@ require "decidim/core/test/shared_examples/has_scope"
 require "decidim/core/test/shared_examples/has_category"
 require "decidim/core/test/shared_examples/has_reference"
 require "decidim/core/test/shared_examples/comments_examples"
+require "decidim/core/test/shared_examples/counts_commentators_as_newsletter_participants"
 require "decidim/core/test/shared_examples/announcements_examples"
 require "decidim/core/test/shared_examples/process_announcements_examples"
 require "decidim/core/test/shared_examples/reportable"
@@ -61,3 +63,5 @@ require "decidim/core/test/shared_examples/manage_component_share_tokens"
 require "decidim/core/test/shared_examples/metric_manage_shared_context"
 require "decidim/core/test/shared_examples/embed_resource_examples"
 require "decidim/core/test/shared_examples/resource_search_examples"
+require "decidim/core/test/shared_examples/static_pages_examples"
+require "decidim/core/test/shared_examples/controller_render_views"

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

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "decidim/faker/localized"
+require "decidim/faker/internet"
 require "decidim/dev"
 
 require "decidim/participatory_processes/test/factories"
@@ -13,7 +14,7 @@ end
 
 FactoryBot.define do
   sequence(:title) do |n|
-    "#{Faker::Lorem.sentence(3)} #{n}".delete("'")
+    "#{Faker::Lorem.sentence(word_count: 3)} #{n}".delete("'")
   end
 
   sequence(:name) do |n|
@@ -21,11 +22,11 @@ FactoryBot.define do
   end
 
   sequence(:nickname) do |n|
-    "#{Faker::Lorem.characters(rand(1..10))}_#{n}".gsub("'", "_")
+    "#{Faker::Lorem.characters(number: rand(1..10))}_#{n}".gsub("'", "_")
   end
 
   sequence(:hashtag_name) do |n|
-    "#{Faker::Lorem.characters(rand(1..10))}_#{n}".gsub("'", "_")
+    "#{Faker::Lorem.characters(number: rand(1..10))}_#{n}".gsub("'", "_")
   end
 
   sequence(:email) do |n|
@@ -37,19 +38,19 @@ FactoryBot.define do
   end
 
   sequence(:slug) do |n|
-    "#{Faker::Internet.slug(nil, "-")}-#{n}".gsub("'", "_")
+    "#{Decidim::Faker::Internet.slug(words: nil, glue: "-")}-#{n}".gsub("'", "_")
   end
 
   sequence(:scope_name) do |n|
-    "#{Faker::Lorem.sentence(1, true, 3)} #{n}".gsub("s", "z").gsub("S", "Z")
+    "#{Faker::Lorem.sentence(word_count: 1, supplemental: true, random_words_to_add: 3)} #{n}".gsub("s", "z").gsub("S", "Z")
   end
 
   sequence(:scope_code) do |n|
-    "#{Faker::Lorem.characters(4).upcase}-#{n}"
+    "#{Faker::Lorem.characters(number: 4).upcase}-#{n}"
   end
 
   sequence(:area_name) do |n|
-    "#{Faker::Lorem.sentence(1, true, 3)} #{n}"
+    "#{Faker::Lorem.sentence(word_count: 1, supplemental: true, random_words_to_add: 3)} #{n}"
   end
 
   factory :category, class: "Decidim::Category" do
@@ -67,6 +68,10 @@ FactoryBot.define do
   end
 
   factory :organization, class: "Decidim::Organization" do
+    transient do
+      create_static_pages { true }
+    end
+
     name { Faker::Company.unique.name }
     reference_prefix { Faker::Name.suffix }
     time_zone { "UTC" }
@@ -104,9 +109,15 @@ FactoryBot.define do
     end
     file_upload_settings { Decidim::OrganizationSettings.default(:upload) }
 
-    after(:create) do |organization|
-      tos_page = Decidim::StaticPage.find_by(slug: "terms-and-conditions", organization: organization)
-      create(:static_page, :tos, organization: organization) if tos_page.nil?
+    trait :secure_context do
+      host { "localhost" }
+    end
+
+    after(:create) do |organization, evaluator|
+      if evaluator.create_static_pages
+        tos_page = Decidim::StaticPage.find_by(slug: "terms-and-conditions", organization: organization)
+        create(:static_page, :tos, organization: organization) if tos_page.nil?
+      end
     end
   end
 
@@ -121,15 +132,23 @@ FactoryBot.define do
     tos_agreement { "1" }
     avatar { Decidim::Dev.test_file("avatar.jpg", "image/jpeg") }
     personal_url { Faker::Internet.url }
-    about { "<script>alert(\"ABOUT\");</script>" + Faker::Lorem.paragraph(2) }
+    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 }
+    email_on_moderations { true }
 
     trait :confirmed do
       confirmed_at { Time.current }
     end
 
+    trait :blocked do
+      blocked { true }
+      blocked_at { Time.current }
+      extended_data { { "user_name": generate(:name) } }
+      name { "Blocked user" }
+    end
+
     trait :deleted do
       email { "" }
       deleted_at { Time.current }
@@ -175,7 +194,7 @@ FactoryBot.define do
 
   factory :user_group, class: "Decidim::UserGroup" do
     transient do
-      document_number { Faker::Number.number(8) + "X" }
+      document_number { "#{Faker::Number.number(digits: 8)}X" }
       phone { Faker::PhoneNumber.phone_number }
       rejected_at { nil }
       verified_at { nil }
@@ -184,7 +203,7 @@ FactoryBot.define do
     sequence(:name) { |n| "#{Faker::Company.name} #{n}" }
     email { generate(:user_group_email) }
     nickname { generate(:nickname) }
-    about { "<script>alert(\"ABOUT\");</script>" + Faker::Lorem.paragraph(2) }
+    about { "<script>alert(\"ABOUT\");</script>#{Faker::Lorem.paragraph(sentence_count: 2)}" }
     organization
     avatar { Decidim::Dev.test_file("avatar.jpg", "image/jpeg") } # Keep after organization
 
@@ -259,6 +278,7 @@ FactoryBot.define do
     title { generate_localized_title }
     content { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
     organization { build(:organization) }
+    allow_public_access { false }
 
     trait :default do
       slug { Decidim::StaticPage::DEFAULT_PAGES.sample }
@@ -290,7 +310,7 @@ FactoryBot.define do
   factory :attachment_collection, class: "Decidim::AttachmentCollection" do
     name { generate_localized_title }
     description { generate_localized_title }
-    weight { Faker::Number.number(1) }
+    weight { Faker::Number.number(digits: 1) }
 
     association :collection_for, factory: :participatory_process
   end
@@ -298,7 +318,7 @@ FactoryBot.define do
   factory :attachment, class: "Decidim::Attachment" do
     title { generate_localized_title }
     description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
-    weight { Faker::Number.number(1) }
+    weight { Faker::Number.number(digits: 1) }
     attached_to { build(:participatory_process) }
     content_type { "image/jpeg" }
     file { Decidim::Dev.test_file("city.jpeg", "image/jpeg") } # Keep after attached_to
@@ -402,6 +422,14 @@ FactoryBot.define do
         }
       end
     end
+
+    trait :with_comments_disabled do
+      settings do
+        {
+          comments_enabled: false
+        }
+      end
+    end
   end
 
   factory :scope_type, class: "Decidim::ScopeType" do
@@ -681,6 +709,16 @@ FactoryBot.define do
     end
   end
 
+  factory :user_report, class: "Decidim::UserReport" do
+    reason { "spam" }
+    moderation { build(:user_moderation) }
+    user { build(:user, organization: moderation.organization) }
+  end
+
+  factory :user_moderation, class: "Decidim::UserModeration" do
+    user { build(:user) }
+  end
+
   factory :endorsement, class: "Decidim::Endorsement" do
     resource { build(:dummy_resource) }
     author { resource.try(:creator_author) || resource.try(:author) || build(:user, organization: resource.organization) }