decidim-comments 0.18.1 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d12a0b7056820ba66e3075215d6458de6249bfd570fc2763bb221543a223bee0
-  data.tar.gz: a91677309faca25128e0e21148b473f930e4de1920b3db0c8105f4eab3744467
+  metadata.gz: 3f4e5986a2b09374bb8c2280de408bf5558d5ce57ee51d9d96e019a14310600d
+  data.tar.gz: f8a6f8e3d129d97233ca57feb43fa4ab0d4c0eebe7e3970dea66a550899ff288
 SHA512:
-  metadata.gz: 2e1aa966f20ee100c28592bc7f1780c9ccb0d25654964d666b354fabeb97c2d22d20e4f9e8a84e53e588321fe4e20c62046a8a58dd6e6396542aa82c12443c68
-  data.tar.gz: e776ad91bdf6e93be5ab4e9a1ab0e8218838390a4de8847693d5ad519f0c618c872013e425b3e0d645a01c70bb008a74fb7fe809e6d12ac75c6986a715e2a13c
+  metadata.gz: b7ca0fe89067bbbcb59fd111d2f6ad4c13ada5ced2b51affc57e967070f8a6681d0a1e69fc213d4dc4f5f4935e25a2bddcd439057b1643bf44ea344e17429942
+  data.tar.gz: f99afe1133b42867846a51793cc9f96d5401fd6a5b891aac310aa19fa0aa3d5a20a22dff7063f260bba4482d1840154786a3d0b510d3aab192c04ae782738b50

data/app/commands/decidim/comments/create_comment.rb

@@ -61,6 +61,7 @@ module Decidim
 
       def root_commentable(commentable)
         return commentable.root_commentable if commentable.is_a? Decidim::Comments::Comment
+
         commentable
       end
     end

data/app/events/decidim/comments/comment_by_followed_user_event.rb

@@ -3,31 +3,7 @@
 module Decidim
   module Comments
     class CommentByFollowedUserEvent < Decidim::Events::SimpleEvent
-      include Decidim::Events::AuthorEvent
-
-      delegate :author, to: :comment
-
-      def resource_path
-        resource_locator.path(url_params)
-      end
-
-      def resource_url
-        resource_locator.url(url_params)
-      end
-
-      def resource_text
-        comment.body
-      end
-
-      private
-
-      def comment
-        @comment ||= Decidim::Comments::Comment.find(extra[:comment_id])
-      end
-
-      def url_params
-        { anchor: "comment_#{comment.id}" }
-      end
+      include Decidim::Comments::CommentEvent
     end
   end
 end

data/app/events/decidim/comments/comment_created_event.rb

@@ -3,31 +3,7 @@
 module Decidim
   module Comments
     class CommentCreatedEvent < Decidim::Events::SimpleEvent
-      include Decidim::Events::AuthorEvent
-
-      delegate :author, to: :comment
-
-      def resource_path
-        resource_locator.path(url_params)
-      end
-
-      def resource_url
-        resource_locator.url(url_params)
-      end
-
-      def resource_text
-        comment.body
-      end
-
-      private
-
-      def comment
-        @comment ||= Decidim::Comments::Comment.find(extra[:comment_id])
-      end
-
-      def url_params
-        { anchor: "comment_#{comment.id}" }
-      end
+      include Decidim::Comments::CommentEvent
     end
   end
 end

data/app/events/decidim/comments/comment_event.rb

@@ -0,0 +1,38 @@
+# frozen-string_literal: true
+
+module Decidim
+  module Comments
+    # This module is used to be included in events triggered by comments.
+    #
+    module CommentEvent
+      extend ActiveSupport::Concern
+      include Decidim::Events::AuthorEvent
+
+      included do
+        delegate :author, to: :comment
+
+        def resource_path
+          resource_locator.path(url_params)
+        end
+
+        def resource_url
+          resource_locator.url(url_params)
+        end
+
+        def resource_text
+          comment.formatted_body
+        end
+
+        private
+
+        def comment
+          @comment ||= Decidim::Comments::Comment.find(extra[:comment_id])
+        end
+
+        def url_params
+          { anchor: "comment_#{comment.id}" }
+        end
+      end
+    end
+  end
+end

data/app/events/decidim/comments/reply_created_event.rb

@@ -3,31 +3,7 @@
 module Decidim
   module Comments
     class ReplyCreatedEvent < Decidim::Events::SimpleEvent
-      include Decidim::Events::AuthorEvent
-
-      delegate :author, to: :comment
-
-      def resource_path
-        resource_locator.path(url_params)
-      end
-
-      def resource_url
-        resource_locator.url(url_params)
-      end
-
-      def resource_text
-        comment.body
-      end
-
-      private
-
-      def comment
-        @comment ||= Decidim::Comments::Comment.find(extra[:comment_id])
-      end
-
-      def url_params
-        { anchor: "comment_#{comment.id}" }
-      end
+      include Decidim::Comments::CommentEvent
     end
   end
 end

data/app/events/decidim/comments/user_mentioned_event.rb

@@ -3,31 +3,7 @@
 module Decidim
   module Comments
     class UserMentionedEvent < Decidim::Events::SimpleEvent
-      include Decidim::Events::AuthorEvent
-
-      delegate :author, to: :comment
-
-      def resource_path
-        resource_locator.path(url_params)
-      end
-
-      def resource_url
-        resource_locator.url(url_params)
-      end
-
-      def resource_text
-        comment.body
-      end
-
-      private
-
-      def comment
-        @comment ||= Decidim::Comments::Comment.find(extra[:comment_id])
-      end
-
-      def url_params
-        { anchor: "comment_#{comment.id}" }
-      end
+      include Decidim::Comments::CommentEvent
     end
   end
 end

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

@@ -41,6 +41,7 @@ module Decidim
 
       def participatory_space
         return root_commentable if root_commentable.is_a?(Decidim::Participable)
+
         root_commentable.participatory_space
       end
 
@@ -105,6 +106,12 @@ module Decidim
                                   .map(&:author).pluck(:id).flatten.compact.uniq
       end
 
+      def can_participate?(user)
+        return true unless root_commentable&.respond_to?(:can_participate?)
+
+        root_commentable.can_participate?(user)
+      end
+
       private
 
       # Private: Check if commentable can have comments and if not adds

data/app/models/decidim/comments/comment_vote.rb

@@ -23,6 +23,7 @@ module Decidim
       # Private: check if the comment and the author have the same organization
       def author_and_comment_same_organization
         return unless author.present? && comment.present?
+
         errors.add(:comment, :invalid) unless author.organization == comment.organization
       end
     end

data/app/queries/decidim/comments/metrics/comment_participants_metric_measure.rb

@@ -18,6 +18,7 @@ module Decidim
             related_object = comment.root_commentable
             next unless related_object
             next unless check_participatory_space(@resource, related_object)
+
             cumulative_users << comment.decidim_author_id
             quantity_users << comment.decidim_author_id if comment.created_at >= start_time
           end
@@ -32,6 +33,7 @@ module Decidim
         def check_participatory_space(participatory_space, related_object)
           return related_object.participatory_space == participatory_space if related_object.respond_to?(:participatory_space)
           return related_object == participatory_space if related_object.is_a?(Decidim::Participable)
+
           false
         end
 

data/app/queries/decidim/comments/metrics/comments_metric_manage.rb

@@ -15,6 +15,7 @@ module Decidim
           query.each do |key, results|
             cumulative_value = results[:cumulative]
             next if cumulative_value.zero?
+
             quantity_value = results[:quantity] || 0
             space_type, space_id, category_id, related_object_type, related_object_id = key
             record = Decidim::Metric.find_or_initialize_by(day: @day.to_s, metric_type: @metric_name,
@@ -44,6 +45,8 @@ module Decidim
             next grouped_comments unless related_object
 
             group_key = generate_group_key(related_object)
+            next grouped_comments unless group_key
+
             grouped_comments[group_key] ||= { cumulative: 0, quantity: 0 }
             grouped_comments[group_key][:cumulative] += 1
             grouped_comments[group_key][:quantity] += 1 if comment.created_at >= start_time
@@ -70,6 +73,8 @@ module Decidim
         # Generates a group key from the related object of a Comment
         def generate_group_key(related_object)
           participatory_space = retrieve_participatory_space(related_object)
+          return unless participatory_space
+
           category_id = related_object.respond_to?(:category) ? related_object.category.try(:id) : ""
           group_key = []
           group_key += [participatory_space.class.name, participatory_space.id]

data/db/migrate/20170510091348_update_root_commentable_for_comments.rb

@@ -20,6 +20,7 @@ class UpdateRootCommentableForComments < ActiveRecord::Migration[5.0]
 
   def root_commentable(comment)
     return comment.commentable if comment.depth.zero?
+
     root_commentable comment.commentable
   end
 end

data/lib/decidim/comments/comments_helper.rb

@@ -9,6 +9,7 @@ module Decidim
       # resource - A commentable resource
       def comments_for(resource)
         return unless resource.commentable?
+
         content_for :expanded do
           inline_comments_for(resource)
         end
@@ -21,6 +22,7 @@ module Decidim
       # Returns a div which contain a RectComponent
       def inline_comments_for(resource)
         return unless resource.commentable?
+
         commentable_type = resource.commentable_type
         commentable_id = resource.id.to_s
         node_id = "comments-for-#{commentable_type.demodulize}-#{commentable_id}"

data/lib/decidim/comments/test.rb

@@ -1,3 +1,4 @@
 # frozen_string_literal: true
 
 require "decidim/comments/test/shared_examples/create_comment_context"
+require "decidim/comments/test/shared_examples/comment_event"

data/lib/decidim/comments/test/shared_examples/comment_event.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+shared_context "when it's a comment event" do
+  include Decidim::ComponentPathHelper
+  include Decidim::SanitizeHelper
+
+  include_context "when a simple event"
+
+  let(:resource) { comment.commentable }
+
+  let(:comment) { create :comment }
+  let(:comment_author) { comment.author }
+  let(:comment_author_name) { decidim_html_escape comment.author.name }
+
+  let(:extra) { { comment_id: comment.id } }
+  let(:resource_title) { decidim_html_escape resource.title }
+end
+
+shared_examples_for "a comment event" do
+  it_behaves_like "a simple event"
+
+  describe "author" do
+    it "returns the comment author" do
+      expect(subject.author).to eq(comment_author)
+    end
+  end
+
+  describe "resource_text" do
+    it "outputs the comment body" do
+      expect(subject.resource_text).to eq comment.formatted_body
+    end
+  end
+end

data/lib/decidim/comments/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-comments version.
   module Comments
     def self.version
-      "0.18.1"
+      "0.19.0"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-comments
 version: !ruby/object:Gem::Version
-  version: 0.18.1
+  version: 0.19.0
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -18,56 +18,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.0
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.3'
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.0
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.0
 description: Pluggable comments system for some components.
 email:
 - josepjaume@gmail.com
@@ -88,6 +88,7 @@ files:
 - app/commands/decidim/comments/vote_comment.rb
 - app/events/decidim/comments/comment_by_followed_user_event.rb
 - app/events/decidim/comments/comment_created_event.rb
+- app/events/decidim/comments/comment_event.rb
 - app/events/decidim/comments/reply_created_event.rb
 - app/events/decidim/comments/user_mentioned_event.rb
 - app/forms/decidim/comments/comment_form.rb
@@ -204,6 +205,7 @@ files:
 - lib/decidim/comments/query_extensions.rb
 - lib/decidim/comments/test.rb
 - lib/decidim/comments/test/factories.rb
+- lib/decidim/comments/test/shared_examples/comment_event.rb
 - lib/decidim/comments/test/shared_examples/create_comment_context.rb
 - lib/decidim/comments/version.rb
 homepage: https://github.com/decidim/decidim