decidim 0.0.8.1 → 0.1.0

data/decidim-proposals/decidim-proposals.gemspec

@@ -15,9 +15,9 @@ Gem::Specification.new do |s|
 
   s.add_dependency "decidim-core", Decidim.version
   s.add_dependency "decidim-comments", Decidim.version
-  s.add_dependency "rectify", "~> 0.8.0"
+  s.add_dependency "rectify", "~> 0.9.1"
   s.add_dependency "kaminari", "~> 1.0.1"
-  s.add_dependency 'social-share-button', "~> 0.9.0"
+  s.add_dependency 'social-share-button', "~> 0.10.0"
 
   s.add_development_dependency "decidim-dev", Decidim.version
   s.add_development_dependency "decidim-meetings", Decidim.version

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

@@ -10,7 +10,12 @@ 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"
       end
 

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

@@ -37,6 +37,20 @@ Decidim.register_feature(:proposals) do |feature|
     resource.template = "decidim/proposals/proposals/linked_proposals"
   end
 
+  feature.register_stat :proposals_count, primary: true, priority: Decidim::StatsRegistry::HIGH_PRIORITY do |features, start_at, end_at|
+    Decidim::Proposals::FilteredProposals.for(features, start_at, end_at).count
+  end
+
+  feature.register_stat :votes_count, priority: Decidim::StatsRegistry::MEDIUM_PRIORITY do |features, start_at, end_at|
+    proposals = Decidim::Proposals::FilteredProposals.for(features, start_at, end_at)
+    Decidim::Proposals::ProposalVote.where(proposal: proposals).count
+  end
+
+  feature.register_stat :comments_count, tag: :comments do |features, start_at, end_at|
+    proposals = Decidim::Proposals::FilteredProposals.for(features, start_at, end_at)
+    Decidim::Comments::Comment.where(root_commentable: proposals).count
+  end
+
   feature.seeds do
     Decidim::ParticipatoryProcess.all.each do |process|
       next unless process.steps.any?

data/decidim-proposals/spec/factories.rb

@@ -1 +1,2 @@
+# frozen_string_literal: true
 require "decidim/proposals/test/factories"

data/decidim-proposals/spec/features/admin_manages_proposals_spec.rb

@@ -6,6 +6,7 @@ describe "Admin manages proposals", type: :feature do
   include_context "admin"
   it_behaves_like "manage proposals"
   it_behaves_like "manage moderations"
+  it_behaves_like "export proposals"
   include_context "feature"
   let(:manifest_name) { "proposals" }
 

data/decidim-proposals/spec/features/process_admin_manages_proposals_spec.rb

@@ -7,6 +7,7 @@ describe "Process admin manages proposals", type: :feature do
   let(:user) { process_admin }
   it_behaves_like "manage proposals"
   it_behaves_like "manage moderations"
+  it_behaves_like "export proposals"
   include_context "feature"
   let(:manifest_name) { "proposals" }
 

data/decidim-proposals/spec/features/proposals_spec.rb

@@ -5,8 +5,8 @@ describe "Proposals", type: :feature do
   include_context "feature"
   let!(:feature) do
     create(:proposal_feature,
-      manifest: manifest,
-      participatory_process: participatory_process)
+           manifest: manifest,
+           participatory_process: participatory_process)
   end
   let(:manifest_name) { "proposals" }
 
@@ -20,9 +20,10 @@ describe "Proposals", type: :feature 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 "creating a new proposal" do
@@ -94,10 +95,10 @@ describe "Proposals", type: :feature do
         context "when geocoding is enabled" do
           let!(:feature) do
             create(:proposal_feature,
-                  :with_creation_enabled,
-                  :with_geocoding_enabled,
-                  manifest: manifest,
-                  participatory_process: participatory_process)
+                   :with_creation_enabled,
+                   :with_geocoding_enabled,
+                   manifest: manifest,
+                   participatory_process: participatory_process)
           end
 
           it "creates a new proposal" do
@@ -156,10 +157,10 @@ describe "Proposals", type: :feature do
           context "when geocoding is enabled" do
             let!(:feature) do
               create(:proposal_feature,
-                    :with_creation_enabled,
-                    :with_geocoding_enabled,
-                    manifest: manifest,
-                    participatory_process: participatory_process)
+                     :with_creation_enabled,
+                     :with_geocoding_enabled,
+                     manifest: manifest,
+                     participatory_process: participatory_process)
             end
 
             it "creates a new proposal as a user group" do
@@ -353,7 +354,7 @@ describe "Proposals", type: :feature do
   end
 
   context "when a proposal has been linked in a project" do
-    let(:proposal) { create(:proposal, feature: feature)}
+    let(:proposal) { create(:proposal, feature: feature) }
     let(:budget_feature) do
       create(:feature, manifest_name: :budgets, participatory_process: proposal.feature.participatory_process)
     end
@@ -398,7 +399,7 @@ describe "Proposals", type: :feature do
     context "when filtering" do
       context "when official_proposals setting is enabled" do
         before do
-          feature.update_attributes(settings: { official_proposals_enabled: true})
+          feature.update_attributes(settings: { official_proposals_enabled: true })
         end
 
         it "can be filtered by origin" do
@@ -439,7 +440,7 @@ describe "Proposals", type: :feature do
 
       context "when official_proposals setting is not enabled" do
         before do
-          feature.update_attributes(settings: { official_proposals_enabled: false } )
+          feature.update_attributes(settings: { official_proposals_enabled: false })
         end
 
         it "cannot be filtered by origin" do
@@ -453,7 +454,7 @@ describe "Proposals", type: :feature do
 
       context "when scoped_proposals setting is enabled" do
         before do
-          feature.update_attributes(settings: { scoped_proposals_enabled: true } )
+          feature.update_attributes(settings: { scoped_proposals_enabled: true })
         end
 
         it "cannot be filtered by scope" do
@@ -481,7 +482,7 @@ describe "Proposals", type: :feature do
 
       context "when proposal_answering feature setting is enabled" do
         before do
-          feature.update_attributes(settings: { proposal_answering_enabled: true } )
+          feature.update_attributes(settings: { proposal_answering_enabled: true })
         end
 
         context "when proposal_answering step setting is enabled" do
@@ -563,7 +564,7 @@ describe "Proposals", type: :feature do
 
       context "when proposal_answering feature setting is not enabled" do
         before do
-          feature.update_attributes(settings: { proposal_answering_enabled: false } )
+          feature.update_attributes(settings: { proposal_answering_enabled: false })
         end
 
         it "cannot be filtered by state" do
@@ -580,9 +581,9 @@ describe "Proposals", type: :feature do
       context "by 'most_support'" do
         let!(:feature) do
           create(:proposal_feature,
-            :with_votes_enabled,
-            manifest: manifest,
-            participatory_process: participatory_process)
+                 :with_votes_enabled,
+                 manifest: manifest,
+                 participatory_process: participatory_process)
         end
 
         before do
@@ -599,13 +600,13 @@ describe "Proposals", type: :feature do
           visit_feature
 
           within ".order-by" do
-            page.find('.dropdown.menu .is-dropdown-submenu-parent').hover
+            page.find(".dropdown.menu .is-dropdown-submenu-parent").hover
           end
 
           click_link "Most voted"
 
-          expect(page.find('#proposals .card-grid .column:first-child', text: most_voted_proposal.title)).to be
-          expect(page.find('#proposals .card-grid .column:last-child', text: less_voted_proposal.title)).to be
+          expect(page.find("#proposals .card-grid .column:first-child", text: most_voted_proposal.title)).to be
+          expect(page.find("#proposals .card-grid .column:last-child", text: less_voted_proposal.title)).to be
         end
       end
 
@@ -617,13 +618,13 @@ describe "Proposals", type: :feature do
           visit_feature
 
           within ".order-by" do
-            page.find('.dropdown.menu .is-dropdown-submenu-parent').hover
+            page.find(".dropdown.menu .is-dropdown-submenu-parent").hover
           end
 
           click_link "Recent"
 
-          expect(page.find('#proposals .card-grid .column:first-child', text: recent_proposal.title)).to be
-          expect(page.find('#proposals .card-grid .column:last-child', text: older_proposal.title)).to be
+          expect(page.find("#proposals .card-grid .column:first-child", text: recent_proposal.title)).to be
+          expect(page.find("#proposals .card-grid .column:last-child", text: older_proposal.title)).to be
         end
       end
     end

data/decidim-proposals/spec/features/report_proposal_spec.rb

@@ -13,7 +13,7 @@ describe "Report Proposal", type: :feature do
 
   let!(:feature) do
     create(:proposal_feature,
-      manifest: manifest,
-      participatory_process: participatory_process)
+           manifest: manifest,
+           participatory_process: participatory_process)
   end
 end

data/decidim-proposals/spec/features/vote_proposal_spec.rb

@@ -11,28 +11,28 @@ describe "Vote Proposal", type: :feature do
 
   let!(:feature) do
     create(:proposal_feature,
-      manifest: manifest,
-      participatory_process: participatory_process)
+           manifest: manifest,
+           participatory_process: participatory_process)
   end
 
   context "when votes are not enabled" do
     it "doesn't show the vote proposal button and counts" do
-      expect(page).not_to have_css('.card__button', text: "Vote")
-      expect(page).not_to have_css('.card__support__data span', text: "0 VOTES")
+      expect(page).not_to have_css(".card__button", text: "Vote")
+      expect(page).not_to have_css(".card__support__data span", text: "0 VOTES")
     end
   end
 
   context "when votes are blocked" do
     let!(:feature) do
       create(:proposal_feature,
-        :with_votes_blocked,
-        manifest: manifest,
-        participatory_process: participatory_process)
+             :with_votes_blocked,
+             manifest: manifest,
+             participatory_process: participatory_process)
     end
 
     it "shows the vote count and the vote button is disabled" do
       visit_feature
-      expect(page).to have_css('.card__support__data', text: "0 VOTES")
+      expect(page).to have_css(".card__support__data", text: "0 VOTES")
       expect(page).to have_content("Voting disabled")
     end
   end
@@ -40,9 +40,9 @@ describe "Vote Proposal", type: :feature do
   context "when votes are enabled" do
     let!(:feature) do
       create(:proposal_feature,
-        :with_votes_enabled,
-        manifest: manifest,
-        participatory_process: participatory_process)
+             :with_votes_enabled,
+             manifest: manifest,
+             participatory_process: participatory_process)
     end
 
     context "when the user is not logged in" do
@@ -50,10 +50,10 @@ describe "Vote Proposal", type: :feature do
         visit_feature
 
         within ".card__support", match: :first do
-          page.find('.card__button').click
+          page.find(".card__button").click
         end
 
-        expect(page).to have_css('#loginModal', visible: true)
+        expect(page).to have_css("#loginModal", visible: true)
       end
     end
 
@@ -66,8 +66,8 @@ describe "Vote Proposal", type: :feature do
       context "when the proposal is not voted yet" do
         it "should be able to vote the proposal" do
           within "#proposal-#{proposal.id}-vote-button" do
-            page.find('.card__button').click
-            expect(page).to have_css('.card__button.success', text: "Already voted")
+            page.find(".card__button").click
+            expect(page).to have_css(".card__button.success", text: "Already voted")
           end
 
           within "#proposal-#{proposal.id}-votes-count" do
@@ -84,8 +84,8 @@ describe "Vote Proposal", type: :feature do
 
         it "should not be able to vote it again" do
           within "#proposal-#{proposal.id}-vote-button" do
-            expect(page).to have_css('.card__button.success', text: "Already voted")
-            page.find('.card__button').click
+            expect(page).to have_css(".card__button.success", text: "Already voted")
+            page.find(".card__button").click
           end
 
           within "#proposal-#{proposal.id}-votes-count" do
@@ -99,18 +99,18 @@ describe "Vote Proposal", type: :feature do
 
         let!(:feature) do
           create(:proposal_feature,
-            :with_votes_enabled,
-            :with_vote_limit,
-            vote_limit: vote_limit,
-            manifest: manifest,
-            participatory_process: participatory_process)
+                 :with_votes_enabled,
+                 :with_vote_limit,
+                 vote_limit: vote_limit,
+                 manifest: manifest,
+                 participatory_process: participatory_process)
         end
 
         context "when the proposal is not voted yet" do
           it "should update the remaining votes counter" do
             within "#proposal-#{proposal.id}-vote-button" do
-              page.find('.card__button').click
-              expect(page).to have_css('.card__button.success')
+              page.find(".card__button").click
+              expect(page).to have_css(".card__button.success")
             end
 
             expect(page).to have_content("REMAINING 9 VOTES")
@@ -125,7 +125,7 @@ describe "Vote Proposal", type: :feature do
 
           it "should show a modal dialog" do
             within "#proposal-#{proposal.id}-vote-button" do
-              page.find('.card__button').click
+              page.find(".card__button").click
             end
 
             expect(page).to have_content("Authorization required")
@@ -140,8 +140,12 @@ describe "Vote Proposal", type: :feature do
 
           it "should be able to undo the vote" do
             within "#proposal-#{proposal.id}-vote-button" do
-              expect(page).to have_css('.card__button.success')
-              page.find('.card__button').click
+              expect(page).to have_css(".card__button.success")
+              page.find(".card__button").click
+            end
+
+            within "#proposal-#{proposal.id}-votes-count" do
+              expect(page).to have_content("0 VOTES")
             end
 
             expect(page).to have_content("REMAINING 10 VOTES")
@@ -157,19 +161,19 @@ describe "Vote Proposal", type: :feature do
           end
 
           it "should not be able to vote other proposals" do
-            expect(page).to have_css('.card__button[disabled]', count: 2)
+            expect(page).to have_css(".card__button[disabled]", count: 2)
           end
 
           context "when votes are blocked" do
             let!(:feature) do
               create(:proposal_feature,
-                :with_votes_blocked,
-                manifest: manifest,
-                participatory_process: participatory_process)
+                     :with_votes_blocked,
+                     manifest: manifest,
+                     participatory_process: participatory_process)
             end
 
             it "shows the vote count but not the vote button" do
-              expect(page).to have_css('.card__support__data', text: "1 VOTE")
+              expect(page).to have_css(".card__support__data", text: "1 VOTE")
               expect(page).to have_content("Voting disabled")
             end
           end

data/decidim-proposals/spec/helpers/proposal_order_helper_spec.rb

@@ -11,7 +11,7 @@ module Decidim
       describe "#order_fields" do
         context "with votes enabled" do
           context "with votes hidden" do
-            let(:current_settings) { double(:current_settings, { votes_enabled?: true, votes_hidden?: true }) }
+            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)
@@ -19,7 +19,7 @@ module Decidim
           end
 
           context "with votes not hidden" do
-            let(:current_settings) { double(:current_settings, { votes_enabled?: true, votes_hidden?: false }) }
+            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)
@@ -28,7 +28,7 @@ module Decidim
         end
 
         context "with votes disabled" do
-          let(:current_settings) { double(:current_settings, { votes_enabled?: false }) }
+          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)

data/decidim-proposals/spec/jobs/export_job_spec.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+require "spec_helper"
+
+module Decidim
+  module Proposals
+    describe ExportJob do
+      let!(:feature) { create(:feature, manifest_name: "proposals") }
+      let!(:proposals) { create_list(:proposal, 3, feature: feature) }
+      let(:organization) { feature.organization }
+      let!(:user) { create(:user, organization: organization) }
+
+      it "sends an email with the result of the export" do
+        ExportJob.perform_now(user, feature, "csv")
+
+        email = last_email
+        expect(email.subject).to include("proposals")
+        attachment = email.attachments.first
+
+        expect(attachment.read.length).to be_positive
+        expect(attachment.mime_type).to eq("application/zip")
+        expect(attachment.filename).to match(/^proposals-[0-9]+-[0-9]+-[0-9]+-[0-9]+\.zip$/)
+      end
+
+      describe "CSV" do
+        it "uses the CSV exporter" do
+          export_data = double
+
+          expect(Decidim::Exporters::CSV)
+            .to(receive(:new).with(anything, ProposalSerializer))
+            .and_return(double(export: export_data))
+
+          expect(ExportMailer)
+            .to(receive(:export).with(user, anything, export_data))
+            .and_return(double(deliver_now: true))
+
+          ExportJob.perform_now(user, feature, "csv")
+        end
+      end
+
+      describe "JSON" do
+        it "uses the JSON exporter" do
+          export_data = double
+
+          expect(Decidim::Exporters::JSON)
+            .to(receive(:new).with(anything, ProposalSerializer))
+            .and_return(double(export: export_data))
+
+          expect(ExportMailer)
+            .to(receive(:export).with(user, anything, export_data))
+            .and_return(double(deliver_now: true))
+
+          ExportJob.perform_now(user, feature, "json")
+        end
+      end
+    end
+  end
+end