decidim-core 0.14.4 → 0.15.0

data/db/seeds.rb

@@ -7,6 +7,15 @@ if !Rails.env.production? || ENV["SEED"]
 
   seeds_root = File.join(__dir__, "seeds")
 
+  # Since we usually migrate and seed in the same process, make sure
+  # that we don't have invalid or cached information after a migration.
+  decidim_tables = ActiveRecord::Base.connection.tables.select do |table|
+    table.starts_with?("decidim_")
+  end
+  decidim_tables.map do |table|
+    table.tr("_", "/").classify.safe_constantize
+  end.compact.each(&:reset_column_information)
+
   organization = Decidim::Organization.first || Decidim::Organization.create!(
     name: Faker::Company.name,
     twitter_handler: Faker::Hipster.word,
@@ -22,7 +31,8 @@ if !Rails.env.production? || ENV["SEED"]
     available_locales: Decidim.available_locales,
     reference_prefix: Faker::Name.suffix,
     available_authorizations: Decidim.authorization_workflows.map(&:name),
-    tos_version: Time.current
+    tos_version: Time.current,
+    badges_enabled: true
   )
 
   if organization.top_scopes.none?
@@ -129,14 +139,18 @@ if !Rails.env.production? || ENV["SEED"]
     [nil, Time.current].each do |verified_at|
       user_group = Decidim::UserGroup.create!(
         name: Faker::Company.unique.name,
-        document_number: Faker::Number.number(10),
-        phone: Faker::PhoneNumber.phone_number,
-        verified_at: verified_at,
+        nickname: Faker::Twitter.unique.screen_name,
+        extended_data: {
+          document_number: Faker::Number.number(10),
+          phone: Faker::PhoneNumber.phone_number,
+          verified_at: verified_at
+        },
         decidim_organization_id: user.organization.id
       )
 
       Decidim::UserGroupMembership.create!(
         user: user,
+        role: "creator",
         user_group: user_group
       )
     end

data/lib/decidim/attributes.rb

@@ -3,5 +3,6 @@
 module Decidim
   module Attributes
     autoload :TimeWithZone, "decidim/attributes/time_with_zone"
+    autoload :LocalizedDate, "decidim/attributes/localized_date"
   end
 end

data/lib/decidim/attributes/localized_date.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Attributes
+    # Custom Virtus value to parse a String representing a Date using
+    # the app localization format.
+    class LocalizedDate < Virtus::Attribute
+      def coerce(value)
+        return value unless value.is_a?(String)
+        Date.strptime(value, I18n.t("date.formats.decidim_short"))
+      rescue ArgumentError
+        nil
+      end
+    end
+  end
+end

data/lib/decidim/attributes/time_with_zone.rb

@@ -7,7 +7,9 @@ module Decidim
     class TimeWithZone < Virtus::Attribute
       def coerce(value)
         return value unless value.is_a?(String)
-        Time.zone.parse(value)
+        Time.zone.strptime(value, I18n.t("time.formats.decidim_short"))
+      rescue ArgumentError
+        nil
       end
     end
   end

data/lib/decidim/authorable.rb

@@ -9,9 +9,10 @@ module Decidim
     extend ActiveSupport::Concern
 
     included do
-      belongs_to :author, foreign_key: "decidim_author_id", class_name: "Decidim::User", optional: true
+      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
 
+      validates :author, presence: true
       validate :verified_user_group, :user_group_membership
       validate :author_belongs_to_organization
 
@@ -19,8 +20,8 @@ module Decidim
       # authoring it or via a user group.
       #
       # user - the user to check for authorship
-      def authored_by?(user)
-        author == user || user.user_groups.include?(user_group)
+      def authored_by?(other_author)
+        other_author == author || other_author.respond_to?(:user_groups) && other_author.user_groups.include?(user_group)
       end
 
       # Returns the normalized author, whether it's a user group or a user. Ideally this should be
@@ -45,7 +46,7 @@ module Decidim
 
       def author_belongs_to_organization
         return if !author || !organization
-        errors.add(:author, :invalid) unless author.organization == organization
+        errors.add(:author, :invalid) unless author == organization || author.respond_to?(:organization) && author.organization == organization
       end
     end
   end

data/lib/decidim/authorization_form_builder.rb

@@ -39,7 +39,7 @@ module Decidim
       return hidden_field(name) if name.to_s == "handler_name"
 
       case type.name
-      when "Date"
+      when "Date", "Decidim::Attributes::LocalizedDate"
         date_field name
       else
         text_field name
@@ -58,7 +58,7 @@ module Decidim
 
     def public_attributes
       form_attributes.inject({}) do |all, attribute|
-        all.update(attribute.name => attribute.type.primitive)
+        all.update(attribute.name => attribute.class)
       end
     end
 

data/lib/decidim/coauthorable.rb

@@ -12,23 +12,62 @@ module Decidim
     extend ActiveSupport::Concern
 
     included do
-      has_many :coauthorships, -> { order(:created_at) }, as: :coauthorable, class_name: "Decidim::Coauthorship", dependent: :destroy
-      has_many :authors, -> { order(:created_at) }, through: :coauthorships, class_name: "Decidim::User"
+      has_many :coauthorships, -> { order(:created_at) }, as: :coauthorable, class_name: "Decidim::Coauthorship", dependent: :destroy, inverse_of: :coauthorable
       has_many :user_groups, -> { order(:created_at) }, as: :coauthorable, class_name: "Decidim::UserGroup", through: :coauthorships
 
-      # retrieves models from all identities of the user.
-      scope :from_all_user_identities, ->(user) { joins(:coauthorships).where("decidim_coauthorships.decidim_author_id": user.id) }
-      # retrieves models from the given User, ignoring the UserGroups it belongs to.
-      scope :from_author, ->(author) { joins(:coauthorships).where("decidim_coauthorships.decidim_author_id": author.id).where("decidim_coauthorships.decidim_user_group_id": nil) }
+      # retrieves models from all identities of the author.
+      scope :from_all_author_identities, lambda { |author|
+        joins(:coauthorships).where("decidim_coauthorships.decidim_author_id = ? AND decidim_coauthorships.decidim_author_type = ?", author.id, author.class.base_class.name)
+      }
+      # retrieves models from the given author, ignoring the UserGroups it belongs to.
+      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) }
 
+      validates :coauthorships, presence: true
+
+      # Overwrite default reload method to unset the instance variables so reloading works as expected.
+      def reload(options = nil)
+        remove_instance_variable(:@authors) if defined?(@authors)
+        remove_instance_variable(:@notifiable_authors) if defined?(@notifiable_authors)
+        super(options)
+      end
+
+      # Returns all the authors of a coauthorable.
+      #
+      # We need to do it this ways since the authors are polymorphic, and we can't have a has_many through relation
+      # with polymorphic objects.
+      def authors
+        return @authors if defined?(@authors)
+
+        authors = coauthorships.pluck(:decidim_author_id, :decidim_author_type).each_with_object({}) do |(id, klass), all|
+          all[klass] ||= []
+          all[klass] << id
+        end
+
+        @authors = authors.flat_map do |klass, ids|
+          klass.constantize.where(id: ids)
+        end.compact.uniq
+      end
+
+      # Returns the authors that should be notified for a coauthorable.
+      #
+      def notifiable_authors
+        @notifiable_authors ||= authors.flat_map do |author|
+          if author.is_a?(Decidim::User)
+            author
+          elsif respond_to?(:component)
+            component.participatory_space.admins
+          end
+        end.compact.uniq
+      end
+
       # Checks whether the user is author of the given proposal, either directly
       # authoring it or via a user group.
       #
-      # user - the user to check for authorship
-      def authored_by?(user)
-        coauthorships.where(author: user).exists?
+      # author - the author to check for authorship
+      def authored_by?(author)
+        coauthorships.where(author: author).exists?
       end
 
       # Returns the identities for the authors, whether they are user groups or users.
@@ -40,30 +79,41 @@ module Decidim
 
       # Syntactic sugar to access first coauthor as a Coauthorship.
       def creator
-        coauthorships.first
+        coauthorships.order(:created_at).first
       end
 
       # Syntactic sugar to access first coauthor Author
       def creator_author
-        authors.first
+        creator.try(:author)
       end
 
       # Syntactic sugar to access first identity whether it is a User or a UserGroup.
       # @return The User od UserGroup that created this Coauthorable.
       def creator_identity
-        coauthorships.order(:created_at).first&.identity
+        creator.try(:identity)
       end
 
       # Adds a new coauthor to the list of coauthors. The coauthorship is created with
       # current object as coauthorable and `user` param as author. To set the user group
-      # use `extra_attrs` either with `user_group` or `decidim_user_group_id` keys.
+      # use `extra_attributes` either with `user_group` or `decidim_user_group_id` keys.
       #
-      # @param user: The new coauthor.
+      # @param author: The new coauthor.
       # @extra_attrs: Extra
-      def add_coauthor(user, extra_attrs = {})
-        attrs = { coauthorable: self, author: user }
-        Decidim::Coauthorship.create!(attrs.merge(extra_attrs))
-        Decidim::Follow.create!(followable: self, user: user) unless followers.exists?(user.id)
+      def add_coauthor(author, extra_attributes = {})
+        user_group = extra_attributes[:user_group]
+
+        return if coauthorships.where(decidim_author_id: author.id, decidim_author_type: author.class.base_class.name).exists? && user_group.blank?
+        return if user_group && coauthorships.where(user_group: user_group).exists?
+
+        coauthorship_attributes = extra_attributes.merge(author: author)
+
+        if persisted?
+          coauthorships.create!(coauthorship_attributes)
+        else
+          coauthorships.build(coauthorship_attributes)
+        end
+
+        authors << author
       end
     end
   end

data/lib/decidim/content_block_manifest.rb

@@ -27,12 +27,19 @@ module Decidim
     attribute :cell, String
     attribute :settings_form_cell, String
     attribute :images, Array[Hash]
+    attribute :default, Boolean, default: false
 
     validates :name, :cell, :public_name_key, presence: true
     validates :settings_form_cell, presence: true, if: :has_settings?
     validate :image_names_are_unique
     validate :images_have_an_uploader
 
+    # Public: Registers whether this content block should be shown by default
+    # when creating an organization. Use `#default` to retrieve it.
+    def default!
+      self.default = true
+    end
+
     def has_settings?
       settings.attributes.any?
     end

data/lib/decidim/content_processor.rb

@@ -61,13 +61,23 @@ module Decidim
     end
 
     def self.parse_with_processor(_type, content, context)
-      parsed = 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
-
+      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
+               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
+               end
       Result.new(parsed[:rewrite], parsed[:metadata])
     end
 

data/lib/decidim/core.rb

@@ -50,6 +50,8 @@ module Decidim
   autoload :ViewHooks, "decidim/view_hooks"
   autoload :ContentBlockRegistry, "decidim/content_block_registry"
   autoload :ContentBlockManifest, "decidim/content_block_manifest"
+  autoload :MetricRegistry, "decidim/metric_registry"
+  autoload :MetricManifest, "decidim/metric_manifest"
   autoload :NewsletterEncryptor, "decidim/newsletter_encryptor"
   autoload :Searchable, "decidim/searchable"
   autoload :SearchResourceFieldsMapper, "decidim/search_resource_fields_mapper"
@@ -213,6 +215,11 @@ module Decidim
     1.minute
   end
 
+  # Time window were users can access the website even if their email is not confirmed.
+  config_accessor :unconfirmed_access_for do
+    2.days
+  end
+
   # A base path for the uploads. If set, make sure it ends in a slash.
   # Uploads will be set to `<base_path>/uploads/`. This can be useful if you
   # want to use the same uploads place for both staging and production
@@ -380,4 +387,9 @@ module Decidim
   def self.traceability
     @traceability ||= Traceability.new
   end
+
+  # Public: Stores an instance of ContentBlockRegistry
+  def self.metrics_registry
+    @metrics_registry ||= MetricRegistry.new
+  end
 end

data/lib/decidim/core/engine.rb

@@ -15,12 +15,7 @@ require "foundation-rails"
 require "foundation_rails_helper"
 require "autoprefixer-rails"
 require "active_link_to"
-
-# Until https://github.com/andypike/rectify/pull/45 is attended, we're shipping
-# with a patched version of rectify
 require "rectify"
-require "decidim/rectify_ext"
-
 require "carrierwave"
 require "rails-i18n"
 require "date_validator"
@@ -42,6 +37,7 @@ require "doorkeeper"
 require "doorkeeper-i18n"
 require "nobspw"
 require "kaminari"
+require "batch-loader"
 
 require "decidim/api"
 
@@ -60,6 +56,7 @@ module Decidim
 
       initializer "decidim.middleware" do |app|
         app.config.middleware.use Decidim::CurrentOrganization
+        app.config.middleware.use BatchLoader::Middleware
       end
 
       initializer "decidim.assets" do |app|
@@ -140,7 +137,7 @@ module Decidim
 
           menu.item I18n.t("menu.more_information", scope: "decidim"),
                     decidim.pages_path,
-                    position: 3,
+                    position: 7,
                     active: :inclusive
         end
       end
@@ -274,6 +271,20 @@ module Decidim
           resource.model_class_name = "Decidim::User"
           resource.card = "decidim/user_profile"
         end
+
+        Decidim.register_resource(:user_group) do |resource|
+          resource.model_class_name = "Decidim::UserGroup"
+          resource.card = "decidim/user_profile"
+        end
+      end
+
+      initializer "decidim.core.register_metrics" do
+        Decidim.metrics_registry.register(
+          :users,
+          "Decidim::Metrics::UsersMetricManage",
+          Decidim::MetricRegistry::HIGHLIGHTED,
+          1
+        )
       end
 
       initializer "decidim.core.content_blocks" do
@@ -292,31 +303,59 @@ module Decidim
           content_block.settings do |settings|
             settings.attribute :welcome_text, type: :text, translated: true
           end
+
+          content_block.default!
         end
 
         Decidim.content_blocks.register(:homepage, :sub_hero) do |content_block|
           content_block.cell = "decidim/content_blocks/sub_hero"
           content_block.public_name_key = "decidim.content_blocks.sub_hero.name"
+          content_block.default!
         end
 
         Decidim.content_blocks.register(:homepage, :highlighted_content_banner) do |content_block|
           content_block.cell = "decidim/content_blocks/highlighted_content_banner"
           content_block.public_name_key = "decidim.content_blocks.highlighted_content_banner.name"
+          content_block.default!
         end
 
         Decidim.content_blocks.register(:homepage, :how_to_participate) do |content_block|
           content_block.cell = "decidim/content_blocks/how_to_participate"
           content_block.public_name_key = "decidim.content_blocks.how_to_participate.name"
+          content_block.default!
+        end
+
+        Decidim.content_blocks.register(:homepage, :last_activity) do |content_block|
+          content_block.cell = "decidim/content_blocks/last_activity"
+          content_block.public_name_key = "decidim.content_blocks.last_activity.name"
+          content_block.default!
         end
 
         Decidim.content_blocks.register(:homepage, :stats) do |content_block|
           content_block.cell = "decidim/content_blocks/stats"
           content_block.public_name_key = "decidim.content_blocks.stats.name"
+          content_block.default!
+        end
+
+        Decidim.content_blocks.register(:homepage, :metrics) do |content_block|
+          content_block.cell = "decidim/content_blocks/metrics"
+          content_block.public_name_key = "decidim.content_blocks.metrics.name"
         end
 
         Decidim.content_blocks.register(:homepage, :footer_sub_hero) do |content_block|
           content_block.cell = "decidim/content_blocks/footer_sub_hero"
           content_block.public_name_key = "decidim.content_blocks.footer_sub_hero.name"
+          content_block.default!
+        end
+
+        Decidim.content_blocks.register(:homepage, :html) do |content_block|
+          content_block.cell = "decidim/content_blocks/html"
+          content_block.public_name_key = "decidim.content_blocks.html.name"
+          content_block.settings_form_cell = "decidim/content_blocks/html_settings_form"
+
+          content_block.settings do |settings|
+            settings.attribute :html_content, type: :text, translated: true
+          end
         end
       end
 
@@ -325,6 +364,15 @@ module Decidim
           badge.levels = [1, 5, 10, 30, 50]
           badge.reset = ->(user) { Decidim::User.where(invited_by: user.id).count }
         end
+
+        Decidim::Gamification.register_badge(:followers) do |badge|
+          badge.levels = [1, 15, 30, 60, 100]
+          badge.reset = ->(user) { user.followers.count }
+        end
+
+        Decidim::Gamification.register_badge(:continuity) do |badge|
+          badge.levels = [2, 10, 30, 60, 180, 365]
+        end
       end
     end
   end