decidim-templates 0.27.5 → 0.28.0.rc4

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

@@ -6,11 +6,26 @@ require "decidim/dev"
 FactoryBot.define do
   factory :template, class: "Decidim::Templates::Template" do
     organization
-    templatable { build(:dummy_resource) }
     name { Decidim::Faker::Localized.sentence }
+    description { Decidim::Faker::Localized.sentence }
+    target { "generic-template" }
+    templatable { build(:dummy_resource) }
+
+    trait :user_block do
+      templatable { organization }
+      target { :user_block }
+    end
+
+    trait :proposal_answer do
+      templatable { organization }
+      target { :proposal_answer }
+      field_values { { internal_state: :accepted } }
+    end
 
     ## Questionnaire templates
     factory :questionnaire_template do
+      target { "questionnaire" }
+
       trait :with_questions do
         after(:create) do |template|
           template.templatable = create(:questionnaire, :with_questions, questionnaire_for: template)

data/lib/decidim/templates/test/shared_examples/copies_all_questionnaire_contents_examples.rb

@@ -31,7 +31,7 @@ shared_examples_for "copies all questionnaire contents" do
     end
 
     def check_answer_options(source_question, new_question)
-      expect(source_question.answer_options.size).to eq(new_question.answer_options.size)
+      expect(source_question.answer_options.count).to eq(new_question.answer_options.count)
 
       source_question.answer_options.each_with_index do |source_answer_option, idx|
         new_answer_option = new_question.answer_options[idx]
@@ -41,7 +41,7 @@ shared_examples_for "copies all questionnaire contents" do
     end
 
     def check_matrix_rows(source_question, new_question)
-      expect(source_question.matrix_rows.size).to eq(new_question.matrix_rows.size)
+      expect(source_question.matrix_rows.count).to eq(new_question.matrix_rows.count)
 
       source_question.matrix_rows.each_with_index do |source_matrix_row, idx|
         new_matrix_row = new_question.matrix_rows[idx]
@@ -52,7 +52,7 @@ shared_examples_for "copies all questionnaire contents" do
     end
 
     def check_display_conditions(source_display_conditions, new_display_conditions)
-      expect(source_display_conditions.size).to eq(new_display_conditions.size)
+      expect(source_display_conditions.count).to eq(new_display_conditions.count)
 
       source_display_conditions.each_with_index do |source_matrix_row, idx|
         new_matrix_row = new_display_conditions[idx]

data/lib/decidim/templates/test/shared_examples/uses_questionnaire_templates.rb

@@ -14,8 +14,8 @@ shared_examples_for "uses questionnaire templates" do |_questionnaire_for|
         )
       end
 
-      it "doesn't show the template selection screen" do
-        expect(page).to have_no_content("Choose template")
+      it "does not show the template selection screen" do
+        expect(page).not_to have_content("Choose template")
       end
     end
 
@@ -32,8 +32,8 @@ shared_examples_for "uses questionnaire templates" do |_questionnaire_for|
           )
         end
 
-        it "doesn't show the template selection screen" do
-          expect(page).to have_no_content("Choose template")
+        it "does not show the template selection screen" do
+          expect(page).not_to have_content("Choose template")
         end
       end
 
@@ -91,9 +91,11 @@ shared_examples_for "uses questionnaire templates" do |_questionnaire_for|
 
       select(template.name["en"], from: "select-template")
 
-      within ".create-from-template" do
-        find("*[type=submit]").click
+      within ".questionnaire-template-preview" do
+        expect(page).to have_content(template.templatable.title["en"])
       end
+
+      click_button "Create from template"
     end
 
     it "copies the template data to the questionnaire on submit" do

data/lib/decidim/templates/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-templates version.
   module Templates
     def self.version
-      "0.27.5"
+      "0.28.0.rc4"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decidim-templates
 version: !ruby/object:Gem::Version
-  version: 0.27.5
+  version: 0.28.0.rc4
 platform: ruby
 authors:
 - Vera Rojman
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-20 00:00:00.000000000 Z
+date: 2023-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.5
+        version: 0.28.0.rc4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.5
+        version: 0.28.0.rc4
 - !ruby/object:Gem::Dependency
   name: decidim-forms
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.5
+        version: 0.28.0.rc4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.5
+        version: 0.28.0.rc4
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.5
+        version: 0.28.0.rc4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.5
+        version: 0.28.0.rc4
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.5
+        version: 0.28.0.rc4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.5
+        version: 0.28.0.rc4
 description: This module provides a solution to create templates for different Decidim
   models, such as Proposals and Questionnaires..
 email:
@@ -78,28 +78,52 @@ files:
 - README.md
 - Rakefile
 - app/commands/decidim/templates/admin/apply_questionnaire_template.rb
+- app/commands/decidim/templates/admin/copy_proposal_answer_template.rb
 - app/commands/decidim/templates/admin/copy_questionnaire_template.rb
+- app/commands/decidim/templates/admin/copy_template.rb
+- app/commands/decidim/templates/admin/create_block_user_template.rb
+- app/commands/decidim/templates/admin/create_proposal_answer_template.rb
 - app/commands/decidim/templates/admin/create_questionnaire_template.rb
+- app/commands/decidim/templates/admin/create_template.rb
+- app/commands/decidim/templates/admin/destroy_questionnaire_template.rb
 - app/commands/decidim/templates/admin/destroy_template.rb
 - app/commands/decidim/templates/admin/questionnaire_copier.rb
+- app/commands/decidim/templates/admin/update_proposal_answer_template.rb
 - app/commands/decidim/templates/admin/update_template.rb
 - app/controllers/decidim/templates/admin/application_controller.rb
+- app/controllers/decidim/templates/admin/block_user_templates_controller.rb
 - app/controllers/decidim/templates/admin/concerns/templatable.rb
+- app/controllers/decidim/templates/admin/proposal_answer_templates_controller.rb
 - app/controllers/decidim/templates/admin/questionnaire_templates/questionnaires_controller.rb
 - app/controllers/decidim/templates/admin/questionnaire_templates_controller.rb
 - app/controllers/decidim/templates/application_controller.rb
+- app/forms/decidim/templates/admin/proposal_answer_template_form.rb
 - app/forms/decidim/templates/admin/template_form.rb
+- app/helpers/decidim/templates/admin/application_helper.rb
 - app/helpers/decidim/templates/application_helper.rb
 - app/models/concerns/decidim/templates/templatable.rb
 - app/models/decidim/templates/application_record.rb
 - app/models/decidim/templates/template.rb
 - app/packs/entrypoints/decidim_templates.js
 - app/packs/entrypoints/decidim_templates.scss
+- app/packs/entrypoints/decidim_templates_admin.js
 - app/packs/images/decidim/templates/decidim_templates.svg
+- app/packs/src/decidim/templates/admin/block_user_template_chooser.js
 - app/packs/src/decidim/templates/admin/choose_template.js
+- app/packs/src/decidim/templates/admin/proposal_answer_template_chooser.js
 - app/packs/stylesheets/decidim/templates/templates.scss
 - app/permissions/decidim/templates/admin/permissions.rb
 - app/presenters/decidim/templates/admin_log/template_presenter.rb
+- app/views/decidim/templates/admin/block_user_templates/_form.html.erb
+- app/views/decidim/templates/admin/block_user_templates/_template_chooser.html.erb
+- app/views/decidim/templates/admin/block_user_templates/edit.html.erb
+- app/views/decidim/templates/admin/block_user_templates/index.html.erb
+- app/views/decidim/templates/admin/block_user_templates/new.html.erb
+- app/views/decidim/templates/admin/proposal_answer_templates/_form.html.erb
+- app/views/decidim/templates/admin/proposal_answer_templates/_template_chooser.html.erb
+- app/views/decidim/templates/admin/proposal_answer_templates/edit.html.erb
+- app/views/decidim/templates/admin/proposal_answer_templates/index.html.erb
+- app/views/decidim/templates/admin/proposal_answer_templates/new.html.erb
 - app/views/decidim/templates/admin/questionnaire_templates/_choose.html.erb
 - app/views/decidim/templates/admin/questionnaire_templates/_form.html.erb
 - app/views/decidim/templates/admin/questionnaire_templates/_preview.html.erb
@@ -109,7 +133,6 @@ files:
 - app/views/decidim/templates/admin/questionnaire_templates/preview.js.erb
 - app/views/layouts/decidim/admin/templates.html.erb
 - config/assets.rb
-- config/environment.rb
 - config/locales/am-ET.yml
 - config/locales/ar.yml
 - config/locales/bg.yml
@@ -177,19 +200,26 @@ files:
 - config/locales/zh-CN.yml
 - config/locales/zh-TW.yml
 - db/migrate/20200518093819_create_decidim_templates.rb
+- db/migrate/20221006055954_add_field_values_and_target_to_decidim_templates.rb
 - db/seeds.rb
 - lib/decidim/templates.rb
 - lib/decidim/templates/admin.rb
 - lib/decidim/templates/admin_engine.rb
 - lib/decidim/templates/engine.rb
+- lib/decidim/templates/menu.rb
 - lib/decidim/templates/test/factories.rb
 - lib/decidim/templates/test/shared_examples/copies_all_questionnaire_contents_examples.rb
 - lib/decidim/templates/test/shared_examples/uses_questionnaire_templates.rb
 - lib/decidim/templates/version.rb
-homepage: https://github.com/decidim/decidim-module-templates
+homepage: https://decidim.org
 licenses:
 - AGPL-3.0
-metadata: {}
+metadata:
+  bug_tracker_uri: https://github.com/decidim/decidim/issues
+  documentation_uri: https://docs.decidim.org/
+  funding_uri: https://opencollective.com/decidim
+  homepage_uri: https://decidim.org
+  source_code_uri: https://github.com/decidim/decidim
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -198,14 +228,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.0'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.4.22
+rubygems_version: 3.4.20
 signing_key:
 specification_version: 4
 summary: A decidim templates module

data/config/environment.rb

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