decidim-elections 0.22.0 → 0.23.0

data/db/migrate/20200807125040_remove_subtitle_from_decidim_elections.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class RemoveSubtitleFromDecidimElections < ActiveRecord::Migration[5.2]
+  def change
+    remove_column :decidim_elections_elections, :subtitle
+  end
+end

data/db/migrate/20200910103648_add_min_selections_to_decidim_elections_questions.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddMinSelectionsToDecidimElectionsQuestions < ActiveRecord::Migration[5.2]
+  def change
+    add_column :decidim_elections_questions, :min_selections, :integer, null: false, default: 1
+  end
+end

data/lib/decidim/elections.rb

@@ -9,5 +9,10 @@ module Decidim
   # This namespace holds the logic of the `Elections` component. This component
   # allows users to create elections in a participatory space.
   module Elections
+    autoload :BulletinBoardClient, "decidim/elections/bulletin_board_client"
+
+    def self.bulletin_board
+      @bulletin_board ||= BulletinBoardClient.new(Rails.application.secrets.bulletin_board || {})
+    end
   end
 end

data/lib/decidim/elections/admin_engine.rb

@@ -11,9 +11,16 @@ module Decidim
 
       routes do
         resources :elections do
+          member do
+            put :publish
+            put :unpublish
+          end
           resources :questions do
             resources :answers do
               get :proposals_picker, on: :collection
+              collection do
+                resource :proposals_import, only: [:new, :create]
+              end
             end
           end
         end

data/lib/decidim/elections/bulletin_board_client.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Elections
+    class BulletinBoardClient
+      def initialize(params)
+        @server = params[:server].presence
+        @api_key = params[:api_key].presence
+        @identification_private_key = params[:identification_private_key]&.strip.presence
+
+        @private_key = OpenSSL::PKey::RSA.new(identification_private_key_content) if identification_private_key
+      end
+
+      def public_key
+        private_key&.public_key
+      end
+
+      def configured?
+        private_key && server && api_key
+      end
+
+      private
+
+      attr_reader :identification_private_key, :server, :api_key, :private_key
+
+      def identification_private_key_content
+        @identification_private_key_content ||= if identification_private_key.starts_with?("-----")
+                                                  identification_private_key
+                                                else
+                                                  File.read(Rails.application.root.join(identification_private_key))
+                                                end
+      end
+    end
+  end
+end

data/lib/decidim/elections/component.rb

@@ -6,14 +6,15 @@ Decidim.register_component(:elections) do |component|
   component.engine = Decidim::Elections::Engine
   component.admin_engine = Decidim::Elections::AdminEngine
   component.icon = "decidim/elections/icon.svg"
+  component.stylesheet = "decidim/elections/elections"
   component.permissions_class_name = "Decidim::Elections::Permissions"
-
+  component.query_type = "Decidim::Elections::ElectionsType"
   # component.on(:before_destroy) do |instance|
   #   # Code executed before removing the component
   # end
 
   # These actions permissions can be configured in the admin panel
-  # component.actions = %w()
+  component.actions = %w(vote)
 
   component.settings(:global) do |settings|
     settings.attribute :announcement, type: :text, translated: true, editor: true
@@ -23,8 +24,15 @@ Decidim.register_component(:elections) do |component|
     settings.attribute :announcement, type: :text, translated: true, editor: true
   end
 
+  component.register_stat :elections_count, primary: true, priority: Decidim::StatsRegistry::HIGH_PRIORITY do |components, start_at, end_at|
+    elections = Decidim::Elections::FilteredElections.for(components, start_at, end_at)
+    elections.count
+  end
+
   component.register_resource(:election) do |resource|
     resource.model_class_name = "Decidim::Elections::Election"
+    resource.actions = %w(vote)
+    resource.card = "decidim/elections/election"
   end
 
   component.register_resource(:question) do |resource|
@@ -35,10 +43,6 @@ Decidim.register_component(:elections) do |component|
     resource.model_class_name = "Decidim::Elections::Answer"
   end
 
-  component.register_stat :elections_count, primary: true, priority: Decidim::StatsRegistry::HIGH_PRIORITY do |components, _start_at, _end_at|
-    Decidim::Elections::Election.where(component: components).count
-  end
-
   component.seeds do |participatory_space|
     admin_user = Decidim::User.find_by(
       organization: participatory_space.organization,
@@ -68,12 +72,12 @@ Decidim.register_component(:elections) do |component|
         {
           component: component,
           title: Decidim::Faker::Localized.sentence(2),
-          subtitle: Decidim::Faker::Localized.sentence(2),
           description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
             Decidim::Faker::Localized.paragraph(3)
           end,
           start_time: 3.weeks.from_now,
-          end_time: 3.weeks.from_now + 4.hours
+          end_time: 3.weeks.from_now + 4.hours,
+          published_at: Faker::Boolean.boolean(0.5) ? 1.week.ago : nil
         },
         visibility: "all"
       )
@@ -88,9 +92,10 @@ Decidim.register_component(:elections) do |component|
             description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
               Decidim::Faker::Localized.paragraph(3)
             end,
-            max_selections: Faker::Number.between(0, 5),
+            max_selections: Faker::Number.between(1, 5),
             weight: Faker::Number.number(1),
-            random_answers_order: Faker::Boolean.boolean(0.5)
+            random_answers_order: Faker::Boolean.boolean(0.5),
+            min_selections: Faker::Number.between(0, 1)
           },
           visibility: "all"
         )
@@ -113,8 +118,8 @@ Decidim.register_component(:elections) do |component|
           Decidim::Attachment.create!(
             title: Decidim::Faker::Localized.sentence(2),
             description: Decidim::Faker::Localized.sentence(5),
-            file: File.new(File.join(__dir__, "seeds", "city.jpeg")),
-            attached_to: answer
+            attached_to: answer,
+            file: File.new(File.join(__dir__, "seeds", "city.jpeg")) # Keep after attached_to
           )
         end
       end

data/lib/decidim/elections/engine.rb

@@ -10,11 +10,18 @@ module Decidim
       isolate_namespace Decidim::Elections
 
       routes do
-        resources :elections, only: [:index, :show]
+        resources :elections, only: [:index, :show] do
+          resource :vote
+        end
 
         root to: "elections#index"
       end
 
+      initializer "decidim_elections.add_cells_view_paths" do
+        Cell::ViewModel.view_paths << File.expand_path("#{Decidim::Elections::Engine.root}/app/cells")
+        Cell::ViewModel.view_paths << File.expand_path("#{Decidim::Elections::Engine.root}/app/views") # for partials
+      end
+
       initializer "decidim_elections.assets" do |app|
         app.config.assets.precompile += %w(decidim_elections_manifest.js decidim_elections_manifest.css)
       end

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

@@ -10,37 +10,90 @@ FactoryBot.define do
   end
 
   factory :election, class: "Decidim::Elections::Election" do
+    upcoming
     title { generate_localized_title }
-    subtitle { Decidim::Faker::Localized.sentence(3) }
     description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
-    start_time { 1.day.from_now }
     end_time { 3.days.from_now }
+    published_at { nil }
     component { create(:elections_component) }
 
+    trait :upcoming do
+      start_time { 1.day.from_now }
+    end
+
     trait :started do
-      start_time { 1.day.ago }
+      start_time { 2.days.ago }
+    end
+
+    trait :ongoing do
+      started
+    end
+
+    trait :finished do
+      started
+      end_time { 1.day.ago }
+    end
+
+    trait :published do
+      published_at { Time.current }
     end
 
     trait :complete do
       after(:build) do |election, _evaluator|
-        build_list(:question, 2, :complete, election: election)
+        election.questions << build(:question, :yes_no, election: election, weight: 1)
+        election.questions << build(:question, :candidates, election: election, weight: 3)
+        election.questions << build(:question, :projects, election: election, weight: 2)
+        election.questions << build(:question, :nota, election: election, weight: 4)
       end
     end
   end
 
   factory :question, class: "Decidim::Elections::Question" do
+    transient do
+      more_information { false }
+      answers { 3 }
+    end
+
     election
     title { generate_localized_title }
     description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
+    min_selections { 1 }
     max_selections { 1 }
     weight { Faker::Number.number(1) }
     random_answers_order { true }
 
     trait :complete do
-      after(:build) do |question, _evaluator|
-        build_list(:election_answer, 2, question: question)
+      after(:build) do |question, evaluator|
+        overrides = { question: question }
+        overrides[:description] = nil unless evaluator.more_information
+        question.answers = build_list(:election_answer, evaluator.answers, overrides)
       end
     end
+
+    trait :yes_no do
+      complete
+      random_answers_order { false }
+    end
+
+    trait :candidates do
+      complete
+      max_selections { 6 }
+      answers { 10 }
+    end
+
+    trait :projects do
+      complete
+      max_selections { 3 }
+      answers { 6 }
+      more_information { true }
+    end
+
+    trait :nota do
+      complete
+      max_selections { 4 }
+      answers { 8 }
+      min_selections { 0 }
+    end
   end
 
   factory :election_answer, class: "Decidim::Elections::Answer" do

data/lib/decidim/elections/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-meetings version.
   module Elections
     def self.version
-      "0.22.0"
+      "0.23.0"
     end
   end
 end

data/lib/tasks/decidim_elections.rake

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+namespace :decidim_elections do
+  desc "Add a new client to the bulletin board"
+
+  IDENTIFICATION_PRIVATE_KEY_SIZE = 4096
+
+  task :generate_identification_keys do
+    identification_private_key = OpenSSL::PKey::RSA.new(IDENTIFICATION_PRIVATE_KEY_SIZE)
+
+    puts identification_private_key.to_s
+    puts "\n"
+    puts identification_private_key.public_key.to_s
+    puts "\nAbove are the generated private and public keys.\n\nSee Decidim docs at docs/services/bulletin_board.md in order to set them up.\n\n"
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decidim-elections
 version: !ruby/object:Gem::Version
-  version: 0.22.0
+  version: 0.23.0
 platform: ruby
 authors:
 - Leonardo Diez
 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-core
@@ -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-proposals
   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-admin
   requirement: !ruby/object:Gem::Requirement
     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
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     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: The Elections module adds elections to any participatory space.
 email:
 - leo@codegram.com
@@ -77,31 +77,55 @@ files:
 - Rakefile
 - app/assets/config/decidim_elections_manifest.js
 - app/assets/images/decidim/elections/icon.svg
+- app/assets/javascripts/decidim/elections/vote.js.es6
+- app/assets/stylesheets/decidim/elections/elections.scss
+- app/assets/stylesheets/decidim/elections/focus/_evote.scss
+- app/assets/stylesheets/decidim/elections/focus/_focus.scss
+- app/cells/decidim/elections/election_cell.rb
+- app/cells/decidim/elections/election_m/data.erb
+- app/cells/decidim/elections/election_m/footer.erb
+- app/cells/decidim/elections/election_m_cell.rb
+- app/cells/decidim/elections/voting_step_navigation/show.erb
+- app/cells/decidim/elections/voting_step_navigation_cell.rb
 - app/commands/decidim/elections/admin/create_answer.rb
 - app/commands/decidim/elections/admin/create_election.rb
 - app/commands/decidim/elections/admin/create_question.rb
 - app/commands/decidim/elections/admin/destroy_answer.rb
 - app/commands/decidim/elections/admin/destroy_election.rb
 - app/commands/decidim/elections/admin/destroy_question.rb
+- app/commands/decidim/elections/admin/import_proposals_to_elections.rb
+- app/commands/decidim/elections/admin/publish_election.rb
+- app/commands/decidim/elections/admin/unpublish_election.rb
 - app/commands/decidim/elections/admin/update_answer.rb
 - app/commands/decidim/elections/admin/update_election.rb
 - app/commands/decidim/elections/admin/update_question.rb
+- app/controllers/concerns/decidim/elections/orderable.rb
 - app/controllers/decidim/elections/admin/answers_controller.rb
 - app/controllers/decidim/elections/admin/application_controller.rb
 - app/controllers/decidim/elections/admin/elections_controller.rb
+- app/controllers/decidim/elections/admin/proposals_imports_controller.rb
 - app/controllers/decidim/elections/admin/questions_controller.rb
 - app/controllers/decidim/elections/application_controller.rb
 - app/controllers/decidim/elections/elections_controller.rb
+- app/controllers/decidim/elections/votes_controller.rb
+- app/events/decidim/elections/election_published_event.rb
 - app/forms/decidim/elections/admin/answer_form.rb
+- app/forms/decidim/elections/admin/answer_import_proposals_form.rb
 - app/forms/decidim/elections/admin/election_form.rb
 - app/forms/decidim/elections/admin/question_form.rb
 - app/helpers/decidim/elections/application_helper.rb
+- app/helpers/decidim/elections/election_cells_helper.rb
+- app/helpers/decidim/elections/votes_helper.rb
 - app/models/decidim/elections/answer.rb
 - app/models/decidim/elections/application_record.rb
 - app/models/decidim/elections/election.rb
 - app/models/decidim/elections/question.rb
 - app/permissions/decidim/elections/admin/permissions.rb
 - app/permissions/decidim/elections/permissions.rb
+- app/presenters/decidim/elections/admin_log/election_presenter.rb
+- app/presenters/decidim/elections/election_presenter.rb
+- app/queries/decidim/elections/filtered_elections.rb
+- app/services/decidim/elections/election_search.rb
 - app/types/decidim/elections/election_answer_type.rb
 - app/types/decidim/elections/election_question_type.rb
 - app/types/decidim/elections/election_type.rb
@@ -115,26 +139,49 @@ files:
 - app/views/decidim/elections/admin/elections/edit.html.erb
 - app/views/decidim/elections/admin/elections/index.html.erb
 - app/views/decidim/elections/admin/elections/new.html.erb
+- app/views/decidim/elections/admin/proposals_imports/new.html.erb
 - app/views/decidim/elections/admin/questions/_form.html.erb
 - app/views/decidim/elections/admin/questions/edit.html.erb
 - app/views/decidim/elections/admin/questions/index.html.erb
 - app/views/decidim/elections/admin/questions/new.html.erb
+- app/views/decidim/elections/elections/_count.html.erb
+- app/views/decidim/elections/elections/_election.html.erb
+- app/views/decidim/elections/elections/_elections.html.erb
+- app/views/decidim/elections/elections/_filters.html.erb
+- app/views/decidim/elections/elections/_filters_small_view.html.erb
 - app/views/decidim/elections/elections/index.html.erb
+- app/views/decidim/elections/elections/index.js.erb
 - app/views/decidim/elections/elections/show.html.erb
+- app/views/decidim/elections/votes/_election_votes_confirm.html.erb
+- app/views/decidim/elections/votes/_election_votes_confirm_footer.html.erb
+- app/views/decidim/elections/votes/_election_votes_confirmed.html.erb
+- app/views/decidim/elections/votes/_election_votes_encrypting.html.erb
+- app/views/decidim/elections/votes/_election_votes_header.html.erb
+- app/views/decidim/elections/votes/_election_votes_modal.html.erb
+- app/views/decidim/elections/votes/_election_votes_question.html.erb
+- app/views/decidim/elections/votes/_election_votes_steps_header.html.erb
+- app/views/decidim/elections/votes/new.html.erb
+- app/views/layouts/decidim/_election_votes_header.html.erb
+- app/views/layouts/decidim/election_votes.html.erb
 - config/i18n-tasks.yml
+- config/locales/am-ET.yml
 - config/locales/ar.yml
 - config/locales/bg-BG.yml
+- config/locales/bg.yml
 - config/locales/ca.yml
 - config/locales/cs.yml
 - config/locales/da-DK.yml
+- config/locales/da.yml
 - config/locales/de.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-plain.yml
 - config/locales/fi.yml
@@ -143,16 +190,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
@@ -160,21 +215,32 @@ files:
 - config/locales/ru.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/20200430083618_create_decidim_elections_elections.rb
 - db/migrate/20200518082327_create_decidim_elections_questions.rb
 - db/migrate/20200518084144_create_decidim_elections_answers.rb
+- db/migrate/20200601141412_add_published_at_to_elections.rb
+- db/migrate/20200807125040_remove_subtitle_from_decidim_elections.rb
+- db/migrate/20200910103648_add_min_selections_to_decidim_elections_questions.rb
 - lib/decidim/elections.rb
 - lib/decidim/elections/admin.rb
 - lib/decidim/elections/admin_engine.rb
+- lib/decidim/elections/bulletin_board_client.rb
 - lib/decidim/elections/component.rb
 - lib/decidim/elections/engine.rb
 - lib/decidim/elections/seeds/city.jpeg
 - lib/decidim/elections/test/factories.rb
 - lib/decidim/elections/version.rb
+- lib/tasks/decidim_elections.rake
 homepage: https://github.com/decidim/decidim-elections
 licenses:
 - AGPL-3.0
@@ -187,14 +253,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: A decidim elections module