decidim-forms 0.27.5 → 0.27.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 388157dd4892e7c4fbe9b8c2d4f25e2adb9fd602d29ae30a460530faba1fe293
-  data.tar.gz: 21d31ca818956b2dfaa47ddc8e366da9832b1adcbb0a700d5f50151f02ee79b4
+  metadata.gz: fb8af1d2c76776bd4e799949d4723e998f57b4cc32ad3f021b1baff85fbd646b
+  data.tar.gz: 65f42cfd48b2b6e175dcba554014b97533a25c7b92eac8e2144d165f5bf86a42
 SHA512:
-  metadata.gz: 94b369be21225795e16a2023d60d335fa713a04075547426eb097af017c57bb05215838a3fb038eccb51ec0e4a8e5494aff7b6fefb309c08c2efae4551940acf
-  data.tar.gz: 18ce45eb9d52c7e6e822975afa6f6a81642a7115177c61ac6182e7369c33a2a235d10cd862c0b6824fe5af881c7dd6055d7ae1538683466092bdced19ea0f4dc
+  metadata.gz: b8a5638134be13bb12df3bc391fe1cff12314030215dde44c52ea87889946efdf7673f602ade25b7e8d87b0f973fc164649a46a97286547d754d469835891e08
+  data.tar.gz: 4e1eaebf065003acc37cd0bcb26e5549f6b32202d2edb9d96e748c32a8caf70a7b26eceda53fe447160880d1e4525038ec572b54766a52bae2e26eb20b2b15f7

data/app/cells/decidim/forms/question_readonly/show.erb

@@ -1,6 +1,6 @@
 <li class="questionnaire-question_readonly">
   <p>
-    <%= translated_attribute(model.body) %>
+    <%= decidim_escape_translated(model.body) %>
     <br>
     <em>
       (<%= t(model.question_type, scope: "decidim.forms.question_types") %>)

data/app/controllers/decidim/forms/admin/concerns/has_questionnaire.rb

@@ -20,7 +20,7 @@ module Decidim
             helper_method :questionnaire_for, :questionnaire, :blank_question, :blank_answer_option, :blank_matrix_row,
                           :blank_display_condition, :question_types, :display_condition_types, :update_url, :public_url, :answer_options_url, :edit_questionnaire_title
 
-            if defined? Decidim::Templates::Admin
+            if defined?(Decidim::Templates::Admin::Concerns::Templatable)
               include Decidim::Templates::Admin::Concerns::Templatable
               helper Decidim::DatalistSelectHelper
 

data/config/locales/bg.yml

@@ -7,8 +7,19 @@ bg:
       question:
         max_choices: Максимален брой възможности
         question_type: Тип
+    errors:
+      models:
+        questionnaire:
+          request_invalid: Възникна грешка при обработката на заявката. Моля, опитайте отново
   decidim:
     forms:
+      errors:
+        answer:
+          body: Основният текст не може да бъде празен
+      questionnaires:
+        show:
+          answer_questionnaire:
+            anonymous_user_message: <a href="%{sign_in_link}">Влезте в профила си</a> или <a href="%{sign_up_link}">се регистрирайте</a>, за да попълните отговорите си във формуляра.
       step_navigation:
         show:
           are_you_sure: Това действие не може да се отмени и Вие не можете да редактирате отговорите си. Сигурни ли сте?

data/config/locales/he-IL.yml

@@ -0,0 +1 @@
+he:

data/config/locales/hu.yml

@@ -30,7 +30,7 @@ hu:
             answer_option: Válasz opció
             free_text: Szabadszöveg
             remove: Eltávolít
-            statement: Nyilatkozat
+            statement: Állítás
           edit:
             save: Mentés
           form:
@@ -41,7 +41,7 @@ hu:
             expand: Minden kérdés kibontása
           matrix_row:
             remove: Eltávolít
-            statement: Nyilatkozat
+            statement: Állítás
           question:
             add_answer_option: Válasz opció hozzáadása
             any: Bármilyen
@@ -51,7 +51,7 @@ hu:
             expand: Kibontás
             question: Kérdés
             remove: Eltávolít
-            statement: Nyilatkozat
+            statement: Állítás
             up: Fel
           title_and_description:
             collapse: Összecsuk

data/config/locales/pl.yml

@@ -122,11 +122,17 @@ pl:
           update:
             invalid: Podczas zapisywania formularza wystąpił błąd.
             success: Formularz został zapisany.
+      admin_log:
+        questionnaire:
+          update: "%{user_name} zaktualizował(a) kwestionariusz %{resource_name}"
       errors:
         answer:
           body: Treść nie może być pusta
       images:
         dimensions: "%{width} × %{height} px"
+        processors:
+          resize_and_pad: Rozmiar obrazu zostanie zmieniony i dopasowany do wymiarów %{dimensions}.
+          resize_to_fit: Rozmiar obrazu zostanie zmieniony i dopasowany do wymiarów %{dimensions}.
       question_types:
         files: Pliki
         long_answer: Długa odpowiedź

data/config/locales/ro-RO.yml

@@ -39,7 +39,7 @@ ro:
           answer_option:
             answer_option: Opțiune de răspuns
             free_text: Text liber
-            remove: Elimină
+            remove: Eliminați
             statement: Declarație
           answers:
             actions:
@@ -53,7 +53,7 @@ ro:
             export_response:
               title: survey_user_answers_%{token}
             index:
-              title: "%{total} total răspunsuri"
+              title: "%{total} răspunsuri în total"
             show:
               title: 'Răspuns #%{number}'
           display_condition:
@@ -71,21 +71,21 @@ ro:
             mandatory: Această condiție trebuie îndeplinită întotdeauna indiferent de stadiul altor condiții
             remove: Elimină
             save_warning: Ține minte să salvezi chestionarul înainte de configurarea condiţiilor de afişare
-            select_answer_option: Selectează opțiunea de răspuns
+            select_answer_option: Selectați opțiunea de răspuns
             select_condition_question: Selectează o întrebare
-            select_condition_type: Selectează un tip de condiție
+            select_condition_type: Selectați un tip de condiție
           edit:
             save: Salvează
-            title: Editează chestionarul
+            title: Editare chestionar
           form:
             add_question: Adaugă întrebare
             add_separator: Adaugă separator
-            add_title_and_description: Adaugă titlu și descriere
-            already_answered_warning: Au fost înregistrare deja câteva răspunsuri de la utilizatori pentru acest chestionar. De aceea, nu mai poți modifica întrebările.
+            add_title_and_description: Adaugați titlu și descriere
+            already_answered_warning: Au fost înregistrare deja câteva răspunsuri de la utilizatori pentru acest chestionar. De aceea, nu mai puteți modifica întrebările.
             collapse: Restrânge toate întrebările
             expand: Extinde toate întrebările
             preview: Previzualizează
-            title: Editează chestionarul pentru %{questionnaire_for}
+            title: Actualizați chestionarul pentru %{questionnaire_for}
             unpublished_warning: Chestionarul nu este publicat. Poți modifica întrebările, dar această acțiune va duce la stergerea automată a răspunsurilor curente.
           matrix_row:
             matrix_row: Rând
@@ -95,14 +95,14 @@ ro:
             add_answer_option: Adaugă opțiune de răspuns
             add_display_condition: Adaugă condiție de afișare
             add_display_condition_info: Salvează formularul pentru a configura condițiile de afișare
-            add_matrix_row: Adaugă rând
+            add_matrix_row: Adaugați rând
             any: Oricare
-            collapse: Restrânge
+            collapse: Restrângeți
             description: Descriere
             down: Mergi în jos
-            expand: Extinde
+            expand: Extindeți
             question: Întrebare
-            remove: Elimină
+            remove: Eliminați
             statement: Declarație
             up: Mergi în sus
           separator:

data/decidim-forms.gemspec

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+$LOAD_PATH.push File.expand_path("lib", __dir__)
+
+# Maintain your gem's version:
+require "decidim/forms/version"
+
+# Describe your gem and declare its dependencies:
+Gem::Specification.new do |s|
+  s.version = Decidim::Forms.version
+  s.authors = ["Josep Jaume Rey Peroy", "Marc Riera Casals", "Oriol Gual Oliva", "Rubén González Valero"]
+  s.email = ["josepjaume@gmail.com", "mrc2407@gmail.com", "oriolgual@gmail.com", "rbngzlv@gmail.com"]
+  s.license = "AGPL-3.0"
+  s.homepage = "https://github.com/decidim/decidim"
+  s.required_ruby_version = "~> 3.0.0"
+
+  s.name = "decidim-forms"
+  s.summary = "Decidim forms"
+  s.description = "A forms gem 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-core", Decidim::Forms.version
+  s.add_dependency "wicked_pdf", "~> 2.1"
+  s.add_dependency "wkhtmltopdf-binary", "~> 0.12"
+
+  s.add_development_dependency "decidim-admin", Decidim::Forms.version
+  s.add_development_dependency "decidim-dev", Decidim::Forms.version
+end

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

@@ -5,37 +5,37 @@ require "decidim/participatory_processes/test/factories"
 
 FactoryBot.define do
   factory :questionnaire, class: "Decidim::Forms::Questionnaire" do
-    title { generate_localized_title }
-    description do
-      Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-        generate_localized_title
-      end
+    transient do
+      skip_injection { false }
     end
-    tos { generate_localized_title }
-    questionnaire_for { build(:participatory_process) }
+    title { generate_localized_title(:questionnaire_title, skip_injection: skip_injection) }
+    description { generate_localized_description(:questionnaire_description, skip_injection: skip_injection) }
+    tos { generate_localized_title(:questionnaire_tos, skip_injection: skip_injection) }
+    questionnaire_for { build(:participatory_process, skip_injection: skip_injection) }
     salt { SecureRandom.hex(32) }
 
     trait :with_questions do
       questions do
         position = 0
         qs = %w(short_answer long_answer).collect do |text_question_type|
-          q = build(:questionnaire_question, question_type: text_question_type, position: position)
+          q = build(:questionnaire_question, question_type: text_question_type, position: position, skip_injection: skip_injection)
           position += 1
           q
         end
-        qs << build(:questionnaire_question, :with_answer_options, question_type: :single_option, position: position)
+        qs << build(:questionnaire_question, :with_answer_options, question_type: :single_option, position: position, skip_injection: skip_injection)
         qs
       end
     end
 
     trait :with_all_questions do
-      after(:build) do |questionaire, _evaluator|
+      after(:build) do |questionaire, evaluator|
         position = 0
         %w(short_answer long_answer).collect do |text_question_type|
           q = create(:questionnaire_question,
                      question_type: text_question_type,
                      position: position,
-                     questionnaire: questionaire)
+                     questionnaire: questionaire,
+                     skip_injection: evaluator.skip_injection)
           position += 1
           questionaire.questions << q
         end
@@ -44,7 +44,8 @@ FactoryBot.define do
           q = create(:questionnaire_question, :with_answer_options,
                      question_type: option_question_type,
                      position: position,
-                     questionnaire: questionaire)
+                     questionnaire: questionaire,
+                     skip_injection: evaluator.skip_injection)
           q.display_conditions.build(
             condition_question: questionaire.questions[q.position - 1],
             question: q,
@@ -60,7 +61,8 @@ FactoryBot.define do
                     question_type: matrix_question_type,
                     position: position,
                     body: generate_localized_title,
-                    questionnaire: questionaire)
+                    questionnaire: questionaire,
+                    skip_injection: evaluator.skip_injection)
           q.display_conditions.build(
             condition_question: questionaire.questions[q.position - 1],
             question: q,
@@ -82,16 +84,13 @@ FactoryBot.define do
 
   factory :questionnaire_question, class: "Decidim::Forms::Question" do
     transient do
+      skip_injection { false }
       options { [] }
       rows { [] }
     end
 
-    body { generate_localized_title }
-    description do
-      Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-        generate_localized_title
-      end
-    end
+    body { generate_localized_title(:questionnaire_question_body, skip_injection: skip_injection) }
+    description { generate_localized_description(:questionnaire_question_description, skip_injection: skip_injection) }
     mandatory { false }
     position { 0 }
     question_type { Decidim::Forms::Question::TYPES.first }
@@ -119,13 +118,13 @@ FactoryBot.define do
 
     trait :with_answer_options do
       answer_options do
-        Array.new(3).collect { build(:answer_option) }
+        Array.new(3).collect { build(:answer_option, skip_injection: skip_injection) }
       end
     end
 
     trait :conditioned do
       display_conditions do
-        Array.new(3).collect { build(:display_condition) }
+        Array.new(3).collect { build(:display_condition, skip_injection: skip_injection) }
       end
     end
 
@@ -139,22 +138,28 @@ FactoryBot.define do
   end
 
   factory :answer, class: "Decidim::Forms::Answer" do
+    transient do
+      skip_injection { false }
+    end
     body { "hola" }
     questionnaire
-    question { create(:questionnaire_question, questionnaire: questionnaire) }
-    user { create(:user, organization: questionnaire.questionnaire_for.organization) }
+    question { create(:questionnaire_question, questionnaire: questionnaire, skip_injection: skip_injection) }
+    user { create(:user, organization: questionnaire.questionnaire_for.organization, skip_injection: skip_injection) }
     session_token { Digest::MD5.hexdigest(user.id.to_s) }
 
     trait :with_attachments do
-      after(:create) do |answer, _evaluator|
-        create :attachment, :with_image, attached_to: answer
-        create :attachment, :with_pdf, attached_to: answer
+      after(:create) do |answer, evaluator|
+        create :attachment, :with_image, attached_to: answer, skip_injection: evaluator.skip_injection
+        create :attachment, :with_pdf, attached_to: answer, skip_injection: evaluator.skip_injection
       end
     end
   end
 
   factory :answer_option, class: "Decidim::Forms::AnswerOption" do
-    question { create(:questionnaire_question) }
+    transient do
+      skip_injection { false }
+    end
+    question { create(:questionnaire_question, skip_injection: skip_injection) }
     body { generate_localized_title }
     free_text { false }
 
@@ -168,31 +173,40 @@ FactoryBot.define do
   end
 
   factory :answer_choice, class: "Decidim::Forms::AnswerChoice" do
+    transient do
+      skip_injection { false }
+    end
     answer
-    answer_option { create(:answer_option, question: answer.question) }
-    matrix_row { create(:question_matrix_row, question: answer.question) }
+    answer_option { create(:answer_option, question: answer.question, skip_injection: skip_injection) }
+    matrix_row { create(:question_matrix_row, question: answer.question, skip_injection: skip_injection) }
   end
 
   factory :question_matrix_row, class: "Decidim::Forms::QuestionMatrixRow" do
-    question { create(:questionnaire_question) }
+    transient do
+      skip_injection { false }
+    end
+    question { create(:questionnaire_question, skip_injection: skip_injection) }
     body { generate_localized_title }
     position { 0 }
   end
 
   factory :display_condition, class: "Decidim::Forms::DisplayCondition" do
-    condition_question { create(:questionnaire_question) }
-    question { create(:questionnaire_question, position: 1) }
+    transient do
+      skip_injection { false }
+    end
+    condition_question { create(:questionnaire_question, skip_injection: skip_injection) }
+    question { create(:questionnaire_question, position: 1, skip_injection: skip_injection) }
     condition_type { :answered }
     mandatory { true }
 
     trait :equal do
       condition_type { :equal }
-      answer_option { create(:answer_option, question: condition_question) }
+      answer_option { create(:answer_option, question: condition_question, skip_injection: skip_injection) }
     end
 
     trait :match do
       condition_type { :match }
-      condition_value { generate_localized_title }
+      condition_value { generate_localized_title(:condition_value, skip_injection: skip_injection) }
     end
   end
 end

data/lib/decidim/forms/test/shared_examples/has_questionnaire.rb

@@ -8,7 +8,7 @@ shared_examples_for "has questionnaire" do
       visit questionnaire_public_path
 
       expect(page).to have_i18n_content(questionnaire.title, upcase: true)
-      expect(page).to have_i18n_content(questionnaire.description)
+      expect(page).to have_i18n_content(questionnaire.description, strip_tags: true)
 
       expect(page).not_to have_css(".form.answer-questionnaire")
 
@@ -29,7 +29,7 @@ shared_examples_for "has questionnaire" do
       visit questionnaire_public_path
 
       expect(page).to have_i18n_content(questionnaire.title, upcase: true)
-      expect(page).to have_i18n_content(questionnaire.description)
+      expect(page).to have_i18n_content(questionnaire.description, strip_tags: true)
 
       fill_in question.body["en"], with: "My first answer"
 

data/lib/decidim/forms/version.rb

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

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: decidim-forms
 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
 - Rubén González Valero
-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
@@ -19,14 +19,14 @@ 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: wicked_pdf
   requirement: !ruby/object:Gem::Requirement
@@ -61,28 +61,28 @@ 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-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
 description: A forms gem for decidim.
 email:
 - josepjaume@gmail.com
@@ -186,7 +186,6 @@ files:
 - app/views/decidim/forms/questionnaires/show.html.erb
 - app/views/layouts/decidim/forms/admin/questionnaires/questionnaire_answers.html.erb
 - config/assets.rb
-- config/environment.rb
 - config/initializers/wicked_pdf.rb
 - config/locales/am-ET.yml
 - config/locales/ar-SA.yml
@@ -220,6 +219,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
@@ -280,6 +280,7 @@ files:
 - db/migrate/20201110152921_add_salt_to_decidim_forms_questionnaires.rb
 - db/migrate/20210208094442_add_max_characters_to_decidim_forms_questions.rb
 - db/migrate/20210616153042_set_position_to_question_matrix_rows.rb
+- decidim-forms.gemspec
 - lib/decidim/api/answer_option_type.rb
 - lib/decidim/api/question_type.rb
 - lib/decidim/api/questionnaire_entity_interface.rb
@@ -307,23 +308,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 forms
 test_files: []

data/config/environment.rb

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