decidim-initiatives 0.27.4 → 0.27.6

data/decidim-initiatives.gemspec

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+$LOAD_PATH.push File.expand_path("lib", __dir__)
+
+require "decidim/initiatives/version"
+
+Gem::Specification.new do |s|
+  s.version = Decidim::Initiatives.version
+  s.authors = ["Juan Salvador Perez Garcia"]
+  s.email = ["jsperezg@gmail.com"]
+  s.license = "AGPL-3.0"
+  s.homepage = "https://github.com/decidim/decidim"
+  s.required_ruby_version = "~> 3.0.0"
+
+  s.name = "decidim-initiatives"
+  s.summary = "Decidim initiatives module"
+  s.description = "Participants initiatives plugin for decidim."
+
+  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-admin", Decidim::Initiatives.version
+  s.add_dependency "decidim-comments", Decidim::Initiatives.version
+  s.add_dependency "decidim-core", Decidim::Initiatives.version
+  s.add_dependency "decidim-verifications", Decidim::Initiatives.version
+  s.add_dependency "origami", "~> 2.1"
+  s.add_dependency "rexml", "~> 3.2.5" # Required for Origami gem to work with Ruby 3.0.0+
+  s.add_dependency "wicked", "~> 1.3"
+  s.add_dependency "wicked_pdf", "~> 2.1"
+  s.add_dependency "wkhtmltopdf-binary", "~> 0.12"
+
+  s.add_development_dependency "decidim-dev", Decidim::Initiatives.version
+  s.add_development_dependency "decidim-meetings", Decidim::Initiatives.version
+end

data/lib/decidim/initiatives/admin_engine.rb

@@ -104,7 +104,7 @@ module Decidim
       initializer "admin_decidim_initiatives.admin_components_menu" do
         Decidim.menu :admin_initiatives_components_menu do |menu|
           current_participatory_space.components.each do |component|
-            caption = translated_attribute(component.name)
+            caption = decidim_escape_translated(component.name)
             if component.primary_stat.present?
               caption += content_tag(:span, component.primary_stat, class: component.primary_stat.zero? ? "component-counter component-counter--off" : "component-counter")
             end

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

@@ -5,8 +5,11 @@ require "decidim/dev"
 
 FactoryBot.define do
   factory :initiatives_type, class: "Decidim::InitiativesType" do
-    title { generate_localized_title }
-    description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
+    transient do
+      skip_injection { false }
+    end
+    title { generate_localized_title(:initiatives_type_title, skip_injection: skip_injection) }
+    description { generate_localized_description(:initiatives_type_description, skip_injection: skip_injection) }
     organization
     # Keep banner_image after organization
     banner_image do
@@ -82,7 +85,7 @@ FactoryBot.define do
 
     trait :with_user_extra_fields_collection do
       collect_user_extra_fields { true }
-      extra_fields_legal_information { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
+      extra_fields_legal_information { generate_localized_description(:initiatives_type_extra_fields_legal_information, skip_injection: skip_injection) }
       document_number_authorization_handler { "dummy_authorization_handler" }
     end
 
@@ -100,20 +103,26 @@ FactoryBot.define do
   end
 
   factory :initiatives_type_scope, class: "Decidim::InitiativesTypeScope" do
-    type { create(:initiatives_type) }
-    scope { create(:scope, organization: type.organization) }
+    transient do
+      skip_injection { false }
+    end
+    type { create(:initiatives_type, skip_injection: skip_injection) }
+    scope { create(:scope, organization: type.organization, skip_injection: skip_injection) }
     supports_required { 1000 }
 
     trait :with_user_extra_fields_collection do
-      type { create(:initiatives_type, :with_user_extra_fields_collection) }
+      type { create(:initiatives_type, :with_user_extra_fields_collection, skip_injection: skip_injection) }
     end
   end
 
   factory :initiative, class: "Decidim::Initiative" do
-    title { generate_localized_title }
-    description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
+    transient do
+      skip_injection { false }
+    end
+    title { generate_localized_title(:initiative_title, skip_injection: skip_injection) }
+    description { generate_localized_description(:initiative_description, skip_injection: skip_injection) }
     organization
-    author { create(:user, :confirmed, organization: organization) }
+    author { create(:user, :confirmed, organization: organization, skip_injection: skip_injection) }
     published_at { Time.current }
     state { "published" }
     signature_type { "online" }
@@ -121,15 +130,15 @@ FactoryBot.define do
     signature_end_date { Date.current + 120.days }
 
     scoped_type do
-      create(:initiatives_type_scope,
-             type: create(:initiatives_type, organization: organization, signature_type: signature_type))
+      create(:initiatives_type_scope, skip_injection: skip_injection,
+                                      type: create(:initiatives_type, organization: organization, signature_type: signature_type, skip_injection: skip_injection))
     end
 
-    after(:create) do |initiative|
+    after(:create) do |initiative, evaluator|
       if initiative.author.is_a?(Decidim::User) && Decidim::Authorization.where(user: initiative.author).where.not(granted_at: nil).none?
-        create(:authorization, user: initiative.author, granted_at: Time.now.utc)
+        create(:authorization, user: initiative.author, granted_at: Time.now.utc, skip_injection: evaluator.skip_injection)
       end
-      create_list(:initiatives_committee_member, 3, initiative: initiative)
+      create_list(:initiatives_committee_member, 3, initiative: initiative, skip_injection: evaluator.skip_injection)
     end
 
     trait :created do
@@ -198,13 +207,13 @@ FactoryBot.define do
 
     trait :with_user_extra_fields_collection do
       scoped_type do
-        create(:initiatives_type_scope,
-               type: create(:initiatives_type, :with_user_extra_fields_collection, organization: organization))
+        create(:initiatives_type_scope, skip_injection: skip_injection,
+                                        type: create(:initiatives_type, :with_user_extra_fields_collection, organization: organization, skip_injection: skip_injection))
       end
     end
 
     trait :with_area do
-      area { create(:area, organization: organization) }
+      area { create(:area, organization: organization, skip_injection: skip_injection) }
     end
 
     trait :with_documents do
@@ -217,7 +226,8 @@ FactoryBot.define do
           initiative.attachments << create(
             :attachment,
             :with_pdf,
-            attached_to: initiative
+            attached_to: initiative,
+            skip_injection: evaluator.skip_injection
           )
         end
       end
@@ -233,7 +243,8 @@ FactoryBot.define do
           initiative.attachments << create(
             :attachment,
             :with_image,
-            attached_to: initiative
+            attached_to: initiative,
+            skip_injection: evaluator.skip_injection
           )
         end
       end
@@ -241,8 +252,11 @@ FactoryBot.define do
   end
 
   factory :initiative_user_vote, class: "Decidim::InitiativesVote" do
-    initiative { create(:initiative) }
-    author { create(:user, :confirmed, organization: initiative.organization) }
+    transient do
+      skip_injection { false }
+    end
+    initiative { create(:initiative, skip_injection: skip_injection) }
+    author { create(:user, :confirmed, organization: initiative.organization, skip_injection: skip_injection) }
     hash_id { SecureRandom.uuid }
     scope { initiative.scope }
     after(:create) do |vote|
@@ -251,17 +265,23 @@ FactoryBot.define do
   end
 
   factory :organization_user_vote, class: "Decidim::InitiativesVote" do
-    initiative { create(:initiative) }
-    author { create(:user, :confirmed, organization: initiative.organization) }
-    decidim_user_group_id { create(:user_group).id }
-    after(:create) do |support|
-      create(:user_group_membership, user: support.author, user_group: Decidim::UserGroup.find(support.decidim_user_group_id))
+    transient do
+      skip_injection { false }
+    end
+    initiative { create(:initiative, skip_injection: skip_injection) }
+    author { create(:user, :confirmed, organization: initiative.organization, skip_injection: skip_injection) }
+    decidim_user_group_id { create(:user_group, skip_injection: skip_injection).id }
+    after(:create) do |support, evaluator|
+      create(:user_group_membership, user: support.author, user_group: Decidim::UserGroup.find(support.decidim_user_group_id), skip_injection: evaluator.skip_injection)
     end
   end
 
   factory :initiatives_committee_member, class: "Decidim::InitiativesCommitteeMember" do
-    initiative { create(:initiative) }
-    user { create(:user, :confirmed, organization: initiative.organization) }
+    transient do
+      skip_injection { false }
+    end
+    initiative { create(:initiative, skip_injection: skip_injection) }
+    user { create(:user, :confirmed, organization: initiative.organization, skip_injection: skip_injection) }
     state { "accepted" }
 
     trait :accepted do
@@ -278,6 +298,9 @@ FactoryBot.define do
   end
 
   factory :initiatives_settings, class: "Decidim::InitiativesSettings" do
+    transient do
+      skip_injection { false }
+    end
     initiatives_order { "random" }
     organization
 

data/lib/decidim/initiatives/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-initiatives version.
   module Initiatives
     def self.version
-      "0.27.4"
+      "0.27.6"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decidim-initiatives
 version: !ruby/object:Gem::Version
-  version: 0.27.4
+  version: 0.27.6
 platform: ruby
 authors:
 - Juan Salvador Perez Garcia
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-27 00:00:00.000000000 Z
+date: 2024-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-admin
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.4
+        version: 0.27.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.4
+        version: 0.27.6
 - !ruby/object:Gem::Dependency
   name: decidim-comments
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.4
+        version: 0.27.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.4
+        version: 0.27.6
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.4
+        version: 0.27.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.4
+        version: 0.27.6
 - !ruby/object:Gem::Dependency
   name: decidim-verifications
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.4
+        version: 0.27.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.4
+        version: 0.27.6
 - !ruby/object:Gem::Dependency
   name: origami
   requirement: !ruby/object:Gem::Requirement
@@ -142,28 +142,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.4
+        version: 0.27.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.4
+        version: 0.27.6
 - !ruby/object:Gem::Dependency
   name: decidim-meetings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.4
+        version: 0.27.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.4
+        version: 0.27.6
 description: Participants initiatives plugin for decidim.
 email:
 - jsperezg@gmail.com
@@ -399,7 +399,6 @@ files:
 - app/views/layouts/decidim/initiative_creation.html.erb
 - app/views/layouts/decidim/initiative_signature_creation.html.erb
 - config/assets.rb
-- config/environment.rb
 - config/initializers/wicked_pdf.rb
 - config/locales/am-ET.yml
 - config/locales/ar-SA.yml
@@ -433,6 +432,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
@@ -467,9 +467,11 @@ files:
 - config/locales/sk.yml
 - config/locales/sl.yml
 - config/locales/so-SO.yml
+- config/locales/sq-AL.yml
 - config/locales/sr-CS.yml
 - config/locales/sv.yml
 - config/locales/sw-KE.yml
+- config/locales/th-TH.yml
 - config/locales/ti-ER.yml
 - config/locales/tr-TR.yml
 - config/locales/uk.yml
@@ -539,6 +541,7 @@ files:
 - db/migrate/20220527130640_create_decidim_initiatives_settings.rb
 - db/seeds/city.jpeg
 - db/seeds/city2.jpeg
+- decidim-initiatives.gemspec
 - lib/decidim/api/initiative_api_type.rb
 - lib/decidim/api/initiative_committee_member_type.rb
 - lib/decidim/api/initiative_type.rb
@@ -562,15 +565,15 @@ 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:
   - - ">="
@@ -578,7 +581,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.2.22
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Decidim initiatives module
 test_files: []