the_comments 0.9.0 → 0.9.9

data/app/assets/javascripts/the_comments.js.coffee

@@ -44,20 +44,20 @@ $ ->
       return false
 
     $('.tolerance_time').val time_diff
-    button.prop 'disabled', true
+    button.hide()
     true
 
   # AJAX ERROR
   $(document).on 'ajax:error', comment_forms, (request, response, status) ->
     form = $ @
-    $('input[type=submit]', form).prop 'disabled', false
+    $('input[type=submit]', form).show()
     error_msgs = error_text_builder(["Server Error: #{response.status}"])
     comments_error_notifier(form, error_msgs)
 
   # COMMENT FORMS => SUCCESS
   $(document).on 'ajax:success', comment_forms, (request, response, status) ->
     form = $ @
-    $('input[type=submit]', form).prop 'disabled', false
+    $('input[type=submit]', form).show()
 
     if typeof(response) is 'string'
       anchor = $(response).find('.comment').attr('id')

data/app/assets/javascripts/the_comments_manage.js.coffee

@@ -4,12 +4,10 @@ $ ->
   
   holder.on 'ajax:success', '.to_published', (request, response, status) ->
     link = $ @
-    log link.parents('.item')
     link.parents('.item').first().attr('class', 'item published')
 
   holder.on 'ajax:success', '.to_draft', (request, response, status) ->
     link = $ @
-    log link.parents('.item')
     link.parents('.item').first().attr('class', 'item draft')
 
   holder.on 'ajax:success', '.to_spam, .to_deleted', (request, response, status) ->

data/app/assets/stylesheets/the_comments.css.scss

@@ -74,14 +74,14 @@
   li{
     .comment.draft{
       border: 1px solid gray;
-      background: lightGray;
+      background: #eff5f3;
       padding: 10px;
     }
   }
 
   .form_holder{ margin-left: 40px; }
   
-  .edit{
+  .edit, .delete{
     margin-bottom: 3px;
     text-align:center;
     line-height: 130%;
@@ -89,6 +89,7 @@
     color: white;
     padding: 1px;
   }
+  .delete{ background: gray; }
 
   .comment{
     overflow: hidden; zoom: 1;
@@ -105,12 +106,12 @@
       padding: 3px;
     }
     .userbar{
-      background: #ddd;
+      background: #eff5f3;
       border-radius: 3px;
       padding-left: 7px;
     }
     &.draft{
-      .userbar{ background: #EED3D7; }
+      .userbar{ background: #ffa768; }
       .to_draft{ display: none; }
     }
     &.published{
@@ -143,7 +144,7 @@
       border-radius: 3px;
       padding: 5px;
     }
-    &.highlighted{ border: 1px dashed #ff6633; }
+    &.highlighted{ border: 1px dashed #ff6633 !important; }
 
   }
 

data/app/controllers/concerns/the_comments_controller.rb

@@ -1,31 +1,24 @@
 module TheCommentsController
   COMMENTS_COOKIES_TOKEN = 'JustTheCommentsCookies'
 
-  # View token for Commentable controller
+  # Cookies and View token for spam protection
   #
-  # class PagesController < ApplicationController
+  # class ApplicationController < ActionController::Base
   #   include TheCommentsController::ViewToken
   # end
   module ViewToken
+    extend ActiveSupport::Concern
+    included { before_action :set_the_comments_cookies }
+
     def comments_view_token
-      cookies[:comments_view_token] = { :value => SecureRandom.hex, :expires => 7.days.from_now } unless cookies[:comments_view_token]
       cookies[:comments_view_token]
     end
-  end
-
-  # Cookies for spam protection
-  #
-  # class ApplicationController < ActionController::Base
-  #   include TheCommentsController::Cookies
-  # end
-  module Cookies
-    extend ActiveSupport::Concern
-    included { before_action :set_the_comments_cookies }
 
     private
 
     def set_the_comments_cookies
-      cookies[:the_comment_cookies] = { :value => TheCommentsController::COMMENTS_COOKIES_TOKEN, :expires => 1.year.from_now }
+      cookies[:the_comment_cookies] = { value: TheCommentsController::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
 
@@ -72,10 +65,15 @@ module TheCommentsController
     end
 
     def my
-      @comments = current_user.comments.with_state(:draft, :published).order('created_at DESC').page(params[:page])
+      @comments = current_user.my_comments.order('created_at DESC').page(params[:page])
       render template: 'the_comments/index'
     end
 
+    def new
+      @comments = current_user.my_comments.with_state(:draft).order('created_at DESC').page(params[:page])
+      render template: 'the_comments/manage'
+    end
+
     def incoming
       @comments = current_user.comcoms.with_state(:draft, :published).order('created_at DESC').page(params[:page])
       render template: 'the_comments/manage'
@@ -86,7 +84,9 @@ module TheCommentsController
       render template: 'the_comments/manage'
     end
 
-    # Base methods
+    # BASE METHODS
+
+    # Public methods
 
     def update
       comment = Comment.where(id: params[:id]).first
@@ -103,6 +103,8 @@ module TheCommentsController
       render json: { errors: @comment.errors.full_messages }
     end
 
+    # Protected methods
+
     def to_published
       Comment.where(id: params[:id]).first.to_published
       render nothing: :true

data/app/controllers/concerns/the_comments_user_agent_controller.rb

@@ -1,17 +1,15 @@
 module TheCommentsUserAgentController
-  extend ActiveSupport::Concern
-
-  included do
-    def index
-      @ip_black_lists = if params[:ip]
-        UserAgentBlackList.where(ip: params[:ip])
-      else
-        UserAgentBlackList.order('count DESC').page(params[:page])
-      end
+  # extend ActiveSupport::Concern
+  # included do; end
+  def index
+    @ip_black_lists = if params[:ip]
+      UserAgentBlackList.where(ip: params[:ip])
+    else
+      UserAgentBlackList.order('count DESC').page(params[:page])
     end
+  end
 
-    def to_state
-      return render text: UserAgentBlackList.where(id: params[:user_agent_black_list_id]).first.update!(state: params[:state])
-    end
+  def to_state
+    return render text: UserAgentBlackList.where(id: params[:user_agent_black_list_id]).first.update!(state: params[:state])
   end
 end

data/app/helpers/render_comments_tree_helper.rb

@@ -39,10 +39,8 @@ module RenderCommentsTreeHelper
 
         if @comment.draft?
           draft_comment
-        elsif @comment.published?
+        else @comment.published?
           published_comment
-        else
-          deleted_comment
         end
       end
 
@@ -89,10 +87,13 @@ module RenderCommentsTreeHelper
         "<div class='userbar'>#{ title } #{ anchor }</div>"
       end
 
-      def moderator_controls
+      def moderator_controls        
+        t = ''
         if moderator?
-          h.link_to t('the_comments.edit'),       h.edit_comment_url(@comment),     class: :edit
+          t += h.link_to(t('the_comments.edit'), h.edit_comment_url(@comment), class: :edit)
+          t += h.link_to(t('the_comments.to_deleted'), h.to_trash_comment_url(@comment), class: :delete, method: :delete, remote: true, confirm: t('the_comments.delete_confirm'))
         end
+        t
       end
 
       def reply

data/app/models/concerns/the_comments_base.rb

@@ -23,42 +23,47 @@ module TheCommentsBase
     belongs_to :commentable, polymorphic: true
 
     # callbacks
-    before_create :define_holder, :define_anchor, :denormalize_commentable
+    before_create :define_holder, :define_default_state, :define_anchor, :denormalize_commentable
     after_create  :update_cache_counters
     before_save   :prepare_content
+  end
 
-    def avatar_url
-      src = id.to_s
-      src = title unless title.blank?
-      src = contacts if !contacts.blank? && /@/ =~ contacts
-      hash = Digest::MD5.hexdigest(src)
-      "http://www.gravatar.com/avatar/#{hash}?s=40&d=identicon"
-    end
+  def avatar_url
+    src = id.to_s
+    src = title unless title.blank?
+    src = contacts if !contacts.blank? && /@/ =~ contacts
+    hash = Digest::MD5.hexdigest(src)
+    "http://www.gravatar.com/avatar/#{hash}?s=40&d=identicon"
+  end
+    
+  private
 
-    private
+  def define_anchor
+    self.anchor = SecureRandom.hex[0..5]
+  end
 
-    def define_anchor
-      self.anchor = SecureRandom.hex[0..5]
-    end
+  def define_holder
+    c = self.commentable
+    self.holder = c.is_a?(User) ? c : c.try(:user)
+  end
 
-    def define_holder
-      self.holder = self.commentable.user
-    end
+  def define_default_state
+    self.state = TheComments.config.default_owner_state if user && user == holder
+  end
 
-    def denormalize_commentable
-      self.commentable_title = self.commentable.try :commentable_title
-      self.commentable_url   = self.commentable.try :commentable_url
-      self.commentable_state = self.commentable.try :state
-    end
+  def denormalize_commentable
+    self.commentable_title = self.commentable.try :commentable_title
+    self.commentable_url   = self.commentable.try :commentable_url
+    self.commentable_state = self.commentable.try :state
+  end
 
-    def prepare_content
-      self.content = self.raw_content
-    end
+  def prepare_content
+    self.content = self.raw_content
+  end
 
-    def update_cache_counters
-      self.user.try        :increment!, :draft_comments_count
-      self.holder.try      :increment!, :draft_comcoms_count
-      self.commentable.try :increment!, :draft_comments_count
-    end
+  def update_cache_counters
+    user.try        :recalculate_my_comments_counter!
+    commentable.try :increment!, :draft_comments_count
+    holder.try      :increment!, :draft_comcoms_count
   end
 end

data/app/models/concerns/the_comments_commentable.rb

@@ -3,48 +3,60 @@ module TheCommentsCommentable
 
   included do
     has_many :comments, as: :commentable
-    
-    # TODO: update requests reduction
-    # *define_denormalize_flags* - should be placed before
-    # title or url builder filters
+
+    # *define_denormalize_flags* - should be placed before title or url builder filters
     before_validation :define_denormalize_flags
     after_save        :denormalize_for_comments
+  end
+
+  def commentable_title
+    try(:title) || TheComments.config.default_title
+  end
+
+  def commentable_url
+    # /pages/1
+    ['', self.class.to_s.tableize, self.to_param].join('/')
+  end
+
+  def commentable_state
+    # 'draft'
+    try(:state)
+  end
+
+  def comments_sum
+    published_comments_count + draft_comments_count
+  end
+
+  def recalculate_comments_counters!
+    self.draft_comments_count     = comments.with_state(:draft).count
+    self.published_comments_count = comments.with_state(:published).count
+    self.deleted_comments_count   = comments.with_state(:deleted).count
+    save
+  end
+
+  private
+
+  def define_denormalize_flags
+    @trackable_commentable_title = commentable_title
+    @trackable_commentable_state = commentable_state
+    @trackable_commentable_url   = commentable_url
+  end
+
+  # Can you make it better? I don't know how.
+  def denormalization_fields_changed?
+    @title_field_changed = @trackable_commentable_title != commentable_title
+    @state_field_changed = @trackable_commentable_state != commentable_state
+    @url_field_changed   = @trackable_commentable_url   != commentable_url
+    @title_field_changed || @url_field_changed || @state_field_changed
+  end
 
-    def commentable_title
-      try(:title) || 'Undefined title'
-    end
-
-    def commentable_url
-      # /pages/1
-      ['', self.class.to_s.tableize, self.to_param].join('/')
-    end
-
-    def comments_sum
-      published_comments_count + draft_comments_count
-    end
-
-    def recalculate_comments_counters
-      self.draft_comments_count     = comments.with_state(:draft).count
-      self.published_comments_count = comments.with_state(:published).count
-      self.deleted_comments_count   = comments.with_state(:deleted).count
-      save
-    end
-
-    private
-
-    def define_denormalize_flags
-      @_commentable_title = commentable_title
-      @_commentable_url   = commentable_url
-    end
-
-    def denormalize_for_comments
-      title_changed = @_commentable_title != commentable_title
-      url_changed   = @_commentable_url   != commentable_url
-      cstate = try(:state_changed?) ? { commentable_state: state } : {}
-
-      if title_changed || url_changed || !cstate.blank?
-        comments.update_all({ commentable_title: commentable_title, commentable_url: commentable_url}.merge(cstate))
-      end
-    end
+  def denormalize_for_comments
+    if denormalization_fields_changed?
+      comments.update_all({
+        commentable_title: commentable_title,
+        commentable_state: commentable_state,
+        commentable_url:   commentable_url
+      })
+    end 
   end
 end

data/app/models/concerns/the_comments_states.rb

@@ -3,7 +3,7 @@ module TheCommentsStates
 
   included do
     # :draft | :published | :deleted
-    state_machine :state, :initial => :draft do
+    state_machine :state, :initial => TheComments.config.default_state do
 
       # events
       event :to_draft do
@@ -31,33 +31,33 @@ module TheCommentsStates
         from = transition.from_name
         to   = transition.to_name
 
-        @holder.try :increment!, :"#{to}_comcoms_count"
-        @holder.try :decrement!, :"#{from}_comcoms_count"
+        @holder.try :increment!, "#{to}_comcoms_count"
+        @holder.try :decrement!, "#{from}_comcoms_count"
 
-        [@owner, @commentable].each do |obj|
-          obj.try :increment!, "#{to}_comments_count"
-          obj.try :decrement!, "#{from}_comments_count"
-        end
+        @commentable.try :increment!, "#{to}_comments_count"
+        @commentable.try :decrement!, "#{from}_comments_count"
       end
 
       # to deleted (cascade like query)
       after_transition [:draft, :published] => :deleted do |comment|
         ids = comment.self_and_descendants.map(&:id)
         Comment.where(id: ids).update_all(state: :deleted)
-        [@holder, @owner, @commentable].each{|o| o.try :recalculate_comments_counters }
+        @owner.try       :recalculate_my_comments_counter!
+        @holder.try      :recalculate_comcoms_counters!
+        @commentable.try :recalculate_comments_counters!
       end
 
       # from deleted
       after_transition :deleted => [:draft, :published] do |comment, transition|
         to = transition.to_name
 
+        @owner.try :recalculate_my_comments_counter!
+
         @holder.try :decrement!, :deleted_comcoms_count
         @holder.try :increment!, "#{to}_comcoms_count"
 
-        [@owner, @commentable].each do |obj|
-          obj.try :decrement!, :deleted_comments_count
-          obj.try :increment!, "#{to}_comments_count"
-        end
+        @commentable.try :decrement!, :deleted_comments_count
+        @commentable.try :increment!, "#{to}_comments_count"
       end
     end
   end