decidim-proposals 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57be816bd788ab639e3f356480d2e2b82099b816
-  data.tar.gz: 849c9453e5e32cd736d7172e10c45b310110fbe4
+  metadata.gz: 656619a854b4e23c556abee9a2641287a8b0b9e4
+  data.tar.gz: fe25ef91ada0e02ce0c8a41b4155843b70de8049
 SHA512:
-  metadata.gz: 4a680b98cdb8fcc5038a25cd50ff7dcd309b99e12fddba0905a960bd87fc5876ac6800c90faa458f117be54b1d8103d69e228a89374d51022e7fc1018f0f3418
-  data.tar.gz: 443db12a69fce3d32c4199e989c0536437bdf4b79f8158783c8b47a205ffc72eb7f2b597893df8ac7c12b2b28e28486f02c463e9ae2150092142082cbb128b52
+  metadata.gz: efdb25720d97e47ce218640b118012b790755a30c13b8e1193a017e53763c8c261f5af140355c5a44864c1cf2b68dfe9ed8dc16e361e4409bea88cbc3a7d583a
+  data.tar.gz: 5b72de0eb3baba3c6430706cf7157ae7cdb459d3a2955af0fd5678dc42b58ca1a5ebc9b38e8b5a727473cd5300b3d4315704844fc12ce5de8221c8fabed46478

data/Rakefile

@@ -1,2 +1,3 @@
 # frozen_string_literal: true
+
 require "decidim/dev/common_rake"

data/app/commands/decidim/proposals/admin/answer_proposal.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Decidim
   module Proposals
     module Admin

data/app/commands/decidim/proposals/admin/create_proposal.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Decidim
   module Proposals
     module Admin

data/app/commands/decidim/proposals/create_proposal.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Decidim
   module Proposals
     # A command with all the business logic when a user creates a new proposal.

data/app/commands/decidim/proposals/create_proposal_export.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Decidim
   module Proposals
     # A command with all the business logic when a user creates a new proposal.

data/app/controllers/concerns/decidim/proposals/orderable.rb

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+require "active_support/concern"
+
+module Decidim
+  module Proposals
+    # Common logic to ordering resources
+    module Orderable
+      extend ActiveSupport::Concern
+
+      included do
+        helper_method :order, :available_orders, :random_seed
+
+        private
+
+        # Gets how the proposals should be ordered based on the choice made by the user.
+        def order
+          @order ||= detect_order(params[:order]) || default_order
+        end
+
+        # Available orders based on enabled settings
+        def available_orders
+          @available_orders ||= begin
+            available_orders = %w(random recent)
+            available_orders << "most_voted" if votes_visible?
+            available_orders
+          end
+        end
+
+        def default_order
+          if current_settings.votes_blocked?
+            detect_order("most_voted")
+          else
+            "random"
+          end
+        end
+
+        def votes_visible?
+          current_settings.votes_enabled? && !current_settings.votes_hidden?
+        end
+
+        # Returns: A random float number between -1 and 1 to be used as a random seed at the database.
+        def random_seed
+          @random_seed ||= (params[:random_seed] ? params[:random_seed].to_f : (rand * 2 - 1))
+        end
+
+        def detect_order(candidate)
+          available_orders.detect { |order| order == candidate }
+        end
+
+        def reorder(proposals)
+          case order
+          when "random"
+            proposals.order_randomly(random_seed)
+          when "most_voted"
+            proposals.order(proposal_votes_count: :desc)
+          when "recent"
+            proposals.order(created_at: :desc)
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/decidim/proposals/admin/application_controller.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Decidim
   module Proposals
     module Admin

data/app/controllers/decidim/proposals/admin/proposal_answers_controller.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Decidim
   module Proposals
     module Admin

data/app/controllers/decidim/proposals/admin/proposals_controller.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Decidim
   module Proposals
     module Admin

data/app/controllers/decidim/proposals/proposals_controller.rb

@@ -7,8 +7,9 @@ module Decidim
       helper Decidim::WidgetUrlsHelper
       include FormFactory
       include FilterResource
+      include Orderable
 
-      helper_method :order, :random_seed, :geocoded_proposals
+      helper_method :geocoded_proposals
 
       before_action :authenticate_user!, only: [:new, :create]
 
@@ -64,38 +65,6 @@ module Decidim
 
       private
 
-      # Gets how the proposals should be ordered based on the choice made by the user.
-      #
-      # Note that when votes are active and hidden at the same time, the "most_voted"
-      # option is not available, so it's replaced to "random" to avoid people
-      # changing the URL manually.
-      def order
-        return @order if @order
-        @order = "random" if current_settings.votes_enabled? && current_settings.votes_hidden? && params[:order] == "most_voted"
-        @order ||= params[:order] || "random"
-      end
-
-      # Returns: A random float number between -1 and 1 to be used as a random seed at the database.
-      def random_seed
-        @random_seed ||= (params[:random_seed] ? params[:random_seed].to_f : (rand * 2 - 1))
-      end
-
-      def reorder(proposals)
-        case order
-        when "random"
-          Proposal.transaction do
-            Proposal.connection.execute("SELECT setseed(#{Proposal.connection.quote(random_seed)})")
-            proposals.order("RANDOM()").load
-          end
-        when "most_voted"
-          proposals.order(proposal_votes_count: :desc)
-        when "recent"
-          proposals.order(created_at: :desc)
-        else
-          proposals
-        end
-      end
-
       def geocoded_proposals
         @geocoded_proposals ||= search.results.not_hidden.select(&:geocoded?)
       end

data/app/forms/decidim/proposals/admin/proposal_answer_form.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Decidim
   module Proposals
     module Admin

data/app/forms/decidim/proposals/admin/proposal_form.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Decidim
   module Proposals
     module Admin

data/app/forms/decidim/proposals/proposal_form.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Decidim
   module Proposals
     # A form object to be used when public users want to create a proposal.

data/app/helpers/decidim/proposals/application_helper.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Decidim
   module Proposals
     # Custom helpers, scoped to the proposals engine.
@@ -7,7 +8,6 @@ module Decidim
       include Decidim::Comments::CommentsHelper
       include PaginateHelper
       include ProposalVotesHelper
-      include ProposalOrderHelper
       include Decidim::MapHelper
       include Decidim::Proposals::MapHelper
 

data/app/helpers/decidim/proposals/map_helper.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Decidim
   module Proposals
     # This helper include some methods for rendering proposals dynamic maps.

data/app/helpers/decidim/proposals/proposal_votes_helper.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Decidim
   module Proposals
     # Simple helpers to handle markup variations for proposal votes partials

data/app/models/decidim/proposals/abilities/admin_user.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Decidim
   module Proposals
     module Abilities

data/app/models/decidim/proposals/abilities/current_user.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Decidim
   module Proposals
     module Abilities
@@ -20,7 +21,7 @@ module Decidim
           end
 
           can :unvote, Proposal do |_proposal|
-            authorized?(:vote) && voting_enabled? && vote_limit_enabled?
+            authorized?(:vote) && voting_enabled?
           end
 
           can :create, Proposal if authorized?(:create) && creation_enabled?

data/app/models/decidim/proposals/abilities/process_admin_user.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Decidim
   module Proposals
     module Abilities

data/app/models/decidim/proposals/application_record.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Decidim
   module Proposals
     # Abstract class from which all models in this engine inherit.

data/app/models/decidim/proposals/proposal.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Decidim
   module Proposals
     # The data store for a Proposal in the Decidim::Proposals component.
@@ -14,7 +15,7 @@ module Decidim
 
       feature_manifest_name "proposals"
 
-      has_many :votes, foreign_key: "decidim_proposal_id", class_name: ProposalVote, dependent: :destroy, counter_cache: "proposal_votes_count"
+      has_many :votes, foreign_key: "decidim_proposal_id", class_name: "ProposalVote", dependent: :destroy, counter_cache: "proposal_votes_count"
 
       validates :title, :body, presence: true
 
@@ -23,6 +24,13 @@ module Decidim
       scope :accepted,   -> { where(state: "accepted") }
       scope :rejected,   -> { where(state: "rejected") }
 
+      def self.order_randomly(seed)
+        transaction do
+          connection.execute("SELECT setseed(#{connection.quote(seed)})")
+          order("RANDOM()").load
+        end
+      end
+
       def author_name
         user_group&.name || author&.name || I18n.t("decidim.proposals.models.proposal.fields.official_proposal")
       end

data/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/lib/decidim/proposals/engine.rb

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

data/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/{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/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/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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-proposals
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-18 00:00:00.000000000 Z
+date: 2017-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -18,28 +18,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: decidim-comments
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: rectify
   requirement: !ruby/object:Gem::Requirement
@@ -88,56 +88,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: decidim-meetings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: decidim-results
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: decidim-budgets
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.0
 description: A proposals component for decidim's participatory processes.
 email:
 - josepjaume@gmail.com
@@ -158,8 +158,8 @@ files:
 - app/commands/decidim/proposals/admin/create_proposal.rb
 - app/commands/decidim/proposals/create_proposal.rb
 - app/commands/decidim/proposals/create_proposal_export.rb
+- app/controllers/concerns/decidim/proposals/orderable.rb
 - app/controllers/decidim/proposals/admin/application_controller.rb
-- app/controllers/decidim/proposals/admin/exports_controller.rb
 - app/controllers/decidim/proposals/admin/proposal_answers_controller.rb
 - app/controllers/decidim/proposals/admin/proposals_controller.rb
 - app/controllers/decidim/proposals/application_controller.rb
@@ -171,9 +171,7 @@ files:
 - app/forms/decidim/proposals/proposal_form.rb
 - app/helpers/decidim/proposals/application_helper.rb
 - app/helpers/decidim/proposals/map_helper.rb
-- app/helpers/decidim/proposals/proposal_order_helper.rb
 - app/helpers/decidim/proposals/proposal_votes_helper.rb
-- app/jobs/decidim/proposals/export_job.rb
 - app/models/decidim/proposals/abilities/admin_user.rb
 - app/models/decidim/proposals/abilities/current_user.rb
 - app/models/decidim/proposals/abilities/process_admin_user.rb
@@ -182,7 +180,6 @@ files:
 - app/models/decidim/proposals/proposal_vote.rb
 - app/queries/decidim/proposals/filtered_proposals.rb
 - app/services/decidim/proposals/proposal_search.rb
-- app/services/decidim/proposals/proposal_serializer.rb
 - app/views/decidim/proposals/admin/proposal_answers/edit.html.erb
 - app/views/decidim/proposals/admin/proposals/_form.html.erb
 - app/views/decidim/proposals/admin/proposals/index.html.erb
@@ -233,6 +230,7 @@ files:
 - lib/decidim/proposals/admin_engine.rb
 - lib/decidim/proposals/engine.rb
 - lib/decidim/proposals/feature.rb
+- lib/decidim/proposals/proposal_serializer.rb
 - lib/decidim/proposals/test/factories.rb
 homepage: https://github.com/decidim/decidim
 licenses:

data/app/controllers/decidim/proposals/admin/exports_controller.rb

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-module Decidim
-  module Proposals
-    module Admin
-      # This controller allows admins to manage proposals in a participatory process.
-      class ExportsController < Admin::ApplicationController
-        def create
-          # call the new proposal export command
-          authorize! :read, Proposal
-          authorize! :export, Proposal
-
-          ExportJob.perform_later(
-            current_user,
-            current_feature,
-            params[:format]
-          )
-
-          flash[:notice] = t("decidim.proposals.exports.notice")
-          redirect_to :back
-        end
-      end
-    end
-  end
-end

data/app/helpers/decidim/proposals/proposal_order_helper.rb

@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-module Decidim
-  module Proposals
-    # Simple helpers to handle proposals ordering
-    module ProposalOrderHelper
-      # Returns the options the user will see to order proposals
-      def order_fields
-        @order_fields ||= begin
-          order_fields = [:random, :recent]
-          order_fields << :most_voted if current_settings.votes_enabled? && !current_settings.votes_hidden?
-          order_fields
-        end
-      end
-    end
-  end
-end

data/app/jobs/decidim/proposals/export_job.rb

@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-module Decidim
-  module Proposals
-    class ExportJob < ApplicationJob
-      queue_as :default
-
-      def perform(user, feature, format)
-        proposals = Proposal
-                    .where(feature: feature)
-                    .includes(:category, feature: { participatory_process: :organization })
-
-        export_data = Decidim::Exporters.const_get(format.upcase)
-                                        .new(proposals, ProposalSerializer).export
-
-        name = "proposals-#{I18n.localize(DateTime.now.to_date, format: :default)}-#{Time.now.seconds_since_midnight.to_i}"
-
-        ExportMailer.export(user, name, export_data).deliver_now
-      end
-    end
-  end
-end