decidim-comments 0.19.0 → 0.22.0

data/lib/decidim/comments.rb

@@ -17,6 +17,7 @@ module Decidim
     autoload :CommentSerializer, "decidim/comments/comment_serializer"
     autoload :CommentVoteSerializer, "decidim/comments/comment_vote_serializer"
     autoload :Export, "decidim/comments/export"
+    autoload :Markdown, "decidim/comments/markdown"
 
     def self.data_portable_entities
       ["Decidim::Comments::Comment", "Decidim::Comments::CommentVote"]

data/lib/decidim/comments/markdown.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+require "redcarpet"
+
+module Decidim
+  module Comments
+    # This class parses a string from plain text (markdown) and
+    # renders it as HTML.
+    class Markdown < ::Redcarpet::Render::Base
+      delegate :render, to: :markdown
+
+      private
+
+      def markdown
+        @markdown ||= ::Redcarpet::Markdown.new(renderer)
+      end
+
+      def renderer
+        @renderer ||= Decidim::Comments::MarkdownRender.new
+      end
+    end
+
+    # Custom markdown renderer for Comments
+    class MarkdownRender < ::Redcarpet::Render::Safe
+      def initialize(extensions = {})
+        super({
+          autolink: true,
+          escape_html: false,
+          filter_html: true,
+          hard_wrap: true,
+          lax_spacing: false,
+          no_images: true,
+          no_styles: true
+        }.merge(extensions))
+      end
+
+      # renders quotes with a custom css class
+      def block_quote(quote)
+        %(<blockquote class="comment__quote">#{quote}</blockquote>)
+      end
+
+      # removes header tags in comments
+      def header(title, _level)
+        title
+      end
+
+      # prevents empty <p/> in comments
+      def paragraph(text)
+        return if text.blank?
+
+        "<p>#{text}</p>"
+      end
+    end
+  end
+end

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

@@ -12,10 +12,16 @@ shared_context "when it's a comment event" do
 
   let(:comment) { create :comment }
   let(:comment_author) { comment.author }
+  let(:normalized_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 }
+  let(:user_group) do
+    user_group = create(:user_group, :verified, organization: organization, users: [comment_author])
+    comment.update!(user_group: user_group)
+    user_group
+  end
 end
 
 shared_examples_for "a comment event" do
@@ -23,7 +29,11 @@ shared_examples_for "a comment event" do
 
   describe "author" do
     it "returns the comment author" do
-      expect(subject.author).to eq(comment_author)
+      if defined? user_group_author
+        expect(subject.author).to eq(user_group_author)
+      else
+        expect(subject.author).to eq(comment_author)
+      end
     end
   end
 

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

@@ -16,7 +16,8 @@ RSpec.shared_context "when creating a comment" do
       "comment" => {
         "body" => body,
         "alignment" => alignment,
-        "user_group_id" => user_group_id
+        "user_group_id" => user_group_id,
+        "commentable" => commentable
       }
     }
   end
@@ -27,5 +28,5 @@ RSpec.shared_context "when creating a comment" do
       current_organization: organization
     )
   end
-  let(:command) { described_class.new(form, author, commentable) }
+  let(:command) { described_class.new(form, author) }
 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.19.0"
+      "0.22.0"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-comments
 version: !ruby/object:Gem::Version
-  version: 0.19.0
+  version: 0.22.0
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-21 00:00:00.000000000 Z
+date: 2020-09-01 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.19.0
+        version: 0.22.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.22.0
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -40,34 +40,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.3'
+- !ruby/object:Gem::Dependency
+  name: redcarpet
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.22.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.22.0
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.22.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.22.0
 description: Pluggable comments system for some components.
 email:
 - josepjaume@gmail.com
@@ -87,9 +101,11 @@ files:
 - 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_by_followed_user_group_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_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
@@ -143,6 +159,7 @@ files:
 - app/queries/decidim/comments/metrics/comments_metric_manage.rb
 - app/queries/decidim/comments/sorted_comments.rb
 - app/resolvers/decidim/comments/vote_comment_resolver.rb
+- 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
@@ -150,30 +167,48 @@ files:
 - app/types/decidim/comments/commentable_type.rb
 - config/locales/ar-SA.yml
 - config/locales/ar.yml
+- config/locales/bg-BG.yml
 - config/locales/ca.yml
 - config/locales/cs-CZ.yml
 - config/locales/cs.yml
+- config/locales/da-DK.yml
 - config/locales/de.yml
+- config/locales/el-GR.yml
+- config/locales/el.yml
 - config/locales/en.yml
 - config/locales/eo-UY.yml
 - config/locales/es-MX.yml
 - config/locales/es-PY.yml
 - config/locales/es.yml
+- config/locales/et-EE.yml
 - config/locales/eu.yml
 - config/locales/fi-pl.yml
 - config/locales/fi-plain.yml
 - config/locales/fi.yml
+- config/locales/fr-CA.yml
 - config/locales/fr.yml
+- config/locales/ga-IE.yml
 - config/locales/gl.yml
+- config/locales/hr-HR.yml
 - config/locales/hu.yml
 - config/locales/id-ID.yml
+- config/locales/is-IS.yml
 - config/locales/it.yml
+- config/locales/ja-JP.yml
+- config/locales/lt-LT.yml
+- config/locales/lv-LV.yml
+- config/locales/mt-MT.yml
 - config/locales/nl.yml
 - config/locales/no.yml
 - config/locales/pl.yml
 - config/locales/pt-BR.yml
 - config/locales/pt.yml
+- config/locales/ro-RO.yml
 - config/locales/ru.yml
+- config/locales/sk-SK.yml
+- config/locales/sk.yml
+- config/locales/sl.yml
+- config/locales/sr-CS.yml
 - config/locales/sv.yml
 - config/locales/tr-TR.yml
 - config/locales/uk.yml
@@ -188,6 +223,7 @@ files:
 - db/migrate/20181003080320_fix_user_groups_ids_in_comments.rb
 - db/migrate/20181016142511_make_authors_polymorphic_for_comments.rb
 - db/migrate/20181019092928_make_author_polymorphic_for_comment_votes.rb
+- db/migrate/20200320105911_index_foreign_keys_in_decidim_comments_comments.rb
 - db/seeds.rb
 - lib/decidim/comments.rb
 - lib/decidim/comments/admin.rb
@@ -201,6 +237,7 @@ files:
 - lib/decidim/comments/comments_helper.rb
 - lib/decidim/comments/engine.rb
 - lib/decidim/comments/export.rb
+- lib/decidim/comments/markdown.rb
 - lib/decidim/comments/mutation_extensions.rb
 - lib/decidim/comments/query_extensions.rb
 - lib/decidim/comments/test.rb
@@ -227,7 +264,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Decidim comments module