decidim-meetings 0.28.0 → 0.28.1

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

@@ -7,9 +7,12 @@ require "decidim/participatory_processes/test/factories"
 
 FactoryBot.define do
   factory :meeting_component, parent: :component do
-    name { Decidim::Components::Namer.new(participatory_space.organization.available_locales, :meetings).i18n_name }
+    transient do
+      skip_injection { false }
+    end
+    name { generate_component_name(participatory_space.organization.available_locales, :meetings, skip_injection:) }
     manifest_name { :meetings }
-    participatory_space { create(:participatory_process, :with_steps, organization:) }
+    participatory_space { create(:participatory_process, :with_steps, organization:, skip_injection:) }
 
     trait :with_creation_enabled do
       settings do
@@ -25,40 +28,10 @@ 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(\"Meetings TITLE\")</script> #{generate(:title)}" }
-      end
-    end
-    description do
-      Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-        if skip_injection
-          Decidim::Faker::Localized.localized { generate(:title) }
-        else
-          Decidim::Faker::Localized.localized { "<script>alert(\"Meetings description\");</script> #{generate(:title)}" }
-        end
-      end
-    end
-    location do
-      Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-        if skip_injection
-          Decidim::Faker::Localized.localized { generate(:title) }
-        else
-          Decidim::Faker::Localized.localized { "<script>alert(\"Meetings location\");</script> #{generate(:title)}" }
-        end
-      end
-    end
-    location_hints do
-      Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-        if skip_injection
-          Decidim::Faker::Localized.localized { generate(:title) }
-        else
-          Decidim::Faker::Localized.localized { "<script>alert(\"Meetings location_hints\");</script> #{generate(:title)}" }
-        end
-      end
-    end
+    title { generate_localized_title(:meeting_title, skip_injection:) }
+    description { generate_localized_description(:meeting_description, skip_injection:) }
+    location { generate_localized_description(:meeting_location, skip_injection:) }
+    location_hints { generate_localized_description(:meeting_location_hints, skip_injection:) }
     address { Faker::Lorem.sentence(word_count: 3) }
     latitude { Faker::Address.latitude }
     longitude { Faker::Address.longitude }
@@ -68,18 +41,10 @@ FactoryBot.define do
     transparent { true }
     questionnaire { build(:questionnaire) }
     registration_form_enabled { true }
-    registration_terms do
-      Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-        if skip_injection
-          Decidim::Faker::Localized.localized { generate(:title) }
-        else
-          Decidim::Faker::Localized.localized { "<script>alert(\"Meetings registration_terms\");</script> #{generate(:title)}" }
-        end
-      end
-    end
+    registration_terms { generate_localized_description(:meeting_registration_terms, skip_injection:) }
     registration_type { :on_this_platform }
     type_of_meeting { :in_person }
-    component { build(:component, manifest_name: "meetings") }
+    component { build(:meeting_component) }
     iframe_access_level { :all }
     iframe_embed_type { :none }
 
@@ -114,7 +79,7 @@ FactoryBot.define do
     end
 
     trait :not_official do
-      author { create(:user, organization: component.organization) if component }
+      author { create(:user, organization: component.organization, skip_injection:) if component }
     end
 
     trait :with_services do
@@ -125,7 +90,7 @@ FactoryBot.define do
       end
 
       after(:build) do |meeting, evaluator|
-        meeting.services = evaluator.services || build_list(:service, 2, meeting:)
+        meeting.services = evaluator.services || build_list(:service, 2, meeting:, skip_injection: evaluator.skip_injection)
       end
     end
 
@@ -133,21 +98,15 @@ FactoryBot.define do
 
     trait :user_group_author do
       author do
-        create(:user, organization: component.organization) if component
+        create(:user, organization: component.organization, skip_injection:) if component
       end
       user_group do
-        create(:user_group, :verified, organization: component.organization, users: [author]) if component
+        create(:user_group, :verified, organization: component.organization, users: [author], skip_injection:) if component
       end
     end
 
     trait :closed do
-      closing_report do
-        if skip_injection
-          Decidim::Faker::Localized.localized { generate(:title) }
-        else
-          Decidim::Faker::Localized.localized { "<script>alert(\"Meetings registration_terms\");</script> #{generate(:title)}" }
-        end
-      end
+      closing_report { generate_localized_title(:meeting_closing_report, skip_injection:) }
       attendees_count { rand(50) }
       contributions_count { rand(50) }
       attending_organizations { Array.new(3) { Faker::TvShows::GameOfThrones.house }.join(", ") }
@@ -166,13 +125,7 @@ FactoryBot.define do
       registrations_enabled { true }
       available_slots { 10 }
       reserved_slots { 4 }
-      registration_terms do
-        if skip_injection
-          Decidim::Faker::Localized.localized { generate(:title) }
-        else
-          Decidim::Faker::Localized.localized { "<script>alert(\"Meetings registration_terms\");</script> #{generate(:title)}" }
-        end
-      end
+      registration_terms { generate_localized_title(:meeting_registration_terms, skip_injection:) }
     end
 
     trait :past do
@@ -218,13 +171,16 @@ FactoryBot.define do
     end
 
     trait :moderated do
-      after(:create) do |meeting, _evaluator|
-        create(:moderation, reportable: meeting, hidden_at: 2.days.ago)
+      after(:create) do |meeting, evaluator|
+        create(:moderation, reportable: meeting, hidden_at: 2.days.ago, skip_injection: evaluator.skip_injection)
       end
     end
   end
 
   factory :registration, class: "Decidim::Meetings::Registration" do
+    transient do
+      skip_injection { false }
+    end
     meeting
     user
   end
@@ -235,18 +191,12 @@ FactoryBot.define do
     end
 
     meeting
-    title do
-      if skip_injection
-        Decidim::Faker::Localized.localized { generate(:title) }
-      else
-        Decidim::Faker::Localized.localized { "<script>alert(\"Meetings agenda title\");</script> #{generate(:title)}" }
-      end
-    end
+    title { generate_localized_title(:meeting_agenda_title, skip_injection:) }
     visible { true }
 
     trait :with_agenda_items do
-      after(:create) do |agenda, _evaluator|
-        create_list(:agenda_item, 2, :with_children, agenda:)
+      after(:create) do |agenda, evaluator|
+        create_list(:agenda_item, 2, :with_children, agenda:, skip_injection: evaluator.skip_injection)
       end
     end
   end
@@ -257,37 +207,26 @@ FactoryBot.define do
     end
 
     agenda
-    title do
-      if skip_injection
-        Decidim::Faker::Localized.localized { generate(:title) }
-      else
-        Decidim::Faker::Localized.localized { "<script>alert(\"Meetings agenda item title\");</script> #{generate(:title)}" }
-      end
-    end
-    description do
-      Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-        if skip_injection
-          Decidim::Faker::Localized.localized { generate(:title) }
-        else
-          Decidim::Faker::Localized.localized { "<script>alert(\"Meetings agenda item descrition\");</script> #{generate(:title)}" }
-        end
-      end
-    end
+    title { generate_localized_title(:meeting_agenda_item_title, skip_injection:) }
+    description { generate_localized_description(:meeting_agenda_item_description, skip_injection:) }
     duration { 15 }
     position { 0 }
 
     trait :with_parent do
-      parent { create(:agenda_item, agenda:) }
+      parent { create(:agenda_item, agenda:, skip_injection:) }
     end
 
     trait :with_children do
       after(:create) do |agenda_item, evaluator|
-        create_list(:agenda_item, 2, parent: agenda_item, agenda: evaluator.agenda)
+        create_list(:agenda_item, 2, parent: agenda_item, agenda: evaluator.agenda, skip_injection: evaluator.skip_injection)
       end
     end
   end
 
   factory :invite, class: "Decidim::Meetings::Invite" do
+    transient do
+      skip_injection { false }
+    end
     meeting
     user
     sent_at { 1.day.ago }
@@ -309,30 +248,22 @@ FactoryBot.define do
     end
 
     meeting
-    title do
-      if skip_injection
-        Decidim::Faker::Localized.localized { generate(:title) }
-      else
-        Decidim::Faker::Localized.localized { "<script>alert(\"Meetings agenda title\");</script> #{generate(:title)}" }
-      end
-    end
-    description do
-      Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-        if skip_injection
-          Decidim::Faker::Localized.localized { generate(:title) }
-        else
-          Decidim::Faker::Localized.localized { "<script>alert(\"Meetings agenda title\");</script> #{generate(:title)}" }
-        end
-      end
-    end
+    title { generate_localized_title(:meeting_service_title, skip_injection:) }
+    description { generate_localized_description(:meeting_service_description, skip_injection:) }
   end
 
   factory :poll, class: "Decidim::Meetings::Poll" do
+    transient do
+      skip_injection { false }
+    end
     meeting
   end
 
   factory :meetings_poll_questionnaire, class: "Decidim::Meetings::Questionnaire" do
-    questionnaire_for { build(:poll) }
+    transient do
+      skip_injection { false }
+    end
+    questionnaire_for { build(:poll, skip_injection:) }
   end
 
   factory :meetings_poll_question, class: "Decidim::Meetings::Question" do
@@ -341,19 +272,13 @@ FactoryBot.define do
       options { [] }
     end
 
-    body do
-      if skip_injection
-        Decidim::Faker::Localized.localized { generate(:title) }
-      else
-        Decidim::Faker::Localized.localized { "<script>alert(\"Meetings agenda title\");</script> #{generate(:title)}" }
-      end
-    end
+    body { generate_localized_title(:meeting_poll_question_body, skip_injection:) }
     position { 0 }
     status { 0 }
     question_type { Decidim::Meetings::Question::QUESTION_TYPES.first }
     questionnaire factory: :meetings_poll_questionnaire
     answer_options do
-      Array.new(3).collect { build(:meetings_poll_answer_option, question: nil) }
+      Array.new(3).collect { build(:meetings_poll_answer_option, question: nil, skip_injection:) }
     end
 
     trait :unpublished do
@@ -370,18 +295,27 @@ FactoryBot.define do
   end
 
   factory :meetings_poll_answer, class: "Decidim::Meetings::Answer" do
+    transient do
+      skip_injection { false }
+    end
     questionnaire factory: :meetings_poll_questionnaire
-    question { create(:meetings_poll_question, questionnaire:) }
-    user { create(:user, organization: questionnaire.questionnaire_for.organization) }
+    question { create(:meetings_poll_question, questionnaire:, skip_injection:) }
+    user { create(:user, organization: questionnaire.questionnaire_for.organization, skip_injection:) }
   end
 
   factory :meetings_poll_answer_option, class: "Decidim::Meetings::AnswerOption" do
-    question { create(:meetings_poll_question) }
+    transient do
+      skip_injection { false }
+    end
+    question { create(:meetings_poll_question, skip_injection:) }
     body { generate_localized_title }
   end
 
   factory :meetings_poll_answer_choice, class: "Decidim::Meetings::AnswerChoice" do
+    transient do
+      skip_injection { false }
+    end
     answer factory: :meetings_poll_answer
-    answer_option { create(:meetings_poll_answer_option, question: answer.question) }
+    answer_option { create(:meetings_poll_answer_option, question: answer.question, skip_injection:) }
   end
 end

data/lib/decidim/meetings/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-meetings version.
   module Meetings
     def self.version
-      "0.28.0"
+      "0.28.1"
     end
   end
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: decidim-meetings
 version: !ruby/object:Gem::Version
-  version: 0.28.0
+  version: 0.28.1
 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-core
@@ -18,28 +18,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.0
+        version: 0.28.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.0
+        version: 0.28.1
 - !ruby/object:Gem::Dependency
   name: decidim-forms
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.0
+        version: 0.28.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.0
+        version: 0.28.1
 - !ruby/object:Gem::Dependency
   name: icalendar
   requirement: !ruby/object:Gem::Requirement
@@ -60,56 +60,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.0
+        version: 0.28.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.0
+        version: 0.28.1
 - !ruby/object:Gem::Dependency
   name: decidim-assemblies
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.0
+        version: 0.28.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.0
+        version: 0.28.1
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.0
+        version: 0.28.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.0
+        version: 0.28.1
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.0
+        version: 0.28.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.0
+        version: 0.28.1
 description: A meetings component for decidim's participatory spaces.
 email:
 - josepjaume@gmail.com
@@ -375,7 +375,6 @@ files:
 - app/views/devise/mailer/join_meeting.html.erb
 - app/views/devise/mailer/join_meeting.text.erb
 - config/assets.rb
-- config/environment.rb
 - config/locales/am-ET.yml
 - config/locales/ar-SA.yml
 - config/locales/ar.yml
@@ -408,6 +407,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
@@ -512,6 +512,7 @@ files:
 - db/migrate/20210928095036_rename_upcoming_events_content_block_to_upcoming_meetings.rb
 - db/migrate/20211105115625_remove_not_null_on_customize_registration_email.rb
 - db/migrate/20230427105701_change_types_and_registration_types_on_meetings.rb
+- decidim-meetings.gemspec
 - lib/decidim/api/agenda_item_type.rb
 - lib/decidim/api/agenda_type.rb
 - lib/decidim/api/linked_resources_interface.rb
@@ -552,23 +553,23 @@ metadata:
   funding_uri: https://opencollective.com/decidim
   homepage_uri: https://decidim.org
   source_code_uri: https://github.com/decidim/decidim
-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.1'
+      version: 3.1.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.5.9
+signing_key: 
 specification_version: 4
 summary: Decidim meetings module
 test_files: []

data/config/environment.rb

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