decidim-core 0.27.0.rc1 → 0.27.0.rc2

data/lib/decidim/dependency_resolver.rb

@@ -0,0 +1,272 @@
+# frozen_string_literal: true
+
+module Decidim
+  # The dependency resolver provides information about the Decidim module
+  # dependencies. For instance, it can be used to check if a particular Decidim
+  # module is needed by the instance or not.
+  #
+  # This is a singleton utility in order to make it perform better when it is
+  # called from different places throughout the application.
+  #
+  # @example Checking whether a module is needed by the instance
+  #   Decidim::DependencyResolver.instance.needed?("decidim-proposals")
+  class DependencyResolver
+    include Singleton
+
+    def initialize
+      @cache = []
+    end
+
+    # Finds a gem specification for the gem with the name provided as the
+    # argument.
+    #
+    # When bundler is available, searches whether the gem is listed in the
+    # Gemfile or required as a dependency for one of the gems in the Gemfile or
+    # their dependencies.
+    #
+    # When bundler is not available, gets the gem specification from the loaded
+    # specs which means any gems available in the gem install folder.
+    #
+    # @param gem [String] The name for the gem to be looked up.
+    # @return [Bundler::LazySpecification, Gem::Specification, nil] When bundler
+    #   is available, returns `Bundler::LazySpecification`. When bundler is not
+    #   available, returns `Gem::Specification`. Both of these implement the
+    #   necessary methods for the other checks. In both cases returns nil if
+    #   the gem is not found.
+    def lookup(gem)
+      # In case the lookup method is called with a spec definition, return the
+      # definition itself.
+      return gem unless gem.is_a?(String)
+
+      if bundler?
+        lookup = Lookup.new
+        return lookup.spec(gem) if cache.include?(gem)
+
+        # Keep a local cache of the already processed gems in order to avoid
+        # double lookups.
+        lookup.find(Bundler.definition.dependencies, gem) do |dependency|
+          if potential_module?(dependency.name)
+            cache_miss = cache.exclude?(dependency.name)
+            cache << dependency.name if cache_miss
+            cache_miss
+          else
+            false
+          end
+        end
+      else
+        return unless potential_module?(gem)
+
+        Gem.loaded_specs[gem]
+      end
+    end
+
+    # Resolves the main load file path for module defined by the gem
+    # specification.
+    #
+    # @param spec [Bundler::LazySpecification, Gem::Specification, String] The
+    #   gem specification to test or the name of the gem.
+    # @return [String] A string pointing the path to the module's main load
+    #   file.
+    def module_path(spec)
+      spec = lookup(spec)
+      return unless spec
+
+      "#{spec.full_gem_path}/lib/#{spec.name.gsub("-", "/")}.rb"
+    end
+
+    # Resolves whether the module for the gem specification defines the main
+    # load file.
+    #
+    # @param spec [Bundler::LazySpecification, Gem::Specification, String] The
+    #   gem specification to test or the name of the gem.
+    # @return [Boolean] A boolean indicating if the gem defined by the spec is
+    #   available for loading.
+    def available?(spec)
+      path = module_path(spec)
+      return false unless path
+
+      File.exist?(path)
+    end
+
+    # Checks if the module for the gem speficiation has been loaded through
+    # `require "decidim/foo"`.
+    #
+    # @param spec [Bundler::LazySpecification, Gem::Specification, String] The
+    #   gem specification to test or the name of the gem.
+    # @return [Boolean] A boolean indicating if the gem defined by the spec is
+    #   loaded.
+    def loaded?(spec)
+      return false unless available?(spec)
+
+      $LOADED_FEATURES.include?(module_path(spec))
+    end
+
+    # Resolves whether the target gem is needed or not, i.e. does it need to be
+    # loaded.
+    #
+    # When bundler is available, the dependencies are resolved based on the
+    # modules defined in the Gemfile which means that the gem is always needed
+    # when it is reported as available by the resolver (i.e. defined as a
+    # dependency in the Gemfile itself or one of those gems depend on it).
+    #
+    # When bundler is not available, this will check whether the Decidim module
+    # provided by the gem has been already required/loaded or not. In this
+    # situation, it is impossible to know whether the implementer has intended
+    # the gem to be used or not, so we assume in these situations implementers
+    # will load all the gems they want before running any initializers. This
+    # means that the `require "decidim/foo"` statements have to be listed for
+    # all modules before the initialization process.
+    #
+    # @param spec [Bundler::LazySpecification, Gem::Specification, String] The
+    #   gem specification to test or the name of the gem.
+    # @return [Boolean] A boolean indicating if the gem defined by the spec is
+    #   needed.
+    def needed?(spec)
+      spec = lookup(spec)
+      return false unless spec
+
+      if bundler?
+        available?(spec)
+      else
+        loaded?(spec)
+      end
+    end
+
+    private
+
+    attr_accessor :cache
+
+    # Reports whether bundler is available.
+    #
+    # @return [Boolean] A boolean indicating if bundler is available or not.
+    def bundler?
+      defined?(Bundler)
+    end
+
+    # Only match the decidim gems. Skip the decidim-dev gem because it has
+    # "decidim" as a runtime dependency which would cause all the default
+    # gems to be always reported as available.
+    #
+    # @return [Boolean] A boolean indicating if the given gem name is a
+    #   potential Decidim module to be processed.
+    def potential_module?(name)
+      name != "decidim-dev" && name =~ /decidim(-.*)?/
+    end
+
+    # The lookup class takes care of the individual recursive lookups over a
+    # dependency tree.
+    class Lookup
+      # @param debug [Boolean] A boolean indicating if the debug mode is enabled
+      #   or not. False by default.
+      def initialize(debug: false)
+        @current_level = 0
+        return unless debug
+
+        formatter = proc do |_severity, _datetime, _progname, msg|
+          "#{msg}\n"
+        end
+        @logger = Logger.new($stdout, formatter: formatter)
+        logger.debug!
+      end
+
+      # Iterates recursively through the runtime dependencies array and their
+      # sub-dependencies to find whether the provided gem is included. This
+      # always iterates through the whole dependency tree even when the gem is
+      # already found in order not to process the same dependencies multiple
+      # times and to make the cache work correctly when calling this.
+      #
+      # @param dependencies [Array] An array of the dependencies to iterate
+      #   through.
+      # @param gem [String] The name of the gem to find.
+      # @yield [dependency] Yields each dependency to be processed to the
+      #   provided block to check if that dependency needs to be processed or
+      #   not.
+      # @yieldparam [Gem::Dependency] The runtime dependency being processed.
+      # @yieldreturn [Boolean] A boolean indicating whether this dependency
+      #   needs to be processed or not. True indicates it needs to be processed
+      #   and false indicates processing is not needed.
+      # @return [Bundler::LazySpecification, nil] The specification for the gem
+      #   or nil when it is not found.
+      def find(dependencies, gem, &block)
+        found = nil
+        dependencies.each do |dependency|
+          next unless process?(dependency, &block)
+
+          spec = spec(dependency.name)
+          next unless spec # E.g. the "bundler" gem is not in the locked gems
+
+          log(dependency)
+
+          found ||= spec if spec.name == gem
+
+          @current_level += 1
+          # Do not se the found value directly here because otherwise the
+          # recursive call would not be made if the target gem is already found.
+          sub_spec = find(spec.dependencies, gem, &block)
+          @current_level -= 1
+          found ||= sub_spec
+        end
+
+        found
+      end
+
+      # Finds a gem specification from the locked gems of the instance.
+      #
+      # Note that this does not resolve if the module is needed or not. This may
+      # also return the gem specification even when it is not listed in the
+      # Gemfile, e.g. when the Decidim gems are installed through git.
+      #
+      # @param name [String] The name of the gem to find.
+      # @return [Bundler::LazySpecification, nil] The specification for the gem
+      #   or nil if the gem is not listed in the locked gems.
+      def spec(name)
+        Bundler.definition.locked_gems.specs.find { |s| s.name == name }
+      end
+
+      private
+
+      attr_reader :logger, :current_level
+
+      # Decides whether a dependency needs to be processed, i.e. compared
+      # whether it is the gem to be found.
+      #
+      # @param dependency [Gem::Dependency] The dependency being processed.
+      # @yield [dependency] Yields each dependency to be processed to the
+      #   provided block to check if that dependency needs to be processed or
+      #   not.
+      # @yieldparam [Gem::Dependency] The runtime dependency being processed.
+      # @yieldreturn [Boolean] A boolean indicating whether this dependency
+      #   needs to be processed or not. True indicates it needs to be processed
+      #   and false indicates processing is not needed.
+      # @return [Boolean] A boolean indicating whether the dependency needs to
+      #   be processed, i.e. compared whether it is the gem to be found.
+      def process?(dependency)
+        return false unless dependency.type == :runtime
+        return true unless block_given?
+
+        yield(dependency)
+      end
+
+      # Writes a log message for the given dependency at the current level of
+      # processing. When debugging is enabled, will produce the following kind
+      # of log output indicating the lookup tree.
+      #
+      # @example
+      #   decidim-admin
+      #   --decidim-core
+      #   ----decidim-api
+      #   decidim-assemblies
+      #   decidim-blogs
+      #   --decidim-comments
+      #
+      # @param dependency [Gem::Dependency] The dependency to be logged at the
+      #   current level of processing.
+      # @return [Boolean] A boolean indicating whether logging happened or not.
+      def log(dependency)
+        return false unless logger
+
+        logger.debug("#{"--" * current_level}#{dependency.name}")
+      end
+    end
+  end
+end

data/lib/decidim/events/simple_event.rb

@@ -40,6 +40,7 @@ module Decidim
       def email_subject_i18n_options
         sanitized_values = { resource_title: decidim_sanitize(resource_title) }
         sanitized_values[:mentioned_proposal_title] = decidim_sanitize(mentioned_proposal_title) if i18n_options.has_key?(:mentioned_proposal_title)
+        sanitized_values[:participatory_space_title] = decidim_sanitize(participatory_space_title) if i18n_options.has_key?(:participatory_space_title)
         i18n_options.merge(sanitized_values)
       end
 

data/lib/decidim/has_resource_permission.rb

@@ -14,8 +14,6 @@ module Decidim
 
       delegate :resource_manifest, :resource_key, to: :class
 
-      alias_method :manifest, :resource_manifest
-
       # Public: Whether the permissions for this object actions can be set at resource level.
       def allow_resource_permissions?
         false

data/lib/decidim/map/provider/dynamic_map/here.rb

@@ -33,7 +33,7 @@ module Decidim
               )
             end
 
-            base_config.merge(api_key: api_key)
+            base_config.merge(api_key: api_key, language: language_code)
           end
 
           # A builder for the HERE maps which needs to be configured differently
@@ -44,6 +44,51 @@ module Decidim
               template.javascript_pack_tag("decidim_map_provider_here", defer: false)
             end
           end
+
+          private
+
+          def language_code
+            primary = I18n.locale.to_s
+            secondary = primary.split("-")[0]
+            available_language_codes[primary] || available_language_codes[secondary] || ""
+          end
+
+          def available_language_codes
+            @available_language_codes ||= {
+              "ar" => "ara", # Arabic
+              "eu" => "baq", # Basque
+              "ca" => "cat", # Catalan
+              "zh" => "chi", # Chinese (simplified)
+              # "" => "cht", # Chinese (traditional)
+              "cs" => "cze", # Czech
+              "da" => "dan", # Danish
+              "nl" => "dut", # Dutch
+              "en" => "eng", # English
+              "fi" => "fin", # Finnish
+              "fr" => "fre", # French
+              "de" => "ger", # German
+              "ga" => "gle", # Gaelic
+              "el" => "gre", # Greek
+              "he" => "heb", # Hebrew
+              "hi" => "hin", # Hindi
+              "id" => "ind", # Indonesian
+              "it" => "ita", # Italian
+              "no" => "nor", # Norwegian
+              "fa" => "per", # Persian
+              "pl" => "pol", # Polish
+              "pt" => "por", # Portuguese
+              "ru" => "rus", # Russian
+              "si" => "sin", # Sinhalese
+              "es" => "spa", # Spanish
+              "sv" => "swe", # Swedish
+              "th" => "tha", # Thai
+              "tr" => "tur", # Turkish
+              "uk" => "ukr", # Ukrainian
+              "ur" => "urd", # Urdu
+              "vi" => "vie", # Vietnamese
+              "cy" => "wel" # Welsh
+            }
+          end
         end
       end
     end

data/lib/decidim/nicknamizable.rb

@@ -52,7 +52,7 @@ module Decidim
         candidate = name
 
         2.step do |n|
-          return candidate if Decidim::User.where("nickname ILIKE ?", candidate.downcase).where(scope).empty?
+          return candidate if Decidim::UserBaseEntity.where("nickname ILIKE ?", candidate.downcase).where(scope).empty?
 
           candidate = numbered_variation_of(name, n)
         end

data/lib/decidim/translatable_attributes.rb

@@ -43,7 +43,14 @@ module Decidim
 
           define_method attribute_name do
             field = public_send(name) || {}
-            value = field[locale.to_s] || field[locale.to_sym]
+            value =
+              if field.is_a?(Hash)
+                field[locale.to_s] || field[locale.to_sym]
+              else
+                # The value may not be a hash in case the attribute type was
+                # changed and the old value is still stored against the record.
+                field
+              end
             value_type = self.class.attribute_types[attribute_name.to_s]
             value_type ? value_type.cast(value) : value
           end

data/lib/decidim/url_option_resolver.rb

@@ -39,7 +39,7 @@ module Decidim
             80
           end
 
-        ENV.fetch("PORT", default_port).to_i
+        ENV.fetch("HTTP_PORT", default_port).to_i
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-core
 version: !ruby/object:Gem::Version
-  version: 0.27.0.rc1
+  version: 0.27.0.rc2
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-27 00:00:00.000000000 Z
+date: 2022-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_link_to
@@ -740,28 +740,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.0.rc1
+        version: 0.27.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.0.rc1
+        version: 0.27.0.rc2
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.0.rc1
+        version: 0.27.0.rc2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.0.rc1
+        version: 0.27.0.rc2
 description: Adds core features so other engines can hook into the framework.
 email:
 - josepjaume@gmail.com
@@ -1410,8 +1410,9 @@ files:
 - app/packs/src/decidim/configuration.js
 - app/packs/src/decidim/confirm.js
 - app/packs/src/decidim/conversations.js
-- app/packs/src/decidim/cookie_consent/consent_manager.js
-- app/packs/src/decidim/cookie_consent/cookie_consent.js
+- app/packs/src/decidim/data_consent/consent_manager.js
+- app/packs/src/decidim/data_consent/consent_manager.test.js
+- app/packs/src/decidim/data_consent/index.js
 - app/packs/src/decidim/data_picker.js
 - app/packs/src/decidim/datalist_select.js
 - app/packs/src/decidim/decidim_application.js
@@ -1556,7 +1557,7 @@ files:
 - app/packs/stylesheets/decidim/modules/_conference-speaker.scss
 - app/packs/stylesheets/decidim/modules/_confirm.scss
 - app/packs/stylesheets/decidim/modules/_conversation.scss
-- app/packs/stylesheets/decidim/modules/_cookie-consent.scss
+- app/packs/stylesheets/decidim/modules/_data-consent.scss
 - app/packs/stylesheets/decidim/modules/_data-picker.scss
 - app/packs/stylesheets/decidim/modules/_datepicker.scss
 - app/packs/stylesheets/decidim/modules/_definition-data.scss
@@ -1723,6 +1724,7 @@ files:
 - app/queries/decidim/user_groups/member_memberships.rb
 - app/resolvers/decidim/core/metric_resolver.rb
 - app/resolvers/decidim/hashtags_resolver.rb
+- app/scrubbers/decidim/admin_input_scrubber.rb
 - app/scrubbers/decidim/newsletter_scrubber.rb
 - app/scrubbers/decidim/user_input_scrubber.rb
 - app/serializers/decidim/exporters/participatory_space_components_serializer.rb
@@ -1820,7 +1822,6 @@ files:
 - app/views/decidim/devise/omniauth_registrations/new.html.erb
 - app/views/decidim/devise/passwords/edit.html.erb
 - app/views/decidim/devise/passwords/new.html.erb
-- app/views/decidim/devise/registrations/edit.html.erb
 - app/views/decidim/devise/registrations/new.html.erb
 - app/views/decidim/devise/sessions/new.html.erb
 - app/views/decidim/devise/shared/_links.html.erb
@@ -1963,8 +1964,8 @@ files:
 - app/views/kaminari/decidim/_prev_page.html.erb
 - app/views/layouts/decidim/_admin_links.html.erb
 - app/views/layouts/decidim/_application.html.erb
-- app/views/layouts/decidim/_cookie_warning.html.erb
 - app/views/layouts/decidim/_cors.html.erb
+- app/views/layouts/decidim/_data_consent_warning.html.erb
 - app/views/layouts/decidim/_decidim_javascript.html.erb
 - app/views/layouts/decidim/_edit_link.html.erb
 - app/views/layouts/decidim/_head.html.erb
@@ -2477,6 +2478,7 @@ files:
 - lib/decidim/core/test/shared_examples/railtie_examples.rb
 - lib/decidim/core/test/shared_examples/reportable.rb
 - lib/decidim/core/test/shared_examples/reports_examples.rb
+- lib/decidim/core/test/shared_examples/resource_endorsed_event_examples.rb
 - lib/decidim/core/test/shared_examples/resource_search_examples.rb
 - lib/decidim/core/test/shared_examples/resourceable.rb
 - lib/decidim/core/test/shared_examples/rich_text_editor_examples.rb
@@ -2495,9 +2497,11 @@ files:
 - lib/decidim/core/test/shared_examples/traceable_interface_examples.rb
 - lib/decidim/core/test/shared_examples/translated_event_examples.rb
 - lib/decidim/core/test/shared_examples/uncommentable_component_examples.rb
+- lib/decidim/core/test/shared_examples/versions_controller_examples.rb
 - lib/decidim/core/test/shared_examples/with_endorsable_permissions_examples.rb
 - lib/decidim/core/version.rb
 - lib/decidim/db/common-passwords.txt
+- lib/decidim/dependency_resolver.rb
 - lib/decidim/deprecations.rb
 - lib/decidim/diffy_extension.rb
 - lib/decidim/download_your_data.rb

data/app/views/decidim/devise/registrations/edit.html.erb

@@ -1,41 +0,0 @@
-<h2><%= t("devise.registrations.edit.title", resource: resource_class.model_name.human) %></h2>
-
-<%= decidim_form_for(resource, namespace: "registration", as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %>
-  <%= render "devise/shared/error_messages", resource: resource %>
-  <%= form_required_explanation %>
-  <%= invisible_captcha %>
-
-  <div class="field">
-    <%= f.email_field :email, autocomplete: "email" %>
-  </div>
-
-  <% if devise_mapping.confirmable? && resource.pending_reconfirmation? %>
-    <p>
-      <%= t("devise.registrations.edit.currently_waiting_confirmation_for_email", email: resource.unconfirmed_email) %>
-    </p>
-  <% end %>
-
-  <div class="field">
-    <%= f.password_field :password, password_field_options_for(current_user) %>
-  </div>
-
-  <div class="field">
-    <%= f.password_field :password_confirmation, password_field_options_for(current_user).except(:help_text) %>
-  </div>
-
-  <div class="field">
-    <%= f.password_field :current_password, autocomplete: "current-password" %>
-  </div>
-
-  <div class="field">
-    <%= f.text_field :name, autocomplete: "name" %>
-  </div>
-
-  <div><%= f.submit t("devise.registrations.edit.update") %></div>
-<% end %>
-
-<h3><%= t("devise.registrations.edit.cancel_my_account") %></h3>
-
-<p><%= t("devise.registrations.edit.unhappy") %> <%= link_to t("devise.registrations.edit.cancel_my_account"), registration_path(resource_name), data: { confirm: t("devise.registrations.edit.are_you_sure") }, method: :delete %>.</p>
-
-<%= link_to t("devise.shared.links.back"), :back %>

data/app/views/layouts/decidim/_cookie_warning.html.erb

@@ -1,8 +0,0 @@
-<div class="cookie-warning flex-center padding-1 hide">
-  <p>
-  <%= t("layouts.decidim.cookie_consent.warning.need_cookies", cookies: t("layouts.decidim.cookie_consent.warning.all_cookies")) %>
-  </p>
-  <a href="#" class="button margin-vertical-2" data-open="cc-modal">
-    <%= t("change_cookie_settings", scope: "layouts.decidim.cookie_consent.warning") %>
-  </a>
-</div>