decidim 0.0.8.1 → 0.1.0

data/decidim-results/config/locales/fr.yml

@@ -2,4 +2,78 @@ fr:
   activemodel:
     attributes:
       result:
-        decidim_category_id: Catégorie
+        decidim_category_id: Catégorie
+        decidim_scope_id: Domaine d'application
+        description: Description
+        proposal_ids: Propositions incluses
+        title: Titre
+  decidim:
+    features:
+      results:
+        name: Résultats
+        settings:
+          global:
+            comments_enabled: Commentaires activés
+          step:
+            comments_blocked: Commentaires bloqués
+    resource_links:
+      included_proposals:
+        result_proposals: Propositions incluses dans ce résultat
+      meetings_through_proposals:
+        result_meetings: Rencontres connexes
+    results:
+      actions:
+        confirm_destroy: Êtes-vous sûr de vouloir supprimer ce résultat?
+        destroy: Supprimer
+        edit: Modifier
+        new: Nouveau
+        preview: Aperçu
+        title: Actions
+      admin:
+        models:
+          result:
+            name: Résultat
+        results:
+          create:
+            invalid: Il y a eu un problème pour créer ce résultat
+            success: Résultat créé avec succès
+          destroy:
+            success: Résultat supprimé avec succès
+          edit:
+            title: Modifier le résultat
+            update: Mettre à jour
+          index:
+            title: Résultats
+          new:
+            create: Créer
+            title: Nouveau résultat
+          update:
+            invalid: Il y a eu un problème pour mettre à jour ce résultat
+            success: Résultat mis à jour avec succès
+      models:
+        result:
+          fields:
+            title: Titre
+      results:
+        count:
+          results_count:
+            one: 1 résultat
+            other: "%{count} résultats"
+        filters:
+          category: Catégorie
+          category_prompt: Sélectionner une catégorie
+          scopes: Domaines d'application
+          search: Rechercher
+        filters_small_view:
+          close_modal: Fermer la fenêtre de dialogue
+          filter: Filtrer
+          filter_by: Filtrer par
+          unfold: Déplier
+        show:
+          stats:
+            attendees: Participants
+            comments: Commentaires
+            contributions: Contributions
+            meetings: Rencontre
+            proposals: Propositions
+            votes: Soutiens

data/decidim-results/decidim-results.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"
+  s.add_dependency "rectify", "~> 0.9.1"
   s.add_dependency "searchlight", "~> 4.1.0"
-  s.add_dependency "kaminari", "~> 1.0.0.rc1"
+  s.add_dependency "kaminari", "~> 1.0.1"
 
   s.add_development_dependency "decidim-dev", Decidim.version
   s.add_development_dependency "decidim-comments", Decidim.version

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

@@ -16,6 +16,15 @@ Decidim.register_feature(:results) do |feature|
     resource.template = "decidim/results/results/linked_results"
   end
 
+  feature.register_stat :results_count, primary: true, priority: Decidim::StatsRegistry::HIGH_PRIORITY do |features, start_at, end_at|
+    Decidim::Results::FilteredResults.for(features, start_at, end_at).count
+  end
+
+  feature.register_stat :comments_count, tag: :comments do |features, start_at, end_at|
+    results = Decidim::Results::FilteredResults.for(features, start_at, end_at)
+    Decidim::Comments::Comment.where(root_commentable: results).count
+  end
+
   feature.settings(:global) do |settings|
     settings.attribute :comments_enabled, type: :boolean, default: true
   end

data/decidim-results/spec/commands/create_result_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "spec_helper"
 
 describe Decidim::Results::Admin::CreateResult do
@@ -27,9 +28,9 @@ describe Decidim::Results::Admin::CreateResult do
   end
   let(:form) do
     double(
-      :invalid? => invalid,
-      title: {en: "title"},
-      description: {en: "description"},
+      invalid?: invalid,
+      title: { en: "title" },
+      description: { en: "description" },
       proposal_ids: proposals.map(&:id),
       scope: scope,
       category: category,

data/decidim-results/spec/commands/update_result_spec.rb

@@ -1,7 +1,8 @@
+# frozen_string_literal: true
 require "spec_helper"
 
 describe Decidim::Results::Admin::UpdateResult do
-  let(:result) { create :result}
+  let(:result) { create :result }
   let(:organization) { result.feature.organization }
   let(:scope) { create :scope, organization: organization }
   let(:category) { create :category, participatory_process: result.feature.participatory_process }
@@ -27,9 +28,9 @@ describe Decidim::Results::Admin::UpdateResult do
   end
   let(:form) do
     double(
-      :invalid? => invalid,
-      title: {en: "title"},
-      description: {en: "description"},
+      invalid?: invalid,
+      title: { en: "title" },
+      description: { en: "description" },
       proposal_ids: proposals.map(&:id),
       scope: scope,
       category: category

data/decidim-results/spec/controllers/results_controller_spec.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+require "spec_helper"
+
+module Decidim
+  module Results
+    describe ResultsController, type: :controller do
+      before do
+        @request.env["decidim.current_organization"] = feature.organization
+        @request.env["decidim.current_participatory_process"] = feature.participatory_process
+        @request.env["decidim.current_feature"] = feature
+      end
+
+      describe "results" do
+        let(:titles) { %w(Biure Atque Delectus Quia Fuga) }
+        let(:feature) { create(:result_feature) }
+        let(:results_count) { titles.size }
+
+        it "returns a collection of results ordered by title" do
+          Array.new(results_count) do |n|
+            title = {}
+            title[I18n.locale.to_s] = titles[n]
+            create(:result, title: title, feature: feature)
+          end
+
+          results = controller.send(:results)
+          expect(results.pluck(:title).map { |title| title[I18n.locale.to_s] }).to eq(titles.sort)
+        end
+      end
+    end
+  end
+end

data/decidim-results/spec/factories.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "decidim/core/test/factories"
 require "decidim/admin/test/factories"
 require "decidim/comments/test/factories"

data/decidim-results/spec/features/explore_results_spec.rb

@@ -1,31 +1,73 @@
+# frozen_string_literal: true
 require "spec_helper"
 
 describe "Explore results", type: :feature do
   include_context "feature"
-  let(:manifest_name) { "results" }
 
+  let(:titles) { %w(Biure Atque Delectus Quia Fuga) }
+  let(:manifest_name) { "results" }
   let(:results_count) { 5 }
   let!(:scope) { create :scope, organization: organization }
   let!(:results) do
-    create_list(
-      :result,
-      results_count,
-      feature: feature
-    )
-  end
-
-  before do
-    visit path
+    Array.new(results_count) do |n|
+      create(:result, title: { en: titles[n] }, feature: feature)
+    end
   end
 
   context "index" do
-    let(:path) { decidim_results.results_path(participatory_process_id: participatory_process.id, feature_id: feature.id) }
+    it "shows all results ordered alphabetically" do
+      visit_feature
 
-    it "shows all results for the given process" do
-      expect(page).to have_selector("article.card", count: results_count)
+      expect(page).to have_selector(".card--result", count: results_count)
 
       results.each do |result|
-        expect(page).to have_content(translated result.title)
+        expect(page).to have_content(translated(result.title))
+      end
+    end
+
+    context "when filtering" do
+      before do
+        create(:result, feature: feature, scope: scope)
+      end
+
+      context "when the process has a linked scope" do
+        before do
+          participatory_process.update_attributes(scope: scope)
+        end
+
+        it "enables filtering by scope" do
+          visit_feature
+
+          within ".filters" do
+            expect(page).not_to have_content(/Scopes/i)
+          end
+        end
+      end
+
+      context "when the process has no linked scope" do
+        before do
+          participatory_process.update_attributes(scope: nil)
+        end
+
+        it "enables filtering by scope" do
+          visit_feature
+
+          within ".filters" do
+            expect(page).to have_content(/Scopes/i)
+          end
+        end
+      end
+
+      context "when filtering by scope" do
+        it "lists the filtered results" do
+          visit_feature
+
+          within ".filters" do
+            check scope.name
+          end
+
+          expect(page).to have_css(".card--result", count: 1)
+        end
       end
     end
   end
@@ -36,6 +78,8 @@ describe "Explore results", type: :feature do
     let(:result) { results.first }
 
     it "shows all result info" do
+      visit path
+
       expect(page).to have_i18n_content(result.title)
       expect(page).to have_i18n_content(result.description)
       expect(page).to have_content(result.reference)
@@ -52,6 +96,8 @@ describe "Explore results", type: :feature do
 
     context "without category or scope" do
       it "does not show any tag" do
+        visit path
+
         expect(page).not_to have_selector("ul.tags.tags--result")
       end
     end
@@ -65,6 +111,8 @@ describe "Explore results", type: :feature do
       end
 
       it "shows tags for category" do
+        visit path
+
         expect(page).to have_selector("ul.tags.tags--result")
         within "ul.tags.tags--result" do
           expect(page).to have_content(translated(result.category.name))
@@ -72,6 +120,8 @@ describe "Explore results", type: :feature do
       end
 
       it "links to the filter for this category" do
+        visit path
+
         within "ul.tags.tags--result" do
           click_link translated(result.category.name)
         end
@@ -88,6 +138,8 @@ describe "Explore results", type: :feature do
       end
 
       it "shows tags for scope" do
+        visit path
+
         expect(page).to have_selector("ul.tags.tags--result")
         within "ul.tags.tags--result" do
           expect(page).to have_content(result.scope.name)
@@ -95,6 +147,8 @@ describe "Explore results", type: :feature do
       end
 
       it "links to the filter for this scope" do
+        visit path
+
         within "ul.tags.tags--result" do
           click_link result.scope.name
         end
@@ -104,14 +158,12 @@ describe "Explore results", type: :feature do
 
     context "when a proposal has comments" do
       let(:result) { results.first }
-      let(:author) { create(:user, :confirmed, organization: feature.organization)}
+      let(:author) { create(:user, :confirmed, organization: feature.organization) }
       let!(:comments) { create_list(:comment, 3, commentable: result) }
 
-      before do
-        visit current_path
-      end
-
       it "shows the comments" do
+        visit path
+
         comments.each do |comment|
           expect(page).to have_content(comment.body)
         end
@@ -126,10 +178,11 @@ describe "Explore results", type: :feature do
 
       before do
         result.link_resources(proposals, "included_proposals")
-        visit current_path
       end
 
       it "shows related proposals" do
+        visit path
+
         proposals.each do |proposal|
           expect(page).to have_content(proposal.title)
           expect(page).to have_content(proposal.author_name)
@@ -146,68 +199,16 @@ describe "Explore results", type: :feature do
 
       before do
         result.link_resources(meetings, "meetings_through_proposals")
-        visit current_path
       end
 
       it "shows related meetings" do
+        visit path
+
         meetings.each do |meeting|
           expect(page).to have_i18n_content(meeting.title)
           expect(page).to have_i18n_content(meeting.description)
         end
       end
     end
-
-    context "when filtering" do
-      before do
-        create(:result, feature: feature, scope: scope)
-        visit_feature
-      end
-
-      context "when the process has a linked scope" do
-        before do
-          participatory_process.update_attributes(scope: scope)
-          visit current_path
-        end
-
-        it "enables filtering by scope" do
-          within ".filters" do
-            expect(page).not_to have_content(/Scopes/i)
-          end
-        end
-      end
-
-      context "when the process has no linked scope" do
-        before do
-          participatory_process.update_attributes(scope: nil)
-          visit current_path
-        end
-
-        it "enables filtering by scope" do
-          within ".filters" do
-            expect(page).to have_content(/Scopes/i)
-          end
-        end
-      end
-
-      context "by origin 'official'" do
-        it "lists the filtered results" do
-          within ".filters" do
-            check scope.name
-          end
-
-          expect(page).to have_css(".card--result", count: 1)
-        end
-      end
-
-      context "by origin 'citizenship'" do
-        it "lists the filtered results" do
-          within ".filters" do
-            check scope.name
-          end
-
-          expect(page).to have_css(".card--result", count: results.size)
-        end
-      end
-    end
   end
 end

data/decidim-results/spec/forms/result_form_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # frozen_literal_string: true
 
 require "spec_helper"
@@ -27,7 +28,7 @@ describe Decidim::Results::Admin::ResultForm do
       decidim_scope_id: scope_id,
       decidim_category_id: category_id,
       title_en: title[:en],
-      description_en: description[:en],
+      description_en: description[:en]
     }
   end
 

data/decidim-results/spec/queries/decidim/results/filtered_results_spec.rb

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