decidim 0.1.0 → 0.2.0

data/decidim-proposals/app/models/decidim/proposals/proposal_vote.rb

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
+
 module Decidim
   module Proposals
     # A proposal can include a vote per user.
     class ProposalVote < ApplicationRecord
-      belongs_to :proposal, foreign_key: "decidim_proposal_id", class_name: Decidim::Proposals::Proposal, counter_cache: true
-      belongs_to :author, foreign_key: "decidim_author_id", class_name: Decidim::User
+      belongs_to :proposal, foreign_key: "decidim_proposal_id", class_name: "Decidim::Proposals::Proposal", counter_cache: true
+      belongs_to :author, foreign_key: "decidim_author_id", class_name: "Decidim::User"
 
       validates :proposal, :author, presence: true
       validates :proposal, uniqueness: { scope: :author }

data/decidim-proposals/app/queries/decidim/proposals/filtered_proposals.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Decidim
   module Proposals
     # A class used to find proposals filtered by features and a date range

data/decidim-proposals/app/services/decidim/proposals/proposal_search.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Decidim
   module Proposals
     # A service to encapsualte all the logic when searching and filtering

data/decidim-proposals/app/views/decidim/proposals/admin/proposals/index.html.erb

@@ -9,14 +9,7 @@
           <%= link_to t("actions.new", scope: "decidim.proposals", name: t("models.proposal.name", scope: "decidim.proposals.admin")), new_proposal_path, class: 'button tiny button--simple' if can? :manage, current_feature %>
         <% end %>
 
-      <button class="exports dropdown tiny button button--simple" data-toggle="export-dropdown"><%= t "actions.export", scope: "decidim.proposals" %></button>
-      <div class="dropdown-pane" id="export-dropdown" data-dropdown data-auto-focus="true" data-close-on-click="true">
-        <ul class="vertical menu add-features">
-          <li class="exports--csv"><%= link_to "CSV", exports_path(feature_id: current_feature, participatory_process_id: current_participatory_process, format: :csv), method: :post %></li>
-          <li class="exports--json"><%= link_to "JSON", exports_path(feature_id: current_feature, participatory_process_id: current_participatory_process, format: :json), method: :post %></li>
-        </ul>
-      </div>
-
+        <%= export_dropdown %>
       </div>
     </h2>
   </div>

data/decidim-proposals/app/views/decidim/proposals/proposals/_proposal.html.erb

@@ -26,7 +26,7 @@
         <% if current_settings.votes_enabled? %>
           <%= render partial: "votes_count", locals: { proposal: proposal, from_proposals_list: true } %>
           <%= render partial: "vote_button", locals: { proposal: proposal, from_proposals_list: true } %>
-        <% elsif !current_settings.votes_enabled? || current_settings.votes_enabled? && current_settings.votes_blocked? %>
+        <% else %>
           <div class="card__support__data"></div>
           <%= link_to t(".view_proposal"), proposal, class: "card__button button small secondary" %>
         <% end %>

data/decidim-proposals/app/views/decidim/proposals/proposals/_proposals.html.erb

@@ -1,5 +1,5 @@
-<%= order_selector order_fields, i18n_scope: "decidim.proposals.proposals.orders" %>
+<%= order_selector available_orders, i18n_scope: "decidim.proposals.proposals.orders" %>
 <div class="row small-up-1 medium-up-2 card-grid">
   <%= render @proposals %>
 </div>
-<%= decidim_paginate @proposals, random_seed: random_seed %>
+<%= decidim_paginate @proposals, random_seed: random_seed %>

data/decidim-proposals/app/views/decidim/proposals/proposals/_vote_button.html.erb

@@ -1,7 +1,7 @@
 <div id="proposal-<%= proposal.id %>-vote-button">
   <% if !current_user %>
     <% if current_settings.votes_blocked? %>
-      <button class="card__button button <%= vote_button_classes(from_proposals_list) %> disabled" data-toggle="loginModal">
+      <button class="card__button button <%= vote_button_classes(from_proposals_list) %> disabled" disabled data-toggle="loginModal">
         <%= t('.votes_blocked') %>
       </button>
     <% else %>
@@ -11,22 +11,16 @@
     <% end %>
   <% else %>
     <% if @voted_proposals ? @voted_proposals.include?(proposal.id) : proposal.voted_by?(current_user) %>
-      <% if vote_limit_enabled? %>
-        <%= action_authorized_button_to :vote, t('.already_voted'), proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list: from_proposals_list), method: :delete, remote: true, data: { disable: true }, class: "card__button button #{vote_button_classes(from_proposals_list)} success" %>
-      <% else %>
-        <button class="card__button button <%= vote_button_classes(from_proposals_list) %> success">
-          <%= t('.already_voted') %>
-        </button>
-      <% end %>
+      <%= action_authorized_button_to :vote, t('.already_voted'), proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list: from_proposals_list), method: :delete, remote: true, data: { disable: true }, class: "card__button button #{vote_button_classes(from_proposals_list)} success" %>
     <% else %>
       <% if vote_limit_enabled? && remaining_votes_count_for(current_user) == 0 %>
         <%= action_authorized_button_to :vote, t('.no_votes_remaining'), proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list: from_proposals_list), remote: true, data: { disable: true }, class: "card__button button #{vote_button_classes(from_proposals_list)}", disabled: true %>
       <% elsif current_settings.votes_blocked? %>
-        <button class="card__button button <%= vote_button_classes(from_proposals_list) %> disabled">
+        <button class="card__button button <%= vote_button_classes(from_proposals_list) %> disabled" disabled>
           <%= t('.votes_blocked') %>
         </button>
       <% else %>
-        <%= action_authorized_button_to "vote", t('.vote'), proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list: from_proposals_list), remote: true, data: { disable: true }, class: "card__button button #{vote_button_classes(from_proposals_list)}" %>
+        <%= action_authorized_button_to :vote, t('.vote'), proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list: from_proposals_list), remote: true, data: { disable: true }, class: "card__button button #{vote_button_classes(from_proposals_list)}" %>
       <% end %>
     <% end %>
   <% end %>

data/decidim-proposals/app/views/decidim/proposals/proposals/show.html.erb

@@ -43,7 +43,7 @@
   <div class="columns mediumlarge-8 mediumlarge-pull-4">
     <div class="section">
       <%= render partial: "proposal_badge", locals: { proposal: @proposal } %>
-      <p><%= @proposal.body %></p>
+      <%= simple_format @proposal.body %>
       <% if feature_settings.geocoding_enabled? %>
         <%= render partial: "decidim/shared/static_map", locals: { icon_name: "proposals", geolocalizable: @proposal } %>
       <% end %>
@@ -61,7 +61,7 @@
         <div class="section">
           <div class="callout warning">
             <h5><%= t(".proposal_rejected_reason") %></h5>
-            <p><%= translated_attribute @proposal.answer %></p>
+            <p><%== translated_attribute @proposal.answer %></p>
           </div>
         </div>
       <% end %>

data/decidim-proposals/bin/rails

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
+
 # This command will automatically be run when you run "rails" with Rails gems
 # installed from the root of your application.
 

data/decidim-proposals/config/i18n-tasks.yml

@@ -1,5 +1,4 @@
 base_locale: en
-locales: [en]
 ignore_unused:
 - "decidim.features.proposals.name"
 - "decidim.features.proposals.settings.*"
@@ -8,5 +7,9 @@ ignore_unused:
 - "decidim.proposals.answers.*"
 - "decidim.features.proposals.actions.*"
 - "decidim.proposals.proposals.orders.*"
+- "decidim.proposals.admin.exports.proposals"
+- "decidim.proposals.admin.exports.comments"
 ignore_missing:
   - decidim.participatory_processes.scopes.global
+search:
+  strict: false

data/decidim-proposals/config/initializers/social_share_button.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 SocialShareButton.configure do |config|
   config.allow_sites = %w(twitter facebook google_plus)
 end

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

@@ -33,12 +33,14 @@ ca:
     proposals:
       actions:
         answer: Respondre
-        export: Exporta
         new: Nova
         title: Accions
       admin:
         actions:
           preview: Previsualitzar
+        exports:
+          comments: Comentaris
+          proposals: Propostes
         models:
           proposal:
             name: Proposta
@@ -69,8 +71,6 @@ ca:
       create:
         error: Hi ha hagut errors en desar la proposta.
         success: Proposta creada correctament.
-      exports:
-        notice: La seva exportació està actualment en curs. Rebràs un correu electrònic quan estigui complet.
       models:
         proposal:
           fields:

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

@@ -35,12 +35,14 @@ en:
     proposals:
       actions:
         answer: Answer
-        export: Export
         new: New
         title: Actions
       admin:
         actions:
           preview: Preview
+        exports:
+          comments: Comments
+          proposals: Proposals
         models:
           proposal:
             name: Proposal
@@ -71,9 +73,6 @@ en:
       create:
         error: There's been errors when saving the proposal.
         success: Proposal created successfully.
-      exports:
-        notice: Your export is currently in progress. You'll receive an email when
-          it's complete.
       models:
         proposal:
           fields:

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

@@ -33,12 +33,14 @@ es:
     proposals:
       actions:
         answer: Respuesta
-        export: Exportar
         new: Nueva
         title: Acciones
       admin:
         actions:
           preview: Previsualizar
+        exports:
+          comments: Comentarios
+          proposals: Propuestas
         models:
           proposal:
             name: Propuesta
@@ -69,8 +71,6 @@ es:
       create:
         error: Ha habido errores al guardar la propuesta.
         success: Propuesta creada correctamente.
-      exports:
-        notice: Su exportación está actualmente en curso. Recibirá un correo electrónico cuando esté completo.
       models:
         proposal:
           fields:

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

@@ -13,6 +13,7 @@ eu:
     features:
       proposals:
         actions:
+          create: Sortu
           vote: Proiektuaren alde egin
         name: Proposamenak
         settings:
@@ -28,19 +29,25 @@ eu:
             proposal_answering_enabled: Erantzuna aktibatutako proposamenei
             votes_blocked: Bozketa blokeatuta
             votes_enabled: Botoak gaituta
+            votes_hidden: Boto ezkutuak (Botoak gaituta egon eta aukera hau markatuz gero, ezkutuan geldituko da botoen kopurua)
     proposals:
       actions:
         answer: Erantzuna
+        new: Berria
         title: Ekintzak
       admin:
         actions:
           preview: Aurreikusi
+        exports:
+          comments: Iruzkinak
+          proposals: Proposamenak
         models:
           proposal:
             name: Proposamena
         proposal_answers:
           edit:
             accepted: Onartuta
+            answer_proposal: Erantzuna
             rejected: Baztertuta
             title: 'Erantzun proposamen honi: %{title}'
         proposals:
@@ -54,6 +61,9 @@ eu:
             select_a_category: Aukeratu kategoria bat
           index:
             title: Proposamenak
+          new:
+            create: Sortu
+            title: Sortu proposamena
       answers:
         accepted: Onartuta
         not_answered: Erantzun gabe

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

@@ -33,7 +33,6 @@ fr:
     proposals:
       actions:
         answer: Répondre
-        export: Exporter
         new: Nouveau
         title: Actions
       admin:
@@ -69,8 +68,6 @@ fr:
       create:
         error: Il y a eu des erreurs lors de la sauvegarde de la proposition.
         success: Proposition créée avec succès.
-      exports:
-        notice: Votre exportation est en cours. Vous recevrez un e-mail quand elle sera terminée.
       models:
         proposal:
           fields:

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "decidim/proposals/admin"
 require "decidim/proposals/engine"
 require "decidim/proposals/admin_engine"
@@ -8,5 +9,6 @@ module Decidim
   # This namespace holds the logic of the `Proposals` component. This component
   # allows users to create proposals in a participatory process.
   module Proposals
+    autoload :ProposalSerializer, "decidim/proposals/proposal_serializer"
   end
 end

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Decidim
   module Proposals
     # This module contains all the domain logic associated to Decidim's Proposal

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Decidim
   module Proposals
     # This is the engine that runs on the public interface of `decidim-proposals`.
@@ -10,10 +11,6 @@ module Decidim
       routes do
         resources :proposals, only: [:index, :new, :create] do
           resources :proposal_answers, only: [:edit, :update]
-
-          collection do
-            resources :exports, only: [:create]
-          end
         end
 
         root to: "proposals#index"

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "kaminari"
 require "social-share-button"
 

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

@@ -51,6 +51,26 @@ Decidim.register_feature(:proposals) do |feature|
     Decidim::Comments::Comment.where(root_commentable: proposals).count
   end
 
+  feature.exports :proposals do |exports|
+    exports.collection do |feature_instance|
+      Decidim::Proposals::Proposal
+        .where(feature: feature_instance)
+        .includes(:category, feature: { participatory_process: :organization })
+    end
+
+    exports.serializer Decidim::Proposals::ProposalSerializer
+  end
+
+  feature.exports :comments do |exports|
+    exports.collection do |feature_instance|
+      Decidim::Comments::Export.comments_for_resource(
+        Decidim::Proposals::Proposal, feature_instance
+      )
+    end
+
+    exports.serializer Decidim::Comments::CommentSerializer
+  end
+
   feature.seeds do
     Decidim::ParticipatoryProcess.all.each do |process|
       next unless process.steps.any?

data/decidim-proposals/{app/services → lib}/decidim/proposals/proposal_serializer.rb

@@ -4,7 +4,7 @@ module Decidim
   module Proposals
     # This class serializes a Proposal so can be exported to CSV, JSON or other
     # formats.
-    class ProposalSerializer
+    class ProposalSerializer < Decidim::Exporters::Serializer
       include Rails.application.routes.url_helpers
       include Decidim::ResourceHelper
 

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "decidim/core/test/factories"
 require "decidim/admin/test/factories"
 require "decidim/comments/test/factories"
@@ -20,6 +21,14 @@ FactoryGirl.define do
       end
     end
 
+    trait :with_votes_disabled do
+      step_settings do
+        {
+          participatory_process.active_step.id => { votes_enabled: false }
+        }
+      end
+    end
+
     trait :with_vote_limit do
       transient do
         vote_limit 10

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "spec_helper"
 
 module Decidim

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "spec_helper"
 
 module Decidim

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "spec_helper"
 
 module Decidim

data/decidim-proposals/spec/{helpers/proposal_order_helper_spec.rb → controllers/concerns/orderable_test.rb}

@@ -1,20 +1,27 @@
 # frozen_string_literal: true
+
 require "spec_helper"
 
 module Decidim
   module Proposals
-    describe ProposalOrderHelper do
+    class OrderableFakeController < ApplicationController
+      include Orderable
+    end
+
+    describe OrderableFakeController, type: :controller do
       before do
-        allow(helper).to receive(:current_settings).and_return(current_settings)
+        allow(controller).to receive(:current_settings).and_return(current_settings)
       end
 
-      describe "#order_fields" do
+      let(:view) { controller.view_context }
+
+      describe "#available_orders" do
         context "with votes enabled" do
           context "with votes hidden" do
             let(:current_settings) { double(:current_settings, votes_enabled?: true, votes_hidden?: true) }
 
             it "does not show most_voted option to sort" do
-              expect(helper.order_fields).not_to include(:most_voted)
+              expect(view.available_orders).not_to include("most_voted")
             end
           end
 
@@ -22,7 +29,7 @@ module Decidim
             let(:current_settings) { double(:current_settings, votes_enabled?: true, votes_hidden?: false) }
 
             it "shows most_voted option to sort" do
-              expect(helper.order_fields).to include(:most_voted)
+              expect(view.available_orders).to include("most_voted")
             end
           end
         end
@@ -31,7 +38,7 @@ module Decidim
           let(:current_settings) { double(:current_settings, votes_enabled?: false) }
 
           it "doesn't show most_voted option to sort" do
-            expect(helper.order_fields).not_to include(:most_voted)
+            expect(view.available_orders).not_to include("most_voted")
           end
         end
       end