the_comments 2.2.2 → 2.3.1

data/app/controllers/concerns/the_comments/view_token.rb

@@ -0,0 +1,20 @@
+module TheComments
+  # Cookies and View token for spam protection
+  # include TheComments::ViewToken
+  module ViewToken
+    extend ActiveSupport::Concern
+
+    included { before_action :set_the_comments_cookies }
+
+    def comments_view_token
+      cookies[:comments_view_token]
+    end
+
+    private
+
+    def set_the_comments_cookies
+      cookies[:the_comment_cookies] = { value: TheComments::COMMENTS_COOKIES_TOKEN, expires: 1.year.from_now }
+      cookies[:comments_view_token] = { value: SecureRandom.hex, expires: 7.days.from_now } unless cookies[:comments_view_token]
+    end
+  end
+end

data/app/models/concerns/{comment.rb → the_comments/comment.rb}

@@ -4,16 +4,19 @@ module TheComments
 
     included do
       scope :active, -> { with_state [:draft, :published] }
-      scope :recent, -> { order('created_at DESC') }
+      scope :with_users, -> { includes(:user) }
 
       # Nested Set
       acts_as_nested_set scope: [:commentable_type, :commentable_id]
 
-      # Comments State Machine
-      include TheComments::CommentStates
+      # simple sort scopes
+      include ::TheSimpleSort::Base
 
       # TheSortableTree
-      include TheSortableTree::Scopes
+      include ::TheSortableTree::Scopes
+
+      # Comments State Machine
+      include TheComments::CommentStates
 
       validates :raw_content, presence: true
 
@@ -28,6 +31,14 @@ module TheComments
       before_save   :prepare_content
     end
 
+    def header_title
+      title.present? ? title : I18n.t('the_comments.guest_name')
+    end
+
+    def user_name
+      user.try(:username) || user.try(:login) || header_title
+    end
+
     def avatar_url
       src = id.to_s
       src = title unless title.blank?
@@ -35,7 +46,7 @@ module TheComments
       hash = Digest::MD5.hexdigest(src)
       "https://2.gravatar.com/avatar/#{hash}?s=42&d=https://identicons.github.com/#{hash}.png"
     end
-      
+
     def mark_as_spam
       count = self_and_descendants.update_all({spam: true})
       update_spam_counter
@@ -86,18 +97,20 @@ module TheComments
     # We have few unuseful requests
     # I impressed that I found it and reduce DB requests
     # Awesome logic pazzl! I'm really pedant :D
-    def update_cache_counters    
+    def update_cache_counters
       user.try :recalculate_my_comments_counter!
 
       if holder
         holder.send :try, :define_denormalize_flags
-        holder.increment! "#{state}_comcoms_count"
+        holder.increment! "#{ state }_comcoms_count"
+        # holder.class.increment_counter("#{ state }_comcoms_count", holder.id)
       end
 
       if commentable
         commentable.send :define_denormalize_flags
-        commentable.increment! "#{state}_comments_count"
+        commentable.increment! "#{ state }_comments_count"
+        # holder.class.increment_counter("#{ state }_comments_count", holder.id)
       end
     end
   end
-end
+end

data/app/models/concerns/{comment_states.rb → the_comments/comment_states.rb}

@@ -47,14 +47,8 @@ module TheComments
 
         # to deleted (cascade like query)
         after_transition [:draft, :published] => :deleted do |comment|
-
-          if TheComments.config.delete_descendants_on_node_delete
-            ids = comment.self_and_descendants.map(&:id)
-            ::Comment.where(id: ids).update_all(state: :deleted)
-          else
-            id = comment.id
-            ::Comment.where(id: id).update_all(state: :deleted)
-          end
+          ids = comment.self_and_descendants.map(&:id)
+          ::Comment.where(id: ids).update_all(state: :deleted)
 
           @owner.try       :recalculate_my_comments_counter!
           @holder.try      :recalculate_comcoms_counters!

data/app/models/concerns/{user.rb → the_comments/user.rb}

@@ -1,7 +1,7 @@
 module TheComments
   module User
     extend ActiveSupport::Concern
-    
+
     included do
       has_many :comcoms, class_name: :Comment, foreign_key: :holder_id
     end
@@ -18,6 +18,10 @@ module TheComments
       end
     end
 
+    def my_spam_comments
+      my_comments.where(spam: true)
+    end
+
     # I think we shouldn't to have my_deleted_comments cache counter
     def recalculate_my_comments_counter!
       dcount = my_draft_comments.count
@@ -49,4 +53,4 @@ module TheComments
       published_comcoms_count + draft_comcoms_count
     end
   end
-end
+end

data/app/views/the_comments/haml/_additional_info.html.haml

@@ -10,4 +10,4 @@
       %td= comment.tolerance_time || :none
       %td= comment.ip
       %td= comment.user_agent
-      %td= comment.referer
+      %td= comment.referer

data/app/views/the_comments/haml/_comment_body.html.haml

@@ -9,7 +9,11 @@
   %tr
     %td
       %b= t('the_comments.title')
-    %td= comment.title.blank? ? t('the_comments.guest_name') : comment.title
+    %td
+      - if comment.try(:user)
+        = link_to comment.user_name, comment.user
+      - else
+        = comment.header_title
   %tr
     %td
       %b= t('the_comments.contacts')
@@ -17,4 +21,5 @@
   %tr.success
     %td
       %b= t('the_comments.content')
-    %td= comment.content
+    %td{ style: 'word-break: break-all;' }= raw comment.content
+

data/app/views/the_comments/haml/_comment_edit.html.haml

@@ -23,4 +23,4 @@
       %tr
         %td
         %td= f.submit t('the_comments.update'), class: "btn btn-success"
-  %hr
+  %hr

data/app/views/the_comments/haml/_form.html.haml

@@ -2,26 +2,7 @@
   = link_to t('the_comments.new'), '#', id: :new_root_comment
 
 = form_for Comment.new, remote: true, authenticity_token: true do |f|
-  .error_notifier{ style: "display:none" }
-  %label= t('the_comments.form.title')
-  %p= f.text_field :title
-
-  %label= t('the_comments.form.contacts')
-  %p= f.text_field :contacts
-
-  %label= t('the_comments.form.content')
-  %p= f.text_area :raw_content
-
-  %p.trap
-    - TheComments.config.empty_inputs.each do |name|
-      = text_field_tag name, nil, autocomplete: :off, tabindex: -1, id: nil
-  
-  = hidden_field_tag :tolerance_time, 0, id: nil, class: :tolerance_time
-
-  = f.hidden_field :commentable_type, value: commentable.class
-  = f.hidden_field :commentable_id,   value: commentable.id
-  = f.hidden_field :parent_id, class: :parent_id
-
-  %p
-    = f.submit t('the_comments.form.create'), class: :btn
-    = t('the_comments.form.thank_you')
+  - if current_user
+    = render partial: 'the_comments/haml/logined_form', locals: { f: f, commentable: commentable }
+  - else
+    = render partial: 'the_comments/haml/guest_form', locals: { f: f, commentable: commentable }

data/app/views/the_comments/haml/_guest_form.html.haml

@@ -0,0 +1,22 @@
+%label= t('the_comments.form.title')
+%p= f.text_field :title, class: 'form-control'
+
+%label= t('the_comments.form.contacts')
+%p= f.text_field :contacts, class: 'form-control'
+
+%label= t('the_comments.form.content')
+%p= f.text_area :raw_content, class: 'form-control'
+
+%p.trap
+  - TheComments.config.empty_inputs.each do |name|
+    = text_field_tag name, nil, autocomplete: :off, tabindex: -1, id: nil
+
+= hidden_field_tag :tolerance_time, 0, id: nil, class: :tolerance_time
+
+= f.hidden_field :commentable_type, value: commentable.class
+= f.hidden_field :commentable_id,   value: commentable.id
+= f.hidden_field :parent_id, class: :parent_id
+
+%p
+  = f.submit t('the_comments.form.create'), class: :btn
+  = t('the_comments.form.thank_you')

data/app/views/the_comments/haml/_logined_form.html.haml

@@ -0,0 +1,18 @@
+.logined_comment_form
+  .user_data
+    = link_to user_path(current_user), nopin: :nopin do
+      = image_tag current_user.try(:avatar).try(:url, :thumb)
+  .comment_data
+    = hidden_field_tag :tolerance_time, 0, id: nil, class: :tolerance_time
+    = f.hidden_field :commentable_type, value: commentable.class
+    = f.hidden_field :commentable_id,   value: commentable.id
+    = f.hidden_field :parent_id, class: :parent_id
+
+    .user_name
+      %b= current_user.username.present? ? current_user.username : current_user.login
+    %label= t('the_comments.form.content')
+    %p= f.text_area :raw_content
+
+    %p
+      = f.submit t('the_comments.form.create'), class: :btn
+      = t('the_comments.form.thank_you')

data/app/views/the_comments/haml/_manage_controls.html.haml

@@ -1,27 +1,30 @@
 - hidden = "display:none"
 
 .row.controls
-  .col-md-9
-    = link_to t('the_comments.edit'), "#", class: "edit btn btn-success"
-    = link_to t('the_comments.cancel'), "#", class: "btn btn-warning edit", style: "display:none"
+  .col-md-9.action_btns
+    = link_to '#', class: "edit btn btn-success" do
+      = t('the_comments.edit')
 
-    - to_hide = comment.published? ? hidden : nil
-    - opts    = { remote: true, style: to_hide, method: :post }
-    = link_to [:to_published, comment], opts.merge(class: "btn btn-primary to_published") do
-      = t('the_comments.to_published')
-    
-    - to_hide = comment.draft? ? hidden : nil
-    - opts    = { remote: true, style: to_hide, method: :post }
-    = link_to [:to_draft, comment], opts.merge(class: "btn btn-warning to_draft") do
-      = t('the_comments.to_draft')
+    = link_to '#', class: "btn btn-warning edit", style: "display:none" do
+      = t('the_comments.cancel')
 
-    - to_hide = comment.deleted? ? hidden : nil
-    - opts    = { remote: true, style: to_hide, method: :delete, data: { confirm: t('the_comments.delete_confirm') } }
-    = link_to [:to_deleted, comment], opts.merge(class: "btn btn-danger to_deleted") do
-      = t('the_comments.to_deleted')
+    - unless to_hide = comment.published? ? hidden : nil
+      - opts    = { remote: true, style: to_hide, method: :post }
+      = link_to [:to_published, comment], opts.merge(class: "btn btn-primary to_published") do
+        = t('the_comments.to_published')
+
+    - unless to_hide = comment.draft? ? hidden : nil
+      - opts    = { remote: true, style: to_hide, method: :post }
+      = link_to [:to_draft, comment], opts.merge(class: "btn btn-warning to_draft") do
+        = t('the_comments.to_draft')
+
+    - unless to_hide = comment.deleted? ? hidden : nil
+      - opts    = { remote: true, style: to_hide, method: :delete, data: { confirm: t('the_comments.delete_confirm') } }
+      = link_to [:to_deleted, comment], opts.merge(class: "btn btn-danger to_deleted") do
+        = t('the_comments.to_deleted')
 
     - opts = { remote: true, method: :post}
     = link_to [:to_spam, comment], opts.merge(class: "btn btn-danger to_spam") do
       = t('the_comments.to_spam')
   .col-md-3.text-right
-    = link_to t('the_comments.additional_info'), "#", class: "additional_info btn btn-info"
+    = link_to t('the_comments.additional_info'), "#", class: "additional_info btn btn-info"

data/app/views/the_comments/haml/_sidebar.html.haml

@@ -1,28 +1,9 @@
-- cuser = current_user
-
-.panel.panel-primary
+.panel.panel-default
   .panel-heading= t "the_comments.nav.header"
   .panel-body
-    %p= link_to raw(t('the_comments.back_to_root')), '/'
-    %hr
-
-    %h5= t 'the_comments.incoming'
-    %ul
-      %li= link_to t("the_comments.draft_comments",     num: cuser.draft_comcoms_count),     [:draft,     :comments]
-      %li= link_to t("the_comments.published_comments", num: cuser.published_comcoms_count), [:published, :comments]
-      %li= link_to t("the_comments.deleted_comments",   num: cuser.deleted_comcoms_count),   [:deleted,   :comments]
-      %li= link_to t("the_comments.spam_comments",      num: cuser.spam_comcoms_count),      [:spam,      :comments]
-
-    %h5= t 'the_comments.written_by_me'
-    %ul
-      %li= link_to t("the_comments.draft_comments",     num: cuser.my_draft_comments.count),     [:my_draft,     :comments]
-      %li= link_to t("the_comments.published_comments", num: cuser.my_published_comments.count), [:my_published, :comments]
-      %li= link_to t("the_comments.my_comments",        num: cuser.my_comments_count),           [:my_comments,  :comments]
+    = render partial: 'the_comments/haml/sidebar_backlink'
 
-    - if cuser.comments_admin?
-      %h5= t 'the_comments.in_system'
-      %ul
-        %li= link_to t("the_comments.draft_comments",     num: Comment.with_state(:draft).count),     [:total_draft,     :comments]
-        %li= link_to t("the_comments.published_comments", num: Comment.with_state(:published).count), [:total_published, :comments]
-        %li= link_to t("the_comments.deleted_comments",   num: Comment.with_state(:deleted).count),   [:total_deleted,   :comments]
-        %li= link_to t("the_comments.spam_comments",      num: Comment.where(spam: true).count),      [:total_spam,      :comments]
+    - if current_user.comments_admin?
+      = render partial: 'the_comments/haml/sidebar_admin'
+    - else
+      = render partial: 'the_comments/haml/sidebar_user'

data/app/views/the_comments/haml/_sidebar_admin.html.haml

@@ -0,0 +1,12 @@
+- cuser = current_user
+
+= render partial: 'the_comments/haml/sidebar_user'
+
+- if cuser.comments_admin?
+  %br
+  %h5= t 'the_comments.in_system', num: Comment.count
+  %p= link_to t("the_comments.published_comments", num: Comment.with_state(:published).count), [:total_published, :comments], class: 'btn btn-success btn-sm'
+  %p= link_to t("the_comments.draft_comments",     num: Comment.with_state(:draft).count),     [:total_draft,     :comments], class: 'btn btn-info btn-sm'
+  %p
+    = link_to t("the_comments.deleted_comments",   num: Comment.with_state(:deleted).count),   [:total_deleted,   :comments], class: 'btn btn-default btn-sm'
+    = link_to t("the_comments.spam_comments",      num: Comment.where(spam: true).count),      [:total_spam,      :comments], class: 'btn btn-default btn-sm'

data/app/views/the_comments/haml/_sidebar_backlink.html.haml

@@ -0,0 +1,3 @@
+%p= link_to t('the_comments.nav.to_root'), root_path
+%p= link_to t('the_comments.nav.all_incoming'), manage_comments_url
+%hr

data/app/views/the_comments/haml/_sidebar_user.html.haml

@@ -0,0 +1,29 @@
+- cuser = current_user
+
+%h5=t 'the_comments.written_by_me', num: cuser.my_comments.count
+
+%p= link_to t("the_comments.published_comments", num: cuser.my_published_comments.count), [:my_published, :comments], class: 'btn btn-success btn-sm'
+%p= link_to t("the_comments.draft_comments",     num: cuser.my_draft_comments.count),     [:my_draft,     :comments], class: 'btn btn-info btn-sm'
+
+%p
+  - if cuser.comments_admin?
+    = link_to t("the_comments.deleted_comments",   num: cuser.my_deleted_comments.count),   [:my_deleted, :comments], class: 'btn btn-default btn-sm'
+    = link_to t("the_comments.spam_comments",      num: cuser.my_spam_comments.count),      [:my_spam,    :comments], class: 'btn btn-default btn-sm'
+  - else
+    %span.btn.btn-default.btn-sm= t("the_comments.deleted_comments",   num: cuser.my_deleted_comments.count)
+    %span.btn.btn-default.btn-sm= t("the_comments.spam_comments",      num: cuser.my_spam_comments.count)
+
+%br
+%h5= t 'the_comments.for_my_posts', num: cuser.comcoms.count
+
+%p= link_to t("the_comments.published_comments", num: cuser.published_comcoms_count), [:published, :comments], class: 'btn btn-success btn-sm'
+%p= link_to t("the_comments.draft_comments",     num: cuser.draft_comcoms_count),     [:draft,     :comments], class: 'btn btn-info btn-sm'
+%p
+  - if cuser.comments_admin?
+    = link_to t("the_comments.deleted_comments",   num: cuser.deleted_comcoms_count),   [:deleted,   :comments], class: 'btn btn-default btn-sm'
+    = link_to t("the_comments.spam_comments",      num: cuser.spam_comcoms_count),      [:spam,      :comments], class: 'btn btn-default btn-sm'
+  - else
+    %span.btn.btn-default.btn-sm= t("the_comments.deleted_comments",   num: cuser.deleted_comcoms_count)
+    %span.btn.btn-default.btn-sm= t("the_comments.spam_comments",      num: cuser.spam_comcoms_count)
+
+

data/app/views/the_comments/haml/_tree.html.haml

@@ -1,4 +1,16 @@
+- if commentable.try(:comments_on?) || true
+  %h4.comments_sum
+    - if commentable.comments_sum.zero?
+      Вы можете стать первым, кто оставит комментарий!
+    - else
+      Комментариев: #{ commentable.comments_sum }
+
+  - unless current_user
+    .comments_description
+      %p &mdash; Комментарий можно оставить <b>без регистрации</b>, для этого достаточно заполнить одно обязательное поле <b class='nobr'>Текст комментария</b>. Анонимные комментарии проходят модерацию и до момента одобрения видны только в браузере автора
+      %p &mdash; Комментарии зарегистрированных пользователей публикуются сразу после создания
+
 .comments#comments
   %ol.comments_tree{ data: { comments: { tolarance_time: TheComments.config.tolerance_time  } } }
     = render partial: 'the_comments/haml/comment', locals: { tree: comments_tree }
-  = render partial: 'the_comments/haml/form', locals: { commentable: commentable }
+  = render partial: 'the_comments/haml/form', locals: { commentable: commentable }

data/app/views/the_comments/haml/manage.html.haml

@@ -12,14 +12,15 @@
 
   .comments
     - @comments.each do |comment|
-      - klass = { published: :primary, draft: :warning, deleted: :danger }[comment.state.to_sym]
+      - klass = { published: :success, draft: :info, deleted: :danger }[comment.state.to_sym]
       .panel{ class: "panel-#{klass}" }
-        .panel-heading= comment.title
+        .panel-heading= comment.header_title
         .panel-body
-          = render partial: 'the_comments/haml/comment_edit', locals: { comment: comment }
           = render partial: 'the_comments/haml/comment_body', locals: { comment: comment }
 
-          = render partial: 'the_comments/haml/manage_controls', locals: { comment: comment }
-          = render partial: 'the_comments/haml/additional_info', locals: { comment: comment }
-        
-  = paginate @comments
+          - if current_user.comments_admin?
+            = render partial: 'the_comments/haml/comment_edit', locals: { comment: comment }
+            = render partial: 'the_comments/haml/manage_controls', locals: { comment: comment }
+            = render partial: 'the_comments/haml/additional_info', locals: { comment: comment }
+
+  = paginate @comments

data/app/views/the_comments/slim/_comment_body.html.slim

@@ -9,7 +9,11 @@ table.comment_body.table.table-striped.table-hover
   tr
     td
       b= t('the_comments.title')
-    td= comment.title.blank? ? t('the_comments.guest_name') : comment.title
+    td
+      - if comment.try(:user)
+        = link_to comment.user_name, comment.user
+      - else
+        = comment.header_title
   tr
     td
       b= t('the_comments.contacts')

data/app/views/the_comments/slim/_form.html.slim

@@ -2,26 +2,7 @@ h3
   = link_to t('the_comments.new'), '#', id: :new_root_comment
 
 = form_for Comment.new, remote: true, authenticity_token: true do |f|
-  .error_notifier style="display:none"  
-  label= t('the_comments.form.title')
-  p= f.text_field :title
-
-  label= t('the_comments.form.contacts')
-  p= f.text_field :contacts
-
-  label= t('the_comments.form.content')
-  p= f.text_area :raw_content
-
-  p.trap
-    - TheComments.config.empty_inputs.each do |name|
-      = text_field_tag name, nil, autocomplete: :off, tabindex: -1, id: nil
-  
-  = hidden_field_tag :tolerance_time, 0, id: nil, class: :tolerance_time
-
-  = f.hidden_field :commentable_type, value: commentable.class
-  = f.hidden_field :commentable_id,   value: commentable.id
-  = f.hidden_field :parent_id, class: :parent_id
-
-  p
-    = f.submit t('the_comments.form.create'), class: :btn
-    = t('the_comments.form.thank_you')
+  - if current_user
+    = render partial: 'the_comments/slim/logined_form', locals: { f: f, commentable: commentable }
+  - else
+    = render partial: 'the_comments/slim/guest_form', locals: { f: f, commentable: commentable }