decidim 0.2.0 → 0.3.0

data/decidim-meetings/spec/features/process_admin_manages_meetings_attachments_spec.rb

@@ -3,8 +3,10 @@
 require "spec_helper"
 
 describe "Process admin manages meetings attachments", type: :feature do
-  include_context "admin"
-  let(:user) { process_admin }
+  let(:manifest_name) { "meetings" }
+  let!(:meeting) { create :meeting, scope: scope, feature: current_feature }
+
+  include_context "feature process admin"
 
   it_behaves_like "manage meetings attachments"
 end

data/decidim-meetings/spec/features/process_admin_manages_meetings_spec.rb

@@ -3,13 +3,10 @@
 require "spec_helper"
 
 describe "Process admin manages meetings", type: :feature do
-  include_context "admin"
-  let(:user) { process_admin }
-  it_behaves_like "manage meetings"
+  let(:manifest_name) { "meetings" }
+  let!(:meeting) { create :meeting, scope: scope, feature: current_feature }
+
+  include_context "feature process admin"
 
-  before do
-    switch_to_host(organization.host)
-    login_as user, scope: :user
-    visit decidim_admin.manage_feature_path(participatory_process_id: participatory_process, feature_id: current_feature)
-  end
+  it_behaves_like "manage meetings"
 end

data/decidim-meetings/spec/shared/manage_attachments_examples.rb

@@ -6,9 +6,6 @@ RSpec.shared_examples "manage meetings attachments" do
   let(:attached_to) { meeting }
 
   before do
-    switch_to_host(organization.host)
-    login_as user, scope: :user
-    visit decidim_admin.manage_feature_path(participatory_process_id: participatory_process, feature_id: current_feature)
     within find("tr", text: translated(meeting.title)) do
       find("a.action-icon--attachments").click
     end

data/decidim-meetings/spec/shared/manage_meetings_examples.rb

@@ -21,7 +21,7 @@ RSpec.shared_examples "manage meetings" do
     within ".edit_meeting" do
       fill_in_i18n(
         :meeting_title,
-        "#title-tabs",
+        "#meeting-title-tabs",
         en: "My new title",
         es: "Mi nuevo título",
         ca: "El meu nou títol"
@@ -58,28 +58,28 @@ RSpec.shared_examples "manage meetings" do
 
     fill_in_i18n(
       :meeting_title,
-      "#title-tabs",
+      "#meeting-title-tabs",
       en: "My meeting",
       es: "Mi meeting",
       ca: "El meu meeting"
     )
     fill_in_i18n(
       :meeting_location,
-      "#location-tabs",
+      "#meeting-location-tabs",
       en: "Location",
       es: "Location",
       ca: "Location"
     )
     fill_in_i18n(
       :meeting_location_hints,
-      "#location_hints-tabs",
+      "#meeting-location_hints-tabs",
       en: "Location hints",
       es: "Location hints",
       ca: "Location hints"
     )
     fill_in_i18n_editor(
       :meeting_description,
-      "#description-tabs",
+      "#meeting-description-tabs",
       en: "A longer description",
       es: "Descripción más larga",
       ca: "Descripció més llarga"
@@ -148,7 +148,7 @@ RSpec.shared_examples "manage meetings" do
       within ".edit_meeting" do
         fill_in_i18n(
           :meeting_title,
-          "#title-tabs",
+          "#meeting-title-tabs",
           en: "My new title",
           es: "Mi nuevo título",
           ca: "El meu nou títol"
@@ -172,28 +172,28 @@ RSpec.shared_examples "manage meetings" do
 
       fill_in_i18n(
         :meeting_title,
-        "#title-tabs",
+        "#meeting-title-tabs",
         en: "My meeting",
         es: "Mi meeting",
         ca: "El meu meeting"
       )
       fill_in_i18n(
         :meeting_location,
-        "#location-tabs",
+        "#meeting-location-tabs",
         en: "Location",
         es: "Location",
         ca: "Location"
       )
       fill_in_i18n(
         :meeting_location_hints,
-        "#location_hints-tabs",
+        "#meeting-location_hints-tabs",
         en: "Location hints",
         es: "Location hints",
         ca: "Location hints"
       )
       fill_in_i18n_editor(
         :meeting_description,
-        "#description-tabs",
+        "#meeting-description-tabs",
         en: "A longer description",
         es: "Descripción más larga",
         ca: "Descripció més llarga"
@@ -241,7 +241,7 @@ RSpec.shared_examples "manage meetings" do
       within ".edit_close_meeting" do
         fill_in_i18n(
           :close_meeting_closing_report,
-          "#closing_report-tabs",
+          "#close_meeting-closing_report-tabs",
           en: "The meeting was great!",
           es: "El encuentro fue genial",
           ca: "La trobada va ser genial"

data/decidim-meetings/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
 
-ENV["ENGINE_NAME"] = File.dirname(File.dirname(__FILE__)).split("/").last
+ENV["ENGINE_NAME"] = File.dirname(__dir__).split("/").last
+
 require "decidim/dev/test/base_spec_helper"

data/decidim-pages/bin/rails

@@ -4,11 +4,11 @@
 # This command will automatically be run when you run "rails" with Rails gems
 # installed from the root of your application.
 
-ENGINE_ROOT = File.expand_path("../..", __FILE__)
-ENGINE_PATH = File.expand_path("../../lib/decidim/pages/engine", __FILE__)
+ENGINE_ROOT = File.expand_path("..", __dir__)
+ENGINE_PATH = File.expand_path("../lib/decidim/pages/engine", __dir__)
 
 # Set up gems listed in the Gemfile.
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile", __FILE__)
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
 require "bundler/setup" if File.exist?(ENV["BUNDLE_GEMFILE"])
 
 require "rails/all"

data/decidim-pages/config/locales/it.yml

@@ -0,0 +1,22 @@
+it:
+  decidim:
+    features:
+      pages:
+        name: Pagina
+        settings:
+          global:
+            comments_enabled: Commenti abilitati
+          step:
+            comments_blocked: Commenti bloccati
+    pages:
+      admin:
+        models:
+          components:
+            body: Corpo del testo
+        pages:
+          edit:
+            save: Aggiorna
+            title: Modifica la pagina
+          update:
+            invalid: C'è stato un errore durante il salvataggio della pagina.
+            success: OK, la pagina è stata salvata.

data/decidim-pages/db/migrate/20161116121353_create_decidim_pages.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateDecidimPages < ActiveRecord::Migration[5.0]
   def change
     create_table :decidim_pages_pages do |t|

data/decidim-pages/db/migrate/20161214150429_add_commentable_to_pages.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddCommentableToPages < ActiveRecord::Migration[5.0]
   def change
     add_column :decidim_pages_pages, :commentable, :boolean, null: false, default: false

data/decidim-pages/db/migrate/20170110145040_remove_commentable_flag_from_pages.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class RemoveCommentableFlagFromPages < ActiveRecord::Migration[5.0]
   def change
     remove_column :decidim_pages_pages, :commentable

data/decidim-pages/db/migrate/20170220091402_remove_page_feature_titles.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class RemovePageFeatureTitles < ActiveRecord::Migration[5.0]
   def change
     remove_column :decidim_pages_pages, :title

data/decidim-pages/decidim-pages.gemspec

@@ -1,4 +1,6 @@
-$:.push File.expand_path("../lib", __FILE__)
+# frozen_string_literal: true
+
+$LOAD_PATH.push File.expand_path("lib", __dir__)
 
 # Maintain your gem's version:
 require_relative "../decidim-core/lib/decidim/core/version"

data/decidim-pages/spec/features/admin_spec.rb

@@ -29,7 +29,7 @@ describe "Edit a page", type: :feature do
       }
 
       within "form.edit_page" do
-        fill_in_i18n_editor(:page_body, "#body-tabs", new_body)
+        fill_in_i18n_editor(:page_body, "#page-body-tabs", new_body)
         find("*[type=submit]").click
       end
 

data/decidim-pages/spec/spec_helper.rb

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

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

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    # A command with all the business logic when a user unvotes a proposal.
+    class UnvoteProposal < Rectify::Command
+      # Public: Initializes the command.
+      #
+      # proposal     - A Decidim::Proposals::Proposal object.
+      # current_user - The current user.
+      def initialize(proposal, current_user)
+        @proposal = proposal
+        @current_user = current_user
+      end
+
+      # Executes the command. Broadcasts these events:
+      #
+      # - :ok when everything is valid, together with the proposal.
+      # - :invalid if the form wasn't valid and we couldn't proceed.
+      #
+      # Returns nothing.
+      def call
+        destroy_proposal_vote
+        broadcast(:ok, @proposal)
+      end
+
+      private
+
+      def destroy_proposal_vote
+        @proposal.votes.where(author: @current_user).destroy_all
+      end
+    end
+  end
+end

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

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    # A command with all the business logic when a user votes a proposal.
+    class VoteProposal < Rectify::Command
+      # Public: Initializes the command.
+      #
+      # proposal     - A Decidim::Proposals::Proposal object.
+      # current_user - The current user.
+      def initialize(proposal, current_user)
+        @proposal = proposal
+        @current_user = current_user
+      end
+
+      # Executes the command. Broadcasts these events:
+      #
+      # - :ok when everything is valid, together with the proposal vote.
+      # - :invalid if the form wasn't valid and we couldn't proceed.
+      #
+      # Returns nothing.
+      def call
+        build_proposal_vote
+        return broadcast(:invalid) unless vote.valid?
+
+        vote.save!
+        broadcast(:ok, vote)
+      end
+
+      attr_reader :vote
+
+      private
+
+      def build_proposal_vote
+        @vote = @proposal.votes.build(author: @current_user)
+      end
+    end
+  end
+end

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

@@ -22,23 +22,27 @@ module Decidim
         def available_orders
           @available_orders ||= begin
             available_orders = %w(random recent)
-            available_orders << "most_voted" if votes_visible?
+            available_orders << "most_voted" if most_voted_order_available?
             available_orders
           end
         end
 
         def default_order
-          if current_settings.votes_blocked?
+          if order_by_votes?
             detect_order("most_voted")
           else
             "random"
           end
         end
 
-        def votes_visible?
+        def most_voted_order_available?
           current_settings.votes_enabled? && !current_settings.votes_hidden?
         end
 
+        def order_by_votes?
+          most_voted_order_available? && current_settings.votes_blocked?
+        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))

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

@@ -12,20 +12,30 @@ module Decidim
 
       def create
         authorize! :vote, proposal
-
-        proposal.votes.create!(author: current_user)
         @from_proposals_list = params[:from_proposals_list] == "true"
-        render :update_buttons_and_counters
+
+        VoteProposal.call(proposal, current_user) do
+          on(:ok) do
+            proposal.reload
+            render :update_buttons_and_counters
+          end
+
+          on(:invalid) do
+            render json: { error: I18n.t("proposal_votes.create.error", scope: "decidim.proposals") }, status: 422
+          end
+        end
       end
 
       def destroy
         authorize! :unvote, proposal
-
-        proposal.votes.where(author: current_user).destroy_all
-        proposal.reload
-
         @from_proposals_list = params[:from_proposals_list] == "true"
-        render :update_buttons_and_counters
+
+        UnvoteProposal.call(proposal, current_user) do
+          on(:ok) do
+            proposal.reload
+            render :update_buttons_and_counters
+          end
+        end
       end
 
       private

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

@@ -87,9 +87,9 @@ module Decidim
         true
       end
 
-      # Public: Overrides the `reported_content` Reportable concern method.
-      def reported_content
-        "<h3>#{title}</h3><p>#{body}</p>"
+      # Public: Overrides the `reported_content_url` Reportable concern method.
+      def reported_content_url
+        ResourceLocatorPresenter.new(self).url
       end
     end
   end

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

@@ -7,7 +7,6 @@ module Decidim
       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 }
       validate :author_and_proposal_same_organization
 

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

@@ -0,0 +1,23 @@
+<div class="author-data__main">
+  <div class="author author--inline">
+    <span class="author__avatar author__avatar--small">
+      <%= image_tag proposal.author_avatar_url %>
+    </span>
+    <span class="author__name">
+      <% if proposal.author&.deleted? %>
+        <span class="label label--small label--basic">
+          <%= t('.deleted') %>
+        </span>
+      <% else %>
+        <%= proposal.author_name %>
+      <% end %>
+    </span>
+    <% if proposal.user_group && proposal.user_group.verified? %>
+      &nbsp;
+      <span class="label label--highlight label--small">
+        <%= t ".verified_user_group" %>
+      </span>
+    <% end %>
+    <%= l proposal.created_at, format: "%d/%m/%Y" %>
+  </div>
+</div>

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

@@ -2,11 +2,11 @@
   <% resources.each do |proposal| %>
     <div class="card--list__item">
       <div class="card--list__text">
-        <%= link_to decidim_resource_path(proposal) do %>
+        <%= link_to resource_locator(proposal).path do %>
           <%= icon "proposals", class: "card--list__icon", remove_icon_class: true %>
         <% end %>
         <div>
-          <%= link_to decidim_resource_path(proposal), class: "card__link" do %>
+          <%= link_to resource_locator(proposal).path, class: "card__link" do %>
             <h5 class="card--list__heading"><%= proposal.title %></h5>
           <% end %>
           <div class="author">