decidim-initiatives 0.22.0 → 0.23.0

data/config/locales/zh-TW.yml

@@ -0,0 +1 @@
+zh-TW:

data/db/migrate/20191106144259_add_settings_to_initiatives_types.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class AddSettingsToInitiativesTypes < ActiveRecord::Migration[5.2]
+  def change
+    add_column :decidim_initiatives_types, :child_scope_threshold_enabled, :boolean, null: false, default: false
+    add_column :decidim_initiatives_types, :only_global_scope_enabled, :boolean, null: false, default: false
+  end
+end

data/db/migrate/20191107134847_add_scopes_to_initiatives_votes.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+class AddScopesToInitiativesVotes < ActiveRecord::Migration[5.2]
+  class InitiativeVote < ApplicationRecord
+    self.table_name = :decidim_initiatives_votes
+    belongs_to :initiative, foreign_key: "decidim_initiative_id", class_name: "Initiative"
+  end
+
+  class Initiative < ApplicationRecord
+    self.table_name = :decidim_initiatives
+    belongs_to :scoped_type, foreign_key: "scoped_type_id", class_name: "InitiativesTypeScope"
+  end
+
+  class InitiativesTypeScope < ApplicationRecord
+    self.table_name = :decidim_initiatives_type_scopes
+  end
+
+  def change
+    add_column :decidim_initiatives_votes, :decidim_scope_id, :integer
+
+    InitiativeVote.reset_column_information
+
+    InitiativeVote.includes(initiative: :scoped_type).find_each do |vote|
+      vote.decidim_scope_id = vote.initiative.scoped_type.decidim_scopes_id
+      vote.save!
+    end
+  end
+end

data/db/migrate/20191116170841_allow_multiple_initiative_votes_counter_caches.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+class AllowMultipleInitiativeVotesCounterCaches < ActiveRecord::Migration[5.2]
+  class InitiativeVote < ApplicationRecord
+    self.table_name = :decidim_initiatives_votes
+  end
+
+  class Initiative < ApplicationRecord
+    self.table_name = :decidim_initiatives
+    has_many :votes, foreign_key: "decidim_initiative_id", class_name: "InitiativeVote"
+  end
+
+  def change
+    add_column :decidim_initiatives, :online_votes, :jsonb, default: {}
+
+    Initiative.reset_column_information
+
+    Initiative.find_each do |initiative|
+      online_votes = initiative.votes.group(:decidim_scope_id).count.each_with_object({}) do |(scope_id, count), counters|
+        counters[scope_id || "global"] = count
+        counters["total"] = count
+      end
+
+      # rubocop:disable Rails/SkipsModelValidations
+      initiative.update_column("online_votes", online_votes)
+      # rubocop:enable Rails/SkipsModelValidations
+    end
+
+    remove_column :decidim_initiatives, :initiative_supports_count
+    remove_column :decidim_initiatives, :initiative_votes_count
+  end
+end

data/db/migrate/20191118105634_allow_multiple_offline_votes.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+class AllowMultipleOfflineVotes < ActiveRecord::Migration[5.2]
+  class InitiativesTypeScope < ApplicationRecord
+    self.table_name = :decidim_initiatives_type_scopes
+  end
+
+  class Initiative < ApplicationRecord
+    self.table_name = :decidim_initiatives
+    belongs_to :scoped_type, foreign_key: "scoped_type_id", class_name: "InitiativesTypeScope"
+  end
+
+  def change
+    rename_column :decidim_initiatives, :offline_votes, :old_offline_votes
+    add_column :decidim_initiatives, :offline_votes, :jsonb, default: {}
+
+    Initiative.reset_column_information
+
+    Initiative.includes(:scoped_type).find_each do |initiative|
+      scope_key = initiative.scoped_type.decidim_scopes_id || "global"
+
+      offline_votes = {
+        scope_key => initiative.old_offline_votes.to_i,
+        "total" => initiative.old_offline_votes.to_i
+      }
+
+      # rubocop:disable Rails/SkipsModelValidations
+      initiative.update_column(:offline_votes, offline_votes)
+      # rubocop:enable Rails/SkipsModelValidations
+    end
+
+    remove_column :decidim_initiatives, :old_offline_votes
+  end
+end

data/db/migrate/20200528151456_remove_user_groups_from_initiative_votes.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class RemoveUserGroupsFromInitiativeVotes < ActiveRecord::Migration[5.2]
+  def change
+    remove_column :decidim_initiatives_votes, :decidim_user_group_id
+  end
+end

data/db/migrate/20200827154214_add_commentable_counter_cache_to_initiatives.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddCommentableCounterCacheToInitiatives < ActiveRecord::Migration[5.2]
+  def change
+    add_column :decidim_initiatives, :comments_count, :integer, null: false, default: 0, index: true
+    Decidim::Initiative.reset_column_information
+    Decidim::Initiative.find_each(&:update_comments_count)
+  end
+end

data/lib/decidim/initiatives/admin_engine.rb

@@ -53,6 +53,7 @@ module Decidim
             member do
               put :publish
               put :unpublish
+              get :share
             end
             resources :exports, only: :create
           end

data/lib/decidim/initiatives/engine.rb

@@ -34,13 +34,13 @@ module Decidim
 
         resources :initiatives, param: :slug, only: [:index, :show], path: "initiatives" do
           resources :initiative_signatures
+
           member do
-            get :signature_identities
             get :authorization_sign_modal, to: "authorization_sign_modals#show"
           end
 
           resource :initiative_vote, only: [:create, :destroy]
-          resource :initiative_widget, only: :show, path: "embed"
+          resource :widget, only: :show, path: "embed"
           resources :committee_requests, only: [:new], shallow: true do
             collection do
               get :spawn

data/lib/decidim/initiatives/participatory_space.rb

@@ -100,6 +100,13 @@ Decidim.register_participatory_space(:initiatives) do |participatory_space|
 
       Decidim::Comments::Seed.comments_for(initiative)
 
+      Decidim::Attachment.create!(
+        title: Decidim::Faker::Localized.sentence(2),
+        description: Decidim::Faker::Localized.sentence(5),
+        attached_to: initiative,
+        file: File.new(File.join(seeds_root, "city.jpeg"))
+      )
+
       Decidim::Initiatives.default_components.each do |component_name|
         component = Decidim::Component.create!(
           name: Decidim::Components::Namer.new(initiative.organization.available_locales, component_name).i18n_name,

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

@@ -7,8 +7,8 @@ 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
+    banner_image { Decidim::Dev.test_file("city2.jpeg", "image/jpeg") } # Keep after organization
     signature_type { :online }
     attachments_enabled { true }
     undo_online_signatures_enabled { true }
@@ -16,6 +16,8 @@ FactoryBot.define do
     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 }
@@ -69,11 +71,20 @@ FactoryBot.define do
     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
@@ -157,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
 
@@ -167,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
 
@@ -182,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.22.0"
+      "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.22.0
+  version: 0.23.0
 platform: ruby
 authors:
 - Juan Salvador Perez Garcia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-01 00:00:00.000000000 Z
+date: 2020-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-admin
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.22.0
+        version: 0.23.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.22.0
+        version: 0.23.0
 - !ruby/object:Gem::Dependency
   name: decidim-comments
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.22.0
+        version: 0.23.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.22.0
+        version: 0.23.0
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.22.0
+        version: 0.23.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.22.0
+        version: 0.23.0
 - !ruby/object:Gem::Dependency
   name: decidim-verifications
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.22.0
+        version: 0.23.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.22.0
+        version: 0.23.0
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
@@ -162,14 +162,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.22.0
+        version: 0.23.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.22.0
+        version: 0.23.0
 description: Citizen initiatives plugin for decidim.
 email:
 - jsperezg@gmail.com
@@ -249,11 +249,11 @@ 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
@@ -355,14 +355,12 @@ 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
@@ -383,22 +381,27 @@ 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
@@ -408,16 +411,24 @@ files:
 - 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/lv-LV.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
@@ -426,10 +437,16 @@ files:
 - 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
@@ -474,12 +491,19 @@ files:
 - 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
@@ -507,14 +531,14 @@ 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
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Decidim initiatives module