decidim 0.0.8.1 → 0.1.0

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "spec_helper"
 
 describe "Proposals feature" do

data/decidim-proposals/spec/models/decidim/proposals/proposal_vote_spec.rb

@@ -8,7 +8,7 @@ module Decidim
       let!(:feature) { create(:feature, organization: organization, manifest_name: "proposals") }
       let!(:participatory_process) { create(:participatory_process, organization: organization) }
       let!(:author) { create(:user, organization: organization) }
-      let!(:proposal) { create(:proposal, feature: feature, author: author)}
+      let!(:proposal) { create(:proposal, feature: feature, author: author) }
       let!(:proposal_vote) { create(:proposal_vote, proposal: proposal, author: author) }
 
       subject { proposal_vote }
@@ -26,9 +26,9 @@ module Decidim
       end
 
       it "validates uniqueness for author and proposal combination" do
-        expect {
+        expect do
           create(:proposal_vote, proposal: proposal, author: author)
-        }.to raise_error(ActiveRecord::RecordInvalid)
+        end.to raise_error(ActiveRecord::RecordInvalid)
       end
 
       context "when no author" do

data/decidim-proposals/spec/queries/decidim/proposals/filtered_proposals_spec.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+require "spec_helper"
+
+describe Decidim::Proposals::FilteredProposals do
+  let(:organization) { create(:organization) }
+  let(:participatory_process) { create(:participatory_process, organization: organization) }
+  let(:feature) { create(:proposal_feature, participatory_process: participatory_process) }
+  let(:another_feature) { create(:proposal_feature, participatory_process: participatory_process) }
+
+  let(:proposals) { create_list(:proposal, 3, feature: feature) }
+  let(:old_proposals) { create_list(:proposal, 3, feature: feature, created_at: 10.days.ago) }
+  let(:another_proposals) { create_list(:proposal, 3, feature: another_feature) }
+
+  it "returns proposals included in a collection of features" do
+    expect(Decidim::Proposals::FilteredProposals.for([feature, another_feature])).to match_array proposals.concat(old_proposals, another_proposals)
+  end
+
+  it "returns proposals created in a date range" do
+    expect(Decidim::Proposals::FilteredProposals.for([feature, another_feature], 2.weeks.ago, 1.week.ago)).to match_array old_proposals
+  end
+end

data/decidim-proposals/spec/services/decidim/proposals/proposal_search_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "spec_helper"
 
 module Decidim
@@ -8,7 +9,7 @@ module Decidim
       let(:scope2) { create :scope, organization: feature.organization }
       let(:participatory_process) { feature.participatory_process }
       let(:user) { create(:user, organization: feature.organization) }
-      let!(:proposal) { create(:proposal, feature: feature, scope: scope1)}
+      let!(:proposal) { create(:proposal, feature: feature, scope: scope1) }
 
       describe "results" do
         let(:activity) { [] }
@@ -19,7 +20,7 @@ module Decidim
         let(:scope_id) { nil }
 
         subject do
-          described_class.new({
+          described_class.new(
             feature: feature,
             activity: activity,
             search_text: search_text,
@@ -28,7 +29,7 @@ module Decidim
             related_to: related_to,
             scope_id: scope_id,
             current_user: user
-          }).results
+          ).results
         end
 
         it "only includes proposals from the given feature" do
@@ -115,7 +116,7 @@ module Decidim
         end
 
         context "scope_id" do
-          let!(:proposal2) { create(:proposal, feature: feature, scope: scope2)}
+          let!(:proposal2) { create(:proposal, feature: feature, scope: scope2) }
 
           context "when a single id is being sent" do
             let(:scope_id) { scope1.id }
@@ -134,7 +135,7 @@ module Decidim
           end
 
           context "when `global` is being sent" do
-            let!(:resource_without_scope) { create(:proposal, feature: feature, scope: nil)}
+            let!(:resource_without_scope) { create(:proposal, feature: feature, scope: nil) }
             let(:scope_id) { ["global"] }
 
             it "returns resources without a scope" do
@@ -151,12 +152,12 @@ module Decidim
 
             it "returns only proposals related to meetings" do
               related_proposal = create(:proposal, :accepted, feature: feature)
-              related_proposal_2 = create(:proposal, :accepted, feature: feature)
+              related_proposal2 = create(:proposal, :accepted, feature: feature)
               create_list(:proposal, 3, feature: feature)
               meeting.link_resources([related_proposal], "proposals_from_meeting")
-              related_proposal_2.link_resources([meeting], "proposals_from_meeting")
+              related_proposal2.link_resources([meeting], "proposals_from_meeting")
 
-              expect(subject).to match_array([related_proposal, related_proposal_2])
+              expect(subject).to match_array([related_proposal, related_proposal2])
             end
           end
 
@@ -165,15 +166,14 @@ module Decidim
             let(:results_feature) { create(:feature, manifest_name: "results", participatory_process: participatory_process) }
             let(:result) { create :result, feature: results_feature }
 
-
             it "returns only proposals related to results" do
               related_proposal = create(:proposal, :accepted, feature: feature)
-              related_proposal_2 = create(:proposal, :accepted, feature: feature)
+              related_proposal2 = create(:proposal, :accepted, feature: feature)
               create_list(:proposal, 3, feature: feature)
               result.link_resources([related_proposal], "included_proposals")
-              related_proposal_2.link_resources([result], "included_proposals")
+              related_proposal2.link_resources([result], "included_proposals")
 
-              expect(subject).to match_array([related_proposal, related_proposal_2])
+              expect(subject).to match_array([related_proposal, related_proposal2])
             end
           end
         end

data/decidim-proposals/spec/services/decidim/proposals/proposal_serializer_spec.rb

@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+require "spec_helper"
+
+module Decidim
+  module Proposals
+    describe ProposalSerializer do
+      let!(:proposal) { create(:proposal) }
+      let!(:category) { create(:category, participatory_process: feature.participatory_process) }
+      let(:participatory_process) { feature.participatory_process }
+      let(:feature) { proposal.feature }
+
+      let!(:meetings_feature) { create(:feature, manifest_name: "meetings", participatory_process: participatory_process) }
+      let(:meetings) { create_list(:meeting, 2, feature: meetings_feature) }
+
+      before do
+        proposal.update_attribute(:category, category)
+        proposal.link_resources(meetings, "proposals_from_meeting")
+      end
+
+      subject do
+        described_class.new(proposal)
+      end
+
+      describe "#serialize" do
+        let(:serialized) { subject.serialize }
+
+        it "serializes the id" do
+          expect(serialized).to include(id: proposal.id)
+        end
+
+        it "serializes the category" do
+          expect(serialized[:category]).to include(id: category.id)
+          expect(serialized[:category]).to include(name: category.name)
+        end
+
+        it "serializes the title" do
+          expect(serialized).to include(title: proposal.title)
+        end
+
+        it "serializes the body" do
+          expect(serialized).to include(body: proposal.body)
+        end
+
+        it "serializes the amount of votes" do
+          expect(serialized).to include(votes: proposal.proposal_votes_count)
+        end
+
+        it "serializes the amount of comments" do
+          expect(serialized).to include(comments: proposal.comments.count)
+        end
+
+        it "serializes the date of creation" do
+          expect(serialized).to include(created_at: proposal.created_at)
+        end
+
+        it "serializes the url" do
+          expect(serialized[:url]).to include("http", proposal.id.to_s)
+        end
+
+        it "serializes the feature" do
+          expect(serialized[:feature]).to include(id: proposal.feature.id)
+        end
+
+        it "serializes the meetings" do
+          expect(serialized[:meeting_urls].length).to eq(2)
+          expect(serialized[:meeting_urls].first).to match(%r{http.*/meetings})
+        end
+      end
+    end
+  end
+end

data/decidim-proposals/spec/shared/admin_shared_context.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 RSpec.shared_context "admin" do
   let(:organization) { create(:organization) }
   let!(:user) { create(:user, :admin, :confirmed, organization: organization) }

data/decidim-proposals/spec/shared/create_proposal_examples.rb

@@ -77,9 +77,10 @@ RSpec.shared_examples "create a proposal" do |with_author|
           let(:address) { "Carrer Pare Llaurador 113, baixos, 08224 Terrassa" }
 
           before do
-            Geocoder::Lookup::Test.add_stub(address, [
-              { 'latitude' => latitude, 'longitude' => longitude }
-            ])
+            Geocoder::Lookup::Test.add_stub(
+              address,
+              [{ "latitude" => latitude, "longitude" => longitude }]
+            )
           end
 
           it "sets the latitude and longitude" do

data/decidim-proposals/spec/shared/export_proposals_examples.rb

@@ -0,0 +1,37 @@
+# -*- coding: utf-8 -*-
+# frozen_string_literal: true
+RSpec.shared_examples "export proposals" do
+  let!(:proposals) { create_list :proposal, 3, feature: current_feature }
+
+  around do |example|
+    perform_enqueued_jobs do
+      example.run
+    end
+  end
+
+  it "exports a CSV" do
+    find(".exports.dropdown").click
+    click_link "CSV"
+
+    within ".callout.success" do
+      expect(page).to have_content("in progress")
+    end
+
+    expect(last_email.subject).to include("proposals", "csv")
+    expect(last_email.attachments.length).to be_positive
+    expect(last_email.attachments.first.filename).to match(/^proposals.*\.zip$/)
+  end
+
+  it "exports a JSON" do
+    find(".exports.dropdown").click
+    click_link "JSON"
+
+    within ".callout.success" do
+      expect(page).to have_content("in progress")
+    end
+
+    expect(last_email.subject).to include("proposals", "json")
+    expect(last_email.attachments.length).to be_positive
+    expect(last_email.attachments.first.filename).to match(/^proposals.*\.zip$/)
+  end
+end

data/decidim-proposals/spec/shared/manage_proposals_examples.rb

@@ -6,9 +6,10 @@ RSpec.shared_examples "manage proposals" do
   let(:longitude) { 2.1234 }
 
   before do
-    Geocoder::Lookup::Test.add_stub(address, [
-      { 'latitude' => latitude, 'longitude' => longitude }
-    ])
+    Geocoder::Lookup::Test.add_stub(
+      address,
+      [{ "latitude" => latitude, "longitude" => longitude }]
+    )
   end
 
   context "previewing proposals" do
@@ -122,9 +123,9 @@ RSpec.shared_examples "manage proposals" do
           context "when geocoding is enabled" do
             let!(:current_feature) do
               create(:proposal_feature,
-                    :with_geocoding_enabled,
-                    manifest: manifest,
-                    participatory_process: participatory_process)
+                     :with_geocoding_enabled,
+                     manifest: manifest,
+                     participatory_process: participatory_process)
             end
 
             it "creates a new proposal related to the process scope" do
@@ -158,7 +159,7 @@ RSpec.shared_examples "manage proposals" do
 
     context "when official_proposals setting is disabled" do
       before do
-        current_feature.update_attributes(settings: { official_proposals_enabled: false } )
+        current_feature.update_attributes(settings: { official_proposals_enabled: false })
       end
 
       it "cannot create a new proposal" do
@@ -170,7 +171,7 @@ RSpec.shared_examples "manage proposals" do
 
   context "when the proposal_answering feature setting is enabled" do
     before do
-      current_feature.update_attributes(settings: { proposal_answering_enabled: true } )
+      current_feature.update_attributes(settings: { proposal_answering_enabled: true })
     end
 
     context "when the proposal_answering step setting is enabled" do
@@ -235,9 +236,9 @@ RSpec.shared_examples "manage proposals" do
 
       it "can edit a proposal answer" do
         proposal.update_attributes!(
-          state: 'rejected',
+          state: "rejected",
           answer: {
-            'en' => "I don't like it"
+            "en" => "I don't like it"
           },
           answered_at: Time.current
         )
@@ -291,7 +292,7 @@ RSpec.shared_examples "manage proposals" do
 
   context "when the proposal_answering feature setting is disabled" do
     before do
-      current_feature.update_attributes(settings: { proposal_answering_enabled: false } )
+      current_feature.update_attributes(settings: { proposal_answering_enabled: false })
     end
 
     it "cannot answer a proposal" do

data/decidim-proposals/spec/shared/proposal_form_examples.rb

@@ -7,8 +7,8 @@ RSpec.shared_examples "a proposal form" do
   let(:author) { create(:user, organization: feature.organization) }
   let(:category) { create(:category, participatory_process: feature.participatory_process) }
   let(:scope) { create(:scope, organization: feature.organization) }
-  let(:category_id) { category.try(:id)}
-  let(:scope_id) { scope.try(:id)}
+  let(:category_id) { category.try(:id) }
+  let(:scope_id) { scope.try(:id) }
   let(:latitude) { 40.1234 }
   let(:longitude) { 2.1234 }
   let(:address) { nil }
@@ -58,28 +58,29 @@ RSpec.shared_examples "a proposal form" do
 
   context "with invalid category_id" do
     let(:category_id) { 987 }
-    it { is_expected.to be_invalid}
+    it { is_expected.to be_invalid }
   end
 
   context "with invalid scope_id" do
     let(:scope_id) { 987 }
-    it { is_expected.to be_invalid}
+    it { is_expected.to be_invalid }
   end
 
   context "when geocoding is enabled" do
     let(:feature) { create(:proposal_feature, :with_geocoding_enabled) }
 
     context "when the address is not present" do
-      it { is_expected.to be_invalid}
+      it { is_expected.to be_invalid }
     end
 
     context "when the address is present" do
       let(:address) { "Carrer Pare Llaurador 113, baixos, 08224 Terrassa" }
 
       before do
-        Geocoder::Lookup::Test.add_stub(address, [
-          { 'latitude' => latitude, 'longitude' => longitude }
-        ])
+        Geocoder::Lookup::Test.add_stub(
+          address,
+          [{ "latitude" => latitude, "longitude" => longitude }]
+        )
       end
 
       it "validates the address and store its coordinates" do

data/decidim-proposals/spec/spec_helper.rb

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

data/decidim-results/app/controllers/decidim/results/result_widgets_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Decidim
   module Results
     class ResultWidgetsController < Decidim::WidgetsController

data/decidim-results/app/controllers/decidim/results/results_controller.rb

@@ -12,7 +12,7 @@ module Decidim
       private
 
       def results
-        @results ||= search.results.page(params[:page]).per(12)
+        @results ||= search.results.order("title -> '#{I18n.locale}' ASC").page(params[:page]).per(12)
       end
 
       def result

data/decidim-results/app/queries/decidim/results/filtered_results.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+module Decidim
+  module Results
+    # A class used to find results filtered by features and a date range
+    class FilteredResults < Rectify::Query
+      # Syntactic sugar to initialize the class and return the queried objects.
+      #
+      # features - An array of Decidim::Feature
+      # start_at - A date to filter resources created after it
+      # end_at - A date to filter resources created before it.
+      def self.for(features, start_at = nil, end_at = nil)
+        new(features, start_at, end_at).query
+      end
+
+      # Initializes the class.
+      #
+      # features - An array of Decidim::Feature
+      # start_at - A date to filter resources created after it
+      # end_at - A date to filter resources created before it.
+      def initialize(features, start_at = nil, end_at = nil)
+        @features = features
+        @start_at = start_at
+        @end_at = end_at
+      end
+
+      # Finds the Results scoped to an array of features and filtered
+      # by a range of dates.
+      def query
+        results = Decidim::Results::Result.where(feature: @features)
+        results = results.where("created_at >= ?", @start_at) if @start_at.present?
+        results = results.where("created_at <= ?", @end_at) if @end_at.present?
+        results
+      end
+    end
+  end
+end

data/decidim-results/app/services/decidim/results/result_stats_calculator.rb

@@ -20,7 +20,7 @@ module Decidim
       end
 
       def comments_count
-        Decidim::Comments::Comment.where(commentable: proposals).count
+        Decidim::Comments::Comment.where(root_commentable: proposals).count
       end
 
       def attendees_count

data/decidim-results/app/views/decidim/results/result_widgets/show.html.erb

@@ -1,10 +1,2 @@
-<div class="column">
-  <article class="card card--result">
-    <div class="card__content">
-      <%= link_to model, class: "card__link" do %>
-        <h5 class="card__title"><%= translated_attribute model.title %></h5>
-      <% end %>
-      <%== translated_attribute model.description %>
-    </div>
-  </article>
-</div>
+<% content_for(:title, translated_attribute(model.title)) %>
+<%== translated_attribute model.description %>