decidim-core 0.23.3 → 0.24.0.rc1

data/app/queries/decidim/metrics/followers_metric_manage.rb

@@ -26,6 +26,8 @@ module Decidim
 
       private
 
+      # rubocop: disable Metrics/CyclomaticComplexity
+
       # Creates a Hashed structure with number of Followers grouped by
       #
       #  - ParticipatorySpace (type & ID)
@@ -57,6 +59,7 @@ module Decidim
         end
         @query
       end
+      # rubocop: enable Metrics/CyclomaticComplexity
     end
   end
 end

data/app/queries/decidim/metrics/participants_metric_manage.rb

@@ -34,6 +34,8 @@ module Decidim
 
       private
 
+      # rubocop: disable Metrics/CyclomaticComplexity
+
       # Creates a Hashed structure with number of Participants grouped by
       #
       #  - ParticipatorySpace (type & ID)
@@ -66,6 +68,7 @@ module Decidim
         end
         @query
       end
+      # rubocop: enable Metrics/CyclomaticComplexity
 
       # Search for all components published, within a fixed list of available
       def retrieve_components(participatory_space)

data/app/queries/decidim/metrics/reported_users_metric_manage.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Metrics
+    # Metric manager for User's registries
+    class ReportedUsersMetricManage < Decidim::MetricManage
+      def metric_name
+        "reported_users"
+      end
+
+      private
+
+      def query
+        return @query if @query
+
+        @query = Decidim::User.where(organization: @organization).joins(:user_moderation)
+        @query = @query.where("#{Decidim::UserModeration.table_name}.created_at <= ?", end_time)
+        @query
+      end
+
+      def quantity
+        @quantity ||= @query.where("#{Decidim::UserModeration.table_name}.created_at >= ?", start_time).count
+      end
+    end
+  end
+end

data/app/queries/decidim/metrics/user_reports_metric_manage.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Metrics
+    # Metric manager for User's registries
+    class UserReportsMetricManage < Decidim::MetricManage
+      def metric_name
+        "user_reports"
+      end
+
+      private
+
+      def query
+        return @query if @query
+
+        @query = Decidim::User.where(organization: @organization).joins(:user_reports)
+        @query = @query.where("#{Decidim::UserReport.table_name}.created_at <= ?", end_time)
+        @query
+      end
+
+      def quantity
+        @quantity ||= @query.where("#{Decidim::UserReport.table_name}.created_at >= ?", start_time).count
+      end
+    end
+  end
+end

data/app/services/decidim/activity_search.rb

@@ -29,9 +29,7 @@ module Decidim
       query = query.where(user: options[:user]) if options[:user]
       query = query.where(resource_type: options[:resource_name]) if options[:resource_name]
 
-      query = filter_follows(query)
-
-      query
+      filter_follows(query)
     end
 
     # Overwrites the default Searchlight run method since we want to return

data/app/services/decidim/base_diff_renderer.rb

@@ -41,7 +41,7 @@ module Decidim
     end
 
     def parse_i18n_changeset(attribute, values, type, diff)
-      values.last.each_key do |locale, _value|
+      values.last.keys.each do |locale, _value|
         first_value = values.first.try(:[], locale)
         last_value = values.last.try(:[], locale)
         next if first_value == last_value

data/app/services/decidim/data_portability_exporter.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "seven_zip_ruby"
+require "zip"
 require_relative "zip_stream/zip_stream_writer"
 
 module Decidim

data/app/services/decidim/email_notification_generator.rb

@@ -38,7 +38,6 @@ module Decidim
 
       followers.each do |recipient|
         next unless ["all", "followed-only"].include?(recipient.notification_types)
-        next unless participatory_space.present? && participatory_space.is_a?(Decidim::Participable) && participatory_space.can_participate?(recipient)
 
         send_email_to(recipient, user_role: :follower)
       end
@@ -81,7 +80,8 @@ module Decidim
 
     def component
       return resource.component if resource.is_a?(Decidim::HasComponent)
-      return resource if resource.is_a?(Decidim::Component)
+
+      resource if resource.is_a?(Decidim::Component)
     end
 
     def participatory_space

data/app/services/decidim/events_manager.rb

@@ -24,7 +24,7 @@ module Decidim
     #
     # Returns nothing.
     # rubocop:disable Metrics/ParameterLists
-    def self.publish(event:, event_class: Decidim::Events::BaseEvent, resource:, affected_users: [], followers: [], extra: {}, force_send: false)
+    def self.publish(event:, resource:, event_class: Decidim::Events::BaseEvent, affected_users: [], followers: [], extra: {}, force_send: false)
       ActiveSupport::Notifications.publish(
         event,
         event_class: event_class.name,

data/app/services/decidim/open_data_exporter.rb

@@ -7,6 +7,8 @@ module Decidim
   # to be uploaded somewhere so users can download an organization
   # data.
   class OpenDataExporter
+    FILE_NAME_PATTERN = "%{host}-open-data-%{entity}.csv"
+
     attr_reader :organization, :path
 
     # Public: Initializes the class.
@@ -28,17 +30,19 @@ module Decidim
 
     def data
       buffer = Zip::OutputStream.write_buffer do |out|
-        open_data_manifests.each do |export_manifest|
-          csv_data = data_for(export_manifest)
-          out.put_next_entry("#{organization.host}-open-data-#{export_manifest.name}.csv")
-          out.write csv_data.read
+        open_data_component_manifests.each do |manifest|
+          add_file_to_output(out, format(FILE_NAME_PATTERN, { host: organization.host, entity: manifest.name }), data_for_component(manifest))
+        end
+
+        open_data_participatory_space_manifests.each do |manifest|
+          add_file_to_output(out, format(FILE_NAME_PATTERN, { host: organization.host, entity: manifest.name }), data_for_participatory_space(manifest))
         end
       end
 
       buffer.string
     end
 
-    def data_for(export_manifest)
+    def data_for_component(export_manifest)
       collection = components.where(manifest_name: export_manifest.manifest.name).find_each.flat_map do |component|
         export_manifest.collection.call(component)
       end
@@ -46,12 +50,37 @@ module Decidim
       Decidim::Exporters::CSV.new(collection, export_manifest.serializer).export
     end
 
-    def open_data_manifests
-      @open_data_manifests ||= Decidim.component_manifests.flat_map(&:export_manifests).select(&:include_in_open_data?)
+    def data_for_participatory_space(export_manifest)
+      collection = participatory_spaces.filter { |space| space.manifest.name == export_manifest.manifest.name }.flat_map do |participatory_space|
+        export_manifest.collection.call(participatory_space)
+      end
+
+      Decidim::Exporters::CSV.new(collection, export_manifest.serializer).export
+    end
+
+    def add_file_to_output(output, file_name, data)
+      output.put_next_entry(file_name)
+      output.write data.read
+    end
+
+    def open_data_component_manifests
+      @open_data_component_manifests ||= Decidim.component_manifests
+                                                .flat_map(&:export_manifests)
+                                                .select(&:include_in_open_data?)
+    end
+
+    def open_data_participatory_space_manifests
+      @open_data_participatory_space_manifests ||= Decidim.participatory_space_manifests
+                                                          .flat_map(&:export_manifests)
+                                                          .select(&:include_in_open_data?)
     end
 
     def components
       @components ||= organization.published_components
     end
+
+    def participatory_spaces
+      @participatory_spaces ||= organization.public_participatory_spaces
+    end
   end
 end

data/app/services/decidim/zip_stream/zip_stream_writer.rb

@@ -24,10 +24,10 @@ module Decidim
           attachment_block.last.each do |attachment_uploader|
             next if attachment_uploader.file.nil?
 
-            case attachment_uploader.fog_provider
-            when "fog" # file system
+            case attachment_uploader.provider
+            when "file" # file system
               next unless File.exist?(attachment_uploader.file.file)
-            when "fog/aws"
+            when "aws"
               cache_attachment_from_aws(attachment_uploader)
             else
               Rails.logger.info "Carrierwave fog_provider not supported by DataPortabilityExporter for attachment: #{attachment_uploader}"

data/app/uploaders/decidim/application_uploader.rb

@@ -5,6 +5,8 @@ module Decidim
   # hold the uploads configuration, so you should inherit from this class and
   # then tweak any configuration you need.
   class ApplicationUploader < CarrierWave::Uploader::Base
+    include CarrierWave::MiniMagick
+
     process :validate_inside_organization
 
     # Override the directory where uploaded files will be stored.
@@ -17,8 +19,26 @@ module Decidim
       default_path
     end
 
-    def skip_ssrf_protection?(_uri)
-      true
+    # When the uploaded content can't be processed, we want to make sure
+    # not to expose internal tools errors to the users.
+    # We'll show a generic error instead.
+    def manipulate!
+      super
+    rescue CarrierWave::ProcessingError => e
+      Rails.logger.error(e)
+      raise CarrierWave::ProcessingError, I18n.t("carrierwave.errors.general")
+    end
+
+    # As of Carrierwave 2.0 fog_provider method has been deprecated, and is throwing RuntimeError
+    # RuntimeError: Carrierwave fog_provider not supported: DEPRECATION WARNING: #fog_provider is deprecated...
+    # We are attempting to fetch the provider from credentials, if not we consider to be file
+    def provider
+      fog_credentials.fetch(:provider, "file").downcase
+    end
+
+    # We overwrite the downloader to be able to fetch some elements from URL.
+    def downloader
+      Decidim::Downloader
     end
 
     protected

data/app/uploaders/decidim/attachment_uploader.rb

@@ -3,8 +3,6 @@
 module Decidim
   # This class deals with uploading attachments to a participatory space.
   class AttachmentUploader < ApplicationUploader
-    include CarrierWave::MiniMagick
-
     process :set_content_type_and_size_in_model
     process :validate_dimensions
     process :strip
@@ -17,7 +15,7 @@ module Decidim
       process resize_to_limit: [nil, 1000]
     end
 
-    def extension_whitelist
+    def extension_allowlist
       case upload_context
       when :admin
         Decidim.organization_settings(model).upload_allowed_file_extensions_admin
@@ -28,7 +26,7 @@ module Decidim
 
     # CarrierWave automatically calls this method and validates the content
     # type fo the temp file to match against any of these options.
-    def content_type_whitelist
+    def content_type_allowlist
       case upload_context
       when :admin
         Decidim.organization_settings(model).upload_allowed_content_types_admin

data/app/uploaders/decidim/downloader.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Decidim
+  class Downloader < CarrierWave::Downloader::Base
+    def skip_ssrf_protection?(_uri)
+      true
+    end
+  end
+end

data/app/uploaders/decidim/image_uploader.rb

@@ -3,15 +3,13 @@
 module Decidim
   # This class deals with uploading hero images to ParticipatoryProcesses.
   class ImageUploader < ApplicationUploader
-    include CarrierWave::MiniMagick
-
     process :validate_size, :validate_dimensions, :strip
     process quality: Decidim.image_uploader_quality
 
     # CarrierWave automatically calls this method and validates the content
     # type fo the temp file to match against any of these options.
-    def content_type_whitelist
-      extension_whitelist.map { |ext| "image/#{ext}" }
+    def content_type_allowlist
+      extension_allowlist.map { |ext| "image/#{ext}" }
     end
 
     # Strips out all embedded information from the image
@@ -25,15 +23,12 @@ module Decidim
     # Fetches info about different versions, their processors and dimensions
     def dimensions_info
       if versions.any?
-        versions.map do |version, info|
-          [
-            version,
-            {
-              processor: info.processors[0][0],
-              dimensions: info.processors[0][1]
-            }
-          ]
-        end.to_h
+        versions.transform_values do |info|
+          {
+            processor: info.processors[0][0],
+            dimensions: info.processors[0][1]
+          }
+        end
       else
         processors.map do |info|
           [:default, { processor: info[0], dimensions: info[1] }]
@@ -43,7 +38,7 @@ module Decidim
 
     # Add a white list of extensions which are allowed to be uploaded.
     # For images you might use something like this:
-    def extension_whitelist
+    def extension_allowlist
       Decidim.organization_settings(model).upload_allowed_file_extensions_image
     end
 
@@ -69,13 +64,6 @@ module Decidim
       3840
     end
 
-    def manipulate!
-      super
-    rescue CarrierWave::ProcessingError => e
-      Rails.logger.error(e)
-      raise CarrierWave::ProcessingError, I18n.t("carrierwave.errors.general")
-    end
-
     private
 
     def validation_error!(text)

data/app/uploaders/decidim/open_data_uploader.rb

@@ -14,5 +14,10 @@ module Decidim
 
       default_path
     end
+
+    # Sets the validation that the associated model is always within an organization to true
+    def validate_inside_organization
+      true
+    end
   end
 end

data/app/uploaders/decidim/record_image_uploader.rb

@@ -4,11 +4,11 @@ module Decidim
   # This class deals with uploading record specific images that have more
   # limited content types than the defaults.
   class RecordImageUploader < ImageUploader
-    def content_type_whitelist
+    def content_type_allowlist
       %w(image/jpeg image/png)
     end
 
-    def extension_whitelist
+    def extension_allowlist
       %w(jpeg jpg png)
     end
   end

data/app/validators/etiquette_validator.rb

@@ -9,7 +9,6 @@ class EtiquetteValidator < ActiveModel::EachValidator
     validate_caps(record, attribute, value)
     validate_marks(record, attribute, value)
     validate_caps_first(record, attribute, value)
-    validate_length(record, attribute, value)
   end
 
   private
@@ -31,10 +30,4 @@ class EtiquetteValidator < ActiveModel::EachValidator
 
     record.errors.add(attribute, options[:message] || :must_start_with_caps)
   end
-
-  def validate_length(record, attribute, value)
-    return if value.length > 15
-
-    record.errors.add(attribute, options[:message] || :too_short)
-  end
 end

data/app/validators/uploader_content_type_validator.rb

@@ -4,6 +4,7 @@
 # content types. This prevents CarrierWave from uploading the records before
 # they pass the content type validations.
 class UploaderContentTypeValidator < ActiveModel::Validations::FileContentTypeValidator
+  # rubocop: disable Metrics/CyclomaticComplexity
   def validate_each(record, attribute, value)
     begin
       values = parse_values(value)
@@ -19,8 +20,8 @@ class UploaderContentTypeValidator < ActiveModel::Validations::FileContentTypeVa
     return unless uploader.is_a?(Decidim::ApplicationUploader)
 
     mode = option_value(record, :mode)
-    allowed_types = uploader.content_type_whitelist || []
-    forbidden_types = uploader.content_type_blacklist || []
+    allowed_types = uploader.content_type_allowlist || []
+    forbidden_types = uploader.content_type_denylist || []
 
     values.each do |val|
       val_mode = mode
@@ -39,6 +40,7 @@ class UploaderContentTypeValidator < ActiveModel::Validations::FileContentTypeVa
       validate_blacklist(record, attribute, content_type, forbidden_types)
     end
   end
+  # rubocop: enable Metrics/CyclomaticComplexity
 
   def check_validity!; end
 end