decidim 0.0.2 → 0.0.3

data/decidim-proposals/config/locales/en.yml

@@ -1,20 +1,41 @@
 ---
 en:
+  activemodel:
+    attributes:
+      proposal:
+        body: Body
+        category_id: Category
+        scope_id: Scope
+        title: Title
+        user_group_id: Create proposal as
   decidim:
     features:
       proposals:
         name: Proposals
         settings:
           step:
+            creation_enabled: Proposal creation enabled
+            votes_blocked: Votes blocked
             votes_enabled: Votes enabled
     proposals:
       actions:
+        answer: Answer
         new: New proposal
+        title: Actions
       admin:
         models:
           proposal:
             name: Proposal
+        proposal_answers:
+          edit:
+            accepted: Accepted
+            answer_proposal: Answer proposal
+            rejected: Rejected
+            title: Answer for proposal %{title}
         proposals:
+          answer:
+            invalid: There's been a problem answering this proposal
+            success: Proposal successfully answered
           create:
             invalid: There's been a problem creating this proposal
             success: Proposal successfully created
@@ -26,6 +47,10 @@ en:
           new:
             create: Create proposal
             title: New proposal
+      answers:
+        accepted: Accepted
+        not_answered: Not answered
+        rejected: Rejected
       create:
         error: There's been errors when saving the proposal.
         success: Proposal created successfully.
@@ -35,6 +60,7 @@ en:
             category: Category
             official_proposal: Official proposal
             scope: Scope
+            state: State
             title: Title
       proposals:
         count:
@@ -42,16 +68,28 @@ en:
             one: 1 proposal
             other: "%{count} proposals"
         filters:
+          accepted: Accepted
           activity: Activity
           all: All
           category: Category
           citizenship: Citizenship
           official: Official
           origin: Origin
+          rejected: Rejected
           search: Search
+          state: State
           voted: Voted
+        filters_small_view:
+          close_modal: Close modal
+          filter: Filter
+          filter_for: Filter by
+          unfold: Unfold
         index:
           new_proposal: New proposal
+        linked_proposals:
+          proposal_votes:
+            one: <span class="card--list__data__number">1</span>vote
+            other: <span class="card--list__data__number">%{count}</span>votes
         new:
           back: Back
           select_a_category: Please select a category
@@ -64,10 +102,26 @@ en:
           close_window: Close window
           share: Share
           share_link: Share link
+        show:
+          proposal_rejected_reason: 'This proposal has been rejected because:'
         vote_button:
           already_voted: Already voted
+          no_votes_remaining: No votes remaining
           vote: Vote
+          votes_blocked: Voting disabled
         votes_count:
           count:
             one: VOTE
             other: VOTES
+        votes_limit:
+          vote_limit:
+            description: Instead of voting as many proposals as you want you can only
+              vote up to %{limit} proposals.
+            left: Remaining
+            title: You have %{limit} votes to distribute
+            votes: Votes
+    resource_links:
+      included_proposals:
+        results: 'Proposal appearing in these results:'
+      proposals_from_meeting:
+        meetings: Related meetings

data/decidim-proposals/config/locales/es.yml

@@ -1,19 +1,40 @@
 es:
+  activemodel:
+    attributes:
+      proposal:
+        body: Cuerpo
+        category_id: Categoría
+        scope_id: Ámbito
+        title: Título
+        user_group_id: Crear propuesta como
   decidim:
     features:
       proposals:
         name: Propuestas
         settings:
           step:
+            creation_enabled: Habilitar creación de propuestas
+            votes_blocked: Votación bloqueada
             votes_enabled: Votos habilitados
     proposals:
       actions:
+        answer: Respuesta
         new: Nueva propuesta
+        title: Acciones
       admin:
         models:
           proposal:
             name: Propuesta
+        proposal_answers:
+          edit:
+            accepted: Aceptada
+            answer_proposal: Respuesta a la propuesta
+            rejected: Rechazada
+            title: Responder a la propuesta %{title}
         proposals:
+          answer:
+            invalid: Ha habido un problema al responder a esta propuesta
+            success: Propuesta respuesta con éxito
           create:
             invalid: Ha habido un problema al crear esta propuesta
             success: Propuesta creada correctamente
@@ -25,6 +46,10 @@ es:
           new:
             create: Crear propuesta
             title: Nueva propuesta
+      answers:
+        accepted: Aceptadas
+        not_answered: No contestada
+        rejected: Rechazada
       create:
         error: Ha habido errores al guardar la propuesta.
         success: Propuesta creada correctamente.
@@ -34,6 +59,7 @@ es:
             category: Categoría
             official_proposal: Propuesta oficial
             scope: Ámbito
+            state: Estado
             title: Título
       proposals:
         count:
@@ -41,16 +67,28 @@ es:
             one: 1 propuesta
             other: "%{count} propuestas"
         filters:
+          accepted: Aceptadas
           activity: Actividad
           all: Todas
           category: Categoría
           citizenship: Ciudadanía
           official: Oficial
           origin: Origen
+          rejected: Rechazadas
           search: Buscar
+          state: Estado
           voted: Votado
+        filters_small_view:
+          close_modal: Cerrar ventana
+          filter: Filtrar
+          filter_for: Filtrar por
+          unfold: Desplegar
         index:
           new_proposal: Nueva propuesta
+        linked_proposals:
+          proposal_votes:
+            one: <span class="card--list__data__number">1</span>vote
+            other: <span class="card--list__data__number">%{count}</span>votos
         new:
           back: Atrás
           select_a_category: Por favor, seleccione una categoría
@@ -63,10 +101,25 @@ es:
           close_window: Cerrar ventana
           share: Compartir
           share_link: Compartir enlace
+        show:
+          proposal_rejected_reason: 'Esta propuesta ha sido rechazada porque:'
         vote_button:
           already_voted: Ya votado
+          no_votes_remaining: No hay votos restantes
           vote: Votar
+          votes_blocked: Votación desactivada
         votes_count:
           count:
             one: VOTAR
-            other: VOTOS
+            other: VOTOS
+        votes_limit:
+          vote_limit:
+            description: En lugar de votación tantas propuestas como desee, sólo se puede votar hasta %{limit} propuestas.
+            left: Restante
+            title: Tiene %{limit} votos a distribuir
+            votes: Votos
+    resource_links:
+      included_proposals:
+        results: 'Propuesta formulada en estos resultados:'
+      proposals_from_meeting:
+        meetings: Encuentros relacionados

data/decidim-proposals/db/migrate/20170120151202_add_user_group_id_to_proposals.rb

@@ -0,0 +1,5 @@
+class AddUserGroupIdToProposals < ActiveRecord::Migration[5.0]
+  def change
+    add_column :decidim_proposals_proposals, :decidim_user_group_id, :integer, index: true
+  end
+end

data/decidim-proposals/db/migrate/20170131092413_add_answers_to_proposals.rb

@@ -0,0 +1,7 @@
+class AddAnswersToProposals < ActiveRecord::Migration[5.0]
+  def change
+    add_column :decidim_proposals_proposals, :state, :string, index: true
+    add_column :decidim_proposals_proposals, :answered_at, :datetime, index: true
+    add_column :decidim_proposals_proposals, :answer, :jsonb
+  end
+end

data/decidim-proposals/decidim-proposals.gemspec

@@ -20,4 +20,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'social-share-button', "~> 0.8.8"
 
   s.add_development_dependency "decidim-dev", Decidim.version
+  s.add_development_dependency "decidim-meetings", Decidim.version
+  s.add_development_dependency "decidim-results", Decidim.version
+  s.add_development_dependency "decidim-budgets", Decidim.version
 end

data/decidim-proposals/lib/decidim/proposals/admin_engine.rb

@@ -8,7 +8,9 @@ module Decidim
       paths["db/migrate"] = nil
 
       routes do
-        resources :proposals, only: [:index, :new, :create]
+        resources :proposals, only: [:index, :new, :create] do
+          resources :proposal_answers, only: [:edit, :update]
+        end
         root to: "proposals#index"
       end
 

data/decidim-proposals/lib/decidim/proposals/engine.rb

@@ -12,7 +12,7 @@ module Decidim
 
       routes do
         resources :proposals, only: [:create, :new, :index, :show] do
-          resources :proposal_votes, only: [:create]
+          resource :proposal_vote, only: [:create, :destroy]
         end
         root to: "proposals#index"
       end
@@ -20,6 +20,12 @@ module Decidim
       initializer "decidim_proposals.assets" do |app|
         app.config.assets.precompile += %w(decidim_proposals_manifest.js decidim_proposals_manifest.css)
       end
+
+      initializer "decidim_proposals.inject_abilities_to_user" do |_app|
+        Decidim.configure do |config|
+          config.abilities += ["Decidim::Proposals::Abilities::CurrentUser"]
+        end
+      end
     end
   end
 end

data/decidim-proposals/lib/decidim/proposals/feature.rb

@@ -13,8 +13,21 @@ Decidim.register_feature(:proposals) do |feature|
     end
   end
 
+  feature.settings(:global) do |settings|
+    settings.attribute :vote_limit, type: :integer, default: 0
+    settings.attribute :comments_always_enabled, type: :boolean, default: true
+  end
+
   feature.settings(:step) do |settings|
     settings.attribute :votes_enabled, type: :boolean
+    settings.attribute :votes_blocked, type: :boolean
+    settings.attribute :comments_enabled, type: :boolean, default: true
+    settings.attribute :creation_enabled, type: :boolean
+  end
+
+  feature.register_resource do |resource|
+    resource.model_class_name = "Decidim::Proposals::Proposal"
+    resource.template = "decidim/proposals/proposals/linked_proposals"
   end
 
   feature.seeds do
@@ -25,8 +38,11 @@ Decidim.register_feature(:proposals) do |feature|
         name: Decidim::Features::Namer.new(process.organization.available_locales, :proposals).i18n_name,
         manifest_name: :proposals,
         participatory_process: process,
+        settings: {
+          vote_limit: 0
+        },
         step_settings: {
-          process.active_step.id => { votes_enabled: true }
+          process.active_step.id => { votes_enabled: true, votes_blocked: false, creation_enabled: true }
         }
       )
 
@@ -38,6 +54,17 @@ Decidim.register_feature(:proposals) do |feature|
           author: Decidim::User.where(organization: feature.organization).all.sample
         )
 
+        if n > 15
+          proposal.state = "accepted"
+          proposal.answered_at = Time.current
+          proposal.save!
+        elsif n > 9
+          proposal.state = "rejected"
+          proposal.answered_at = Time.current
+          proposal.answer = Decidim::Faker::Localized.sentence(10)
+          proposal.save!
+        end
+
         rand(3).times do |m|
           email = "vote-author-#{process.id}-#{n}-#{m}@decidim.org"
           name = "#{Faker::Name.name} #{process.id} #{n} #{m}"

data/decidim-proposals/lib/decidim/proposals/test/factories.rb

@@ -0,0 +1,83 @@
+# frozen_string_literal: true
+require "decidim/core/test/factories"
+require "decidim/admin/test/factories"
+require "decidim/comments/test/factories"
+require "decidim/meetings/test/factories"
+require "decidim/results/test/factories"
+require "decidim/budgets/test/factories"
+
+FactoryGirl.define do
+  factory :proposal_feature, class: Decidim::Feature do
+    name { Decidim::Features::Namer.new(participatory_process.organization.available_locales, :proposals).i18n_name }
+    manifest_name :proposals
+    participatory_process { create(:participatory_process, :with_steps) }
+
+    trait :with_votes_enabled do
+      step_settings do
+        {
+          participatory_process.active_step.id => { votes_enabled: true }
+        }
+      end
+    end
+
+    trait :with_vote_limit do
+      transient do
+        vote_limit 10
+      end
+
+      settings do
+        {
+          vote_limit: vote_limit
+        }
+      end
+    end
+
+    trait :with_votes_blocked do
+      step_settings do
+        {
+          participatory_process.active_step.id => {
+            votes_enabled: true,
+            votes_blocked: true
+          }
+        }
+      end
+    end
+
+    trait :with_creation_enabled do
+      step_settings do
+        {
+          participatory_process.active_step.id => { creation_enabled: true }
+        }
+      end
+    end
+  end
+
+  factory :proposal, class: Decidim::Proposals::Proposal do
+    title { Faker::Lorem.sentence }
+    body { Faker::Lorem.sentences(3).join("\n") }
+    feature { create(:proposal_feature) }
+    author do
+      create(:user, organization: feature.organization) if feature
+    end
+
+    trait :official do
+      author nil
+    end
+
+    trait :accepted do
+      state "accepted"
+      answered_at { Time.current }
+    end
+
+    trait :rejected do
+      state "rejected"
+      answer { Decidim::Faker::Localized.sentence }
+      answered_at { Time.current }
+    end
+  end
+
+  factory :proposal_vote, class: Decidim::Proposals::ProposalVote do
+    proposal { build(:proposal) }
+    author { build(:user, organization: proposal.organization) }
+  end
+end

data/decidim-proposals/spec/commands/decidim/proposals/admin_create_proposal_spec.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+require "spec_helper"
+require_relative "../../../shared/create_proposal_examples"
+
+module Decidim
+  module Proposals
+    module Admin
+      describe CreateProposal do
+        let(:form_klass) { ProposalForm }
+        it_behaves_like "create a proposal", false
+      end
+    end
+  end
+end

data/decidim-proposals/spec/commands/decidim/proposals/answer_proposal_spec.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+require "spec_helper"
+
+module Decidim
+  module Proposals
+    module Admin
+      describe AnswerProposal do
+        describe "call" do
+          let(:proposal) { create(:proposal) }
+          let(:form) { ProposalAnswerForm.from_params(form_params) }
+          let(:form_params) do
+            {
+              state: "rejected", answer: { en: "Foo" }
+            }
+          end
+
+          let(:command) { described_class.new(form, proposal) }
+
+          describe "when the form is not valid" do
+            before do
+              expect(form).to receive(:invalid?).and_return(true)
+            end
+
+            it "broadcasts invalid" do
+              expect { command.call }.to broadcast(:invalid)
+            end
+
+            it "doesn't update the proposal" do
+              expect(proposal).not_to receive(:update_attributes!)
+              command.call
+            end
+          end
+
+          describe "when the form is valid" do
+            before do
+              expect(form).to receive(:invalid?).and_return(false)
+            end
+
+            it "broadcasts ok" do
+              expect { command.call }.to broadcast(:ok)
+            end
+
+            it "updates the proposal" do
+              command.call
+
+              expect(proposal.reload).to be_answered
+            end
+          end
+        end
+      end
+    end
+  end
+end