biovision-comment 0.7.190905.0 → 0.8.190926.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a602c3288d543c9a10860099700cb6657f206b3b6dce1b88a82c5ad1c239b5c8
-  data.tar.gz: 552231814a6ad6ed6b43c1edbc12b195192090e2ef821d73b962c1c6cd1850b4
+  metadata.gz: 7aa9177ba4ca81f53183269587c9ff8d1ab7da046904e65616a72686856b1b44
+  data.tar.gz: 24550aecb8c28841f760bbe9f4caef9ca502efb0c396450ab39f5a18f2499856
 SHA512:
-  metadata.gz: ba351318a8b74404e890374ae9c9a1cfab90924d25c10dc0374660fba6b014005e7ce4105ca3f6ce4805939935cbd52fd4517d4cda960057e1e2c23bbbc6badb
-  data.tar.gz: 5272919b6715ef8641f458257d9d35f2638b5c4cb6b593163c1fe44e0e3c5d8da2a265477a205bc338b7bd5625282d9330b7db042de7e1b3556fd04a14ea3a1e
+  metadata.gz: b49ee2521b7c018184f042c464d905c6209452f21aacdb636327a4a07fe254ea79a34ff522ff7257531727e441076e8faf4f683fb8c3e235291904d58c7e8134
+  data.tar.gz: 967b2cb830a8f4076c45c4ccdac61152f88943e67e0a3b5d13c642241e896bd6464c55f017f48884a5e7e4327214ceaa879a4d7cdda6dab94c06f297272370f2

data/app/assets/javascripts/biovision/comment/biovision-comments.js

@@ -115,4 +115,60 @@ Comments.components.replyFormMover = {
     }
 };
 
+Comments.components.commentApproval = {
+    initialized: false,
+    selector: ".js-approve-comment",
+    buttons: [],
+    init: function () {
+        document.querySelectorAll(this.selector).forEach(this.apply);
+        this.initialized = true;
+    },
+    apply: function (button) {
+        const component = Comments.components.commentApproval;
+        component.buttons.push(button);
+        button.addEventListener("click", component.click);
+    },
+    click: function (event) {
+        const button = event.target;
+        const url = button.getAttribute("data-url");
+        const request = Biovision.jsonAjaxRequest("put", url, function () {
+            const container = button.closest("div");
+            container.remove();
+        }, function () {
+            button.disabled = false;
+        });
+
+        button.disabled = true;
+        request.send();
+    }
+};
+
+Comments.components.commentDelete = {
+    initialized: false,
+    selector: ".js-delete-comment",
+    buttons: [],
+    init: function () {
+        document.querySelectorAll(this.selector).forEach(this.apply);
+        this.initialized = true;
+    },
+    apply: function (button) {
+        const component = Comments.components.commentDelete;
+        component.buttons.push(button);
+        button.addEventListener("click", component.click);
+    },
+    click: function (event) {
+        const button = event.target;
+        const url = button.getAttribute("data-url");
+        const request = Biovision.jsonAjaxRequest("delete", url, function () {
+            const container = button.closest("div");
+            container.remove();
+        }, function () {
+            button.disabled = false;
+        });
+
+        button.disabled = true;
+        request.send();
+    }
+};
+
 Biovision.components.comments = Comments;

data/app/assets/stylesheets/biovision/comment/comments.scss

@@ -148,6 +148,10 @@ $row-background-odd: #fafafa !default;
       }
     }
   }
+
+  .children {
+    margin-left: var(--spacer-xs, .8rem);
+  }
 }
 
 .comment-form {

data/app/controllers/admin/comments_controller.rb

@@ -23,6 +23,12 @@ class Admin::CommentsController < AdminController
     head :no_content
   end
 
+  def destroy
+    @entity.destroy
+
+    head :no_content
+  end
+
   protected
 
   def component_slug

data/app/controllers/comments_controller.rb

@@ -2,7 +2,6 @@
 
 # Comments
 class CommentsController < ApplicationController
-  before_action :set_handler
   before_action :restrict_access, except: %i[check create]
   before_action :set_entity, only: %i[edit update destroy]
 
@@ -45,6 +44,11 @@ class CommentsController < ApplicationController
     redirect_to(@entity.commentable || admin_comments_path)
   end
 
+  # get /comments/:id
+  def show
+    redirect_to(admin_comment_path(id: params[:id]))
+  end
+
   private
 
   def component_slug
@@ -86,6 +90,7 @@ class CommentsController < ApplicationController
   end
 
   def notify_participants
+    flash[:notice] = t('comments.create.premoderation') unless @entity.approved?
     # to be implemented...
   end
 end

data/app/models/comment.rb

@@ -48,7 +48,8 @@ class Comment < ApplicationRecord
 
   scope :recent, -> { order 'id desc' }
   scope :chronological, -> { order 'id asc' }
-  scope :visible, -> { where(deleted: false, visible: true, spam: false) } #, approved: true) }
+  scope :approved, -> { where(approved: true) }
+  scope :visible, -> { approved.where(deleted: false, visible: true, spam: false) }
   scope :list_for_administration, -> { recent }
   scope :list_for_visitors, -> { visible.chronological }
   scope :list_for_visitors_recent, -> { visible.recent }

data/app/services/biovision/components/comments_component.rb

@@ -17,6 +17,7 @@ module Biovision
       # @param [Hash] parameters
       def create_comment(parameters)
         @comment = ::Comment.new(parameters)
+        @comment.approved = approval_flag if settings['premoderation']
         @comment.save
         @comment
       end
@@ -34,6 +35,20 @@ module Biovision
 
         result
       end
+
+      def approval_flag
+        threshold = settings['auto_approve_threshold']
+        if @comment.user.nil?
+          criteria = {
+            user_id: nil,
+            ip: @comment.ip,
+            agent_id: @comment.agent_id
+          }
+          ::Comment.approved.where(criteria).count >= threshold
+        else
+          ::Comment.approved.owned_by(@comment.user).count >= threshold
+        end
+      end
     end
   end
 end

data/app/services/comment_handler.rb

@@ -8,7 +8,7 @@ class CommentHandler
   def initialize(user = nil)
     slug = Biovision::Components::CommentsComponent::SLUG
     @user = user
-    @handler = Biovision::Components::BaseComponent.handler(slug)
+    @handler = Biovision::Components::BaseComponent.handler(slug, user)
   end
 
   # Get list of comments for entity
@@ -18,7 +18,7 @@ class CommentHandler
   #
   # @param [ApplicationRecord] entity
   def list(entity)
-    if @handler.class.allow?(@user)
+    if @handler.allow?
       entity.comments.list_for_administration
     else
       entity.comments.list_for_visitors
@@ -32,16 +32,21 @@ class CommentHandler
   # comments must be more than threshold; anonymous comments are always
   # non-approved.
   def approve?
-    return true unless @component.settings['premoderate']
+    return true unless @handler.settings['premoderate']
     return false if @user.nil?
-    return true if @component.class.allow?(@user)
+    return true if @handler.allow?
 
-    gate = @component.settings['auto_approve_threshold'].to_i
+    gate = @handler.settings['auto_approve_threshold'].to_i
     positive = Comment.where(user: @user, approved: true).count
     negative = Comment.where(user: @user, approved: false).count
     positive - negative >= gate
   end
 
+  # @param [String] privilege_name
+  def allow?(*privilege_name)
+    @handler.allow?(*privilege_name)
+  end
+
   # @param [ApplicationRecord] entity
   def allow_reply?(entity)
     entity.respond_to?(:commentable_by?) && entity.commentable_by?(@user)

data/app/services/comments_manager.rb

@@ -6,19 +6,11 @@ class CommentsManager
   # @param [TrueClass|FalseClass] anchor
   def self.commentable_path(comment, anchor = false)
     method_name = "#{comment.commentable_type}_path".downcase.to_sym
-    if respond_to?(method_name)
-      result = send(method_name, comment.commentable)
+    if comment.commentable.respond_to?(:url)
+      result = comment.commentable.url
       anchor ? "#{result}#comment-#{comment.id}" : result
     else
       "##{method_name}"
     end
   end
-
-  # @param [Post] entity
-  def self.post_path(entity)
-    return '#post' unless Gem.loaded_specs.key?('biovision-post')
-
-    handler = PostManager.new(entity)
-    handler.post_path
-  end
 end

data/app/views/admin/comments/entity/_in_list.html.erb

@@ -21,6 +21,13 @@
     <%= simple_format(entity.body) %>
   </div>
 
+  <% unless entity.approved? %>
+    <div>
+      <button class="js-approve-comment" data-url="<%= approve_admin_comment_path(id: entity.id) %>"><%= t('.approve') %></button>
+      <button class="js-delete-comment" data-url="<%= admin_comment_path(id: entity.id) %>"><%= t(:delete) %></button>
+    </div>
+  <% end %>
+
   <ul class="actions">
     <li><%= edit_icon(edit_comment_path(id: entity.id)) %></li>
     <% unless entity.deleted? %>

data/app/views/admin/comments/show.html.erb

@@ -52,4 +52,13 @@
       </div>
     </dd>
   </dl>
+
+  <%= render partial: 'shared/track', locals: { item: @entity } %>
+
+  <% unless @entity.approved? %>
+    <div>
+      <button class="js-approve-comment" data-url="<%= approve_admin_comment_path(id: @entity.id) %>"><%= t('admin.comments.entity.in_list.approve') %></button>
+      <button class="js-delete-comment" data-url="<%= admin_comment_path(id: @entity.id) %>"><%= t(:delete) %></button>
+    </div>
+  <% end %>
 </article>

data/app/views/comments/_comment.html.erb

@@ -10,7 +10,7 @@
     <div class="deleted"><%= t('.deleted') %></div>
   <% else %>
     <meta itemprop="url" content="<%= url_for(anchor: element_id) %>"/>
-    <% if current_user_has_privilege?(:moderator) %>
+    <% if handler.allow?('moderator') %>
       <ul class="actions">
         <li><%= edit_icon(edit_comment_path(id: comment.id)) %></li>
         <li class="danger"><%= destroy_icon(comment) %></li>
@@ -65,7 +65,8 @@
               locals: {
                   comment: item[:comment],
                   show_container: show_container,
-                  comment_tree: comment_tree
+                  comment_tree: comment_tree,
+                  handler: handler
               }
           )
         %>

data/app/views/comments/_list.html.erb

@@ -8,7 +8,8 @@
             locals: {
                 comment: item[:comment],
                 show_container: show_reply_container,
-                comment_tree: comment_tree
+                comment_tree: comment_tree,
+                handler: handler
             }
         )
       %>

data/config/locales/comments-ru.yml

@@ -38,7 +38,7 @@ ru:
   admin:
     comments:
       nav_item:
-        text: "Комментарии"
+        text: "Список комментариев"
         description: "Модерация комментариев"
       index:
         title: "Комментарии, страница %{page}"
@@ -47,6 +47,9 @@ ru:
         title: "Комментарий №%{id}"
       comment:
         deleted: "Комментарий удалён"
+      entity:
+        in_list:
+          approve: "Одобрить"
     index:
       dashboard:
         biovision_comment:
@@ -60,6 +63,7 @@ ru:
   comments:
     create:
       success: "Комментарий добавлен"
+      premoderation: "Ваш комментарий добавлен в очередь модерации"
     update:
       success: "Комментарий изменён"
     destroy:

data/config/routes.rb

@@ -9,11 +9,12 @@ Rails.application.routes.draw do
     end
 
     namespace :admin do
-      resources :comments, only: %i[index show] do
+      resources :comments, only: %i[index show destroy] do
         member do
           post 'toggle', defaults: { format: :json }
           put 'lock', defaults: { format: :json }
           delete 'lock', action: :unlock, defaults: { format: :json }
+          put 'approve'
         end
       end
     end

data/lib/biovision/comment/version.rb

@@ -2,6 +2,6 @@
 
 module Biovision
   module Comment
-    VERSION = '0.7.190905.0'
+    VERSION = '0.8.190926.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: biovision-comment
 version: !ruby/object:Gem::Version
-  version: 0.7.190905.0
+  version: 0.8.190926.0
 platform: ruby
 authors:
 - Maxim Khan-Magomedov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-04 00:00:00.000000000 Z
+date: 2019-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails