decidim-comments 0.10.1 → 0.11.0.pre1

data/config/locales/uk.yml

@@ -50,20 +50,10 @@ uk:
         blocked_comments_warning: Коментарі зараз вимкнені, але ви можете прочитати попередні.
         loading: Завантаження коментарів...
         title: "%{count} коментарів"
-      featured_comment:
-        title: Рекомендований коментар
     events:
       comments:
-        comment_created:
-          comment:
-            email_intro: '"%{resource_title}" прокоментували. Ви можете прочитати коментар на цій сторінці:'
-          reply:
-            email_intro: '"%{resource_title}" прокоментували'
-            email_subject: Надійшла нова відповідь на ваш коментар від %{author_name} на <a href="%{resource_url}">%{resource_title}</a>
-            notification_title: Надійшла нова відповідь на ваш коментар від <a href="%{author_path}">%{author_name} %{author_nickname}</a> на <a href="%{resource_path}">%{resource_title}</a>
         user_mentioned:
           email_intro: Вас згадали
-          email_outro: Ви отримали це сповіщення, оскільки вас згадали в "%{resource_title}".
           email_subject: Вас згадали у %{resource_title}
           notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> згадав вас у <a href="%{resource_path}">%{resource_title}</a>
   errors:

data/lib/decidim/comments.rb

@@ -5,7 +5,7 @@ require "decidim/comments/engine"
 require "decidim/comments/admin_engine"
 
 module Decidim
-  # This module contains all the logic related to the comments feature.
+  # This module contains all the logic related to the comments component.
   # 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

data/lib/decidim/comments/api/comment_type.rb

@@ -8,7 +8,8 @@ module Decidim
       description "A comment"
 
       interfaces [
-        Decidim::Comments::CommentableInterface
+        Decidim::Comments::CommentableInterface,
+        Decidim::Core::AuthorableInterface
       ]
 
       field :id, !types.ID, "The Comment's unique ID"
@@ -31,12 +32,6 @@ module Decidim
 
       field :formattedCreatedAt, !types.String, "The creation date of the comment in relative format", property: :friendly_created_at
 
-      field :author, !Decidim::Core::AuthorInterface, "The comment's author" do
-        resolve lambda { |obj, _args, _ctx|
-          obj.user_group || obj.author
-        }
-      end
-
       field :alignment, types.Int, "The comment's alignment. Can be 0 (neutral), 1 (in favor) or -1 (against)'"
 
       field :upVotes, !types.Int, "The number of comment's upVotes" do

data/lib/decidim/comments/engine.rb

@@ -36,9 +36,9 @@ module Decidim
       end
 
       initializer "decidim.stats" do
-        Decidim.stats.register :comments_count, priority: StatsRegistry::MEDIUM_PRIORITY do |features, start_at, end_at|
-          Decidim.feature_manifests.sum do |feature|
-            feature.stats.filter(tag: :comments).with_context(features, start_at, end_at).map { |_name, value| value }.sum
+        Decidim.stats.register :comments_count, priority: StatsRegistry::MEDIUM_PRIORITY do |components, start_at, end_at|
+          Decidim.component_manifests.sum do |component|
+            component.stats.filter(tag: :comments).with_context(components, start_at, end_at).map { |_name, value| value }.sum
           end
         end
       end

data/lib/decidim/comments/export.rb

@@ -3,16 +3,16 @@
 module Decidim
   module Comments
     module Export
-      # Public: Given a resource class and a feature, returns the comments for that
-      # resource in that feature.
+      # Public: Given a resource class and a component, returns the comments for that
+      # resource in that component.
       #
       # resource_class - The resource's Class
-      # feature        - The feature where the resource is scoped to.
+      # component        - The component where the resource is scoped to.
       #
-      # Returns an Arel::Relation with all the comments for that feature and resource.
-      def comments_for_resource(resource_class, feature)
+      # Returns an Arel::Relation with all the comments for that component and resource.
+      def comments_for_resource(resource_class, component)
         Comment
-          .where(decidim_root_commentable_id: resource_class.where(feature: feature))
+          .where(decidim_root_commentable_id: resource_class.where(component: component))
           .where(decidim_root_commentable_type: resource_class.to_s)
       end
 

data/lib/decidim/comments/test.rb

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

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

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+RSpec.shared_context "when creating a comment" do
+  let(:organization) { create(:organization) }
+  let(:participatory_process) { create(:participatory_process, organization: organization) }
+  let(:component) { create(:component, participatory_space: participatory_process) }
+  let(:user) { create(:user, organization: organization) }
+  let(:author) { create(:user, organization: organization) }
+  let(:dummy_resource) { create :dummy_resource, component: component }
+  let(:commentable) { dummy_resource }
+  let(:body) { ::Faker::Lorem.paragraph }
+  let(:alignment) { 1 }
+  let(:user_group_id) { nil }
+  let(:form_params) do
+    {
+      "comment" => {
+        "body" => body,
+        "alignment" => alignment,
+        "user_group_id" => user_group_id
+      }
+    }
+  end
+  let(:form) do
+    Decidim::Comments::CommentForm.from_params(
+      form_params
+    ).with_context(
+      current_organization: organization
+    )
+  end
+  let(:command) { described_class.new(form, author, commentable) }
+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.10.1"
+      "0.11.0.pre1"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-comments
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.11.0.pre1
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-17 00:00:00.000000000 Z
+date: 2018-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.11.0.pre1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.11.0.pre1
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -46,28 +46,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.11.0.pre1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.11.0.pre1
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.11.0.pre1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.11.0.pre1
 description: Pluggable comments system for some components.
 email:
 - josepjaume@gmail.com
@@ -85,7 +85,9 @@ files:
 - app/assets/javascripts/decidim/comments/comments.js.erb
 - app/commands/decidim/comments/create_comment.rb
 - 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/reply_created_event.rb
 - app/events/decidim/comments/user_mentioned_event.rb
 - app/forms/decidim/comments/comment_form.rb
 - app/frontend/application/apollo_client.ts
@@ -141,6 +143,8 @@ files:
 - app/models/decidim/comments/seed.rb
 - app/queries/decidim/comments/sorted_comments.rb
 - app/resolvers/decidim/comments/vote_comment_resolver.rb
+- app/services/decidim/comments/comment_creation.rb
+- app/services/decidim/comments/new_comment_notification_creator.rb
 - app/types/decidim/comments/commentable_interface.rb
 - app/types/decidim/comments/commentable_mutation_type.rb
 - app/types/decidim/comments/commentable_type.rb
@@ -181,7 +185,9 @@ files:
 - lib/decidim/comments/export.rb
 - lib/decidim/comments/mutation_extensions.rb
 - lib/decidim/comments/query_extensions.rb
+- lib/decidim/comments/test.rb
 - lib/decidim/comments/test/factories.rb
+- lib/decidim/comments/test/shared_examples/create_comment_context.rb
 - lib/decidim/comments/version.rb
 homepage: https://github.com/decidim/decidim
 licenses:
@@ -198,9 +204,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.3