decidim-core 0.26.9 → 0.27.0.rc1

data/lib/decidim/has_attachments.rb

@@ -26,14 +26,14 @@ module Decidim
       #
       # Returns an Array<Attachment>
       def photos
-        @photos ||= attachments.select(&:photo?)
+        @photos ||= attachments.with_attached_file.order(:weight).select(&:photo?)
       end
 
       # All the attachments that are documents for this model.
       #
       # Returns an Array<Attachment>
       def documents
-        @documents ||= attachments.includes(:attachment_collection).select(&:document?)
+        @documents ||= attachments.with_attached_file.order(:weight).includes(:attachment_collection).select(&:document?)
       end
 
       # All the attachments that are documents for this model that has a collection.

data/lib/decidim/has_category.rb

@@ -11,6 +11,42 @@ module Decidim
       has_one :categorization, as: :categorizable
       has_one :category, through: :categorization
 
+      scope :with_category, lambda { |category|
+        return includes(:category).where(decidim_categories: { id: nil }) if category == "without" || category.nil?
+
+        includes(:category).where(decidim_categories: { id: category }).or(
+          includes(:category).where(decidim_categories: { parent_id: category })
+        )
+      }
+
+      scope :with_any_category, lambda { |*categories|
+        return self if categories.include?("all")
+
+        parent_ids = categories.without("without")
+        cat_ids = parent_ids.dup
+        cat_ids.prepend(nil) if categories.include?("without")
+
+        subquery = includes(:category).where(decidim_categories: { id: cat_ids })
+        return subquery if parent_ids.none?
+
+        subquery.or(
+          includes(:category).where(decidim_categories: { parent_id: parent_ids })
+        )
+      }
+
+      scope :with_any_global_category, lambda { |*categories|
+        return self if categories.include?("all")
+
+        cat_ids = categories.without("without")
+
+        additional_ids = cat_ids.grep(/Decidim__/)
+        additional_ids = additional_ids.map { |a| a.gsub("__", "::").gsub(/(\d+)/, '.\1').split(".") }
+        additional_ids = additional_ids.map { |v| v.first.safe_constantize.send(:find, v.last.to_i).category_ids }
+        additional_ids = additional_ids.flatten
+
+        with_any_category(*(categories + additional_ids))
+      }
+
       validate :category_belongs_to_organization
 
       def previous_category

data/lib/decidim/has_resource_permission.rb

@@ -14,6 +14,8 @@ 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/importers/import_manifest.rb

@@ -6,7 +6,7 @@ module Decidim
     # specify it's own creator, which will be responsible for producing (creating)
     # and finishing (saving) the imported resource.
     class ImportManifest
-      include Virtus.model
+      include Decidim::AttributeObject::Model
 
       attr_reader :name, :manifest
 
@@ -24,7 +24,7 @@ module Decidim
         super()
         @name = name.to_sym
         @manifest = manifest
-        @messages = Messages.new
+        @messages = ImportManifestMessages.new
       end
 
       # Public: Sets the creator when an argument is provided, returns the
@@ -112,25 +112,7 @@ module Decidim
         @example.present?
       end
 
-      class Messages
-        def initialize
-          @store = {}
-        end
-
-        def has?(key)
-          @store.has_key?(key)
-        end
-
-        def set(key, &block)
-          raise ArgumentError, "You need to provide a block for the message." unless block_given?
-
-          @store[key] = block
-        end
-
-        def render(key, context = nil, **extra)
-          context.instance_exec(**extra, &@store[key]) if @store[key]
-        end
-      end
+      class ImportManifestMessages < Decidim::ManifestMessages; end
     end
   end
 end

data/lib/decidim/jsonb_attributes.rb

@@ -4,13 +4,13 @@ require "active_support/concern"
 
 module Decidim
   # A set of convenient methods to generate dynamic jsonb objects in a way is
-  # compatilbe with Virtus and ActiveModel thus making it easy to integrate
-  # into Rails forms and similar workflows.
+  # compatible with AttirubteObject and ActiveModel thus making it easy to
+  # integrate into Rails forms and similar workflows.
   module JsonbAttributes
     extend ActiveSupport::Concern
 
     class_methods do
-      # Public: Mirrors Virtus `attribute` interface to define attributes in
+      # Public: Mirrors the `attribute` interface to define attributes in
       # custom jsonb objects.
       #
       # name - Attribute's name
@@ -25,7 +25,7 @@ module Decidim
       #
       # Returns nothing.
       def jsonb_attribute(name, fields, *options)
-        attribute name, Hash, default: {}
+        attribute(name, { String => Object }, default: {})
 
         fields.each do |f, type|
           attribute f, type, *options
@@ -36,6 +36,8 @@ module Decidim
 
           define_method "#{f}=" do |value|
             field = public_send(name) || {}
+            value_type = self.class.attribute_types[f.to_s]
+            value = value_type.cast(value) if value_type
             public_send("#{name}=", field.merge(f => super(value)))
           end
         end

data/lib/decidim/manifest_messages.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Decidim
+  class ManifestMessages
+    def initialize
+      @store = {}
+    end
+
+    def has?(key)
+      @store.has_key?(key)
+    end
+
+    def set(key, &block)
+      raise ArgumentError, "You need to provide a block for the message." unless block_given?
+
+      @store[key] = block
+    end
+
+    def render(key, context = nil, **extra)
+      context.instance_exec(**extra, &@store[key]) if @store[key]
+    end
+  end
+end

data/lib/decidim/map/autocomplete.rb

@@ -49,12 +49,14 @@ module Decidim
             geocoding_options
           )
 
-          unless @template.snippets.any?(:geocoding)
-            @template.snippets.add(:geocoding, builder.stylesheet_snippets)
-            @template.snippets.add(:geocoding, builder.javascript_snippets)
+          unless @template.snippets.any?(:geocoding_styles) || @template.snippets.any?(:geocoding_scripts)
+            @template.snippets.add(:geocoding_styles, builder.stylesheet_snippets)
+            @template.snippets.add(:geocoding_scripts, builder.javascript_snippets)
 
             # This will display the snippets in the <head> part of the page.
-            @template.snippets.add(:head, @template.snippets.for(:geocoding))
+            @template.snippets.add(:head, @template.snippets.for(:geocoding_styles))
+            # This will display the snippets in the bottom part of the page.
+            @template.snippets.add(:foot, @template.snippets.for(:geocoding_scripts))
           end
 
           options = merge_geocoding_options(attribute, options)

data/lib/decidim/map/frontend.rb

@@ -84,12 +84,12 @@ module Decidim
         # @return [Hash] The resulting hash with JS-style hash keys in camelCase
         #   format.
         def hash_to_js(hash)
-          hash.map do |key, value|
+          hash.to_h do |key, value|
             value = hash_to_js(value) if value.is_a?(Hash)
             value = value.call(self) if value.respond_to?(:call)
 
             [key.to_s.camelize(:lower), value]
-          end.to_h
+          end
         end
       end
     end

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

@@ -33,7 +33,7 @@ module Decidim
               )
             end
 
-            base_config.merge(api_key: api_key, language: language_code)
+            base_config.merge(api_key: api_key)
           end
 
           # A builder for the HERE maps which needs to be configured differently
@@ -44,51 +44,6 @@ 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 if Decidim::UserBaseEntity.where("nickname ILIKE ?", candidate.downcase).where(scope).empty?
+          return candidate if Decidim::User.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/participatory_space_resourceable.rb

@@ -47,13 +47,7 @@ module Decidim
              .joins(:participatory_space_resource_links_to)
              .where(decidim_participatory_space_links: { name: link_name, from_id: id, from_type: self.class.name })
 
-        query = klass.where(id: from).or(klass.where(id: to)).published
-
-        if klass.column_names.include?("weight")
-          query.order(:weight)
-        else
-          query.order(created_at: :desc)
-        end
+        klass.where(id: from).or(klass.where(id: to))
       end
 
       def participatory_space_sibling_scope(participatory_space_name)

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/publicable.rb

@@ -45,9 +45,5 @@ module Decidim
     def unpublish!
       update!(published_at: nil)
     end
-
-    def previously_published?
-      respond_to?(:versions) && versions.where(event: "update").where("object ->> 'published_at' IS NOT NULL").any?
-    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