decidim-initiatives 0.19.1 → 0.23.0

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

@@ -7,18 +7,32 @@ FactoryBot.define do
   factory :initiatives_type, class: "Decidim::InitiativesType" do
     title { generate_localized_title }
     description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
-    banner_image { Decidim::Dev.test_file("city2.jpeg", "image/jpeg") }
     organization
-    online_signature_enabled { true }
+    banner_image { Decidim::Dev.test_file("city2.jpeg", "image/jpeg") } # Keep after organization
+    signature_type { :online }
+    attachments_enabled { true }
     undo_online_signatures_enabled { true }
+    custom_signature_end_date_enabled { false }
+    area_enabled { false }
+    promoting_committee_enabled { true }
     minimum_committee_members { 3 }
+    child_scope_threshold_enabled { false }
+    only_global_scope_enabled { false }
+
+    trait :attachments_enabled do
+      attachments_enabled { true }
+    end
+
+    trait :attachments_disabled do
+      attachments_enabled { false }
+    end
 
     trait :online_signature_enabled do
-      online_signature_enabled { true }
+      signature_type { :online }
     end
 
     trait :online_signature_disabled do
-      online_signature_enabled { false }
+      signature_type { :offline }
     end
 
     trait :undo_online_signatures_enabled do
@@ -29,14 +43,48 @@ FactoryBot.define do
       undo_online_signatures_enabled { false }
     end
 
+    trait :custom_signature_end_date_enabled do
+      custom_signature_end_date_enabled { true }
+    end
+
+    trait :custom_signature_end_date_disabled do
+      custom_signature_end_date_enabled { false }
+    end
+
+    trait :area_enabled do
+      area_enabled { true }
+    end
+
+    trait :area_disabled do
+      area_enabled { false }
+    end
+
+    trait :promoting_committee_enabled do
+      promoting_committee_enabled { true }
+    end
+
+    trait :promoting_committee_disabled do
+      promoting_committee_enabled { false }
+      minimum_committee_members { 0 }
+    end
+
     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 } }
+      document_number_authorization_handler { "dummy_authorization_handler" }
     end
 
     trait :with_sms_code_validation do
       validate_sms_code_on_votes { true }
     end
+
+    trait :child_scope_threshold_enabled do
+      child_scope_threshold_enabled { true }
+    end
+
+    trait :only_global_scope_enabled do
+      only_global_scope_enabled { true }
+    end
   end
 
   factory :initiatives_type_scope, class: "Decidim::InitiativesTypeScope" do
@@ -62,11 +110,13 @@ FactoryBot.define do
 
     scoped_type do
       create(:initiatives_type_scope,
-             type: create(:initiatives_type, organization: organization))
+             type: create(:initiatives_type, organization: organization, signature_type: signature_type))
     end
 
     after(:create) do |initiative|
-      create(:authorization, user: initiative.author, granted_at: Time.now.utc) unless Decidim::Authorization.where(user: initiative.author).where.not(granted_at: nil).any?
+      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)
+      end
       create_list(:initiatives_committee_member, 3, initiative: initiative)
     end
 
@@ -88,6 +138,10 @@ FactoryBot.define do
       state { "published" }
     end
 
+    trait :unpublished do
+      published_at { nil }
+    end
+
     trait :accepted do
       state { "accepted" }
     end
@@ -114,7 +168,8 @@ FactoryBot.define do
       signature_type { "online" }
 
       after(:build) do |initiative|
-        initiative.initiative_votes_count = initiative.scoped_type.supports_required + 1
+        initiative.online_votes[initiative.scope.id.to_s] = initiative.supports_required + 1
+        initiative.online_votes["total"] = initiative.supports_required + 1
       end
     end
 
@@ -124,7 +179,8 @@ FactoryBot.define do
       signature_type { "online" }
 
       after(:build) do |initiative|
-        initiative.initiative_votes_count = initiative.scoped_type.supports_required - 1
+        initiative.online_votes[initiative.scope.id.to_s] = 0
+        initiative.online_votes["total"] = 0
       end
     end
 
@@ -139,6 +195,11 @@ FactoryBot.define do
   factory :initiative_user_vote, class: "Decidim::InitiativesVote" do
     initiative { create(:initiative) }
     author { create(:user, :confirmed, organization: initiative.organization) }
+    hash_id { SecureRandom.uuid }
+    scope { initiative.scope }
+    after(:create) do |vote|
+      vote.initiative.update_online_votes_counters
+    end
   end
 
   factory :organization_user_vote, class: "Decidim::InitiativesVote" do

data/lib/decidim/initiatives/version.rb

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

data/lib/tasks/decidim_initiatives.rake

@@ -11,9 +11,7 @@ namespace :decidim_initiatives do
   desc "Check published initiatives and moves to accepted/rejected state depending on the votes collected when the signing period has finished"
   task check_published: :environment do
     Decidim::Initiatives::SupportPeriodFinishedInitiatives.new.each do |initiative|
-      supports_required = initiative.scoped_type.supports_required
-
-      if initiative.initiative_votes_count >= supports_required
+      if initiative.supports_goal_reached?
         initiative.accepted!
       else
         initiative.rejected!

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decidim-initiatives
 version: !ruby/object:Gem::Version
-  version: 0.19.1
+  version: 0.23.0
 platform: ruby
 authors:
 - Juan Salvador Perez Garcia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-13 00:00:00.000000000 Z
+date: 2020-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-admin
@@ -16,70 +16,76 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.23.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.23.0
 - !ruby/object:Gem::Dependency
   name: decidim-comments
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.23.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.23.0
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.23.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.23.0
 - !ruby/object:Gem::Dependency
   name: decidim-verifications
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.23.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.23.0
 - !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: origami
   requirement: !ruby/object:Gem::Requirement
@@ -156,14 +162,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.23.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.23.0
 description: Citizen initiatives plugin for decidim.
 email:
 - jsperezg@gmail.com
@@ -178,6 +184,7 @@ files:
 - app/assets/config/decidim_initiatives_manifest.js
 - app/assets/images/decidim/gamification/badges/initiatives.svg
 - app/assets/images/decidim/initiatives/icon.svg
+- app/assets/javascripts/decidim/initiatives/admin/initiatives_types.js.es6
 - app/assets/javascripts/decidim/initiatives/admin/invite_users.js
 - app/assets/javascripts/decidim/initiatives/application.js
 - app/assets/javascripts/decidim/initiatives/identity_selector_dialog.js
@@ -209,6 +216,7 @@ files:
 - app/commands/decidim/initiatives/admin/update_initiative_answer.rb
 - app/commands/decidim/initiatives/admin/update_initiative_type.rb
 - app/commands/decidim/initiatives/admin/update_initiative_type_scope.rb
+- app/commands/decidim/initiatives/attachment_methods.rb
 - app/commands/decidim/initiatives/create_initiative.rb
 - app/commands/decidim/initiatives/spawn_committee_request.rb
 - app/commands/decidim/initiatives/unvote_initiative.rb
@@ -217,9 +225,11 @@ files:
 - app/commands/decidim/initiatives/vote_initiative.rb
 - app/constraints/decidim/initiatives/current_component.rb
 - app/constraints/decidim/initiatives/current_initiative.rb
+- app/controllers/concerns/decidim/initiatives/admin/filterable.rb
 - app/controllers/concerns/decidim/initiatives/admin/initiative_admin.rb
 - app/controllers/concerns/decidim/initiatives/needs_initiative.rb
 - app/controllers/concerns/decidim/initiatives/orderable.rb
+- app/controllers/concerns/decidim/initiatives/single_initiative_type.rb
 - app/controllers/concerns/decidim/initiatives/type_selector_options.rb
 - app/controllers/decidim/initiatives/admin/answers_controller.rb
 - app/controllers/decidim/initiatives/admin/application_controller.rb
@@ -239,10 +249,13 @@ files:
 - app/controllers/decidim/initiatives/initiative_signatures_controller.rb
 - app/controllers/decidim/initiatives/initiative_types_controller.rb
 - app/controllers/decidim/initiatives/initiative_votes_controller.rb
-- app/controllers/decidim/initiatives/initiative_widgets_controller.rb
 - app/controllers/decidim/initiatives/initiatives_controller.rb
 - app/controllers/decidim/initiatives/initiatives_type_scopes_controller.rb
 - app/controllers/decidim/initiatives/initiatives_type_signature_types_controller.rb
+- app/controllers/decidim/initiatives/versions_controller.rb
+- app/controllers/decidim/initiatives/widgets_controller.rb
+- app/events/decidim/initiatives/admin/initiative_sent_to_technical_validation_event.rb
+- app/events/decidim/initiatives/admin/support_threshold_reached_event.rb
 - app/events/decidim/initiatives/create_initiative_event.rb
 - app/events/decidim/initiatives/endorse_initiative_event.rb
 - app/events/decidim/initiatives/extend_initiative_event.rb
@@ -256,10 +269,13 @@ files:
 - app/forms/decidim/initiatives/previous_form.rb
 - app/forms/decidim/initiatives/select_initiative_type_form.rb
 - app/forms/decidim/initiatives/vote_form.rb
+- app/helpers/decidim/initiatives/application_helper.rb
 - app/helpers/decidim/initiatives/create_initiative_helper.rb
 - app/helpers/decidim/initiatives/initiative_helper.rb
 - app/helpers/decidim/initiatives/initiatives_helper.rb
+- app/jobs/decidim/initiatives/export_initiatives_job.rb
 - app/mailers/decidim/initiatives/initiatives_mailer.rb
+- app/models/concerns/decidim/initiatives/has_area.rb
 - app/models/decidim/initiative.rb
 - app/models/decidim/initiatives_committee_member.rb
 - app/models/decidim/initiatives_type.rb
@@ -281,17 +297,24 @@ files:
 - app/queries/decidim/initiatives/similar_initiatives.rb
 - app/queries/decidim/initiatives/support_period_finished_initiatives.rb
 - app/queries/decidim/initiatives/user_authorizations.rb
+- app/serializers/decidim/initiatives/initiative_serializer.rb
 - app/services/decidim/initiatives/data_encryptor.rb
+- app/services/decidim/initiatives/diff_renderer.rb
 - app/services/decidim/initiatives/dummy_timestamp.rb
 - app/services/decidim/initiatives/initiative_search.rb
 - app/services/decidim/initiatives/pdf_signature_example.rb
 - app/services/decidim/initiatives/progress_notifier.rb
 - app/services/decidim/initiatives/status_change_notifier.rb
+- app/types/decidim/initiatives/initiative_api_type.rb
+- app/types/decidim/initiatives/initiative_committee_member_type.rb
+- app/types/decidim/initiatives/initiative_type.rb
 - app/views/decidim/initiatives/_initiative.html.erb
 - app/views/decidim/initiatives/admin/answers/_info_initiative.html.erb
 - app/views/decidim/initiatives/admin/answers/edit.html.erb
 - app/views/decidim/initiatives/admin/committee_requests/index.html.erb
+- app/views/decidim/initiatives/admin/exports/_dropdown.html.erb
 - app/views/decidim/initiatives/admin/initiatives/_form.html.erb
+- app/views/decidim/initiatives/admin/initiatives/_initiative_attachments.erb
 - app/views/decidim/initiatives/admin/initiatives/edit.html.erb
 - app/views/decidim/initiatives/admin/initiatives/export_pdf_signatures.pdf.erb
 - app/views/decidim/initiatives/admin/initiatives/index.html.erb
@@ -320,7 +343,6 @@ files:
 - app/views/decidim/initiatives/initiative_signatures/sms_phone_number.html.erb
 - app/views/decidim/initiatives/initiative_signatures/update_buttons_and_counters.js.erb
 - app/views/decidim/initiatives/initiative_votes/update_buttons_and_counters.js.erb
-- app/views/decidim/initiatives/initiative_widgets/show.html.erb
 - app/views/decidim/initiatives/initiatives/_author.html.erb
 - app/views/decidim/initiatives/initiatives/_count.html.erb
 - app/views/decidim/initiatives/initiatives/_filters.html.erb
@@ -333,21 +355,20 @@ files:
 - app/views/decidim/initiatives/initiatives/_no_initiatives_yet.html.erb
 - app/views/decidim/initiatives/initiatives/_progress_bar.html.erb
 - app/views/decidim/initiatives/initiatives/_result.html.erb
-- app/views/decidim/initiatives/initiatives/_supports.html.erb
 - app/views/decidim/initiatives/initiatives/_tags.html.erb
 - app/views/decidim/initiatives/initiatives/_vote_button.html.erb
 - app/views/decidim/initiatives/initiatives/_vote_cabin.html.erb
 - app/views/decidim/initiatives/initiatives/index.html.erb
 - app/views/decidim/initiatives/initiatives/index.js.erb
 - app/views/decidim/initiatives/initiatives/show.html.erb
-- app/views/decidim/initiatives/initiatives/signature_identities.html.erb
 - app/views/decidim/initiatives/initiatives_mailer/_initiative_link.html.erb
 - app/views/decidim/initiatives/initiatives_mailer/notify_creation.html.erb
 - app/views/decidim/initiatives/initiatives_mailer/notify_progress.html.erb
 - app/views/decidim/initiatives/initiatives_mailer/notify_state_change.html.erb
-- app/views/decidim/initiatives/initiatives_mailer/notify_validating_request.html.erb
 - app/views/decidim/initiatives/initiatives_type_scopes/search.html.erb
 - app/views/decidim/initiatives/initiatives_type_signature_types/search.html.erb
+- app/views/decidim/initiatives/versions/index.html.erb
+- app/views/decidim/initiatives/versions/show.html.erb
 - app/views/layouts/decidim/_initiative_creation_header.html.erb
 - app/views/layouts/decidim/_initiative_header.html.erb
 - app/views/layouts/decidim/_initiative_header_steps.html.erb
@@ -360,35 +381,72 @@ files:
 - app/views/layouts/decidim/initiative_signature_creation.html.erb
 - config/initializers/mail_previews.rb
 - config/initializers/wicked_pdf.rb
+- 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/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/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/20170906091626_create_decidim_initiatives_types.rb
 - db/migrate/20170906094044_create_decidim_initiatives.rb
 - db/migrate/20170917072556_create_decidim_initiatives_votes.rb
@@ -431,15 +489,33 @@ files:
 - db/migrate/20190124170442_add_validate_sms_code_on_votes_to_initiatives_types.rb
 - db/migrate/20190125131847_add_document_number_authorization_handler_to_initiatives_types.rb
 - db/migrate/20190213184301_add_undo_online_signatures_enabled_to_initiatives_types.rb
+- db/migrate/20190925145648_add_promoting_committee_option.rb
+- db/migrate/20191002082220_move_signature_type_to_initative_type.rb
+- db/migrate/20191106144259_add_settings_to_initiatives_types.rb
+- db/migrate/20191107134847_add_scopes_to_initiatives_votes.rb
+- db/migrate/20191116170841_allow_multiple_initiative_votes_counter_caches.rb
+- db/migrate/20191118105634_allow_multiple_offline_votes.rb
+- db/migrate/20200320105920_index_foreign_keys_in_decidim_initiatives.rb
+- db/migrate/20200320105921_index_foreign_keys_in_decidim_initiatives_votes.rb
+- db/migrate/20200417120551_add_custom_signature_end_time_option.rb
+- db/migrate/20200424110930_add_attachments_enabled_option.rb
+- db/migrate/20200514085422_add_area_to_initiatives.rb
+- db/migrate/20200514102631_add_area_enabled_option_to_initiatives.rb
+- db/migrate/20200528151456_remove_user_groups_from_initiative_votes.rb
+- db/migrate/20200827154214_add_commentable_counter_cache_to_initiatives.rb
+- db/seeds/city.jpeg
 - db/seeds/city2.jpeg
+- lib/decidim/api/initiative_type_interface.rb
 - lib/decidim/initiatives.rb
 - lib/decidim/initiatives/admin.rb
 - lib/decidim/initiatives/admin_engine.rb
+- lib/decidim/initiatives/api.rb
 - lib/decidim/initiatives/current_locale.rb
 - lib/decidim/initiatives/engine.rb
 - lib/decidim/initiatives/initiative_slug.rb
 - lib/decidim/initiatives/initiatives_filter_form_builder.rb
 - lib/decidim/initiatives/participatory_space.rb
+- lib/decidim/initiatives/query_extensions.rb
 - lib/decidim/initiatives/test/factories.rb
 - lib/decidim/initiatives/version.rb
 - lib/tasks/decidim_initiatives.rake
@@ -455,7 +531,7 @@ 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:
   - - ">="