decidim-comments 0.23.6 → 0.24.0.rc1

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

@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+shared_examples_for "a comment voted event" do
+  include_context "when it's a comment event"
+
+  let(:resource) { comment.commentable }
+
+  let(:comment) { create :comment }
+  let(:comment_vote) { create :comment_vote, comment: comment }
+  let(:comment_vote_author) { comment_vote.author }
+
+  let(:extra) { { comment_id: comment.id, author_id: comment_vote_author.id, weight: weight, downvotes: 100, upvotes: 999 } }
+  let(:resource_title) { decidim_html_escape(translated(resource.title)) }
+  let(:resource_text) { subject.resource_text }
+
+  let(:verb) { weight.positive? ? "upvoted" : "downvoted" }
+
+  describe "downvotes" do
+    it "outputs the total downvotes" do
+      expect(subject.downvotes).to eq(100)
+    end
+  end
+
+  describe "upvotes" do
+    it "outputs the total upvotes" do
+      expect(subject.upvotes).to eq(999)
+    end
+  end
+
+  describe "resource_text" do
+    it "outputs the comment body" do
+      expect(subject.resource_text).to eq comment.formatted_body
+    end
+  end
+
+  describe "email_subject" do
+    it "is generated correctly" do
+      expect(subject.email_subject).to eq("Your comment in \"#{resource_title}\" has been #{verb}.")
+    end
+  end
+
+  describe "email_intro" do
+    it "is generated correctly" do
+      expect(subject.email_intro).to eq("Your comment in \"#{resource_title}\" has been #{verb}. It now has a total of 999 upvotes and 100 downvotes.")
+    end
+  end
+
+  describe "email_outro" do
+    it "is generated correctly" do
+      expect(subject.email_outro)
+        .to eq("You have received this notification because you are the author of this comment.")
+    end
+  end
+
+  describe "notification_title" do
+    it "is generated correctly" do
+      expect(subject.notification_title)
+        .to include("Your <a href=\"#{resource_path}#comment_#{comment.id}\">comment</a> in \"#{resource_title}\" has been #{verb}")
+      expect(subject.notification_title)
+        .to include("It now has a total of 999 upvotes and 100 downvotes.")
+    end
+  end
+end

data/lib/decidim/comments/test.rb

@@ -2,3 +2,4 @@
 
 require "decidim/comments/test/shared_examples/create_comment_context"
 require "decidim/comments/test/shared_examples/comment_event"
+require "decidim/comments/test/shared_examples/comment_voted_event"

data/lib/decidim/comments/version.rb

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

data/lib/decidim/comments.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "decidim/comments/admin"
+require "decidim/comments/api"
 require "decidim/comments/engine"
 require "decidim/comments/admin_engine"
 
@@ -10,9 +11,6 @@ module Decidim
   # a React component which handle all the comments render and logic.
   module Comments
     autoload :CommentsHelper, "decidim/comments/comments_helper"
-    autoload :AddCommentType, "decidim/comments/api/add_comment_type"
-    autoload :CommentMutationType, "decidim/comments/api/comment_mutation_type"
-    autoload :CommentType, "decidim/comments/api/comment_type"
     autoload :Commentable, "decidim/comments/commentable"
     autoload :CommentSerializer, "decidim/comments/comment_serializer"
     autoload :CommentVoteSerializer, "decidim/comments/comment_vote_serializer"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-comments
 version: !ruby/object:Gem::Version
-  version: 0.23.6
+  version: 0.24.0.rc1
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-10 00:00:00.000000000 Z
+date: 2021-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -18,70 +18,76 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.6
+        version: 0.24.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.6
+        version: 0.24.0.rc1
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '4.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '4.4'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.5.1
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.6
+        version: 0.24.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.6
+        version: 0.24.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.6
+        version: 0.24.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.6
+        version: 0.24.0.rc1
 description: Pluggable comments system for some components.
 email:
 - josepjaume@gmail.com
@@ -94,72 +100,57 @@ files:
 - README.md
 - Rakefile
 - app/assets/config/decidim_comments_manifest.js
-- app/assets/javascripts/decidim/comments/bundle.js
 - app/assets/javascripts/decidim/comments/bundle.js.map
+- app/assets/javascripts/decidim/comments/comments.component.js.es6
+- app/assets/javascripts/decidim/comments/comments.component.test.js
 - app/assets/javascripts/decidim/comments/comments.js.erb
+- app/cells/decidim/comments/comment/actions.erb
+- app/cells/decidim/comments/comment/alignment_badge.erb
+- app/cells/decidim/comments/comment/author.erb
+- app/cells/decidim/comments/comment/show.erb
+- app/cells/decidim/comments/comment/utilities.erb
+- app/cells/decidim/comments/comment/votes.erb
 - app/cells/decidim/comments/comment_activity_cell.rb
+- app/cells/decidim/comments/comment_card_cell.rb
 - app/cells/decidim/comments/comment_cell.rb
+- app/cells/decidim/comments/comment_form/comment_as.erb
+- app/cells/decidim/comments/comment_form/show.erb
+- app/cells/decidim/comments/comment_form_cell.rb
 - app/cells/decidim/comments/comment_m/footer.erb
 - app/cells/decidim/comments/comment_m/top.erb
 - app/cells/decidim/comments/comment_m_cell.rb
+- app/cells/decidim/comments/comment_thread/show.erb
+- app/cells/decidim/comments/comment_thread/title.erb
+- app/cells/decidim/comments/comment_thread_cell.rb
+- app/cells/decidim/comments/comments/add_comment.erb
+- app/cells/decidim/comments/comments/blocked_comments_warning.erb
+- app/cells/decidim/comments/comments/order_control.erb
+- app/cells/decidim/comments/comments/show.erb
+- app/cells/decidim/comments/comments/single_comment_warning.erb
+- app/cells/decidim/comments/comments/user_comments_blocked_warning.erb
+- app/cells/decidim/comments/comments_cell.rb
 - app/commands/decidim/comments/create_comment.rb
 - app/commands/decidim/comments/vote_comment.rb
+- app/controllers/decidim/comments/application_controller.rb
+- app/controllers/decidim/comments/comments_controller.rb
+- app/controllers/decidim/comments/votes_controller.rb
 - app/events/decidim/comments/comment_by_followed_user_event.rb
 - app/events/decidim/comments/comment_by_followed_user_group_event.rb
 - app/events/decidim/comments/comment_created_event.rb
+- app/events/decidim/comments/comment_downvoted_event.rb
 - app/events/decidim/comments/comment_event.rb
+- app/events/decidim/comments/comment_upvoted_event.rb
+- app/events/decidim/comments/comment_voted_event.rb
 - app/events/decidim/comments/reply_created_event.rb
 - app/events/decidim/comments/user_group_mentioned_event.rb
 - app/events/decidim/comments/user_mentioned_event.rb
 - app/forms/decidim/comments/comment_form.rb
-- app/frontend/application/apollo_client.ts
-- app/frontend/application/application.component.test.tsx
-- app/frontend/application/application.component.tsx
-- app/frontend/application/icon.component.test.tsx
-- app/frontend/application/icon.component.tsx
-- app/frontend/comments/add_comment_form.component.test.tsx
-- app/frontend/comments/add_comment_form.component.tsx
-- app/frontend/comments/comment.component.test.tsx
-- app/frontend/comments/comment.component.tsx
-- app/frontend/comments/comment_order_selector.component.test.tsx
-- app/frontend/comments/comment_order_selector.component.tsx
-- app/frontend/comments/comment_thread.component.test.tsx
-- app/frontend/comments/comment_thread.component.tsx
-- app/frontend/comments/comments.component.test.tsx
-- app/frontend/comments/comments.component.tsx
-- app/frontend/comments/down_vote_button.component.test.tsx
-- app/frontend/comments/down_vote_button.component.tsx
-- app/frontend/comments/up_vote_button.component.test.tsx
-- app/frontend/comments/up_vote_button.component.tsx
-- app/frontend/comments/vote_button.component.tsx
-- app/frontend/comments/vote_button_component.test.tsx
-- app/frontend/entry.ts
-- app/frontend/entry_test.ts
-- app/frontend/fragments/add_comment_form_commentable.fragment.graphql
-- app/frontend/fragments/add_comment_form_session.fragment.graphql
-- app/frontend/fragments/comment.fragment.graphql
-- app/frontend/fragments/comment_data.fragment.graphql
-- app/frontend/fragments/comment_thread.fragment.graphql
-- app/frontend/fragments/down_vote_button.fragment.graphql
-- app/frontend/fragments/up_vote_button.fragment.graphql
-- app/frontend/mutations/add_comment.mutation.graphql
-- app/frontend/mutations/down_vote.mutation.graphql
-- app/frontend/mutations/up_vote.mutation.graphql
-- app/frontend/queries/comments.query.graphql
-- app/frontend/support/asset_url.ts
-- app/frontend/support/generate_comments_data.ts
-- app/frontend/support/generate_user_data.ts
-- app/frontend/support/generate_user_group_data.ts
-- app/frontend/support/graphql_transformer.js
-- app/frontend/support/load_translations.ts
-- app/frontend/support/require_all.ts
-- app/frontend/support/resolve_graphql_query.ts
-- app/frontend/support/schema.ts
 - app/helpers/decidim/comments/comment_cells_helper.rb
 - app/models/decidim/comments/application_record.rb
 - app/models/decidim/comments/comment.rb
 - app/models/decidim/comments/comment_vote.rb
 - app/models/decidim/comments/seed.rb
+- app/permissions/decidim/comments/permissions.rb
 - app/queries/decidim/comments/metrics/comment_participants_metric_measure.rb
 - app/queries/decidim/comments/metrics/comments_metric_manage.rb
 - app/queries/decidim/comments/sorted_comments.rb
@@ -167,9 +158,14 @@ files:
 - app/scrubbers/decidim/comments/user_input_scrubber.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
+- app/views/decidim/comments/comments/_comment.html.erb
+- app/views/decidim/comments/comments/_comments.html.erb
+- app/views/decidim/comments/comments/create.js.erb
+- app/views/decidim/comments/comments/error.js.erb
+- app/views/decidim/comments/comments/index.js.erb
+- app/views/decidim/comments/comments/reload.js.erb
+- app/views/decidim/comments/votes/create.js.erb
+- app/views/decidim/comments/votes/error.js.erb
 - config/locales/am-ET.yml
 - config/locales/ar-SA.yml
 - config/locales/ar.yml
@@ -253,12 +249,16 @@ files:
 - db/migrate/20200706123136_make_comments_handle_i18n.rb
 - db/migrate/20200828101910_add_commentable_counter_cache_to_comments.rb
 - db/seeds.rb
+- lib/decidim/api/add_comment_type.rb
+- lib/decidim/api/comment_mutation_type.rb
+- lib/decidim/api/comment_type.rb
+- lib/decidim/api/commentable_interface.rb
+- lib/decidim/api/commentable_mutation_type.rb
+- lib/decidim/api/commentable_type.rb
 - lib/decidim/comments.rb
 - lib/decidim/comments/admin.rb
 - lib/decidim/comments/admin_engine.rb
-- lib/decidim/comments/api/add_comment_type.rb
-- lib/decidim/comments/api/comment_mutation_type.rb
-- lib/decidim/comments/api/comment_type.rb
+- lib/decidim/comments/api.rb
 - lib/decidim/comments/comment_serializer.rb
 - lib/decidim/comments/comment_vote_serializer.rb
 - lib/decidim/comments/commentable.rb
@@ -271,6 +271,7 @@ files:
 - 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/comment_voted_event.rb
 - lib/decidim/comments/test/shared_examples/create_comment_context.rb
 - lib/decidim/comments/version.rb
 homepage: https://github.com/decidim/decidim
@@ -285,14 +286,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key:
 specification_version: 4
 summary: Decidim comments module