decidim-core 0.26.8 → 0.27.0.rc1

data/lib/decidim/events/base_event.rb

@@ -59,24 +59,20 @@ module Decidim
 
       # Caches the path for the given resource.
       def resource_path
-        @resource_path ||= begin
-          if resource&.respond_to?(:polymorphic_resource_path)
-            resource.polymorphic_resource_path(resource_url_params)
-          else
-            resource_locator.path(resource_url_params)
-          end
-        end
+        @resource_path ||= if resource.respond_to?(:polymorphic_resource_path)
+                             resource.polymorphic_resource_path(resource_url_params)
+                           else
+                             resource_locator.path(resource_url_params)
+                           end
       end
 
       # Caches the URL for the given resource.
       def resource_url
-        @resource_url ||= begin
-          if resource&.respond_to?(:polymorphic_resource_url)
-            resource.polymorphic_resource_url(resource_url_params)
-          else
-            resource_locator.url(resource_url_params)
-          end
-        end
+        @resource_url ||= if resource.respond_to?(:polymorphic_resource_url)
+                            resource.polymorphic_resource_url(resource_url_params)
+                          else
+                            resource_locator.url(resource_url_params)
+                          end
       end
 
       def resource_text; end

data/lib/decidim/events/simple_event.rb

@@ -13,6 +13,8 @@ module Decidim
       include Decidim::ComponentPathHelper
       include Decidim::SanitizeHelper
 
+      delegate :created_at, to: :resource
+
       class_attribute :i18n_interpolations
       self.i18n_interpolations = []
 
@@ -32,26 +34,25 @@ module Decidim
       end
 
       def email_subject
-        I18n.t("email_subject", email_subject_i18n_options).html_safe
+        I18n.t("email_subject", **email_subject_i18n_options).html_safe
       end
 
       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
 
       def email_intro
-        I18n.t("email_intro", i18n_options).html_safe
+        I18n.t("email_intro", **i18n_options).html_safe
       end
 
       def email_outro
-        I18n.t("email_outro", i18n_options).html_safe
+        I18n.t("email_outro", **i18n_options).html_safe
       end
 
       def notification_title
-        I18n.t("notification_title", i18n_options).html_safe
+        I18n.t("notification_title", **i18n_options).html_safe
       end
 
       # Public: The String to use as scope to search for the keys

data/lib/decidim/exporters/export_data.rb

@@ -27,7 +27,7 @@ module Decidim
       #
       # Returns a String with the filename of the export.
       def filename(prefix = "export", options = {})
-        options[:extension] = !options[:extension].nil? ? options[:extension] : true
+        options[:extension] = options[:extension].nil? ? true : options[:extension]
         result = "#{prefix}-#{I18n.l(Time.zone.today, format: :default)}-#{Time.now.seconds_since_midnight.to_i}"
         result += ".#{extension}" if options[:extension]
         result

data/lib/decidim/exporters/export_manifest.rb

@@ -10,7 +10,7 @@ module Decidim
     #
     class ExportManifest
       include ActiveModel::Model
-      include Virtus.model
+      include Decidim::AttributeObject::Model
 
       # A setting to choose if the collection exported by this manifest should
       # be included in the open data export available for all users.
@@ -26,6 +26,7 @@ module Decidim
       # manifest - The parent manifest where this export manifest belongs to.
       #
       def initialize(name, manifest)
+        super()
         @name = name.to_sym
         @manifest = manifest
       end

data/lib/decidim/file_validator_humanizer.rb

@@ -12,6 +12,8 @@ module Decidim
   # another object in case the PassthruValidator is in charge of the
   # validations.
   class FileValidatorHumanizer
+    # record - Form object (e.g. Decidim::AccountForm)
+    # attribute - Form field (e.g. :avatar)
     def initialize(record, attribute)
       @record = record
       @attribute = attribute
@@ -21,7 +23,7 @@ module Decidim
     end
 
     def uploader
-      @uploader ||= passthru_uploader || record.attached_uploader(attribute) || record.send(attribute)
+      @uploader ||= fetch_uploader
     end
 
     def messages
@@ -36,6 +38,14 @@ module Decidim
         )
       end
 
+      if (file_dimensions = max_file_dimensions)
+        messages << I18n.t(
+          "max_file_dimension",
+          resolution: file_dimensions,
+          scope: "decidim.forms.file_validation"
+        )
+      end
+
       if (extensions = extension_allowlist)
         messages << I18n.t(
           "allowed_file_extensions",
@@ -73,6 +83,12 @@ module Decidim
     end
     # rubocop: enable Metrics/CyclomaticComplexity
 
+    def max_file_dimensions
+      return unless uploader.respond_to?(:max_image_height_or_width)
+
+      "#{uploader.max_image_height_or_width}x#{uploader.max_image_height_or_width}"
+    end
+
     def extension_allowlist
       return unless uploader.respond_to?(:extension_allowlist, true)
 
@@ -85,6 +101,13 @@ module Decidim
 
     attr_reader :record, :attribute, :passthru_validator
 
+    def fetch_uploader
+      return passthru_uploader if passthru_uploader.present?
+      return record.attached_uploader(attribute) if record.respond_to?(:attached_uploader) && record.attached_uploader(attribute).present?
+
+      record.send(attribute)
+    end
+
     def passthru_record
       return unless passthru_validator
 

data/lib/decidim/filterable_resource.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+module Decidim
+  # A concern that adds extra search helpers for the models for Ransack
+  # searches.
+  module FilterableResource
+    extend ActiveSupport::Concern
+
+    class_methods do
+      def ransacker_i18n(field_name, attr_name = nil)
+        ransacker field_name do |parent|
+          Arel::Nodes::InfixOperation.new("->>", parent.table[attr_name || field_name], Arel::Nodes.build_quoted(I18n.locale.to_s))
+        end
+      end
+
+      def ransacker_i18n_multi(field_name, attrs)
+        raise "The second argument needs to be an array" unless attrs.is_a?(Array)
+        raise "You need to define at least one field in the second argument" if attrs.count < 1
+        return ransacker_i18n(field_name, attrs.first) if attrs.count < 2
+
+        # Create an i18n ransacker search for each of the provided attributes.
+        attrs.each { |attr_name| ransacker_i18n(attr_name) }
+
+        # Create the field name search alias for the attributes
+        ransacker_text_multi(field_name, attrs)
+      end
+
+      def ransacker_text_multi(field_name, attrs)
+        raise "The second argument needs to be an array" unless attrs.is_a?(Array)
+        raise "You need to define at least two fields in the second argument" if attrs.count < 1
+
+        # Alias the field_name as an OR query with all the provided fields.
+        ransack_alias field_name, attrs.join("_or_").to_sym
+      end
+
+      def scope_search_multi(scope_key, possible_scopes)
+        scope scope_key, lambda { |*value_keys|
+          search_values = value_keys.compact.compact_blank
+
+          conditions = possible_scopes.map do |scope|
+            search_values.member?(scope.to_s) ? try(scope) : nil
+          end.compact
+          return self unless conditions.any?
+
+          scoped_query = where(id: conditions.shift)
+          conditions.each do |condition|
+            scoped_query = scoped_query.or(where(id: condition))
+          end
+
+          scoped_query
+        }
+      end
+    end
+  end
+end

data/lib/decidim/fingerprint_calculator.rb

@@ -33,10 +33,8 @@ module Decidim
     def sort_hash(hash)
       return hash unless hash.is_a?(Hash)
 
-      Hash[
-        hash.map { |key, value| [key, sort_hash(value)] }
-            .sort_by { |key, _value| key }
-      ]
+      hash.map { |key, value| [key, sort_hash(value)] }
+          .sort_by { |key, _value| key }.to_h
     end
   end
 end