decidim-core 0.26.2 → 0.27.0.rc2

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/map/provider/geocoding/here.rb

@@ -22,15 +22,15 @@ module Decidim
             # Always prioritize house number results, even if they are not as
             # close as street level matches.
             hn_result = results.find do |r|
-              r.data["MatchLevel"] == "houseNumber"
+              r.data["resultType"] == "houseNumber"
             end
             return hn_result.address if hn_result
 
-            # Some of the matches that have "MatchLevel" == "street" do not even
-            # contain the street name unless they also have the "Street" key in
-            # the "MatchQuality" attribute defined.
+            # Some of the matches that have "resultType" == "street" do not even
+            # contain the street name unless they also have the "streets" key in
+            # the "scoring" -> "fieldScore" attribute defined.
             street_result = results.find do |r|
-              r.data["MatchQuality"].has_key?("Street")
+              r.data["scoring"]["fieldScore"].has_key?("streets")
             end
             return street_result.address if street_result
 

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

@@ -7,12 +7,15 @@ module Decidim
       module Autocomplete
         autoload :Here, "decidim/map/provider/autocomplete/here"
       end
+
       module Geocoding
         autoload :Here, "decidim/map/provider/geocoding/here"
       end
+
       module DynamicMap
         autoload :Here, "decidim/map/provider/dynamic_map/here"
       end
+
       module StaticMap
         autoload :Here, "decidim/map/provider/static_map/here"
       end

data/lib/decidim/map/provider/osm.rb

@@ -8,12 +8,15 @@ module Decidim
       module Autocomplete
         autoload :Osm, "decidim/map/provider/autocomplete/osm"
       end
+
       module Geocoding
         autoload :Osm, "decidim/map/provider/geocoding/osm"
       end
+
       module DynamicMap
         autoload :Osm, "decidim/map/provider/dynamic_map/osm"
       end
+
       module StaticMap
         autoload :Osm, "decidim/map/provider/static_map/osm"
       end

data/lib/decidim/map.rb

@@ -51,7 +51,7 @@ module Decidim
 
       config = utility_configuration(category)
       options[:config] = config.except(:provider)
-      klass.new(options)
+      klass.new(**options)
     end
 
     # Public: Returns the utility class module namespace for each category of
@@ -75,9 +75,9 @@ module Decidim
 
       # Dynamically define the category method.
       module_eval %{
-        def self.#{category}(options)
-          utility(:#{category}, options)
-        end
+        def self.#{category}(options)    # def self.dynamic(options)
+          utility(:#{category}, options) #  utility(:dynamic, options)
+        end                              # end
       }, __FILE__, __LINE__ - 4
 
       mod

data/lib/decidim/menu.rb

@@ -102,7 +102,7 @@ module Decidim
     #
     def items
       @items.reject! { |item| @removed_items.include?(item.identifier) }
-      @ordered_elements.each { |item| move_element(item) }
+      @ordered_elements.each { |item| move_element(**item) }
       @items.select(&:visible?).sort_by(&:position)
     end
 

data/lib/decidim/metric_manifest.rb

@@ -4,11 +4,11 @@ module Decidim
   # This class acts as a manifest for metrics.
   #
   # This manifest is a simple object that holds and stores currently available
-  # metrics and his managers, for calculations purpose
+  # metrics and its managers, for calculations purpose
   #
   class MetricManifest
     include ActiveModel::Model
-    include Virtus.model
+    include Decidim::AttributeObject::Model
 
     attribute :metric_name, String
     attribute :manager_class, String

data/lib/decidim/nicknamizable.rb

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

data/lib/decidim/notification_setting_manifest.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Decidim
+  # This class holds the configuration for notification settings at component level.
+  #
+  # This manifest is a simple object that holds and stores current attributes
+  # and their specific validators
+  class NotificationSettingManifest
+    include ActiveModel::Model
+    include Decidim::AttributeObject::Model
+
+    attribute :name, Symbol
+    attribute :settings_area, Symbol
+    attribute :default_value, Boolean, default: true
+
+    validates :default_value, inclusion: { in: [true, false] }
+    validates :settings_area, inclusion: { in: [:global, :administrators] }
+  end
+end

data/lib/decidim/organization_settings.rb

@@ -106,7 +106,8 @@ module Decidim
             "allowed_file_extensions" => {
               "default" => %w(jpg jpeg gif png bmp pdf rtf txt),
               "admin" => %w(jpg jpeg gif png bmp pdf doc docx xls xlsx ppt pptx ppx rtf txt odt ott odf otg ods ots),
-              "image" => %w(jpg jpeg gif png bmp ico)
+              "image" => %w(jpg jpeg gif png bmp),
+              "favicon" => %w(png)
             },
             "allowed_content_types" => {
               "default" => %w(
@@ -129,8 +130,8 @@ module Decidim
               )
             },
             "maximum_file_size" => {
-              "default" => 10,
-              "avatar" => 5
+              "default" => 10.0,
+              "avatar" => 5.0
             }
           }
         }
@@ -148,7 +149,7 @@ module Decidim
       # all configurations have values even when the organization settings do
       # not define them.
       super(
-        keys_map.map do |config, method|
+        keys_map.to_h do |config, method|
           [
             config.to_s,
             generate_config(
@@ -156,7 +157,7 @@ module Decidim
               self.class.default(config)
             )
           ]
-        end.to_h
+        end
       )
 
       keys_map.keys.each do |config|
@@ -190,10 +191,10 @@ module Decidim
     # @return [OpenStruct] The configuration struct.
     def generate_config(hash, default = {})
       OpenStruct.new(
-        default.deep_merge(hash).map do |key, value|
+        default.deep_merge(hash).to_h do |key, value|
           value = generate_config(value) if value.is_a?(Hash)
           [key, value]
-        end.to_h
+        end
       )
     end
 

data/lib/decidim/participatory_space_context_manifest.rb

@@ -5,9 +5,9 @@ module Decidim
   # engine, a layout and a set of helpers (usually used by the layout itself).
   class ParticipatorySpaceContextManifest
     include ActiveModel::Model
-    include Virtus.model
+    include Decidim::AttributeObject::Model
 
-    attribute :engine, Rails::Engine
+    attribute :engine, Rails::Engine, **{}
     attribute :helper
     attribute :layout
   end

data/lib/decidim/participatory_space_manifest.rb

@@ -12,7 +12,7 @@ module Decidim
   # `Decidim.register_participatory_space`.
   class ParticipatorySpaceManifest
     include ActiveModel::Model
-    include Virtus.model
+    include Decidim::AttributeObject::Model
 
     attribute :name, Symbol
 
@@ -28,7 +28,7 @@ module Decidim
     attribute :query_list, String, default: "Decidim::Core::ParticipatorySpaceList"
 
     # 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: []
 
     # A String with the component's icon. The icon must be stored in the

data/lib/decidim/processes_file_locally.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require "active_support/concern"
+
+module Decidim
+  # A concern to help when the file needs to be available locally.
+  # For example, we need to download file first if it's in AWS S3 bucket
+  # or somewhere else than locally in the server.
+  module ProcessesFileLocally
+    extend ActiveSupport::Concern
+
+    private
+
+    def process_file_locally(blob)
+      if ActiveStorage::Blob.service.respond_to? :path_for
+        yield ActiveStorage::Blob.service.path_for(blob.key)
+      else
+        begin
+          tempfile = Tempfile.new
+          tempfile.binmode
+          blob.download { |chunk| tempfile.write(chunk) }
+          tempfile.flush
+          tempfile.rewind
+          yield tempfile.path
+        ensure
+          tempfile.close!
+        end
+      end
+    end
+  end
+end

data/lib/decidim/query.rb

@@ -0,0 +1,84 @@
+# 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/query.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
+  class UnableToComposeQueriesException < StandardError
+    def initialize(query, other)
+      super(
+        "Unable to composite queries #{query.class.name} and " \
+        "#{other.class.name}. You cannot compose queries where #query " \
+        "returns an ActiveRecord::Relation in one and an array in the other."
+      )
+    end
+  end
+
+  class Query
+    include Enumerable
+
+    def self.merge(*queries)
+      queries.reduce(Decidim::Query.new([])) { |a, e| a.merge(e) }
+    end
+
+    def initialize(scope = ActiveRecord::NullRelation)
+      @scope = scope
+    end
+
+    def query
+      @scope
+    end
+
+    def |(other)
+      return other if @scope.is_a?(Array) && @scope == []
+
+      if relation? && other.relation?
+        Decidim::Query.new(cached_query.merge(other.cached_query))
+      elsif eager? && other.eager?
+        Decidim::Query.new(cached_query | other.cached_query)
+      else
+        raise Decidim::UnableToComposeQueriesException.new(self, other)
+      end
+    end
+
+    alias merge |
+
+    delegate :count, to: :cached_query
+
+    alias size count
+
+    delegate :first, to: :cached_query
+
+    def each(&block)
+      cached_query.each(&block)
+    end
+
+    def exists?
+      return cached_query.exists? if relation?
+
+      cached_query.present?
+    end
+
+    def none?
+      !exists?
+    end
+
+    delegate :to_a, to: :cached_query
+
+    alias to_ary to_a
+
+    def relation?
+      cached_query.is_a?(ActiveRecord::Relation)
+    end
+
+    def eager?
+      cached_query.is_a?(Array)
+    end
+
+    def cached_query
+      @cached_query ||= query
+    end
+  end
+end

data/lib/decidim/record_encryptor.rb

@@ -35,14 +35,12 @@ module Decidim
         # the `type` is `:hash`, method `decrypt_hash_values` would be called
         # for decryption and `encrypt_hash_values` would be called for
         # encryption.
-        method_suffix = begin
-          case type
-          when :hash
-            "hash_values"
-          else
-            "value"
-          end
-        end
+        method_suffix = case type
+                        when :hash
+                          "hash_values"
+                        else
+                          "value"
+                        end
 
         # Dynamically defines the getter and setter for the encrypted attribute.
         # E.g. when called as `encrypt_attribute :name, type: :string`, this
@@ -56,6 +54,19 @@ module Decidim
         #     super(encrypt_value(value))
         #   end
         class_eval <<-RUBY, __FILE__, __LINE__ + 1
+
+          # def full_name
+          #   return @full_name_decrypted if instance_variable_defined?(:@full_name_decrypted)
+          #
+          #   encrypted_value = begin
+          #     if defined?(super)
+          #       super
+          #     elsif instance_variable_defined?(:@full_name)
+          #       @full_name
+          #     end
+          #   end
+          #   @full_name_decrypted = decrypt_value(encrypted_value)
+          # end
           def #{attribute}
             return @#{attribute}_decrypted if instance_variable_defined?(:@#{attribute}_decrypted)
 
@@ -69,6 +80,16 @@ module Decidim
             @#{attribute}_decrypted = decrypt_#{method_suffix}(encrypted_value)
           end
 
+          # def full_name=(value)
+          #   remove_instance_variable(:@full_name_decrypted) if instance_variable_defined?(:@full_name_decrypted)
+          #   encrypted_value = encrypt_value(value)
+          #
+          #   if defined?(super)
+          #     super(encrypted_value)
+          #   else
+          #     @full_name = encrypted_value
+          #   end
+          # end
           def #{attribute}=(value)
             remove_instance_variable(:@#{attribute}_decrypted) if instance_variable_defined?(:@#{attribute}_decrypted)
             encrypted_value = encrypt_#{method_suffix}(value)

data/lib/decidim/reminder_manifest.rb

@@ -0,0 +1,75 @@
+# frozen_string_literal: true
+
+module Decidim
+  # This class acts as a manifest for reminders.
+  #
+  # This manifest is a simple object that holds and stores reminder
+  # and it's generator class.
+  class ReminderManifest
+    include ActiveModel::Model
+    include Decidim::AttributeObject::Model
+
+    attribute :generator_class_name, String
+    attribute :form_class_name, String
+    attribute :command_class_name, String
+
+    validates :generator_class, presence: true
+
+    attr_reader :name
+
+    def initialize(name:)
+      super()
+      @name = name
+      @messages = ReminderManifestMessages.new
+    end
+
+    def generator_class
+      generator_class_name.constantize
+    end
+
+    def form_class
+      form_class_name.constantize
+    end
+
+    def command_class
+      command_class_name.constantize
+    end
+
+    def has_settings?
+      settings.attributes.any?
+    end
+
+    def settings(&block)
+      @settings ||= SettingsManifest.new
+      yield(@settings) if block
+      @settings
+    end
+
+    # Fetch the messages object or yield it for the block when a block is
+    # given.
+    def messages
+      if block_given?
+        yield @messages
+      else
+        @messages
+      end
+    end
+
+    def message(key, context = nil, **extra, &block)
+      extra = context if extra.empty? && context.is_a?(Hash)
+
+      if block_given?
+        messages.set(key, &block)
+      else
+        messages.render(key, context, **extra)
+      end
+    end
+
+    # Returns a boolean indicating whether the message exists with the given key.
+    def has_message?(key)
+      messages.has?(key)
+    end
+
+    class ReminderManifestMessages < Decidim::ManifestMessages; end
+  end
+end

data/lib/decidim/reminder_registry.rb

@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+module Decidim
+  # This class acts as a registry for reminders. Each reminder needs a name,
+  # and a generator class, that will be used for generating the actual sendable reminders.
+  # Reminder times could be used to define intervals between reminders, so that user
+  # isn't reminded too often. In addition, you can register form and command classes
+  # for additional features, such as order reminders can be sent manually from the admin panel.
+  # Notice that if you implement admin panel functionality, you should add 118n messages too.
+  #
+  # In order to register a reminder, you can follow this example:
+  #
+  #     Decidim.reminders_registry.register(:orders) do |reminder_registry|
+  #       reminder_registry.generator_class_name = "Decidim::Budgets::OrderReminderGenerator"
+  #       reminder_registry.form_class_name = "Decidim::Budgets::Admin::OrderReminderForm"
+  #       reminder_registry.command_class_name = "Decidim::Budgets::Admin::CreateOrderReminders"
+  #
+  #       reminder_registry.settings do |settings|
+  #         settings.attribute :reminder_times, type: :array, default: [2.hours, 1.week, 2.weeks]
+  #       end
+  #
+  #       reminder_registry.messages do |msg|
+  #         msg.set(:title) { |count: 0| I18n.t("decidim.budgets.admin.reminders.orders.title", count: count) }
+  #         msg.set(:description) { I18n.t("decidim.budgets.admin.reminders.orders.description") }
+  #       end
+  #     end
+  #
+  # Reminders need to be registered in the `engine.rb` file of each module.
+  class ReminderRegistry
+    def register(reminder_name)
+      reminder_name = reminder_name.to_s
+      if reminder_exists?(reminder_name)
+        raise(
+          ReminderAlreadyRegistered,
+          "There's a reminder already registered with the name `:#{reminder_name}`, must be unique"
+        )
+      end
+
+      reminder_manifest = ::Decidim::ReminderManifest.new(name: reminder_name)
+      yield(reminder_manifest)
+      reminder_manifest.validate!
+
+      reminder_manifests << reminder_manifest
+    end
+
+    def for(reminder_name, list = nil)
+      list ||= all
+      list.find { |manifest| manifest.name == reminder_name.to_s }
+    end
+
+    def all
+      reminder_manifests
+    end
+
+    class ReminderAlreadyRegistered < StandardError; end
+
+    private
+
+    def reminder_exists?(reminder_name)
+      self.for(reminder_name).present?
+    end
+
+    def reminder_manifests
+      @reminder_manifests ||= []
+    end
+  end
+end

data/lib/decidim/resource_manifest.rb

@@ -15,7 +15,7 @@ module Decidim
   #
   class ResourceManifest
     include ActiveModel::Model
-    include Virtus.model
+    include Decidim::AttributeObject::Model
 
     # The name of the resource we are exposing.
     attribute :name, String

data/lib/decidim/resourceable.rb

@@ -18,6 +18,17 @@ module Decidim
       # An association with the permissions settings for the resource
       has_one :resource_permission, as: :resource, class_name: "Decidim::ResourcePermission"
 
+      scope :related_to, lambda { |related_to_key|
+        from = joins(:resource_links_from).where(
+          decidim_resource_links: { to_type: related_to_key.camelcase }
+        )
+        to = joins(:resource_links_to).where(
+          decidim_resource_links: { from_type: related_to_key.camelcase }
+        )
+
+        where(id: from).or(where(id: to))
+      }
+
       # Finds all the linked resources to or from this model for a given resource
       # name and link name.
       #

data/lib/decidim/scopable.rb

@@ -26,6 +26,21 @@ module Decidim
       delegate :scopes, to: :organization
 
       validate :scope_belongs_to_organization
+
+      scope :with_scope, ->(scope_id) { includes(:scope).references(:decidim_scopes).where("? = ANY(decidim_scopes.part_of)", scope_id) }
+
+      scope :with_any_scope, lambda { |*original_scope_ids|
+        scope_ids = original_scope_ids.flatten
+        return self if scope_ids.include?("all")
+
+        clean_scope_ids = scope_ids
+
+        conditions = []
+        conditions << "#{table_name}.decidim_scope_id IS NULL" if clean_scope_ids.delete("global")
+        conditions.concat(["? = ANY(decidim_scopes.part_of)"] * clean_scope_ids.count) if clean_scope_ids.any?
+
+        includes(:scope).references(:decidim_scopes).where(Arel.sql(conditions.join(" OR ")).to_s, *clean_scope_ids.map(&:to_i))
+      }
     end
 
     # Whether the resource has scopes enabled or not.