decidim-proposals 0.27.5 → 0.27.6

data/config/locales/zh-TW.yml

@@ -271,7 +271,6 @@ zh-TW:
             notification_title: 您的提案 <a href="%{resource_path}">%{resource_title}</a> 已被接受。
           follower:
             email_intro: '該提案「%{resource_title}」已被接受。您可以在此頁面上閱讀回應：'
-            email_outro: 您收到了此通知，是因為您正在關注 "%{resource_title}"。您可以通過前面的鏈接取消關注它。
             email_subject: 您追蹤的提案已被接受
             notification_title: <a href="%{resource_path}">%{resource_title}</a>" 提案已經被接受。
         proposal_evaluating:
@@ -282,7 +281,6 @@ zh-TW:
             notification_title: 您的提案<a href="%{resource_path}">%{resource_title}</a>正在評估中。
           follower:
             email_intro: '該提案“%{resource_title}”正在進行評估。您可以在此頁面上查看答案：'
-            email_outro: 您收到了此通知，是因為您正在關注 "%{resource_title}"。您可以通過前面的鏈接取消關注它。
             email_subject: 你追蹤的提案正在評估中
             notification_title: <a href="%{resource_path}">%{resource_title}</a> 提案正在評估中。
         proposal_mentioned:
@@ -309,7 +307,6 @@ zh-TW:
             notification_title: 您的提案<a href="%{resource_path}">%{resource_title}</a>已被拒絕。
           follower:
             email_intro: '該提案「%{resource_title}」已被駁回。您可以在此頁面中閱讀回覆：'
-            email_outro: 您收到了此通知，是因為您正在關注 "%{resource_title}"。您可以通過前面的鏈接取消關注它。
             email_subject: 您追蹤的提案已被拒絕
             notification_title: <a href="%{resource_path}">%{resource_title}</a>" 提案已經被拒絕。
         proposal_update_category:

data/db/migrate/20240404202756_add_valuation_assignments_count_to_decidim_proposals_proposals.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class AddValuationAssignmentsCountToDecidimProposalsProposals < ActiveRecord::Migration[6.1]
+  def change
+    add_column :decidim_proposals_proposals, :valuation_assignments_count, :integer, default: 0
+
+    reversible do |dir|
+      dir.up do
+        Decidim::Proposals::Proposal.reset_column_information
+        Decidim::Proposals::Proposal.find_each do |record|
+          Decidim::Proposals::Proposal.reset_counters(record.id, :valuation_assignments)
+        end
+      end
+    end
+  end
+end

data/decidim-proposals.gemspec

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+$LOAD_PATH.push File.expand_path("lib", __dir__)
+
+# Maintain your gem's version:
+require "decidim/proposals/version"
+
+# Describe your gem and declare its dependencies:
+Gem::Specification.new do |s|
+  s.version = Decidim::Proposals.version
+  s.authors = ["Josep Jaume Rey Peroy", "Marc Riera Casals", "Oriol Gual Oliva"]
+  s.email = ["josepjaume@gmail.com", "mrc2407@gmail.com", "oriolgual@gmail.com"]
+  s.license = "AGPL-3.0"
+  s.homepage = "https://github.com/decidim/decidim"
+  s.required_ruby_version = "~> 3.0.0"
+
+  s.name = "decidim-proposals"
+  s.summary = "Decidim proposals module"
+  s.description = "A proposals component for decidim's participatory spaces."
+
+  s.files = Dir.chdir(__dir__) do
+    `git ls-files -z`.split("\x0").select do |f|
+      (File.expand_path(f) == __FILE__) ||
+        f.start_with?(*%w(app/ config/ db/ lib/ Rakefile README.md))
+    end
+  end
+
+  s.add_dependency "decidim-comments", Decidim::Proposals.version
+  s.add_dependency "decidim-core", Decidim::Proposals.version
+  s.add_dependency "doc2text", "~> 0.4.5"
+  s.add_dependency "redcarpet", "~> 3.5", ">= 3.5.1"
+
+  s.add_development_dependency "decidim-admin", Decidim::Proposals.version
+  s.add_development_dependency "decidim-assemblies", Decidim::Proposals.version
+  s.add_development_dependency "decidim-budgets", Decidim::Proposals.version
+  s.add_development_dependency "decidim-conference", Decidim::Proposals.version
+  s.add_development_dependency "decidim-dev", Decidim::Proposals.version
+  s.add_development_dependency "decidim-meetings", Decidim::Proposals.version
+  s.add_development_dependency "decidim-participatory_processes", Decidim::Proposals.version
+end

data/lib/decidim/proposals/proposal_serializer.rb

@@ -40,6 +40,7 @@ module Decidim
           state: proposal.state.to_s,
           reference: proposal.reference,
           answer: ensure_translatable(proposal.answer),
+          answered_at: proposal.answered_at,
           supports: proposal.proposal_votes_count,
           endorsements: {
             total_count: proposal.endorsements.size,

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

@@ -6,10 +6,12 @@ require "decidim/meetings/test/factories"
 
 FactoryBot.define do
   factory :proposal_component, parent: :component do
-    name { Decidim::Components::Namer.new(participatory_space.organization.available_locales, :proposals).i18n_name }
+    transient do
+      skip_injection { false }
+    end
+    name { generate_component_name(participatory_space.organization.available_locales, :proposals) }
     manifest_name { :proposals }
-    participatory_space { create(:participatory_process, :with_steps, organization: organization) }
-
+    participatory_space { create(:participatory_process, :with_steps, organization: organization, skip_injection: skip_injection) }
     trait :with_endorsements_enabled do
       step_settings do
         {
@@ -250,28 +252,16 @@ FactoryBot.define do
       skip_injection { false }
     end
 
-    title do
-      if skip_injection
-        Decidim::Faker::Localized.localized { generate(:title) }
-      else
-        Decidim::Faker::Localized.localized { "<script>alert(\"TITLE\");</script> #{generate(:title)}" }
-      end
-    end
-    body do
-      if skip_injection
-        Decidim::Faker::Localized.localized { Faker::Lorem.sentences(number: 3).join("\n") }
-      else
-        Decidim::Faker::Localized.localized { "<script>alert(\"TITLE\");</script> #{Faker::Lorem.sentences(number: 3).join("\n")}" }
-      end
-    end
-    component { create(:proposal_component) }
+    title { generate_localized_title(:proposal_title, skip_injection: skip_injection) }
+    body { generate_localized_description(:proposal_body, skip_injection: skip_injection) }
+    component { create(:proposal_component, skip_injection: skip_injection) }
     published_at { Time.current }
     address { "#{Faker::Address.street_name}, #{Faker::Address.city}" }
     latitude { Faker::Address.latitude }
     longitude { Faker::Address.longitude }
     cost { 20_000 }
-    cost_report { { en: "My cost report" } }
-    execution_period { { en: "My execution period" } }
+    cost_report { generate_localized_title(:proposal_cost_report, skip_injection: skip_injection) }
+    execution_period { generate_localized_title(:proposal_execution_period, skip_injection: skip_injection) }
 
     after(:build) do |proposal, evaluator|
       proposal.title = if evaluator.title.is_a?(String)
@@ -289,7 +279,7 @@ FactoryBot.define do
       proposal.body = Decidim::ContentProcessor.parse_with_processor(:hashtag, proposal.body, current_organization: proposal.organization).rewrite
 
       if proposal.component
-        users = evaluator.users || [create(:user, :confirmed, organization: proposal.component.participatory_space.organization)]
+        users = evaluator.users || [create(:user, :confirmed, organization: proposal.component.participatory_space.organization, skip_injection: evaluator.skip_injection)]
         users.each_with_index do |user, idx|
           user_group = evaluator.user_groups[idx]
           proposal.coauthorships.build(author: user, user_group: user_group)
@@ -306,18 +296,18 @@ FactoryBot.define do
     end
 
     trait :participant_author do
-      after :build do |proposal|
+      after :build do |proposal, evaluator|
         proposal.coauthorships.clear
-        user = build(:user, organization: proposal.component.participatory_space.organization)
+        user = build(:user, organization: proposal.component.participatory_space.organization, skip_injection: evaluator.skip_injection)
         proposal.coauthorships.build(author: user)
       end
     end
 
     trait :user_group_author do
-      after :build do |proposal|
+      after :build do |proposal, evaluator|
         proposal.coauthorships.clear
-        user = create(:user, organization: proposal.component.participatory_space.organization)
-        user_group = create(:user_group, :verified, organization: user.organization, users: [user])
+        user = create(:user, organization: proposal.component.participatory_space.organization, skip_injection: evaluator.skip_injection)
+        user_group = create(:user_group, :verified, organization: user.organization, users: [user], skip_injection: evaluator.skip_injection)
         proposal.coauthorships.build(author: user, user_group: user_group)
       end
     end
@@ -330,10 +320,10 @@ FactoryBot.define do
     end
 
     trait :official_meeting do
-      after :build do |proposal|
+      after :build do |proposal, evaluator|
         proposal.coauthorships.clear
-        component = build(:meeting_component, participatory_space: proposal.component.participatory_space)
-        proposal.coauthorships.build(author: build(:meeting, component: component))
+        component = build(:meeting_component, participatory_space: proposal.component.participatory_space, skip_injection: evaluator.skip_injection)
+        proposal.coauthorships.build(author: build(:meeting, component: component, skip_injection: evaluator.skip_injection))
       end
     end
 
@@ -382,78 +372,89 @@ FactoryBot.define do
     end
 
     trait :hidden do
-      after :create do |proposal|
-        create(:moderation, hidden_at: Time.current, reportable: proposal)
+      after :create do |proposal, evaluator|
+        create(:moderation, hidden_at: Time.current, reportable: proposal, skip_injection: evaluator.skip_injection)
       end
     end
 
     trait :with_votes do
-      after :create do |proposal|
-        create_list(:proposal_vote, 5, proposal: proposal)
+      after :create do |proposal, evaluator|
+        create_list(:proposal_vote, 5, proposal: proposal, skip_injection: evaluator.skip_injection)
       end
     end
 
     trait :with_endorsements do
-      after :create do |proposal|
+      after :create do |proposal, evaluator|
         5.times.collect do
-          create(:endorsement, resource: proposal, author: build(:user, organization: proposal.participatory_space.organization))
+          create(:endorsement, resource: proposal, skip_injection: evaluator.skip_injection,
+                               author: build(:user, organization: proposal.participatory_space.organization, skip_injection: evaluator.skip_injection))
         end
       end
     end
 
     trait :with_amendments do
-      after :create do |proposal|
-        create_list(:proposal_amendment, 5, amendable: proposal)
+      after :create do |proposal, evaluator|
+        create_list(:proposal_amendment, 5, amendable: proposal, skip_injection: evaluator.skip_injection)
       end
     end
 
     trait :with_photo do
-      after :create do |proposal|
-        proposal.attachments << create(:attachment, :with_image, attached_to: proposal)
+      after :create do |proposal, evaluator|
+        proposal.attachments << create(:attachment, :with_image, attached_to: proposal, skip_injection: evaluator.skip_injection)
       end
     end
 
     trait :with_document do
-      after :create do |proposal|
-        proposal.attachments << create(:attachment, :with_pdf, attached_to: proposal)
+      after :create do |proposal, evaluator|
+        proposal.attachments << create(:attachment, :with_pdf, attached_to: proposal, skip_injection: evaluator.skip_injection)
       end
     end
   end
 
   factory :proposal_vote, class: "Decidim::Proposals::ProposalVote" do
-    proposal { build(:proposal) }
-    author { build(:user, organization: proposal.organization) }
+    transient do
+      skip_injection { false }
+    end
+    proposal { build(:proposal, skip_injection: skip_injection) }
+    author { build(:user, organization: proposal.organization, skip_injection: skip_injection) }
   end
 
   factory :proposal_amendment, class: "Decidim::Amendment" do
-    amendable { build(:proposal) }
-    emendation { build(:proposal, component: amendable.component) }
-    amender { build(:user, organization: amendable.component.participatory_space.organization) }
+    transient do
+      skip_injection { false }
+    end
+    amendable { build(:proposal, skip_injection: skip_injection) }
+    emendation { build(:proposal, component: amendable.component, skip_injection: skip_injection) }
+    amender { build(:user, organization: amendable.component.participatory_space.organization, skip_injection: skip_injection) }
     state { Decidim::Amendment::STATES.sample }
   end
 
   factory :proposal_note, class: "Decidim::Proposals::ProposalNote" do
+    transient do
+      skip_injection { false }
+    end
     body { Faker::Lorem.sentences(number: 3).join("\n") }
-    proposal { build(:proposal) }
-    author { build(:user, organization: proposal.organization) }
+    proposal { build(:proposal, skip_injection: skip_injection) }
+    author { build(:user, organization: proposal.organization, skip_injection: skip_injection) }
   end
 
   factory :collaborative_draft, class: "Decidim::Proposals::CollaborativeDraft" do
     transient do
       users { nil }
+      skip_injection { false }
       # user_groups correspondence to users is by sorting order
       user_groups { [] }
     end
 
-    title { "<script>alert(\"TITLE\");</script> #{generate(:title)}" }
-    body { "<script>alert(\"BODY\");</script>\n#{Faker::Lorem.sentences(number: 3).join("\n")}" }
-    component { create(:proposal_component) }
+    title { generate_localized_title(:collaborative_draft_title, skip_injection: skip_injection)["en"] }
+    body { generate_localized_description(:collaborative_draft_body, skip_injection: skip_injection)["en"] }
+    component { create(:proposal_component, skip_injection: skip_injection) }
     address { "#{Faker::Address.street_name}, #{Faker::Address.city}" }
     state { "open" }
 
     after(:build) do |collaborative_draft, evaluator|
       if collaborative_draft.component
-        users = evaluator.users || [create(:user, organization: collaborative_draft.component.participatory_space.organization)]
+        users = evaluator.users || [create(:user, organization: collaborative_draft.component.participatory_space.organization, skip_injection: evaluator.skip_injection)]
         users.each_with_index do |user, idx|
           user_group = evaluator.user_groups[idx]
           collaborative_draft.coauthorships.build(author: user, user_group: user_group)
@@ -476,17 +477,23 @@ FactoryBot.define do
   end
 
   factory :participatory_text, class: "Decidim::Proposals::ParticipatoryText" do
-    title { { en: "<script>alert(\"TITLE\");</script> #{generate(:title)}" } }
-    description { { en: "<script>alert(\"DESCRIPTION\");</script>\n#{Faker::Lorem.sentences(number: 3).join("\n")}" } }
-    component { create(:proposal_component) }
+    transient do
+      skip_injection { false }
+    end
+    title { generate_localized_title(:participatory_text_title, skip_injection: skip_injection) }
+    description { generate_localized_description(:participatory_text_description, skip_injection: skip_injection) }
+    component { create(:proposal_component, skip_injection: skip_injection) }
   end
 
   factory :valuation_assignment, class: "Decidim::Proposals::ValuationAssignment" do
+    transient do
+      skip_injection { false }
+    end
     proposal
     valuator_role do
       space = proposal.component.participatory_space
       organization = space.organization
-      build :participatory_process_user_role, role: :valuator, user: build(:user, organization: organization)
+      build :participatory_process_user_role, role: :valuator, skip_injection: skip_injection, user: build(:user, organization: organization, skip_injection: skip_injection)
     end
   end
 end

data/lib/decidim/proposals/valuatable.rb

@@ -8,7 +8,8 @@ module Decidim
       include Decidim::Comments::Commentable
 
       included do
-        has_many :valuation_assignments, foreign_key: "decidim_proposal_id", dependent: :destroy
+        has_many :valuation_assignments, foreign_key: "decidim_proposal_id", dependent: :destroy,
+                                         counter_cache: :valuation_assignments_count, class_name: "Decidim::Proposals::ValuationAssignment"
 
         def valuators
           valuator_role_ids = valuation_assignments.where(proposal: self).pluck(:valuator_role_id)

data/lib/decidim/proposals/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds decidim-proposals version.
   module Proposals
     def self.version
-      "0.27.5"
+      "0.27.6"
     end
   end
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: decidim-proposals
 version: !ruby/object:Gem::Version
-  version: 0.27.5
+  version: 0.27.6
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
 - Marc Riera Casals
 - Oriol Gual Oliva
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-12-20 00:00:00.000000000 Z
+date: 2024-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-comments
@@ -18,28 +18,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.5
+        version: 0.27.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.5
+        version: 0.27.6
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.5
+        version: 0.27.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.5
+        version: 0.27.6
 - !ruby/object:Gem::Dependency
   name: doc2text
   requirement: !ruby/object:Gem::Requirement
@@ -80,98 +80,98 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.5
+        version: 0.27.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.5
+        version: 0.27.6
 - !ruby/object:Gem::Dependency
   name: decidim-assemblies
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.5
+        version: 0.27.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.5
+        version: 0.27.6
 - !ruby/object:Gem::Dependency
   name: decidim-budgets
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.5
+        version: 0.27.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.5
+        version: 0.27.6
 - !ruby/object:Gem::Dependency
   name: decidim-conference
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.5
+        version: 0.27.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.5
+        version: 0.27.6
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.5
+        version: 0.27.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.5
+        version: 0.27.6
 - !ruby/object:Gem::Dependency
   name: decidim-meetings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.5
+        version: 0.27.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.5
+        version: 0.27.6
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.5
+        version: 0.27.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.5
+        version: 0.27.6
 description: A proposals component for decidim's participatory spaces.
 email:
 - josepjaume@gmail.com
@@ -458,7 +458,6 @@ files:
 - app/views/decidim/proposals/versions/show.html.erb
 - config/assets.rb
 - config/brakeman.ignore
-- config/environment.rb
 - config/locales/am-ET.yml
 - config/locales/ar-SA.yml
 - config/locales/ar.yml
@@ -491,6 +490,7 @@ files:
 - config/locales/ga-IE.yml
 - config/locales/gl.yml
 - config/locales/gn-PY.yml
+- config/locales/he-IL.yml
 - config/locales/hr-HR.yml
 - config/locales/hr.yml
 - config/locales/hu.yml
@@ -593,6 +593,8 @@ files:
 - db/migrate/20210310102839_add_followable_counter_cache_to_proposals.rb
 - db/migrate/20210310120812_add_followable_counter_cache_to_collaborative_drafts.rb
 - db/migrate/20210318082934_fix_counters_for_copied_proposals.rb
+- db/migrate/20240404202756_add_valuation_assignments_count_to_decidim_proposals_proposals.rb
+- decidim-proposals.gemspec
 - lib/decidim/api/proposal_input_filter.rb
 - lib/decidim/api/proposal_input_sort.rb
 - lib/decidim/api/proposal_type.rb
@@ -626,23 +628,23 @@ homepage: https://github.com/decidim/decidim
 licenses:
 - AGPL-3.0
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '3.0'
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.22
-signing_key:
+rubygems_version: 3.2.22
+signing_key: 
 specification_version: 4
 summary: Decidim proposals module
 test_files: []

data/config/environment.rb

@@ -1,3 +0,0 @@
-# frozen_string_literal: true
-
-# Empty line for playing nice with tpope/vim-rails