decidim-core 0.18.1 → 0.19.0

data/lib/decidim/events/author_event.rb

@@ -30,6 +30,7 @@ module Decidim
 
         def author_presenter
           return unless author
+
           @author_presenter ||= Decidim::UserPresenter.new(author)
         end
 

data/lib/decidim/events/base_event.rb

@@ -67,28 +67,16 @@ module Decidim
         @resource_url ||= resource_locator.url
       end
 
-      # Whether this event should be notified or not. Useful when you want the
-      # event to decide based on the params.
-      #
-      # It returns false when the resource or any element in the chain is a
-      # `Decidim::Publicable` and it isn't published or participatory_space
-      # is a `Decidim::Participable` and the user can't participate.
-      def notifiable?
-        return false if resource.is_a?(Decidim::Publicable) && !resource.published?
-        return false if participatory_space.is_a?(Decidim::Publicable) && !participatory_space&.published?
-        return false if component && !component.published?
-
-        return false if participatory_space.is_a?(Decidim::Participable) && !participatory_space.can_participate?(user)
-
-        true
-      end
-
       def resource_text; end
 
       def resource_title
         return unless resource
 
-        if resource.respond_to?(:title)
+        if resource.is_a?(Decidim::Hashtaggable)
+          translated_title = translated_attribute(resource.title)
+          renderer = Decidim::ContentRenderers::HashtagRenderer.new(translated_title)
+          renderer.render(links: false).html_safe
+        elsif resource.respond_to?(:title)
           translated_attribute(resource.title)
         elsif resource.respond_to?(:name)
           translated_attribute(resource.name)
@@ -97,17 +85,19 @@ module Decidim
 
       private
 
-      attr_reader :event_name, :resource, :user, :user_role, :extra
-
       def component
-        return resource.component if resource.is_a?(Decidim::HasComponent)
         return resource if resource.is_a?(Decidim::Component)
+
+        resource.try(:component)
       end
 
       def participatory_space
-        return resource if resource.is_a?(Decidim::ParticipatorySpaceResourceable)
-        component&.participatory_space
+        return resource if resource.is_a?(Decidim::Participable)
+
+        resource.try(:participatory_space)
       end
+
+      attr_reader :event_name, :resource, :user, :user_role, :extra
     end
   end
 end

data/lib/decidim/events/coauthor_event.rb

@@ -30,6 +30,7 @@ module Decidim
 
         def author_presenter
           return unless author
+
           @author_presenter ||= Decidim::UserPresenter.new(author)
         end
 

data/lib/decidim/events/simple_event.rb

@@ -54,6 +54,7 @@ module Decidim
       # then the role is appended to the i18n scope.
       def i18n_scope
         return event_name if user_role.blank? || !event_has_roles?
+
         "#{event_name}.#{user_role}"
       end
 
@@ -79,12 +80,14 @@ module Decidim
       # Caches the path for the given resource when it's a Decidim::Component.
       def resource_path
         return super unless resource.is_a?(Decidim::Component)
+
         @resource_path ||= main_component_path(resource)
       end
 
       # Caches the URL for the given resource when it's a Decidim::Component.
       def resource_url
         return super unless resource.is_a?(Decidim::Component)
+
         @resource_url ||= main_component_url(resource)
       end
 

data/lib/decidim/exporters/csv.rb

@@ -28,6 +28,7 @@ module Decidim
 
       def headers
         return [] if processed_collection.empty?
+
         processed_collection.first.keys
       end
 

data/lib/decidim/fingerprintable.rb

@@ -28,6 +28,7 @@ module Decidim
           @fingerprint_options[:block] = block
         else
           raise "You must provide a set of fields to generate the fingerprint." unless fields
+
           @fingerprint_options[:fields] = fields
         end
       end

data/lib/decidim/followable.rb

@@ -9,5 +9,13 @@ module Decidim
       has_many :follows, as: :followable, foreign_key: "decidim_followable_id", foreign_type: "decidim_followable_type", class_name: "Decidim::Follow"
       has_many :followers, through: :follows, source: :user
     end
+
+    def followers
+      if respond_to?(:participatory_space) && participatory_space.present? && participatory_space.respond_to?(:followers)
+        super.or(participatory_space.followers).distinct
+      else
+        super
+      end
+    end
   end
 end

data/lib/decidim/form_builder.rb

@@ -28,6 +28,23 @@ module Decidim
     end
     # rubocop:enable Metrics/ParameterLists
 
+    # Public: generates a radio buttons input from a collection and adds help
+    # text and errors.
+    #
+    # attribute       - the name of the field
+    # collection      - the collection from which we will render the check boxes
+    # value_attribute - a Symbol or a Proc defining how to find the value attribute
+    # text_attribute  - a Symbol or a Proc defining how to find the text attribute
+    # options         - a Hash with options
+    # html_options    - a Hash with options
+    #
+    # Renders a collection of radio buttons.
+    # rubocop:disable Metrics/ParameterLists
+    def collection_radio_buttons(attribute, collection, value_attribute, text_attribute, options = {}, html_options = {})
+      super + error_and_help_text(attribute, options)
+    end
+    # rubocop:enable Metrics/ParameterLists
+
     # Public: Generates an form field for each locale.
     #
     # type - The form field's type, like `text_area` or `text_input`
@@ -79,6 +96,7 @@ module Decidim
 
     def translated_one_locale(type, name, locale, options = {})
       return hashtaggable_text_field(type, name, locale, options.merge(value: options[:value])) if options[:hashtaggable]
+
       send(
         type,
         "#{name}_#{locale.to_s.gsub("-", "__")}",
@@ -299,7 +317,7 @@ module Decidim
 
     # Public: Override so checkboxes are rendered before the label.
     def check_box(attribute, options = {}, checked_value = "1", unchecked_value = "0")
-      custom_label(attribute, options[:label], options[:label_options], true, false) do
+      custom_label(attribute, options[:label], options[:label_options], true) do
         options.delete(:label)
         options.delete(:label_options)
         @template.check_box(@object_name, attribute, objectify_options(options), checked_value, unchecked_value)
@@ -365,10 +383,10 @@ module Decidim
                     else
                       @template.content_tag :label, I18n.t("default_image", scope: "decidim.forms")
                     end
-        template += @template.link_to @template.image_tag(file.url), file.url, target: "_blank"
+        template += @template.link_to @template.image_tag(file.url), file.url, target: "_blank", rel: "noopener"
       elsif file_is_present?(file)
         template += @template.label_tag I18n.t("current_file", scope: "decidim.forms")
-        template += @template.link_to file.file.filename, file.url, target: "_blank"
+        template += @template.link_to file.file.filename, file.url, target: "_blank", rel: "noopener"
       end
 
       if file_is_present?(file)
@@ -524,6 +542,7 @@ module Decidim
     # Returns a klass object.
     def find_validator(attribute, klass)
       return unless object.respond_to?(:_validators)
+
       object._validators[attribute].find { |validator| validator.class == klass }
     end
 
@@ -632,12 +651,14 @@ module Decidim
     def file_is_image?(file)
       return unless file && file.respond_to?(:url)
       return file.content_type.start_with? "image" if file.content_type.present?
+
       Mime::Type.lookup_by_extension(File.extname(file.url)[1..-1]).to_s.start_with? "image" if file.url.present?
     end
 
     # Private: Returns whether the file exists or not.
     def file_is_present?(file)
       return unless file && file.respond_to?(:url)
+
       file.present?
     end
 

data/lib/decidim/gamification.rb

@@ -15,6 +15,7 @@ module Decidim
     # Returns a `BadgeStatus` instance.
     def self.status_for(user, badge_name)
       return unless user.is_a?(Decidim::UserBaseEntity)
+
       BadgeStatus.new(user, find_badge(badge_name))
     end
 
@@ -28,6 +29,7 @@ module Decidim
     def self.increment_score(user, badge_name, amount = 1)
       return unless amount.positive?
       return unless user.is_a?(Decidim::UserBaseEntity)
+
       BadgeScorer.new(user, find_badge(badge_name)).increment(amount)
     end
 
@@ -41,6 +43,7 @@ module Decidim
     def self.decrement_score(user, badge_name, amount = 1)
       return unless amount.positive?
       return unless user.is_a?(Decidim::UserBaseEntity)
+
       BadgeScorer.new(user, find_badge(badge_name)).decrement(amount)
     end
 
@@ -53,6 +56,7 @@ module Decidim
     # Returns nothing.
     def self.set_score(user, badge_name, score)
       return unless user.is_a?(Decidim::UserBaseEntity)
+
       BadgeScorer.new(user, find_badge(badge_name)).set(score)
     end
 

data/lib/decidim/gamification/badge_status.rb

@@ -29,6 +29,7 @@ module Decidim
       # Returns an Integer with the remaining score.
       def next_level_in
         return nil if level >= @badge.levels.count
+
         @badge.levels[level] - score
       end
 

data/lib/decidim/has_category.rb

@@ -15,6 +15,7 @@ module Decidim
 
       def previous_category
         return if categorization.versions.count <= 1
+
         Decidim::Category.find_by(id: categorization.versions.last.reify.decidim_category_id)
       end
 
@@ -22,6 +23,7 @@ module Decidim
 
       def category_belongs_to_organization
         return unless category
+
         errors.add(:category, :invalid) unless component.categories.where(id: category.id).exists?
       end
     end

data/lib/decidim/has_component.rb

@@ -11,14 +11,9 @@ module Decidim
     included do
       belongs_to :component, foreign_key: "decidim_component_id", class_name: "Decidim::Component", touch: true
       delegate :organization, to: :component, allow_nil: true
-      delegate :participatory_space, to: :component, allow_nil: true
+      delegate :participatory_space, :can_participate_in_space?, to: :component, allow_nil: true
 
-      def can_participate_in_space?(user)
-        return true unless participatory_space.try(:private_space?)
-        return false unless user
-
-        participatory_space.users.include?(user)
-      end
+      alias_method :can_participate?, :can_participate_in_space?
     end
 
     class_methods do

data/lib/decidim/has_private_users.rb

@@ -31,8 +31,15 @@ module Decidim
         end
       end
 
+      def can_participate?(user)
+        return true unless private_space?
+        return false unless user
+
+        users.include?(user)
+      end
+
       def self.public_spaces
-        where(private_space: false)
+        where(private_space: false).published
       end
 
       def self.private_spaces

data/lib/decidim/has_settings.rb

@@ -11,11 +11,11 @@ module Decidim
     end
 
     def settings
-      settings_schema(:global).new(self[:settings]["global"])
+      new_settings_schema(:global, self[:settings]["global"])
     end
 
     def settings=(data)
-      self[:settings]["global"] = settings_schema(:global).new(data)
+      self[:settings]["global"] = new_settings_schema(:global, data)
     end
 
     def current_settings
@@ -27,24 +27,24 @@ module Decidim
     end
 
     def default_step_settings
-      settings_schema(:step).new(self[:settings]["default_step"])
+      new_settings_schema(:step, self[:settings]["default_step"])
     end
 
     def default_step_settings=(data)
-      self[:settings]["default_step"] = settings_schema(:step).new(data)
+      self[:settings]["default_step"] = new_settings_schema(:step, data)
     end
 
     def step_settings
       return {} unless participatory_space.allows_steps?
 
       participatory_space.steps.each_with_object({}) do |step, result|
-        result[step.id.to_s] = settings_schema(:step).new(self[:settings].dig("steps", step.id.to_s))
+        result[step.id.to_s] = new_settings_schema(:step, self[:settings].dig("steps", step.id.to_s))
       end
     end
 
     def step_settings=(data)
       self[:settings]["steps"] = data.each_with_object({}) do |(key, value), result|
-        result[key.to_s] = settings_schema(:step).new(value)
+        result[key.to_s] = new_settings_schema(:step, value)
       end
     end
 
@@ -59,8 +59,12 @@ module Decidim
       step_settings.fetch(active_step.id.to_s)
     end
 
-    def settings_schema(name)
-      manifest.settings(name.to_sym).schema
+    # Returns a Class with the attributes sanitized, coerced  and filtered
+    # to the right type. See Decidim::SettingsManifest#schema.
+    def new_settings_schema(name, data)
+      return {} unless manifest && participatory_space
+
+      manifest.settings(name).schema.new(data, participatory_space.organization.default_locale)
     end
 
     def default_values

data/lib/decidim/hashtaggable.rb

@@ -11,10 +11,14 @@ module Decidim
         renderer.render(links: false).html_safe
       end
 
+      alias_method :formatted_title, :search_title
+
       def search_body
         renderer = Decidim::ContentRenderers::HashtagRenderer.new(body)
         renderer.render(links: false).html_safe
       end
+
+      alias_method :formatted_body, :search_body
     end
   end
 end

data/lib/decidim/metric_operation_manifest.rb

@@ -14,6 +14,7 @@ module Decidim
     def calculate(day, resource)
       operation = manager_class.constantize.new(day, resource)
       return unless operation.valid?
+
       operation.calculate
     end
   end

data/lib/decidim/nicknamizable.rb

@@ -35,6 +35,7 @@ module Decidim
       #
       def nicknamize(name, scope = {})
         return unless name
+
         disambiguate(
           name.parameterize(separator: "_")[nickname_length_range],
           scope

data/lib/decidim/participable.rb

@@ -82,6 +82,7 @@ module Decidim
 
       def cta_button_text_key
         return :more_info if empty_published_component?
+
         :take_part
       end
     end

data/lib/decidim/participatory_space_resourceable.rb

@@ -51,6 +51,7 @@ module Decidim
       def participatory_space_sibling_scope(participatory_space_name)
         manifest = Decidim.find_participatory_space_manifest(participatory_space_name)
         return self.class.none unless manifest
+
         scope = manifest.participatory_spaces.call(organization)
 
         scope

data/lib/decidim/randomable.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require "active_support/concern"
+
+module Decidim
+  # A concern with the components needed when you want a model to have a component.
+  module Randomable
+    extend ActiveSupport::Concern
+
+    class_methods do
+      # Public: Randomly orders a collection given a seed.
+      def order_randomly(seed)
+        transaction do
+          connection.execute("SELECT setseed(#{connection.quote(seed)})")
+          order(Arel.sql("RANDOM()")).load
+        end
+      end
+    end
+  end
+end

data/lib/decidim/search_resource_fields_mapper.rb

@@ -98,6 +98,7 @@ module Decidim
         if value_field.is_a?(Array)
           value_field.collect do |vfield_name|
             raise ArgumentError, "nested fields not supported for translations" if vfield_name.is_a?(Hash)
+
             resource.send(vfield_name.to_sym)
           end
         else
@@ -122,6 +123,7 @@ module Decidim
     def read_i18n_field(resource, locale, field_name)
       content = read_field(resource, @declared_fields, field_name)
       return if content.nil?
+
       content = Array.wrap(content).collect do |item|
         item.is_a?(Hash) ? item[locale] : item
       end

data/lib/decidim/searchable.rb

@@ -50,6 +50,7 @@ module Decidim
       #
       def try_add_to_index_as_search_resource
         return unless self.class.search_resource_fields_mapper.index_on_create?(self)
+
         add_to_index_as_search_resource
       end
 
@@ -105,6 +106,7 @@ module Decidim
     class_methods do
       def search_resource_fields_mapper
         raise "`searchable_fields` should be declared when including Searchable" unless defined?(@search_resource_indexable_fields)
+
         @search_resource_indexable_fields
       end