decidim 0.0.3 → 0.0.4

data/decidim-comments/app/frontend/entry.test.js

@@ -9,6 +9,8 @@ import chaiEnzyme       from 'chai-enzyme';
 import loadTranslations from './support/load_translations';
 import requireAll       from './support/require_all';
 
+require('jquery');
+
 // 
 chai.use(sinonChai)
 chai.use(chaiAsPromised)

data/decidim-comments/app/mailers/decidim/comments/comment_notification_mailer.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+module Decidim
+  module Comments
+    # A custom mailer for sending notifications to users when
+    # a comment is created.
+    class CommentNotificationMailer < Decidim::ApplicationMailer
+      helper Decidim::ResourceHelper
+
+      def comment_created(user, comment, commentable)
+        with_user(user) do
+          @comment = comment
+          @commentable = commentable
+          @organization = commentable.organization
+          subject = I18n.t("comment_created.subject", scope: "decidim.comments.mailer.comment_notification")
+          mail(to: commentable.author.email, subject: subject)
+        end
+      end
+
+      def reply_created(user, reply, comment, commentable)
+        with_user(user) do
+          @reply = reply
+          @comment = comment
+          @commentable = commentable
+          @organization = commentable.organization
+          subject = I18n.t("reply_created.subject", scope: "decidim.comments.mailer.comment_notification")
+          mail(to: comment.author.email, subject: subject)
+        end
+      end
+    end
+  end
+end

data/decidim-comments/app/models/decidim/comments/comment.rb

@@ -51,6 +51,12 @@ module Decidim
         down_votes.any? { |vote| vote.author == user }
       end
 
+      # Public: Returns the commentable object of the parent comment
+      def root_commentable
+        return commentable if depth == 0
+        commentable.root_commentable
+      end
+
       private
 
       # Private: Check if commentable can have replies and if not adds

data/decidim-comments/app/views/decidim/comments/comment_notification_mailer/comment_created.html.erb

@@ -0,0 +1,18 @@
+<p><%= t("decidim.comments.comment_notification_mailer.hello", name: @commentable.author.name) %></p>
+
+<p>
+  <%=
+    t(".new_comment_html", {
+      commenter: @comment.author.name,
+      commentable_link: link_to(@commentable.title, decidim_resource_url(@commentable))
+    })
+  %>
+</p>
+
+<blockquote>
+  <%= @comment.body %>
+</blockquote>
+
+<p>
+  <%= t("decidim.comments.comment_notification_mailer.manage_email_subscriptions_html", link: link_to(t("decidim.comments.comment_notification_mailer.notifications_settings_link"), decidim.notifications_settings_url(host: @organization.host))) %>
+</p>

data/decidim-comments/app/views/decidim/comments/comment_notification_mailer/reply_created.html.erb

@@ -0,0 +1,18 @@
+<p><%= t("decidim.comments.comment_notification_mailer.hello", name: @comment.author.name) %></p>
+
+<p>
+  <%=
+    t(".new_reply_html", {
+      commenter: @reply.author.name,
+      commentable_link: link_to(@commentable.title, decidim_resource_url(@commentable))
+    })
+  %>
+</p>
+
+<blockquote>
+  <%= @reply.body %>
+</blockquote>
+
+<p>
+  <%= t("decidim.comments.comment_notification_mailer.manage_email_subscriptions_html", link: link_to(t("decidim.comments.comment_notification_mailer.notifications_settings_link"), decidim.notifications_settings_url(host: @organization.host))) %>
+</p>

data/decidim-comments/config/locales/ca.yml

@@ -4,19 +4,33 @@ ca:
       messages:
         cannot_have_replies: no pot tenir respostes
   decidim:
+    comments:
+      comment_notification_mailer:
+        comment_created:
+          new_comment_html: Hi ha un nou comentari d'<b>%{commenter}</b> a <b>%{commentable_link}</b>
+        hello: Hola %{name},
+        manage_email_subscriptions_html: Pots deixar de rebre aquests correus electrònics canviant la configuració a %{link}.
+        notifications_settings_link: la pàgina de configuració de les notificacions
+        reply_created:
+          new_reply_html: Hi ha una nova resposta del teu comentari de l'<b>%{commenter}</b> a <b>%{commentable_link}</b>
+      mailer:
+        comment_notification:
+          comment_created:
+            subject: Tens un nou comentari
+          reply_created:
+            subject: Tens una nova resposta del teu comentari
     components:
       add_comment_form:
         form:
           body:
             label: Comentari
             placeholder: Què en penses d'això?
+          form_error: El text és necessari i no pot ser més llarg de %{length}
           submit: Envia
           user_group_id:
             label: Comentar com a
         opinion:
-          against: Hi estic en contra
-          in_favor: Hi estic a favor
-          neutral: Sóc neutral
+          neutral: Neutral
         title: Deixa el teu comentari
       comment:
         alignment:

data/decidim-comments/config/locales/en.yml

@@ -5,19 +5,33 @@ en:
       messages:
         cannot_have_replies: can't have replies
   decidim:
+    comments:
+      comment_notification_mailer:
+        comment_created:
+          new_comment_html: There is a new comment from <b>%{commenter}</b> in <b>%{commentable_link}</b>
+        hello: Hello %{name},
+        manage_email_subscriptions_html: You can stop receiving these emails by changing your settings in %{link}.
+        notifications_settings_link: the notifications settings page
+        reply_created:
+          new_reply_html: There is a new reply of your comment from <b>%{commenter}</b> in <b>%{commentable_link}</b>
+      mailer:
+        comment_notification:
+          comment_created:
+            subject: You have a new comment
+          reply_created:
+            subject: You have a new reply of your comment
     components:
       add_comment_form:
         form:
           body:
             label: Comment
             placeholder: What do you think about this?
+          form_error: The text is required and it can't be longer than %{length} characters.
           submit: Send
           user_group_id:
             label: Comment as
         opinion:
-          against: I am against
-          in_favor: I am in favor
-          neutral: I am neutral
+          neutral: Neutral
         title: Leave your comment
       comment:
         alignment:

data/decidim-comments/config/locales/es.yml

@@ -4,19 +4,33 @@ es:
       messages:
         cannot_have_replies: no pueden tener respuestas
   decidim:
+    comments:
+      comment_notification_mailer:
+        comment_created:
+          new_comment_html: Hay un nuevo comentario de <b>%{commenter}</b> en <b>%{commentable_link}</b>
+        hello: Hola %{name},
+        manage_email_subscriptions_html: Puedes dejar de recibir estos correos electrónicos cambiando la configuración en %{link}.
+        notifications_settings_link: la página de configuración de las notificaciones
+        reply_created:
+          new_reply_html: Hay una nueva respuesta de tu comentario de <b>%{commenter}</b> en <b>%{commentable_link}</b>
+      mailer:
+        comment_notification:
+          comment_created:
+            subject: Tienes un nuevo comentario
+          reply_created:
+            subject: Uno de tus comentarios ha recibido respuesta
     components:
       add_comment_form:
         form:
           body:
             label: Comentario
             placeholder: '¿Qué piensas sobre esto?'
+          form_error: El texto es necesario y no puede ser más de caracteres %{length}.
           submit: Enviar
           user_group_id:
             label: Comentar como
         opinion:
-          against: Estoy en contra
-          in_favor: Estoy a favor
-          neutral: Soy neutral
+          neutral: Neutral
         title: Deje su comentario
       comment:
         alignment:

data/decidim-comments/config/locales/eu.yml

@@ -0,0 +1,5 @@
+eu:
+  decidim:
+    comments:
+      comment_notification_mailer:
+        hello: Kaixo %{name},

data/decidim-comments/lib/decidim/comments.rb

@@ -6,5 +6,6 @@ module Decidim
   # It exposes a single entry point as a rails helper method to render
   # a React component which handle all the comments render and logic.
   module Comments
+    autoload :CommentsHelper, "decidim/comments/comments_helper"
   end
 end

data/decidim-comments/spec/commands/create_comment_spec.rb

@@ -6,8 +6,11 @@ module Decidim
     describe CreateComment, :db do
       describe "call" do
         let(:organization) { create(:organization) }
+        let(:participatory_process) { create(:participatory_process, organization: organization)}
+        let(:feature) { create(:feature, participatory_process: participatory_process)}
         let(:author) { create(:user, organization: organization) }
-        let(:commentable) { create :participatory_process, organization: organization }
+        let(:dummy_resource) { create :dummy_resource, feature: feature }
+        let(:commentable) { dummy_resource }
         let(:body) { ::Faker::Lorem.paragraph }
         let(:alignment) { 1 }
         let(:user_group_id) { nil }
@@ -60,6 +63,70 @@ module Decidim
               command.call
             end.to change { Comment.count }.by(1)
           end
+
+          context "and the comment is a root comment" do
+            it "sends an email to the author of the commentable" do
+              expect(CommentNotificationMailer)
+                .to receive(:comment_created)
+                .with(author, an_instance_of(Comment), commentable)
+                .and_call_original
+
+              command.call
+            end
+
+            context "and I am the author of the commentable" do
+              let(:dummy_resource) { create :dummy_resource, feature: feature, author: author }
+
+              it "doesn't send an email" do
+                expect(CommentNotificationMailer).not_to receive(:comment_created)
+                command.call
+              end
+            end
+
+            context "and the author has comment notifications disabled" do
+              before do
+                commentable.author.update_attributes!(comments_notifications: false)
+              end
+
+              it "doesn't send an email" do
+                expect(CommentNotificationMailer).not_to receive(:comment_created)
+                command.call
+              end
+            end
+          end
+
+          context "and the comment is a reply" do
+            let (:commentable) { create(:comment, commentable: dummy_resource) }
+
+            it "sends an email to the author of the parent comment" do
+              expect(CommentNotificationMailer)
+                .to receive(:reply_created)
+                .with(author, an_instance_of(Comment), commentable, commentable.root_commentable)
+                .and_call_original
+
+              command.call
+            end
+
+            context "and I am the author of the parent comment" do
+              let (:commentable) { create(:comment, author: author, commentable: dummy_resource) }
+
+              it "doesn't send an email" do
+                expect(CommentNotificationMailer).not_to receive(:reply_created)
+                command.call
+              end
+            end
+
+            context "and the author has reply notifications disabled" do
+              before do
+                commentable.author.update_attribute(:replies_notifications, false)
+              end
+
+              it "doesn't send an email" do
+                expect(CommentNotificationMailer).not_to receive(:reply_created)
+                command.call
+              end
+            end
+          end
         end
       end
     end

data/decidim-comments/spec/features/comments_spec.rb

@@ -3,21 +3,25 @@ require "spec_helper"
 
 describe "Comments", type: :feature do
   let!(:organization) { create(:organization) }
+  let!(:feature) { create(:feature, organization: organization) }
   let!(:user) { create(:user, :confirmed, organization: organization) }
-  let!(:participatory_process) { create(:participatory_process, organization: organization) }
+  let!(:commentable) { create(:dummy_resource, feature: feature) }
   let!(:comments) {
     3.times.map do
-      create(:comment, commentable: participatory_process)
+      create(:comment, commentable: commentable)
     end
   }
 
+  def visit_commentable_path(options = {})
+    visit decidim_dummy.dummy_resource_path(commentable, feature_id: commentable.feature, participatory_process_id: commentable.feature.participatory_process, arguable: options[:arguable], votable: options[:votable])
+  end
+
   before do
     switch_to_host(organization.host)
+    visit_commentable_path
   end
 
   it "user should see a list of comments" do
-    visit decidim.dummy_path(participatory_process)
-
     expect(page).to have_selector("#comments")
     expect(page).to have_selector("article.comment", count: comments.length)
 
@@ -28,12 +32,13 @@ describe "Comments", type: :feature do
       end
     end
   end
-  
+
   it "user should be able to sort the comments" do
-    comment = create(:comment, commentable: participatory_process, body: "Most Rated Comment")
+    comment = create(:comment, commentable: commentable, body: "Most Rated Comment")
     create(:comment_vote, comment: comment, author: user, weight: 1)
 
-    visit decidim.dummy_path(participatory_process)
+    visit_commentable_path
+
     page.find("div.order-by__dropdown.order-by__dropdown--right").hover
     within "div.order-by__dropdown.order-by__dropdown--right" do
       click_link "Best rated"
@@ -46,7 +51,6 @@ describe "Comments", type: :feature do
 
   context "when not authenticated" do
     it "user should not see the form to add comments" do
-      visit decidim.dummy_path(participatory_process)
       expect(page).not_to have_selector(".add-comment form")
     end
   end
@@ -54,19 +58,18 @@ describe "Comments", type: :feature do
   context "when authenticated" do
     before do
       login_as user, scope: :user
+      visit_commentable_path
     end
 
     it "user should not see the form to add comments" do
-      visit decidim.dummy_path(participatory_process)
       expect(page).to have_selector(".add-comment form")
     end
 
     it "user can add a new comment" do
-      visit decidim.dummy_path(participatory_process)
       expect(page).to have_selector(".add-comment form")
 
       within ".add-comment form" do
-        fill_in "add-comment-#{participatory_process.class.name}-#{participatory_process.id}", with: "This is a new comment"
+        fill_in "add-comment-#{commentable.class.name}-#{commentable.id}", with: "This is a new comment"
         click_button "Send"
       end
 
@@ -81,14 +84,14 @@ describe "Comments", type: :feature do
 
       before do
         create(:user_group_membership, user: user, user_group: user_group)
+        visit_commentable_path
       end
 
       it "user can add a new comment as a user group" do
-        visit decidim.dummy_path(participatory_process)
         expect(page).to have_selector(".add-comment form")
 
         within ".add-comment form" do
-          fill_in "add-comment-#{participatory_process.class.name}-#{participatory_process.id}", with: "This is a new comment"
+          fill_in "add-comment-#{commentable.class.name}-#{commentable.id}", with: "This is a new comment"
           select user_group.name, from: "Comment as"
           click_button "Send"
         end
@@ -101,11 +104,12 @@ describe "Comments", type: :feature do
     end
 
     it "user can reply a comment" do
-      comment = create(:comment, commentable: participatory_process)
-      visit decidim.dummy_path(participatory_process)
+      comment = create(:comment, commentable: commentable)
+
+      visit_commentable_path
 
       expect(page).to have_selector(".comment__reply")
- 
+
       within "#comments #comment_#{comment.id}" do
         click_button "Reply"
         find("textarea").set("This is a reply")
@@ -116,14 +120,17 @@ describe "Comments", type: :feature do
     end
 
     context "when arguable option is enabled" do
+      before do
+        visit_commentable_path arguable: true
+      end
+
       it "user can comment in favor" do
-        visit decidim.dummy_path(participatory_process, arguable: true)
         expect(page).to have_selector(".add-comment form")
 
-        click_button "I am in favor"
+        page.find('.opinion-toggle--ok').click
 
         within ".add-comment form" do
-          fill_in "add-comment-#{participatory_process.class.name}-#{participatory_process.id}", with: "I am in favor about this!"
+          fill_in "add-comment-#{commentable.class.name}-#{commentable.id}", with: "I am in favor about this!"
           click_button "Send"
         end
 
@@ -135,7 +142,7 @@ describe "Comments", type: :feature do
 
     context "when votable option is enabled" do
       before do
-        visit decidim.dummy_path(participatory_process, votable: true)
+        visit_commentable_path votable: true
       end
 
       it "user can upvote a comment" do