decidim 0.0.8.1 → 0.1.0

data/decidim-budgets/decidim-budgets.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-proposals", Decidim.version

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

@@ -19,6 +19,15 @@ Decidim.register_feature(:budgets) do |feature|
     resource.template = "decidim/budgets/projects/linked_projects"
   end
 
+  feature.register_stat :projects_count, primary: true do |features, start_at, end_at|
+    Decidim::Budgets::FilteredProjects.for(features, start_at, end_at).count
+  end
+
+  feature.register_stat :comments_count, tag: :comments do |features, start_at, end_at|
+    projects = Decidim::Budgets::FilteredProjects.for(features, start_at, end_at)
+    Decidim::Comments::Comment.where(root_commentable: projects).count
+  end
+
   feature.settings(:global) do |settings|
     settings.attribute :total_budget, type: :integer, default: 100_000_000
     settings.attribute :vote_threshold_percent, type: :integer, default: 70

data/decidim-budgets/spec/commands/add_line_item_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "spec_helper"
 
 describe Decidim::Budgets::AddLineItem do
@@ -5,7 +6,7 @@ describe Decidim::Budgets::AddLineItem do
   let(:participatory_process) { create :participatory_process, :with_steps, organization: user.organization }
   let(:feature) { create(:budget_feature, participatory_process: participatory_process, settings: settings) }
   let(:project) { create(:project, feature: feature, budget: 60_000) }
-  let(:settings) { { "total_budget" => 100_000, vote_threshold_percent: 50 }}
+  let(:settings) { { "total_budget" => 100_000, vote_threshold_percent: 50 } }
   let(:order) { nil }
 
   subject { described_class.new(order, project, user) }
@@ -19,17 +20,13 @@ describe Decidim::Budgets::AddLineItem do
       let!(:order) { create(:order, user: user, feature: feature) }
 
       it "doesn't create a new order" do
-        expect {
-          subject.call
-        }.not_to change { Decidim::Budgets::Order.count }
+        expect { subject.call }.not_to change { Decidim::Budgets::Order.count }
       end
     end
 
     context "when a order for the current user doesn't exist" do
       it "creates an order" do
-        expect {
-          subject.call
-        }.to change { Decidim::Budgets::Order.count }.by(1)
+        expect { subject.call }.to change { Decidim::Budgets::Order.count }.by(1)
       end
     end
 
@@ -47,8 +44,8 @@ describe Decidim::Budgets::AddLineItem do
 
     let!(:order) do
       order = create(:order,
-                    user: user,
-                    feature: feature)
+                     user: user,
+                     feature: feature)
       order.projects << projects
       order.checked_out_at = Time.current
       order.save!

data/decidim-budgets/spec/commands/cancel_order_spec.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
 require "spec_helper"
 
 describe Decidim::Budgets::CancelOrder do
   let(:user) { create(:user) }
   let(:feature) do
-    create(:budget_feature,
+    create(
+      :budget_feature,
       :with_total_budget_and_vote_threshold_percent,
       organization: user.organization
     )

data/decidim-budgets/spec/commands/checkout_spec.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
 require "spec_helper"
 
 describe Decidim::Budgets::Checkout do
   let(:user) { create(:user) }
   let(:feature) do
-    create(:budget_feature,
+    create(
+      :budget_feature,
       :with_total_budget_and_vote_threshold_percent,
       organization: user.organization
     )

data/decidim-budgets/spec/commands/create_project_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "spec_helper"
 
 describe Decidim::Budgets::Admin::CreateProject do
@@ -18,9 +19,9 @@ describe Decidim::Budgets::Admin::CreateProject do
   end
   let(:form) do
     double(
-      :invalid? => invalid,
-      title: {en: "title"},
-      description: {en: "description"},
+      invalid?: invalid,
+      title: { en: "title" },
+      description: { en: "description" },
       budget: 10_000_000,
       proposal_ids: proposals.map(&:id),
       scope: scope,

data/decidim-budgets/spec/commands/remove_line_item_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "spec_helper"
 
 describe Decidim::Budgets::RemoveLineItem do
@@ -5,7 +6,7 @@ describe Decidim::Budgets::RemoveLineItem do
   let(:feature) do
     create(:budget_feature,
            organization: user.organization,
-           settings: { "total_budget" => 100_000, "vote_threshold_percent": 50})
+           settings: { "total_budget" => 100_000, "vote_threshold_percent": 50 })
   end
   let(:project) { create(:project, feature: feature, budget: 100) }
 

data/decidim-budgets/spec/commands/update_project_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "spec_helper"
 
 describe Decidim::Budgets::Admin::UpdateProject do
@@ -18,9 +19,9 @@ describe Decidim::Budgets::Admin::UpdateProject do
   end
   let(:form) do
     double(
-      :invalid? => invalid,
-      title: {en: "title"},
-      description: {en: "description"},
+      invalid?: invalid,
+      title: { en: "title" },
+      description: { en: "description" },
       budget: 10_000_000,
       proposal_ids: proposals.map(&:id),
       scope: scope,

data/decidim-budgets/spec/factories.rb

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

data/decidim-budgets/spec/features/orders_spec.rb

@@ -22,10 +22,10 @@ describe "Orders", type: :feature do
       visit_feature
 
       within "#project-#{project.id}-item" do
-        page.find('.budget--list__action').click
+        page.find(".budget--list__action").click
       end
 
-      expect(page).to have_css('#loginModal', visible: true)
+      expect(page).to have_css("#loginModal", visible: true)
     end
   end
 
@@ -39,10 +39,10 @@ describe "Orders", type: :feature do
         visit_feature
 
         within "#project-#{project.id}-item" do
-          page.find('.budget--list__action').click
+          page.find(".budget--list__action").click
         end
 
-        expect(page).to have_selector '.budget-list__data--added', count: 1
+        expect(page).to have_selector ".budget-list__data--added", count: 1
 
         expect(page).to have_content "ASSIGNED: €25,000,000"
         expect(page).to have_content "1 project selected"
@@ -69,7 +69,7 @@ describe "Orders", type: :feature do
         visit_feature
 
         within "#project-#{project.id}-item" do
-          page.find('.budget--list__action').click
+          page.find(".budget--list__action").click
         end
 
         expect(page).to have_content("Authorization required")
@@ -86,7 +86,7 @@ describe "Orders", type: :feature do
         expect(page).to have_content "ASSIGNED: €25,000,000"
 
         within "#project-#{project.id}-item" do
-          page.find('.budget--list__action').click
+          page.find(".budget--list__action").click
         end
 
         expect(page).to have_content "ASSIGNED: €0"
@@ -97,7 +97,7 @@ describe "Orders", type: :feature do
           expect(page).to have_content "0%"
         end
 
-        expect(page).not_to have_selector '.budget-list__data--added'
+        expect(page).not_to have_selector ".budget-list__data--added"
       end
 
       context "and try to vote a project that exceed the total budget" do
@@ -107,10 +107,10 @@ describe "Orders", type: :feature do
           visit_feature
 
           within "#project-#{expensive_project.id}-item" do
-            page.find('.budget--list__action').click
+            page.find(".budget--list__action").click
           end
 
-          expect(page).to have_css('#budget-excess', visible: true)
+          expect(page).to have_css("#budget-excess", visible: true)
         end
       end
 
@@ -121,19 +121,19 @@ describe "Orders", type: :feature do
           visit_feature
 
           within "#project-#{other_project.id}-item" do
-            page.find('.budget--list__action').click
+            page.find(".budget--list__action").click
           end
 
-          expect(page).to have_selector '.budget-list__data--added', count: 2
+          expect(page).to have_selector ".budget-list__data--added", count: 2
 
           within "#order-progress .budget-summary__progressbox:not(.budget-summary__progressbox--fixed)" do
-            page.find('.button.small').click
+            page.find(".button.small").click
           end
 
-          expect(page).to have_css('#budget-confirm', visible: true)
+          expect(page).to have_css("#budget-confirm", visible: true)
 
           within "#budget-confirm" do
-            page.find('.button.expanded').click
+            page.find(".button.expanded").click
           end
 
           expect(page).to have_content("successfully")
@@ -158,7 +158,7 @@ describe "Orders", type: :feature do
         visit_feature
 
         within ".budget-summary" do
-          page.find('.cancel-order').click
+          page.find(".cancel-order").click
         end
 
         expect(page).to have_content("successfully")
@@ -168,7 +168,7 @@ describe "Orders", type: :feature do
         end
 
         within ".budget-summary" do
-          expect(page).not_to have_selector('.cancel-order')
+          expect(page).not_to have_selector(".cancel-order")
         end
       end
     end
@@ -176,25 +176,25 @@ describe "Orders", type: :feature do
     context "and votes are disabled" do
       let!(:feature) do
         create(:budget_feature,
-              :with_votes_disabled,
-              manifest: manifest,
-              participatory_process: participatory_process)
+               :with_votes_disabled,
+               manifest: manifest,
+               participatory_process: participatory_process)
       end
 
       it "cannot create new orders" do
         visit_feature
 
-        expect(page).to have_selector('button.budget--list__action[disabled]', count: 3)
-        expect(page).to have_no_selector('.budget-summary')
+        expect(page).to have_selector("button.budget--list__action[disabled]", count: 3)
+        expect(page).to have_no_selector(".budget-summary")
       end
     end
 
     context "and show votes are enabled" do
       let!(:feature) do
         create(:budget_feature,
-              :with_show_votes_enabled,
-              manifest: manifest,
-              participatory_process: participatory_process)
+               :with_show_votes_enabled,
+               manifest: manifest,
+               participatory_process: participatory_process)
       end
 
       let!(:order) do

data/decidim-budgets/spec/forms/project_form_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # frozen_literal_string: true
 
 require "spec_helper"

data/decidim-budgets/spec/models/project_spec.rb

@@ -35,7 +35,7 @@ describe Decidim::Budgets::Project do
     let(:order) { create :order, feature: project.feature }
     let(:unfinished_order) { create :order, feature: project.feature }
     let!(:line_item) { create :line_item, project: project, order: order }
-    let!(:line_item_1) { create :line_item, project: project , order: unfinished_order}
+    let!(:line_item_1) { create :line_item, project: project, order: unfinished_order }
 
     it "return number of finished orders for this project" do
       order.reload.update_attributes!(checked_out_at: Time.current)

data/decidim-budgets/spec/queries/decidim/budgets/filtered_projects_spec.rb

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

data/decidim-budgets/spec/services/project_search_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "spec_helper"
 
 describe Decidim::Budgets::ProjectSearch do
@@ -35,7 +36,7 @@ describe Decidim::Budgets::ProjectSearch do
       let(:default_params) { { feature: nil } }
 
       it "raises an error" do
-        expect{ subject.results }.to raise_error(StandardError, "Missing feature")
+        expect { subject.results }.to raise_error(StandardError, "Missing feature")
       end
     end
   end
@@ -62,12 +63,12 @@ describe Decidim::Budgets::ProjectSearch do
         let(:params) { default_params.merge(scope_id: [scope2.id, scope1.id]) }
 
         it "filters projects by scope" do
-          expect(subject.results).to match_array [project1,project2]
+          expect(subject.results).to match_array [project1, project2]
         end
       end
 
       context "when `global` is being sent" do
-        let!(:resource_without_scope) { create(:project, feature: current_feature, scope: nil)}
+        let!(:resource_without_scope) { create(:project, feature: current_feature, scope: nil) }
         let(:params) { default_params.merge(scope_id: ["global"]) }
 
         it "returns resources without a scope" do

data/decidim-budgets/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, email: "admin@example.org") }

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "decidim/admin/test/manage_attachments_examples"
 
 RSpec.shared_examples "manage project attachments" do

data/decidim-budgets/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-comments/app/commands/decidim/comments/create_comment.rb

@@ -34,15 +34,16 @@ module Decidim
       def create_comment
         @comment = Comment.create!(author: @author,
                                    commentable: @commentable,
+                                   root_commentable: root_commentable(@commentable),
                                    body: form.body,
                                    alignment: form.alignment,
                                    decidim_user_group_id: form.user_group_id)
       end
 
       def send_notification_to_author
-        if @comment.depth > 0 && @commentable.author.replies_notifications?
+        if @comment.depth.positive? && @commentable.author.replies_notifications?
           CommentNotificationMailer.reply_created(@author, @comment, @commentable, @comment.root_commentable).deliver_later
-        elsif @comment.depth == 0 && @commentable.author.comments_notifications?
+        elsif @comment.depth.zero? && @commentable.author.comments_notifications?
           CommentNotificationMailer.comment_created(@author, @comment, @commentable).deliver_later
         end
       end
@@ -54,6 +55,11 @@ module Decidim
       def same_author?
         @author == @commentable.author
       end
+
+      def root_commentable(commentable)
+        return commentable.root_commentable if commentable.is_a? Decidim::Comments::Comment
+        commentable
+      end
     end
   end
 end

data/decidim-comments/app/frontend/application/application.component.tsx

@@ -1,8 +1,8 @@
-import * as moment        from "moment";
-import * as React         from "react";
+import * as moment from "moment";
+import * as React from "react";
 import { ApolloProvider } from "react-apollo";
 
-import apolloClient       from "./apollo_client";
+import apolloClient from "./apollo_client";
 
 const { I18n } = require("react-i18nify");
 

data/decidim-comments/app/frontend/application/icon.component.tsx

@@ -1,5 +1,5 @@
 import * as React from "react";
-import assetUrl   from "../support/asset_url";
+import assetUrl from "../support/asset_url";
 
 interface IconProps {
   name: string;

data/decidim-comments/app/frontend/comments/add_comment_form.component.tsx

@@ -1,10 +1,10 @@
 /* eslint-disable no-return-assign, react/no-unused-prop-types, max-lines */
-import * as classnames                   from "classnames";
-import * as React                        from "react";
-import { graphql }                       from "react-apollo";
-import * as uuid                         from "uuid";
+import * as classnames from "classnames";
+import * as React from "react";
+import { graphql } from "react-apollo";
+import * as uuid from "uuid";
 
-import Icon                              from "../application/icon.component";
+import Icon from "../application/icon.component";
 
 const { I18n, Translate } = require("react-i18nify");
 
@@ -159,7 +159,7 @@ export class AddCommentForm extends React.Component<AddCommentFormProps, AddComm
     const { error } = this.state;
     const className = classnames({ "is-invalid-input": error });
 
-    let textAreaProps: any = {
+    const textAreaProps: any = {
       ref: (textarea: HTMLTextAreaElement) => {this.bodyTextArea = textarea; },
       id: `add-comment-${type}-${id}`,
       className,
@@ -312,7 +312,7 @@ export class AddCommentForm extends React.Component<AddCommentFormProps, AddComm
   private addComment = (evt: React.FormEvent<HTMLFormElement>) => {
     const { alignment } = this.state;
     const { addComment, onCommentAdded } = this.props;
-    let addCommentParams: { body: string, alignment: number, userGroupId?: string } = { body: this.bodyTextArea.value, alignment };
+    const addCommentParams: { body: string, alignment: number, userGroupId?: string } = { body: this.bodyTextArea.value, alignment };
 
     evt.preventDefault();