decidim-debates 0.21.0 → 0.23.2

data/lib/decidim/debates/engine.rb

@@ -12,7 +12,13 @@ module Decidim
       isolate_namespace Decidim::Debates
 
       routes do
-        resources :debates, only: [:index, :show, :new, :create]
+        resources :debates, except: [:destroy] do
+          member do
+            post :close
+          end
+          resources :versions, only: [:show, :index]
+          resource :widget, only: :show, path: "embed"
+        end
         root to: "debates#index"
       end
 

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

@@ -10,8 +10,6 @@ FactoryBot.define do
     description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_debate_title } }
     information_updates { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_debate_title } }
     instructions { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_debate_title } }
-    start_time { 1.day.from_now }
-    end_time { start_time.advance(hours: 2) }
     component { build(:component, manifest_name: "debates") }
     author { component.try(:organization) }
 
@@ -20,20 +18,37 @@ FactoryBot.define do
       end_time { 1.day.from_now }
     end
 
-    trait :with_author do
+    trait :citizen_author do
+      start_time { nil }
+      end_time { nil }
       author do
         build(:user, organization: component.organization) if component
       end
     end
 
-    trait :with_user_group_author do
+    trait :official do
+      author { component.try(:organization) }
+    end
+
+    trait :user_group_author do
       author do
-        build(:user, organization: component.organization) if component
+        create(:user, organization: component.organization) if component
       end
+
       user_group do
-        build(:user_group, :verified, organization: component.organization, users: [author]) if component
+        create(:user_group, :verified, organization: component.organization, users: [author]) if component
       end
     end
+
+    trait :closed do
+      closed_at { Time.current }
+      conclusions { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_debate_title } }
+    end
+
+    after(:build) do |debate|
+      debate.title = Decidim::ContentProcessor.parse_with_processor(:hashtag, debate.title, current_organization: debate.organization).rewrite
+      debate.description = Decidim::ContentProcessor.parse_with_processor(:hashtag, debate.description, current_organization: debate.organization).rewrite
+    end
   end
 
   factory :debates_component, parent: :component do
@@ -46,6 +61,16 @@ FactoryBot.define do
       }
     end
 
+    trait :with_comments_blocked do
+      step_settings do
+        {
+          participatory_space.active_step.id => {
+            comments_blocked: true
+          }
+        }
+      end
+    end
+
     trait :with_creation_enabled do
       step_settings do
         {
@@ -53,5 +78,36 @@ FactoryBot.define do
         }
       end
     end
+
+    trait :with_votes_enabled do
+      # Needed for endorsements tests
+    end
+
+    trait :with_endorsements_blocked do
+      step_settings do
+        {
+          participatory_space.active_step.id => {
+            endorsements_enabled: true,
+            endorsements_blocked: true
+          }
+        }
+      end
+    end
+
+    trait :with_endorsements_enabled do
+      step_settings do
+        {
+          participatory_space.active_step.id => { endorsements_enabled: true }
+        }
+      end
+    end
+
+    trait :with_endorsements_disabled do
+      step_settings do
+        {
+          participatory_space.active_step.id => { endorsements_enabled: false }
+        }
+      end
+    end
   end
 end

data/lib/decidim/debates/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-debates version.
   module Debates
     def self.version
-      "0.21.0"
+      "0.23.2"
     end
   end
 end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: decidim-debates
 version: !ruby/object:Gem::Version
-  version: 0.21.0
+  version: 0.23.2
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
 - Marc Riera Casals
 - Oriol Gual Oliva
 - Genis Matutes Pujol
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-08 00:00:00.000000000 Z
+date: 2021-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-comments
@@ -19,42 +19,48 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.23.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.23.2
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.23.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.23.2
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: searchlight
   requirement: !ruby/object:Gem::Requirement
@@ -75,28 +81,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.23.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.23.2
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.23.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.23.2
 description: A debates component for decidim's participatory spaces.
 email:
 - josepjaume@gmail.com
@@ -120,18 +126,29 @@ files:
 - app/cells/decidim/debates/debate_m/single_date.erb
 - app/cells/decidim/debates/debate_m/tags.erb
 - app/cells/decidim/debates/debate_m_cell.rb
+- app/commands/decidim/debates/admin/close_debate.rb
 - app/commands/decidim/debates/admin/create_debate.rb
 - app/commands/decidim/debates/admin/update_debate.rb
+- app/commands/decidim/debates/close_debate.rb
 - app/commands/decidim/debates/create_debate.rb
+- app/commands/decidim/debates/update_debate.rb
 - app/controllers/decidim/debates/admin/application_controller.rb
+- app/controllers/decidim/debates/admin/debate_closes_controller.rb
 - app/controllers/decidim/debates/admin/debates_controller.rb
 - app/controllers/decidim/debates/application_controller.rb
 - app/controllers/decidim/debates/debates_controller.rb
+- app/controllers/decidim/debates/orderable.rb
+- app/controllers/decidim/debates/versions_controller.rb
+- app/controllers/decidim/debates/widgets_controller.rb
+- app/events/decidim/debates/close_debate_event.rb
 - app/events/decidim/debates/create_debate_event.rb
 - app/events/decidim/debates/creation_disabled_event.rb
 - app/events/decidim/debates/creation_enabled_event.rb
+- app/forms/decidim/debates/admin/close_debate_form.rb
 - app/forms/decidim/debates/admin/debate_form.rb
+- app/forms/decidim/debates/close_debate_form.rb
 - app/forms/decidim/debates/debate_form.rb
+- app/helpers/decidim/debates/admin/application_helper.rb
 - app/helpers/decidim/debates/application_helper.rb
 - app/helpers/decidim/debates/debate_cells_helper.rb
 - app/jobs/decidim/debates/settings_change_job.rb
@@ -140,60 +157,105 @@ files:
 - app/permissions/decidim/debates/admin/permissions.rb
 - app/permissions/decidim/debates/permissions.rb
 - app/presenters/decidim/debates/admin_log/debate_presenter.rb
+- app/presenters/decidim/debates/admin_log/value_types/debate_title_description_presenter.rb
 - app/presenters/decidim/debates/debate_presenter.rb
+- app/presenters/decidim/debates/log/resource_presenter.rb
 - app/presenters/decidim/debates/official_author_presenter.rb
 - app/queries/decidim/debates/metrics/debate_followers_metric_measure.rb
 - app/queries/decidim/debates/metrics/debate_participants_metric_measure.rb
 - app/queries/decidim/debates/metrics/debates_metric_manage.rb
 - app/serializers/decidim/debates/data_portability_debate_serializer.rb
 - app/services/decidim/debates/debate_search.rb
+- app/services/decidim/debates/diff_renderer.rb
 - app/types/decidim/debates/debate_type.rb
 - app/types/decidim/debates/debates_type.rb
+- app/views/decidim/debates/admin/debate_closes/edit.html.erb
 - app/views/decidim/debates/admin/debates/_form.html.erb
 - app/views/decidim/debates/admin/debates/edit.html.erb
 - app/views/decidim/debates/admin/debates/index.html.erb
 - app/views/decidim/debates/admin/debates/new.html.erb
+- app/views/decidim/debates/debates/_close_debate_modal.html.erb
 - app/views/decidim/debates/debates/_count.html.erb
 - app/views/decidim/debates/debates/_debate.html.erb
 - app/views/decidim/debates/debates/_debates.html.erb
 - app/views/decidim/debates/debates/_filters.html.erb
 - app/views/decidim/debates/debates/_filters_small_view.html.erb
+- app/views/decidim/debates/debates/_form.html.erb
+- app/views/decidim/debates/debates/edit.html.erb
 - app/views/decidim/debates/debates/index.html.erb
 - app/views/decidim/debates/debates/index.js.erb
 - app/views/decidim/debates/debates/new.html.erb
 - app/views/decidim/debates/debates/show.html.erb
+- app/views/decidim/debates/versions/index.html.erb
+- app/views/decidim/debates/versions/show.html.erb
+- config/locales/am-ET.yml
 - config/locales/ar-SA.yml
 - config/locales/ar.yml
+- config/locales/bg-BG.yml
+- config/locales/bg.yml
 - config/locales/ca.yml
 - config/locales/cs-CZ.yml
 - config/locales/cs.yml
+- config/locales/da-DK.yml
+- config/locales/da.yml
 - config/locales/de.yml
 - config/locales/el-GR.yml
 - config/locales/el.yml
 - config/locales/en.yml
 - config/locales/eo-UY.yml
+- config/locales/eo.yml
 - config/locales/es-MX.yml
 - config/locales/es-PY.yml
 - config/locales/es.yml
+- config/locales/et-EE.yml
+- config/locales/et.yml
 - config/locales/eu.yml
 - config/locales/fi-pl.yml
 - config/locales/fi-plain.yml
 - config/locales/fi.yml
+- config/locales/fr-CA.yml
 - config/locales/fr.yml
+- config/locales/ga-IE.yml
 - config/locales/gl.yml
+- config/locales/hr-HR.yml
+- config/locales/hr.yml
 - config/locales/hu.yml
 - config/locales/id-ID.yml
 - config/locales/is-IS.yml
+- config/locales/is.yml
 - config/locales/it.yml
+- config/locales/ja-JP.yml
+- config/locales/ja.yml
+- config/locales/ko-KR.yml
+- config/locales/ko.yml
+- config/locales/lt-LT.yml
+- config/locales/lt.yml
+- config/locales/lv.yml
+- config/locales/mt-MT.yml
+- config/locales/mt.yml
 - config/locales/nl.yml
 - config/locales/no.yml
+- config/locales/om-ET.yml
 - config/locales/pl.yml
 - config/locales/pt-BR.yml
 - config/locales/pt.yml
+- config/locales/ro-RO.yml
 - config/locales/ru.yml
+- config/locales/si-LK.yml
+- config/locales/sk-SK.yml
+- config/locales/sk.yml
+- config/locales/sl.yml
+- config/locales/so-SO.yml
+- config/locales/sr-CS.yml
 - config/locales/sv.yml
+- config/locales/sw-KE.yml
+- config/locales/ti-ER.yml
 - config/locales/tr-TR.yml
 - config/locales/uk.yml
+- config/locales/vi-VN.yml
+- config/locales/vi.yml
+- config/locales/zh-CN.yml
+- config/locales/zh-TW.yml
 - db/migrate/20170118141619_create_debates.rb
 - db/migrate/20180117100413_add_debate_information_updates.rb
 - db/migrate/20180118132243_add_author_to_debates.rb
@@ -203,6 +265,12 @@ files:
 - db/migrate/20180305133556_rename_features_to_components_at_debates.rb
 - db/migrate/20181003081235_fix_user_groups_ids_on_debates.rb
 - db/migrate/20181016132850_add_organization_as_author_to_debates.rb
+- db/migrate/20200320105918_index_foreign_keys_in_decidim_debates_debates.rb
+- db/migrate/20200703134657_close_debates.rb
+- db/migrate/20200708072042_fix_debates_i18n_fields.rb
+- db/migrate/20200716143929_add_endorsable_to_debates.rb
+- db/migrate/20200827154116_add_commentable_counter_cache_to_debates.rb
+- db/migrate/20200902133452_add_cached_comment_metadata_to_debates.rb
 - lib/decidim/debates.rb
 - lib/decidim/debates/admin.rb
 - lib/decidim/debates/admin_engine.rb
@@ -214,7 +282,7 @@ homepage: https://github.com/decidim/decidim
 licenses:
 - AGPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -222,15 +290,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: Decidim debates module
 test_files: []