decidim-core 0.14.4 → 0.15.0

data/lib/decidim/core/test/factories.rb

@@ -7,7 +7,15 @@ require "decidim/participatory_processes/test/factories"
 require "decidim/assemblies/test/factories"
 require "decidim/comments/test/factories"
 
+def generate_localized_title
+  Decidim::Faker::Localized.localized { generate(:title) }
+end
+
 FactoryBot.define do
+  sequence(:title) do |n|
+    "#{Faker::Lorem.sentence(3)} #{n}"
+  end
+
   sequence(:name) do |n|
     "#{Faker::Name.name} #{n}"
   end
@@ -24,6 +32,10 @@ FactoryBot.define do
     "user#{n}@example.org"
   end
 
+  sequence(:user_group_email) do |n|
+    "usergroup#{n}@example.org"
+  end
+
   sequence(:slug) do |n|
     "#{Faker::Internet.slug(nil, "-")}-#{n}"
   end
@@ -41,8 +53,8 @@ FactoryBot.define do
   end
 
   factory :category, class: "Decidim::Category" do
-    name { Decidim::Faker::Localized.sentence(3) }
-    description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { Decidim::Faker::Localized.sentence(2) } }
+    name { generate_localized_title }
+    description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
 
     association :participatory_space, factory: :participatory_process
   end
@@ -62,7 +74,7 @@ FactoryBot.define do
     youtube_handler { Faker::Hipster.word }
     github_handler { Faker::Hipster.word }
     sequence(:host) { |n| "#{n}.lvh.me" }
-    description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { Decidim::Faker::Localized.sentence(2) } }
+    description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
     favicon { Decidim::Dev.test_file("icon.png", "image/png") }
     default_locale { Decidim.default_locale }
     available_locales { Decidim.available_locales }
@@ -72,6 +84,7 @@ FactoryBot.define do
     highlighted_content_banner_enabled { false }
     enable_omnipresent_banner { false }
     tos_version { Time.current }
+    badges_enabled { true }
 
     trait :with_tos do
       after(:create) do |organization|
@@ -93,6 +106,7 @@ FactoryBot.define do
     avatar { Decidim::Dev.test_file("avatar.jpg", "image/jpeg") }
     personal_url { Faker::Internet.url }
     about { Faker::Lorem.paragraph(2) }
+    confirmation_sent_at { Time.current }
 
     after(:create) do |user|
       tos_page = Decidim::StaticPage.find_by(slug: "terms-and-conditions", organization: user.organization)
@@ -127,7 +141,7 @@ FactoryBot.define do
 
     trait :officialized do
       officialized_at { Time.current }
-      officialized_as { Decidim::Faker::Localized.sentence(3) }
+      officialized_as { generate_localized_title }
     end
   end
 
@@ -142,9 +156,16 @@ FactoryBot.define do
   end
 
   factory :user_group, class: "Decidim::UserGroup" do
+    transient do
+      document_number { Faker::Number.number(8) + "X" }
+      phone { Faker::PhoneNumber.phone_number }
+      rejected_at { nil }
+      verified_at { nil }
+    end
+
     sequence(:name) { |n| "#{Faker::Company.name} #{n}" }
-    document_number { Faker::Number.number(8) + "X" }
-    phone { Faker::PhoneNumber.phone_number }
+    email { generate(:user_group_email) }
+    nickname { generate(:nickname) }
     avatar { Decidim::Dev.test_file("avatar.jpg", "image/jpeg") }
     organization
 
@@ -160,18 +181,31 @@ FactoryBot.define do
       rejected_at { Time.current }
     end
 
+    after(:build) do |user_group, evaluator|
+      user_group.extended_data = {
+        document_number: evaluator.document_number,
+        phone: evaluator.phone,
+        rejected_at: evaluator.rejected_at,
+        verified_at: evaluator.verified_at
+      }
+    end
+
     after(:create) do |user_group, evaluator|
-      users = evaluator.users
+      users = evaluator.users.dup
       next if users.empty?
 
+      creator = users.shift
+      create(:user_group_membership, user: creator, user_group: user_group, role: :creator)
+
       users.each do |user|
-        create(:user_group_membership, user: user, user_group: user_group)
+        create(:user_group_membership, user: user, user_group: user_group, role: :admin)
       end
     end
   end
 
   factory :user_group_membership, class: "Decidim::UserGroupMembership" do
     user
+    role { :creator }
     user_group
   end
 
@@ -199,8 +233,8 @@ FactoryBot.define do
 
   factory :static_page, class: "Decidim::StaticPage" do
     slug { generate(:slug) }
-    title { Decidim::Faker::Localized.sentence(3) }
-    content { Decidim::Faker::Localized.wrapped("<p>", "</p>") { Decidim::Faker::Localized.sentence(4) } }
+    title { generate_localized_title }
+    content { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
     organization
 
     trait :default do
@@ -213,16 +247,16 @@ FactoryBot.define do
   end
 
   factory :attachment_collection, class: "Decidim::AttachmentCollection" do
-    name { Decidim::Faker::Localized.sentence(1) }
-    description { Decidim::Faker::Localized.sentence(2) }
+    name { generate_localized_title }
+    description { generate_localized_title }
     weight { Faker::Number.number(1) }
 
     association :collection_for, factory: :participatory_process
   end
 
   factory :attachment, class: "Decidim::Attachment" do
-    title { Decidim::Faker::Localized.sentence(3) }
-    description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { Decidim::Faker::Localized.sentence(4) } }
+    title { generate_localized_title }
+    description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
     file { Decidim::Dev.test_file("city.jpeg", "image/jpeg") }
     weight { Faker::Number.number(1) }
     attached_to { build(:participatory_process) }
@@ -245,7 +279,7 @@ FactoryBot.define do
       organization { create(:organization) }
     end
 
-    name { Decidim::Faker::Localized.sentence(3) }
+    name { generate_localized_title }
     participatory_space { create(:participatory_process, organization: organization) }
     manifest_name { "dummy" }
     published_at { Time.current }
@@ -316,9 +350,9 @@ FactoryBot.define do
     author { build(:user, :confirmed, organization: organization) }
     organization
 
-    subject { Decidim::Faker::Localized.sentence(3) }
+    subject { generate_localized_title }
 
-    body { Decidim::Faker::Localized.wrapped("<p>", "</p>") { Decidim::Faker::Localized.sentence(4) } }
+    body { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
 
     trait :sent do
       sent_at { Time.current }
@@ -384,6 +418,7 @@ FactoryBot.define do
     component { build :component, participatory_space: participatory_space }
     resource { build(:dummy_resource, component: component) }
     action { "create" }
+    visibility { "admin-only" }
     extra do
       {
         component: {
@@ -449,4 +484,15 @@ FactoryBot.define do
     name { generate(:hashtag_name) }
     organization
   end
+
+  factory :metric, class: "Decidim::Metric" do
+    organization
+    day { Time.zone.today }
+    metric_type { "random_metric" }
+    cumulative { 2 }
+    quantity { 1 }
+    category { create :category }
+    participatory_space { create :participatory_process, organization: organization }
+    related_object { create :component, participatory_space: participatory_space }
+  end
 end

data/lib/decidim/core/test/shared_examples/coauthorable.rb

@@ -16,10 +16,17 @@ shared_examples_for "coauthorable" do
       end
 
       context "when there are many authors" do
-        before { coauthorable.authors = other_authors }
+        before do
+          coauthorable.coauthorships.destroy_all
+          coauthorable.reload
+
+          other_authors.each do |author|
+            coauthorable.add_coauthor(author)
+          end
+        end
 
         it "returns all coauthors" do
-          expect(coauthorable.authors).to eq(other_authors)
+          expect(coauthorable.reload.authors).to match_array(other_authors)
         end
       end
     end
@@ -66,7 +73,10 @@ shared_examples_for "coauthorable" do
 
     describe "authored by? user" do
       context "when there are no coauthors" do
-        before { coauthorable.authors.clear }
+        before do
+          coauthorable.coauthorships.clear
+          coauthorable.reload
+        end
 
         it "returns false" do
           expect(coauthorable.authored_by?(creator_author)).to be(false)
@@ -82,23 +92,31 @@ shared_examples_for "coauthorable" do
           expect(coauthorable.authored_by?(creator_author)).to be(true)
         end
       end
-
-      context "when the checked user is one of the coauthors user_groups"
     end
 
     describe "identities" do
       context "when there are no coauthors" do
-        before { coauthorable.authors.clear }
+        before do
+          coauthorable.coauthorships.clear
+          coauthorable.reload
+        end
 
         it "returns an empty list" do
+          expect(coauthorable.identities).to be_blank
         end
       end
 
       context "when there are many coauthors of both types" do
         before do
-          other_authors.each { |author| coauthorable.authors << author }
+          other_authors.each do |author|
+            coauthorable.add_coauthor(author)
+          end
+
           other_user_groups.each do |user_group|
-            Decidim::Coauthorship.create(author: user_group.memberships.first.user, user_group: user_group, coauthorable: coauthorable)
+            coauthorable.add_coauthor(
+              user_group.memberships.first.user,
+              user_group: user_group
+            )
           end
         end
 
@@ -106,7 +124,7 @@ shared_examples_for "coauthorable" do
           identities = [creator_author]
           identities += other_authors
           identities += other_user_groups
-          expect(coauthorable.identities.to_a).to eq(identities)
+          expect(coauthorable.identities.to_a).to match_array(identities)
         end
       end
     end

data/lib/decidim/core/test/shared_examples/coauthorable_interface_examples.rb

@@ -9,7 +9,7 @@ shared_examples_for "coauthorable interface" do
     describe "with a regular user" do
       let(:query) { "{ author { name } }" }
 
-      it "includes the user's ID" do
+      it "returns the user's name as the author name" do
         expect(response["author"]["name"]).to eq(author.name)
       end
     end
@@ -23,7 +23,7 @@ shared_examples_for "coauthorable interface" do
         coauthorship.update!(user_group: user_group)
       end
 
-      it "includes the user's ID" do
+      it "includes returns the user group's name as the author name" do
         expect(response["author"]["name"]).to eq(user_group.name)
       end
     end

data/lib/decidim/core/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-core version.
   module Core
     def self.version
-      "0.14.4"
+      "0.15.0"
     end
   end
 end

data/lib/decidim/data_portability.rb

@@ -11,7 +11,9 @@ module Decidim
       # Returns a collection scoped by user.
       # This is the default, if you want, you can overwrite in each Class to be export.
       def self.user_collection(user)
-        where(decidim_author_id: user.id)
+        return unless user.is_a?(Decidim::User)
+
+        where(decidim_author_id: user.id, decidim_author_type: "Decidim::UserBaseEntity")
       end
 
       # Returns a Default export serializer

data/lib/decidim/data_portability_file_reader.rb

@@ -29,7 +29,7 @@ module Decidim
     # Returns a String with the absolute file_path to be read or generate.
     def file_path
       directory_name = Rails.root.join(Decidim::DataPortabilityUploader.new.store_dir)
-      Dir.mkdir(directory_name) unless File.exist?(directory_name)
+      FileUtils.mkdir_p(directory_name) unless File.exist?(directory_name)
       directory_name + file_name
     end
 

data/lib/decidim/events/author_event.rb

@@ -34,7 +34,10 @@ module Decidim
         end
 
         def author
-          resource.author if resource.respond_to?(:author)
+          return unless resource.respond_to?(:author)
+          return unless resource.author.is_a?(Decidim::UserBaseEntity)
+
+          resource.author
         end
       end
     end

data/lib/decidim/events/coauthor_event.rb

@@ -34,7 +34,10 @@ module Decidim
         end
 
         def author
-          resource.creator_author if resource.respond_to?(:creator_author)
+          return unless resource.respond_to?(:creator_author)
+          return unless resource.creator_author.is_a?(Decidim::UserBaseEntity)
+
+          resource.creator_author
         end
       end
     end

data/lib/decidim/faker/localized.rb

@@ -135,7 +135,7 @@ module Decidim
         end.with_indifferent_access
       end
 
-      # Wrapps a text build by the block with some other text.o
+      # Wrapps a text build by the block with some other text.
       #
       # before - The String text to inject at the begining of each value.
       # after  - The String text to inject at the end of each value.
@@ -155,7 +155,10 @@ module Decidim
         end
       end
 
-      # nodoc
+      # Runs the given block for each of the available locales in Decidim,
+      # momentarilly setting the locale to the current one.
+      #
+      # Returns a Hash with a value for each locale.
       def self.localized
         Decidim.available_locales.inject({}) do |result, locale|
           text = ::Faker::Base.with_locale(locale) do
@@ -165,8 +168,6 @@ module Decidim
           result.update(locale => text)
         end.with_indifferent_access
       end
-
-      private_class_method :localized
     end
   end
 end

data/lib/decidim/form_builder.rb

@@ -257,20 +257,19 @@ module Decidim
     def date_field(attribute, options = {})
       value = object.send(attribute)
       data = { datepicker: "" }
-      data[:startdate] = I18n.localize(value, format: :datepicker) if value.present?
-      iso_value = value.present? ? value.strftime("%Y-%m-%d") : ""
+      data[:startdate] = I18n.localize(value, format: :decidim_short) if value.present? && value.is_a?(Date)
+      datepicker_format = ruby_format_to_datepicker(I18n.t("date.formats.decidim_short"))
+      data[:"date-format"] = datepicker_format
 
       template = ""
       template += label(attribute, label_for(attribute) + required_for_attribute(attribute))
       template += @template.text_field(
         @object_name,
         attribute,
-        options.merge(name: nil,
-                      id: "date_field_#{@object_name}_#{attribute}",
-                      data: data)
+        options.merge(data: data)
       )
-      template += @template.hidden_field(@object_name, attribute, value: iso_value)
-      template += error_and_help_text(attribute, options)
+      help_text = I18n.t("decidim.datepicker.help_text", datepicker_format: datepicker_format)
+      template += error_and_help_text(attribute, options.merge(help_text: help_text))
       template.html_safe
     end
 
@@ -278,22 +277,20 @@ module Decidim
     # datepicker library
     def datetime_field(attribute, options = {})
       value = object.send(attribute)
-      if value.present?
-        iso_value = value.strftime("%Y-%m-%dT%H:%M:%S")
-        formatted_value = I18n.localize(value, format: :timepicker)
-      end
+      data = { datepicker: "", timepicker: "" }
+      data[:startdate] = I18n.localize(value, format: :decidim_short) if value.present? && value.is_a?(ActiveSupport::TimeWithZone)
+      datepicker_format = ruby_format_to_datepicker(I18n.t("time.formats.decidim_short"))
+      data[:"date-format"] = datepicker_format
+
       template = ""
       template += label(attribute, label_for(attribute) + required_for_attribute(attribute))
       template += @template.text_field(
         @object_name,
         attribute,
-        options.merge(value: formatted_value,
-                      name: nil,
-                      id: "datetime_field_#{@object_name}_#{attribute}",
-                      data: { datepicker: "", timepicker: "" })
+        options.merge(data: data)
       )
-      template += @template.hidden_field(@object_name, attribute, value: iso_value)
-      template += error_and_help_text(attribute, options)
+      help_text = I18n.t("decidim.datepicker.help_text", datepicker_format: datepicker_format)
+      template += error_and_help_text(attribute, options.merge(help_text: help_text))
       template.html_safe
     end
 
@@ -605,5 +602,9 @@ module Decidim
       selected = Decidim::Scope.where(id: selected.map(&:to_i)) unless selected.first.is_a?(Decidim::Scope)
       selected
     end
+
+    def ruby_format_to_datepicker(ruby_date_format)
+      ruby_date_format.gsub("%d", "dd").gsub("%m", "mm").gsub("%Y", "yyyy").gsub("%H", "hh").gsub("%M", "ii")
+    end
   end
 end

data/lib/decidim/gamification.rb

@@ -14,6 +14,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
 
@@ -25,6 +26,8 @@ module Decidim
     #
     # Returns nothing.
     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
 
@@ -36,6 +39,8 @@ module Decidim
     #
     # Returns nothing.
     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
 
@@ -47,6 +52,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
 
@@ -91,14 +97,14 @@ module Decidim
     #
     # Returns nothing.
     def self.reset_badges(users = nil)
-      users ||= User.all
+      return reset_badges(User.all) && reset_badges(UserGroup.all) unless users
 
       badges.each do |badge|
         Rails.logger.info "Resetting #{badge.name}..."
 
         if badge.reset
           users.find_each do |user|
-            set_score(user, badge.name, badge.reset.call(user))
+            set_score(user, badge.name, badge.reset.call(user)) if badge.valid_for?(user)
           end
         else
           Rails.logger.info "Badge can't be reset since it doesn't have a reset method."