decidim 0.0.1 → 0.0.2

data/decidim-pages/spec/forms/page_form_spec.rb

@@ -1,3 +1,4 @@
+# coding: utf-8
 # frozen_string_literal: true
 require "spec_helper"
 
@@ -6,7 +7,7 @@ module Decidim
     module Admin
       describe PageForm do
         let(:current_organization) { create(:organization) }
-        
+
         let(:title) do
           {
             "en" => "Hello world",
@@ -36,8 +37,7 @@ module Decidim
         end
 
         subject do
-          described_class.from_params(
-            attributes,
+          described_class.from_params(attributes).with_context(
             current_organization: current_organization
           )
         end
@@ -60,4 +60,4 @@ module Decidim
       end
     end
   end
-end
+end

data/decidim-pages/spec/spec_helper.rb

@@ -1,2 +1,4 @@
 ENV["ENGINE_NAME"] = File.dirname(File.dirname(__FILE__)).split("/").last
-require "decidim/test/base_spec_helper"
+require "decidim/dev/test/base_spec_helper"
+
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }

data/decidim-proposals/Rakefile

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

data/decidim-proposals/app/assets/config/decidim_proposals_manifest.css

@@ -0,0 +1 @@
+/*= link decidim/proposals/social_share.css.scss */

data/decidim-proposals/app/assets/config/decidim_proposals_manifest.js

@@ -0,0 +1 @@
+//= link decidim/proposals/social_share.js

data/decidim-proposals/app/assets/images/decidim/proposals/icon.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 35 35"><path d="M17.5 35A17.5 17.5 0 1 1 35 17.5 17.52 17.52 0 0 1 17.5 35zm0-33.06A15.56 15.56 0 1 0 33.06 17.5 15.57 15.57 0 0 0 17.5 1.94zm9.5 13.7H8a1 1 0 0 1 0-1.94h19a1 1 0 0 1 0 1.94zm0 3.68H8a1 1 0 0 1 0-1.94h19a1 1 0 0 1 0 1.94zM22.26 23H8a1 1 0 0 1 0-1.94h14.26a1 1 0 0 1 0 1.94z"/></svg>

data/decidim-proposals/app/assets/javascripts/decidim/proposals/social_share.js

@@ -0,0 +1,2 @@
+// = require social-share-button
+// = require_self

data/decidim-proposals/app/assets/stylesheets/decidim/proposals/social_share.css.scss

@@ -0,0 +1,14 @@
+/*= require social-share-button */
+$size: 45px;
+
+.social-share-button {
+  display: inline-block;
+  vertical-align: top;
+  .ssb-icon {
+    margin-right: 5px;
+    background-size: $size $size;
+    height: $size;
+    width: $size;
+  }
+}
+

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

@@ -5,9 +5,11 @@ module Decidim
     class CreateProposal < Rectify::Command
       # Public: Initializes the command.
       #
-      # form - A form object with the params.
-      def initialize(form)
+      # form         - A form object with the params.
+      # current_user - The current user.
+      def initialize(form, current_user)
         @form = form
+        @current_user = current_user
       end
 
       # Executes the command. Broadcasts these events:
@@ -33,7 +35,7 @@ module Decidim
           body: form.body,
           category: form.category,
           scope: form.scope,
-          author: form.author,
+          author: @current_user,
           feature: form.feature
         )
       end

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

@@ -7,13 +7,13 @@ module Decidim
         helper_method :proposals
 
         def new
-          @form = form(ProposalForm).from_params({}, feature: current_feature)
+          @form = form(Admin::ProposalForm).from_params({})
         end
 
         def create
-          @form = form(ProposalForm).from_params(params, feature: current_feature)
+          @form = form(Admin::ProposalForm).from_params(params)
 
-          CreateProposal.call(@form) do
+          Admin::CreateProposal.call(@form) do
             on(:ok) do
               flash[:notice] = I18n.t("proposals.create.success", scope: "decidim.proposals.admin")
               redirect_to proposals_path

data/decidim-proposals/app/controllers/decidim/proposals/proposal_votes_controller.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    # Exposes the proposal vote resource so users can vote proposals.
+    class ProposalVotesController < Decidim::Proposals::ApplicationController
+      before_action :authenticate_user!
+      before_action :check_current_settings!
+
+      def create
+        @proposal = Proposal.where(feature: current_feature).find(params[:proposal_id])
+        @proposal.votes.create!(author: current_user)
+        @from_proposals_list = params[:from_proposals_list] == "true"
+      end
+
+      private
+
+      # The vote buttons should not be visible if the setting is not enabled.
+      # This ensure the votes cannot be created using a POST request directly.
+      def check_current_settings!
+        raise "This setting is not enabled for this step" unless current_settings.votes_enabled?
+      end
+    end
+  end
+end

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

@@ -5,6 +5,8 @@ module Decidim
     # Exposes the proposal resource so users can view and create them.
     class ProposalsController < Decidim::Proposals::ApplicationController
       include FormFactory
+      include FilterResource
+
       before_action :authenticate_user!, only: [:new, :create]
 
       def show
@@ -12,19 +14,21 @@ module Decidim
       end
 
       def index
-        @search = ProposalSearch.new(current_feature, params[:page], params[:random_seed])
-        @proposals = @search.proposals
-        @random_seed = @search.random_seed
+        @proposals = search
+                     .results
+                     .includes(:author)
+                     .includes(votes: [:author])
+        @random_seed = search.random_seed
       end
 
       def new
-        @form = form(ProposalForm).from_params({}, author: current_user, feature: current_feature)
+        @form = form(ProposalForm).from_params({})
       end
 
       def create
-        @form = form(ProposalForm).from_params(params, author: current_user, feature: current_feature)
+        @form = form(ProposalForm).from_params(params)
 
-        CreateProposal.call(@form) do
+        CreateProposal.call(@form, current_user) do
           on(:ok) do |proposal|
             flash[:notice] = I18n.t("proposals.create.success", scope: "decidim")
             redirect_to proposal_path(proposal)
@@ -36,6 +40,29 @@ module Decidim
           end
         end
       end
+
+      private
+
+      def search_klass
+        ProposalSearch
+      end
+
+      def default_search_params
+        {
+          page: params[:page],
+          per_page: 12
+        }
+      end
+
+      def default_filter_params
+        {
+          search_text: "",
+          origin: "all",
+          activity: "",
+          category_id: "",
+          random_seed: params[:random_seed]
+        }
+      end
     end
   end
 end

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

@@ -10,27 +10,28 @@ module Decidim
         attribute :body, String
         attribute :category_id, Integer
         attribute :scope_id, Integer
-        attribute :feature, Decidim::Feature
 
-        validates :title, :body, :feature, presence: true
+        validates :title, :body, presence: true
         validates :category, presence: true, if: ->(form) { form.category_id.present? }
         validates :scope, presence: true, if: ->(form) { form.scope_id.present? }
 
-        delegate :categories, to: :feature
-        delegate :scopes, to: :current_organization
+        delegate :categories, to: :current_feature, prefix: false
+        delegate :scopes, to: :current_organization, prefix: false
+
+        alias feature current_feature
 
         # Finds the Category from the category_id.
         #
         # Returns a Decidim::Category
         def category
-          @category ||= feature.categories.where(id: category_id).first
+          @category ||= categories.where(id: category_id).first
         end
 
         # Finds the Scope from the scope_id.
         #
         # Returns a Decidim::Scope
         def scope
-          @scope ||= feature.scopes.where(id: scope_id).first
+          @scope ||= scopes.where(id: scope_id).first
         end
       end
     end

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

@@ -7,30 +7,30 @@ module Decidim
 
       attribute :title, String
       attribute :body, String
-      attribute :author, Decidim::User
       attribute :category_id, Integer
       attribute :scope_id, Integer
-      attribute :feature, Decidim::Feature
 
-      validates :title, :body, :author, :feature, presence: true
+      validates :title, :body, presence: true
       validates :category, presence: true, if: ->(form) { form.category_id.present? }
       validates :scope, presence: true, if: ->(form) { form.scope_id.present? }
 
-      delegate :categories, to: :feature
+      delegate :categories, to: :current_feature
       delegate :scopes, to: :current_organization
 
+      alias feature current_feature
+
       # Finds the Category from the category_id.
       #
       # Returns a Decidim::Category
       def category
-        @category ||= feature.categories.where(id: category_id).first
+        @category ||= categories.where(id: category_id).first
       end
 
       # Finds the Scope from the scope_id.
       #
       # Returns a Decidim::Scope
       def scope
-        @scope ||= feature.scopes.where(id: scope_id).first
+        @scope ||= scopes.where(id: scope_id).first
       end
     end
   end

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

@@ -1,10 +1,12 @@
 # frozen_string_literal: true
 module Decidim
   module Proposals
-    # Custom helpers, scoped to the pages engine.
+    # Custom helpers, scoped to the proposals engine.
     #
     module ApplicationHelper
       include Decidim::Comments::CommentsHelper
+      include PaginateHelper
+      include ProposalVotesHelper
     end
   end
 end

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

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+module Decidim
+  module Proposals
+    # Simple helpers to handle markup variations for proposal votes partials
+    module ProposalVotesHelper
+      # Returns the css classes used for proposal votes count in both proposals list and show pages
+      #
+      # from_proposals_list - A boolean to indicate if the template is rendered from the proposals list page
+      #
+      # Returns a hash with the css classes for the count number and label
+      def votes_count_classes(from_proposals_list)
+        return { number: "card__support__number", label: "" } if from_proposals_list
+        { number: "extra__suport-number", label: "extra__suport-text" }
+      end
+
+      # Returns the css classes used for proposal vote button in both proposals list and show pages
+      #
+      # from_proposals_list - A boolean to indicate if the template is rendered from the proposals list page
+      #
+      # Returns a string with the value of the css classes.
+      def vote_button_classes(from_proposals_list)
+        return "small" if from_proposals_list
+        "expanded button--sc"
+      end
+    end
+  end
+end

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

@@ -8,6 +8,7 @@ module Decidim
       belongs_to :category, foreign_key: "decidim_category_id", class_name: Decidim::Category
       belongs_to :scope, foreign_key: "decidim_scope_id", class_name: Decidim::Scope
       has_one :organization, through: :feature
+      has_many :votes, foreign_key: "decidim_proposal_id", class_name: ProposalVote, dependent: :destroy
 
       validates :title, :feature, :body, presence: true
       validate :category_belongs_to_feature
@@ -32,6 +33,13 @@ module Decidim
         true
       end
 
+      # Public: Check if the user has voted the proposal
+      #
+      # Returns Boolean
+      def voted_by?(user)
+        votes.any? { |vote| vote.author == user }
+      end
+
       private
 
       def category_belongs_to_feature

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

@@ -0,0 +1,20 @@
+# 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
+
+      validates :proposal, uniqueness: { scope: :author }
+      validate :author_and_proposal_same_organization
+
+      private
+
+      # Private: check if the proposal and the author have the same organization
+      def author_and_proposal_same_organization
+        errors.add(:proposal, :invalid) unless author.organization == proposal.organization
+      end
+    end
+  end
+end

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

@@ -3,26 +3,54 @@ module Decidim
   module Proposals
     # A service to encapsualte all the logic when searching and filtering
     # proposals in a participatory process.
-    class ProposalSearch
-      attr_reader :feature, :page, :per_page
-
+    class ProposalSearch < ResourceSearch
       # Public: Initializes the service.
       # feature     - A Decidim::Feature to get the proposals from.
       # page        - The page number to paginate the results.
-      # random_seed - A random flaot number between -1 and 1 to be used as a random seed at the database.
       # per_page    - The number of proposals to return per page.
-      def initialize(feature, page = nil, random_seed = nil, per_page = nil)
-        @feature = feature
-        @page = (page || 1).to_i
-        @per_page = (per_page || 12).to_i
-        @random_seed = random_seed.to_f
+      # random_seed - A random flaot number between -1 and 1 to be used as a random seed at the database.
+      def initialize(options = {})
+        super(Proposal.all, options)
+        @random_seed = options[:random_seed].to_f
+      end
+
+      # Handle the search_text filter
+      def search_search_text
+        query
+          .where("title ILIKE ?", "%#{search_text}%")
+          .or(query.where("body ILIKE ?", "%#{search_text}%"))
+      end
+
+      # Handle the origin filter
+      # The 'official' proposals doesn't have an author id
+      def search_origin
+        if origin == "official"
+          query.where(decidim_author_id: nil)
+        elsif origin == "citizenship"
+          query.where.not(decidim_author_id: nil)
+        else # Assume 'all'
+          query
+        end
+      end
+
+      # Handle the activity filter
+      def search_activity
+        if activity.include? "voted"
+          query
+            .includes(:votes)
+            .where(decidim_proposals_proposal_votes: {
+                     decidim_author_id: options[:current_user]
+                   })
+        else
+          query
+        end
       end
 
       # Returns the random proposals for the current page.
-      def proposals
+      def results
         @proposals ||= Proposal.transaction do
           Proposal.connection.execute("SELECT setseed(#{Proposal.connection.quote(random_seed)})")
-          Proposal.where(feature: feature).reorder("RANDOM()").page(page).per(per_page).load
+          super.reorder("RANDOM()").load
         end
       end
 

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

@@ -8,12 +8,12 @@
 
 <% if @form.categories&.any? %>
   <div class="field">
-    <%= form.categories_select :category_id, @form.categories, t(".select_a_category") %>
+    <%= form.categories_select :category_id, @form.categories, prompt: t(".select_a_category") %>
   </div>
 <% end %>
 
 <% if @form.scopes&.any? %>
   <div class="field">
-    <%= form.select :scope_id, @form.scopes.map{|s| [translated_attribute(s.name), s.id]}, prompt: t(".select_a_scope") %>
+    <%= form.select :scope_id, @form.scopes.map{|s| [s.name, s.id]}, prompt: t(".select_a_scope") %>
   </div>
 <% end %>