decidim-core 0.22.0 → 0.23.3

data/config/locales/zh-TW.yml

@@ -0,0 +1 @@
+zh-TW:

data/db/migrate/20200525184143_add_enable_machine_translation_to_decidim_organizations.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddEnableMachineTranslationToDecidimOrganizations < ActiveRecord::Migration[5.2]
+  def change
+    add_column :decidim_organizations, :enable_machine_translations, :boolean, default: false
+  end
+end

data/db/migrate/20200702073419_create_decidim_share_tokens.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class CreateDecidimShareTokens < ActiveRecord::Migration[5.2]
+  def change
+    create_table :decidim_share_tokens do |t|
+      t.references :decidim_organization, null: false, index: true
+      t.references :decidim_user, null: false, index: true
+      t.references :token_for, polymorphic: true, null: false, index: { name: "decidim_share_tokens_token_for" }
+      t.string :token, null: false
+      t.integer :times_used, default: 0
+      t.datetime :created_at
+      t.datetime :last_used_at
+      t.datetime :expires_at
+    end
+  end
+end

data/db/migrate/20200707132401_add_comments_max_length_to_decidim_organization.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddCommentsMaxLengthToDecidimOrganization < ActiveRecord::Migration[5.2]
+  def change
+    add_column :decidim_organizations, :comments_max_length, :integer, default: 1000
+  end
+end

data/db/migrate/20200730142511_add_file_upload_settings_to_decidim_organizations.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+class AddFileUploadSettingsToDecidimOrganizations < ActiveRecord::Migration[5.2]
+  def change
+    add_column :decidim_organizations, :file_upload_settings, :jsonb
+
+    reversible do |dir|
+      dir.up do
+        Decidim.configure do |config|
+          # Even when these configurations have been deleted, they are available
+          # in the config object if they are defined by the initializer.
+          attachment_size = config.fetch(:maximum_attachment_size, 10.megabytes)
+          avatar_size = config.fetch(:maximum_avatar_size, 5.megabytes)
+
+          # Update all organizations with the default file upload settings.
+          Decidim::Organization.all.each do |organization|
+            organization.update(
+              file_upload_settings: default_settings.merge(
+                "maximum_file_size" => {
+                  "default" => attachment_size / 1.megabyte,
+                  "avatar" => avatar_size / 1.megabyte
+                }
+              )
+            )
+          end
+        end
+      end
+    end
+  end
+
+  private
+
+  def default_settings
+    Decidim::OrganizationSettings.default(:upload)
+  end
+end

data/db/migrate/20200806092109_add_machine_translation_display_priority_to_organizations.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class AddMachineTranslationDisplayPriorityToOrganizations < ActiveRecord::Migration[5.2]
+  class Organization < ApplicationRecord
+    self.table_name = "decidim_organizations"
+  end
+
+  def change
+    add_column :decidim_organizations, :machine_translation_display_priority, :string
+
+    Organization.reset_column_information
+    Organization.update_all(machine_translation_display_priority: :original) # rubocop:disable Rails/SkipsModelValidations
+
+    change_column_default :decidim_organizations, :machine_translation_display_priority, "original"
+    change_column_null :decidim_organizations, :machine_translation_display_priority, false
+  end
+end

data/db/migrate/20201004160335_remove_notifications_with_continuity_badge.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class RemoveNotificationsWithContinuityBadge < ActiveRecord::Migration[5.2]
+  def up
+    Decidim::Notification.where("extra->>'badge_name' =?", "continuity").delete_all
+  end
+
+  def down; end
+end

data/db/seeds.rb

@@ -16,6 +16,9 @@ if !Rails.env.production? || ENV["SEED"]
     table.tr("_", "/").classify.safe_constantize
   end.compact.each(&:reset_column_information)
 
+  smtp_label = Faker::Twitter.unique.screen_name
+  smtp_email = Faker::Internet.email
+
   organization = Decidim::Organization.first || Decidim::Organization.create!(
     name: Faker::Company.name,
     twitter_handler: Faker::Hipster.word,
@@ -24,7 +27,9 @@ if !Rails.env.production? || ENV["SEED"]
     youtube_handler: Faker::Hipster.word,
     github_handler: Faker::Hipster.word,
     smtp_settings: {
-      from: Faker::Internet.email,
+      from: "#{smtp_label} <#{smtp_email}>",
+      from_email: smtp_email,
+      from_label: smtp_label,
       user_name: Faker::Twitter.unique.screen_name,
       encrypted_password: Decidim::AttributeEncryptor.encrypt(Faker::Internet.password(8)),
       address: ENV["DECIDIM_HOST"] || "localhost",
@@ -42,7 +47,8 @@ if !Rails.env.production? || ENV["SEED"]
     tos_version: Time.current,
     badges_enabled: true,
     user_groups_enabled: true,
-    send_welcome_notification: true
+    send_welcome_notification: true,
+    file_upload_settings: Decidim::OrganizationSettings.default(:upload)
   )
 
   if organization.top_scopes.none?
@@ -172,7 +178,7 @@ if !Rails.env.production? || ENV["SEED"]
         email: Faker::Internet.email,
         confirmed_at: Time.current,
         extended_data: {
-          document_number: Faker::Number.number(10),
+          document_number: Faker::Number.number(10).to_s,
           phone: Faker::PhoneNumber.phone_number,
           verified_at: verified_at
         },
@@ -188,13 +194,13 @@ if !Rails.env.production? || ENV["SEED"]
   end
 
   Decidim::OAuthApplication.create!(
+    organization: organization,
     name: "Test OAuth application",
     organization_name: "Example organization",
     organization_url: "http://www.example.org",
-    organization_logo: File.new(File.join(seeds_root, "homepage_image.jpg")),
+    organization_logo: File.new(File.join(seeds_root, "homepage_image.jpg")), # Keep after organization
     redirect_uri: "https://www.example.org/oauth/decidim",
-    scopes: "public",
-    organization: organization
+    scopes: "public"
   )
 
   Decidim::System::CreateDefaultContentBlocks.call(organization)

data/lib/decidim/authorable.rb

@@ -12,11 +12,25 @@ module Decidim
       belongs_to :author, polymorphic: true, foreign_key: "decidim_author_id", foreign_type: "decidim_author_type"
       belongs_to :user_group, foreign_key: "decidim_user_group_id", class_name: "Decidim::UserGroup", optional: true
 
+      scope :official_origin, lambda {
+        where(decidim_author_type: "Decidim::Organization")
+      }
+
+      scope :user_group_origin, lambda {
+        where(decidim_author_type: "Decidim::UserBaseEntity")
+          .where.not(decidim_user_group_id: nil)
+      }
+
+      scope :citizens_origin, lambda {
+        where(decidim_author_type: "Decidim::UserBaseEntity")
+          .where(decidim_user_group_id: nil)
+      }
+
       validates :author, presence: true
       validate :verified_user_group, :user_group_membership
       validate :author_belongs_to_organization
 
-      # Checks whether the user is author of the given proposal, either directly
+      # Checks whether the user is author of the given resource, either directly
       # authoring it or via a user group.
       #
       # user - the user to check for authorship
@@ -32,6 +46,13 @@ module Decidim
         user_group || author
       end
 
+      # Public: Checks whether the resource is official or not.
+      #
+      # Returns a boolean.
+      def official?
+        decidim_author_type == Decidim::Organization.name
+      end
+
       private
 
       def verified_user_group

data/lib/decidim/authorization_form_builder.rb

@@ -37,6 +37,7 @@ module Decidim
 
     def input_field(name, type)
       return hidden_field(name) if name.to_s == "handler_name"
+      return scopes_selector if name.to_s == "scope_id"
 
       case type.name
       when "Date", "Time"
@@ -46,6 +47,12 @@ module Decidim
       end
     end
 
+    def scopes_selector
+      return if object.user.blank?
+
+      collection_select :scope_id, object.user.organization.scopes, :id, ->(scope) { translated_attribute(scope.name) }
+    end
+
     def find_input_type(name)
       found_attribute = object.class.attribute_set.detect do |attribute|
         attribute.name.to_s == name

data/lib/decidim/coauthorable.rb

@@ -23,6 +23,28 @@ module Decidim
       scope :from_author, ->(author) { from_all_author_identities(author).where("decidim_coauthorships.decidim_user_group_id": nil) }
       # retrieves models from the given UserGroup.
       scope :from_user_group, ->(user_group) { joins(:coauthorships).where("decidim_coauthorships.decidim_user_group_id": user_group.id) }
+      scope :official_origin, lambda {
+        where.not(coauthorships_count: 0)
+             .joins(:coauthorships)
+             .where(decidim_coauthorships: { decidim_author_type: "Decidim::Organization" })
+      }
+      scope :citizens_origin, lambda {
+        where.not(coauthorships_count: 0)
+             .joins(:coauthorships)
+             .where.not(decidim_coauthorships: { decidim_author_type: "Decidim::Organization" })
+             .where(decidim_coauthorships: { decidim_user_group_id: nil })
+      }
+      scope :user_group_origin, lambda {
+        where.not(coauthorships_count: 0)
+             .joins(:coauthorships)
+             .where(decidim_coauthorships: { decidim_author_type: "Decidim::UserBaseEntity" })
+             .where.not(decidim_coauthorships: { decidim_user_group_id: nil })
+      }
+      scope :meeting_origin, lambda {
+        where.not(coauthorships_count: 0)
+             .joins(:coauthorships)
+             .where(decidim_coauthorships: { decidim_author_type: "Decidim::Meetings::Meeting" })
+      }
 
       validates :coauthorships, presence: true
 

data/lib/decidim/component_manifest.rb

@@ -108,7 +108,7 @@ module Decidim
     def run_hooks(event_name, context = nil)
       return unless hooks[event_name]
 
-      hooks[event_name.to_sym].each do |hook|
+      hooks[event_name.to_sym].map do |hook|
         hook.call(context)
       end
     end

data/lib/decidim/content_processor.rb

@@ -51,52 +51,75 @@ module Decidim
     #
     # @return [Result] a Result object with the content rewritten and the metadata
     def self.parse(content, context)
-      parsed = Decidim.content_processors.each_with_object(rewrite: content, metadata: {}) do |type, result|
-        parser = parser_klass(type).constantize.new(result[:rewrite], context)
-        result[:rewrite] = parser.rewrite
-        result[:metadata][type] = parser.metadata
+      Decidim.content_processors.each_with_object(Result.new(content, {})) do |type, result|
+        parse_with_processor(type, result, context)
       end
-
-      Result.new(parsed[:rewrite], parsed[:metadata])
     end
 
-    def self.parse_with_processor(_type, content, context)
-      parsed = if content.is_a?(Hash)
-                 Decidim.content_processors.each_with_object(rewrite: content, metadata: {}) do |type, result|
-                   next unless type == :hashtag
-
-                   result[:rewrite].each do |key, value|
-                     parser = parser_klass(type).constantize.new(value, context)
-                     result[:rewrite][key] = parser.rewrite
-                     result[:metadata][type] = parser.metadata
-                   end
-                 end
+    # Public: Calls the specified processors to process the given content with
+    # it. For example, to convert hashtags to its Global ID representation.
+    #
+    # @param type [String] the name of the processor to use.
+    # @param content [String] already rewritten content or regular content
+    # @param context [Hash] with information to inject to the parsers as context
+    #
+    # @return [Result] a Result object with the content rewritten and the metadata
+    def self.parse_with_processor(type, content, context)
+      result = if content.is_a?(Result)
+                 content
                else
-                 Decidim.content_processors.each_with_object(rewrite: content, metadata: {}) do |type, result|
-                   next unless type == :hashtag
-
-                   parser = parser_klass(type).constantize.new(result[:rewrite], context)
-                   result[:rewrite] = parser.rewrite
-                   result[:metadata][type] = parser.metadata
-                 end
+                 Result.new(content, {})
                end
-      Result.new(parsed[:rewrite], parsed[:metadata])
+
+      if result.rewrite.is_a?(Hash)
+        result.rewrite.each do |key, value|
+          child_result = Result.new(value, {})
+          child_result = parse_with_processor(type, child_result, context)
+
+          result.rewrite.update(key => child_result.rewrite)
+          result.metadata.update(child_result.metadata)
+        end
+      else
+        parser = parser_klass(type).constantize.new(result.rewrite, context)
+        result.rewrite = parser.rewrite
+        result.metadata.update(type => parser.metadata)
+      end
+
+      result
     end
 
     # This calls all registered processors one after the other and returns
     # the processed content ready to display.
     #
+    # @param content [String] with the content to be rendered.
+    # @param wrapper_tag [String] with the HTML tag to wrap the content.
+    # @param options [Hash] with options to pass to the renderer.
+    #
     # @return [String] the content processed and ready to display (it is expected to include HTML)
-    def self.render(content, wrapper_tag = "p")
+    def self.render(content, wrapper_tag = "p", options = {})
       simple_format(
-        Decidim.content_processors.reduce(content) do |result, type|
-          renderer_klass(type).constantize.new(result).render
-        end,
+        render_without_format(content, options),
         {},
         wrapper_tag: wrapper_tag
       )
     end
 
+    # This calls all registered processors one after the other and returns
+    # the processed content ready to display without wrapping the content in
+    # HTML.
+    #
+    # @param content [String] with the content to be rendered.
+    # @param options [Hash] with options to pass to the renderer.
+    #
+    # @return [String] the content processed and ready to display.
+    def self.render_without_format(content, options = {})
+      return content if content.blank?
+
+      Decidim.content_processors.reduce(content) do |result, type|
+        renderer_klass(type).constantize.new(result).render(options)
+      end
+    end
+
     # This method overwrites the views `sanitize` method. This is required to
     # ensure the content does not include any weird HTML that could harm the end
     # user.

data/lib/decidim/content_renderers/base_renderer.rb

@@ -29,7 +29,7 @@ module Decidim
       #
       # @abstract Subclass is expected to implement it
       # @return [String] the content processed and ready to display
-      def render
+      def render(_options = nil)
         content
       end
     end

data/lib/decidim/content_renderers/hashtag_renderer.rb

@@ -21,6 +21,8 @@ module Decidim
       #
       # @return [String] the content ready to display (contains HTML)
       def render(links: true, extras: true)
+        return content unless content.respond_to?(:gsub)
+
         content.gsub(GLOBAL_ID_REGEX) do |hashtag_gid|
           id, extra, cased_name = hashtag_gid.scan(GLOBAL_ID_REGEX).flatten
           hashtag = hashtags[id.to_i]

data/lib/decidim/content_renderers/link_renderer.rb

@@ -16,7 +16,10 @@ module Decidim
     # @see BaseRenderer Examples of how to use a content renderer
     class LinkRenderer < BaseRenderer
       # @return [String] the content ready to display (contains HTML)
-      def render(options = { target: "_blank", rel: "nofollow noopener" })
+      def render(options = {})
+        return content unless content.is_a?(String)
+
+        options = { target: "_blank", rel: "nofollow noopener" }.merge(options)
         Anchored::Linker.auto_link(content, options)
       end
     end

data/lib/decidim/content_renderers/user_group_renderer.rb

@@ -17,7 +17,9 @@ module Decidim
       # invalid Decidim::UserGroup are replaced with an empty string.
       #
       # @return [String] the content ready to display (contains HTML)
-      def render
+      def render(_options = nil)
+        return content unless content.respond_to?(:gsub)
+
         content.gsub(GLOBAL_ID_REGEX) do |user_gid|
           user = GlobalID::Locator.locate(user_gid)
           Decidim::UserGroupPresenter.new(user).display_mention

data/lib/decidim/content_renderers/user_renderer.rb

@@ -17,7 +17,9 @@ module Decidim
       # invalid Decidim::User are replaced with an empty string.
       #
       # @return [String] the content ready to display (contains HTML)
-      def render
+      def render(_options = nil)
+        return content unless content.respond_to?(:gsub)
+
         content.gsub(GLOBAL_ID_REGEX) do |user_gid|
           user = GlobalID::Locator.locate(user_gid)
           Decidim::UserPresenter.new(user).display_mention

data/lib/decidim/core.rb

@@ -8,6 +8,7 @@ module Decidim
   autoload :Deprecations, "decidim/deprecations"
   autoload :ActsAsAuthor, "decidim/acts_as_author"
   autoload :TranslatableAttributes, "decidim/translatable_attributes"
+  autoload :TranslatableResource, "decidim/translatable_resource"
   autoload :JsonbAttributes, "decidim/jsonb_attributes"
   autoload :FormBuilder, "decidim/form_builder"
   autoload :AuthorizationFormBuilder, "decidim/authorization_form_builder"
@@ -24,7 +25,9 @@ module Decidim
   autoload :Participable, "decidim/participable"
   autoload :Publicable, "decidim/publicable"
   autoload :Scopable, "decidim/scopable"
+  autoload :ScopableParticipatorySpace, "decidim/scopable_participatory_space"
   autoload :ScopableComponent, "decidim/scopable_component"
+  autoload :ScopableResource, "decidim/scopable_resource"
   autoload :ContentParsers, "decidim/content_parsers"
   autoload :ContentRenderers, "decidim/content_renderers"
   autoload :ContentProcessor, "decidim/content_processor"
@@ -74,7 +77,6 @@ module Decidim
   autoload :Amendable, "decidim/amendable"
   autoload :Gamification, "decidim/gamification"
   autoload :Hashtag, "decidim/hashtag"
-  autoload :Hashtaggable, "decidim/hashtaggable"
   autoload :Paddable, "decidim/paddable"
   autoload :OpenDataExporter, "decidim/open_data_exporter"
   autoload :IoEncoder, "decidim/io_encoder"
@@ -83,6 +85,13 @@ module Decidim
   autoload :Randomable, "decidim/randomable"
   autoload :Endorsable, "decidim/endorsable"
   autoload :ActionAuthorization, "decidim/action_authorization"
+  autoload :Map, "decidim/map"
+  autoload :Geocodable, "decidim/geocodable"
+  autoload :Snippets, "decidim/snippets"
+  autoload :OrganizationSettings, "decidim/organization_settings"
+  autoload :HasUploadValidations, "decidim/has_upload_validations"
+  autoload :FileValidatorHumanizer, "decidim/file_validator_humanizer"
+  autoload :ShareableWithToken, "decidim/shareable_with_token"
 
   include ActiveSupport::Configurable
   # Loads seeds from all engines.
@@ -140,7 +149,7 @@ module Decidim
 
   # Exposes a configuration option: The application available locales.
   config_accessor :available_locales do
-    %w(en ar ca de el es es-MX es-PY eu fi-pl fi fr gl hu id it nl no pl pt pt-BR ro ru sk sv tr uk)
+    %w(en bg ar ca cs da de el eo es es-MX es-PY et eu fi-pl fi fr fr-CA ga gl hr hu id is it ja lt lv mt nl no pl pt pt-BR ro ru sk sl sr sv tr uk)
   end
 
   # Exposes a configuration option: The application default locale.
@@ -168,6 +177,10 @@ module Decidim
   # Exposes a configuration option: an object to configure geocoder
   config_accessor :geocoder
 
+  # Exposes a configuration option: an object to configure the mapping
+  # functionality. See Decidim::Map for more information.
+  config_accessor :maps
+
   # Exposes a configuration option: a custom method to generate references.
   # If overwritten, it should handle both component resources and participatory spaces.
   # Default: Calculates a unique reference for the model in
@@ -214,16 +227,6 @@ module Decidim
     80
   end
 
-  # Exposes a configuration option: The maximum file size of an attachment.
-  config_accessor :maximum_attachment_size do
-    10.megabytes
-  end
-
-  # Exposes a configuration option: The maximum file size for user avatar images.
-  config_accessor :maximum_avatar_size do
-    5.megabytes
-  end
-
   # The number of reports which a resource can receive before hiding it
   config_accessor :max_reports_before_hiding do
     3
@@ -259,6 +262,11 @@ module Decidim
     2.days
   end
 
+  # Allow machine translations
+  config_accessor :enable_machine_translations do
+    false
+  end
+
   # How long can a user remained logged in before the session expires
   config_accessor :expire_session_after do
     1.day
@@ -303,6 +311,12 @@ module Decidim
     # "MyPDFSignatureService"
   end
 
+  # The name of the class to translate user content.
+  #
+  config_accessor :machine_translation_service do
+    # "MyTranslationService"
+  end
+
   # The Decidim::Exporters::CSV's default column separator
   config_accessor :default_csv_col_sep do
     ";"
@@ -331,6 +345,18 @@ module Decidim
     %w(all participants)
   end
 
+  # Exposes a configuration option: The maximum length for conversation
+  # messages.
+  config_accessor :maximum_conversation_message_length do
+    1_000
+  end
+
+  # Defines the name of the cookie used to check if the user allows Decidim to
+  # set cookies.
+  config_accessor :consent_cookie_name do
+    "decidim-cc"
+  end
+
   # Public: Registers a global engine. This method is intended to be used
   # by component engines that also offer unscoped functionality
   #
@@ -515,4 +541,33 @@ module Decidim
   def self.metrics_operation
     @metrics_operation ||= MetricOperation.new
   end
+
+  # Public: Returns the correct settings object for the given organization or
+  # the default settings object when the organization cannot be determined. The
+  # model to be passed to this method can be any model that responds to the
+  # `organization` method or the organization itself. If the given model is not
+  # an organization or does not respond to the organization method, returns the
+  # default organization settings.
+  #
+  # model - The target model for which to fetch the settings object, either an
+  #         organization or a model responding to the `organization` method.
+  #
+  def self.organization_settings(model)
+    organization = begin
+      if model.is_a?(Decidim::Organization)
+        model
+      elsif model.respond_to?(:organization)
+        model.organization
+      end
+    end
+    return Decidim::OrganizationSettings.defaults unless organization
+
+    Decidim::OrganizationSettings.for(organization)
+  end
+
+  def self.machine_translation_service_klass
+    return unless Decidim.enable_machine_translations
+
+    Decidim.machine_translation_service.to_s.safe_constantize
+  end
 end