commontator 5.1.0 → 6.0.0.pre.1

data/app/helpers/commontator/application_helper.rb

@@ -1,7 +1,5 @@
-module Commontator
-  module ApplicationHelper
-    def javascript_proc
-      Commontator.javascript_proc.call(self).html_safe
-    end
+module Commontator::ApplicationHelper
+  def javascript_proc
+    Commontator.javascript_proc.call(self).html_safe
   end
 end

data/app/helpers/commontator/link_renderer.rb

@@ -0,0 +1,25 @@
+require 'will_paginate'
+
+class Commontator::LinkRenderer < WillPaginate::ActionView::LinkRenderer
+  protected
+
+  def url(page)
+    @base_url_params ||= begin
+      url_params = merge_get_params(default_url_params)
+      merge_optional_params(url_params)
+    end
+
+    url_params = @base_url_params.dup
+    add_current_page_param(url_params, page)
+
+    routes_proxy = @options[:routes_proxy] || @template
+    routes_proxy.url_for(url_params)
+  end
+
+  private
+
+  def link(text, target, attributes = {})
+    attributes = attributes.merge('data-remote' => true) if @options[:remote]
+    super
+  end
+end

data/app/mailers/commontator/subscriptions_mailer.rb

@@ -1,49 +1,49 @@
-module Commontator
-  class SubscriptionsMailer < ActionMailer::Base
-    def comment_created(comment, recipients)
-      setup_variables(comment, recipients)
+class Commontator::SubscriptionsMailer < ActionMailer::Base
+  helper Commontator::SharedHelper
 
-      mail(@mail_params).tap do |message|
-        message.mailgun_recipient_variables = @mailgun_recipient_variables if @using_mailgun
-      end
+  def comment_created(comment, recipients)
+    setup_variables(comment, recipients)
+
+    mail(@mail_params).tap do |message|
+      message.mailgun_recipient_variables = @mailgun_recipient_variables if @using_mailgun
     end
+  end
 
-    protected
+  protected
 
-    def setup_variables(comment, recipients)
-      @comment = comment
-      @thread = @comment.thread
-      @creator = @comment.creator
+  def setup_variables(comment, recipients)
+    @comment = comment
+    @thread = @comment.thread
+    @creator = @comment.creator
 
-      @mail_params = { from: @thread.config.email_from_proc.call(@thread) }
+    @mail_params = { from: @thread.config.email_from_proc.call(@thread) }
 
-      @recipient_emails = recipients.map do |recipient|
-        Commontator.commontator_email(recipient, self)
-      end
+    @recipient_emails = recipients.map do |recipient|
+      Commontator.commontator_email(recipient, self)
+    end
 
-      @using_mailgun = Rails.application.config.action_mailer.delivery_method == :mailgun
+    @using_mailgun = Rails.application.config.action_mailer.delivery_method == :mailgun
 
-      if @using_mailgun
-        @recipients_header = :to
-        @mailgun_recipient_variables = {}.tap do |mailgun_recipient_variables|
-          @recipient_emails.each { |email| mailgun_recipient_variables[email] = {} }
-        end
-      else
-        @recipients_header = :bcc
+    if @using_mailgun
+      @recipients_header = :to
+      @mailgun_recipient_variables = {}.tap do |mailgun_recipient_variables|
+        @recipient_emails.each { |email| mailgun_recipient_variables[email] = {} }
       end
+    else
+      @recipients_header = :bcc
+    end
 
-      @mail_params[@recipients_header] = @recipient_emails
+    @mail_params[@recipients_header] = @recipient_emails
 
-      @creator_name = Commontator.commontator_name(@creator)
-      @commontable_name = Commontator.commontable_name(@thread)
-      @comment_url = Commontator.comment_url(@comment, main_app)
+    @creator_name = Commontator.commontator_name(@creator)
+    @commontable_name = Commontator.commontable_name(@thread)
+    @comment_url = Commontator.comment_url(@comment, main_app)
 
-      @mail_params[:subject] = t(
-        'commontator.email.comment_created.subject',
-        creator_name: @creator_name,
-        commontable_name: @commontable_name,
-        comment_url: @comment_url
-      )
-    end
+    @mail_params[:subject] = t(
+      'commontator.email.comment_created.subject',
+      creator_name: @creator_name,
+      commontable_name: @commontable_name,
+      comment_url: @comment_url
+    )
   end
 end

data/app/models/commontator/comment.rb

@@ -1,116 +1,233 @@
-module Commontator
-  class Comment < ActiveRecord::Base
-    belongs_to :creator, polymorphic: true
-    belongs_to :editor, polymorphic: true, optional: true
-    belongs_to :thread
+class Commontator::Comment < ActiveRecord::Base
+  belongs_to :creator, polymorphic: true
+  belongs_to :editor, polymorphic: true, optional: true
+  belongs_to :thread, inverse_of: :comments
+  belongs_to :parent, optional: true, class_name: name, inverse_of: :children
+
+  has_many :children, class_name: name, inverse_of: :parent
+
+  serialize :ancestor_ids, Commontator::JsonArrayCoder
+  serialize :descendant_ids, Commontator::JsonArrayCoder
+
+  validates :editor, presence: true, on: :update
+  validates :body, presence: true, uniqueness: {
+    scope: [ :creator_type, :creator_id, :thread_id, :deleted_at ],
+    message: I18n.t('commontator.comment.errors.double_posted')
+  }
+  validate :parent_is_not_self, :parent_belongs_to_the_same_thread, if: :parent
+
+  before_save :set_ancestor_ids_and_ancestor_descendant_ids
+  before_destroy :remove_ancestor_descendant_ids
+
+  cattr_accessor :will_paginate
+  self.will_paginate = begin
+    require 'will_paginate'
+
+    true
+  rescue LoadError
+    false
+  end
 
-    validates_presence_of :creator, on: :create
-    validates_presence_of :editor, on: :update
-    validates_presence_of :thread
-    validates_presence_of :body
+  cattr_accessor :is_votable
+  self.is_votable = begin
+    require 'acts_as_votable'
+    acts_as_votable
 
-    validates_uniqueness_of :body,
-      scope: [:creator_type, :creator_id, :thread_id, :deleted_at],
-      message: I18n.t('commontator.comment.errors.double_posted')
+    true
+  rescue LoadError
+    false
+  end
 
-    protected
+  def self.will_paginate?
+    will_paginate
+  end
 
-    cattr_accessor :acts_as_votable_initialized
+  def self.is_votable?
+    is_votable
+  end
 
-    public
+  def is_modified?
+    !editor.nil?
+  end
 
-    def is_modified?
-      !editor.nil?
-    end
+  def is_latest?
+    thread.comments.last == self
+  end
 
-    def is_latest?
-      thread.comments.last == self
-    end
+  def get_vote_by(user)
+    return nil unless self.class.is_votable? && !user.nil? && user.is_commontator
 
-    def is_votable?
-      return true if acts_as_votable_initialized
-      return false unless self.class.respond_to?(:acts_as_votable)
-      self.class.acts_as_votable
-      self.class.acts_as_votable_initialized = true
-    end
+    votes_for.find_by(voter_type: user.class.name, voter_id: user.id)
+  end
 
-    def get_vote_by(user)
-      return nil unless is_votable? && !user.nil? && user.is_commontator
-      votes_for.where(voter_type: user.class.name, voter_id: user.id).first
-    end
+  def update_cached_votes(vote_scope = nil)
+    self.update_column(:cached_votes_up, count_votes_up(true))
+    self.update_column(:cached_votes_down, count_votes_down(true))
+  end
 
-    def update_cached_votes(vote_scope = nil)
-      self.update_column(:cached_votes_up, count_votes_up(true))
-      self.update_column(:cached_votes_down, count_votes_down(true))
-    end
+  def is_deleted?
+    !deleted_at.nil?
+  end
 
-    def is_deleted?
-      !deleted_at.blank?
-    end
+  def delete_by(user)
+    return false if is_deleted?
 
-    def delete_by(user)
-      return false if is_deleted?
-      self.deleted_at = Time.now
-      self.editor = user
-      self.save
-    end
+    self.deleted_at = Time.now
+    self.editor = user
+    self.save
+  end
 
-    def undelete_by(user)
-      return false unless is_deleted?
-      self.deleted_at = nil
-      self.editor = user
-      self.save
-    end
+  def undelete_by(user)
+    return false unless is_deleted?
 
-    def created_timestamp
-      I18n.t 'commontator.comment.status.created_at',
-             created_at: I18n.l(created_at, format: :commontator)
-    end
+    self.deleted_at = nil
+    self.editor = user
+    self.save
+  end
 
-    def updated_timestamp
-      I18n.t 'commontator.comment.status.updated_at',
-             editor_name: Commontator.commontator_name(editor || creator),
-             updated_at: I18n.l(updated_at, format: :commontator)
-    end
+  def created_timestamp
+    I18n.t 'commontator.comment.status.created_at',
+           created_at: I18n.l(created_at, format: :commontator)
+  end
 
-    ##################
-    # Access Control #
-    ##################
+  def updated_timestamp
+    I18n.t 'commontator.comment.status.updated_at',
+           editor_name: Commontator.commontator_name(editor || creator),
+           updated_at: I18n.l(updated_at, format: :commontator)
+  end
 
-    def can_be_created_by?(user)
-      user == creator && !user.nil? && user.is_commontator &&\
-      !thread.is_closed? && thread.can_be_read_by?(user)
-    end
+  ##################
+  # Access Control #
+  ##################
 
-    def can_be_edited_by?(user)
-      return true if thread.can_be_edited_by?(user) &&\
-                     thread.config.moderator_permissions.to_sym == :e
-      comment_edit = thread.config.comment_editing.to_sym
-      !thread.is_closed? && !is_deleted? && user == creator &&\
-      comment_edit != :n && (is_latest? || comment_edit == :a) &&\
-      thread.can_be_read_by?(user)
-    end
+  def can_be_created_by?(user)
+    user == creator && !user.nil? && user.is_commontator &&
+    !thread.is_closed? && thread.can_be_read_by?(user)
+  end
 
-    def can_be_deleted_by?(user)
-      mod_perm = thread.config.moderator_permissions.to_sym
-      return true if thread.can_be_edited_by?(user) &&\
-                     (mod_perm == :e ||\
-                       mod_perm == :d)
-      comment_del = thread.config.comment_deletion.to_sym
-      !thread.is_closed? && (!is_deleted? || editor == user) &&\
-      user == creator && comment_del != :n &&\
-      (is_latest? || comment_del == :a) &&\
-      thread.can_be_read_by?(user)
-    end
+  def can_be_edited_by?(user)
+    return true if thread.can_be_edited_by?(user) &&
+                   thread.config.moderator_permissions.to_sym == :e
+
+    comment_edit = thread.config.comment_editing.to_sym
+    !thread.is_closed? && !is_deleted? && user == creator && (editor.nil? || user == editor) &&
+    comment_edit != :n && (is_latest? || comment_edit == :a) && thread.can_be_read_by?(user)
+  end
+
+  def can_be_deleted_by?(user)
+    mod_perm = thread.config.moderator_permissions.to_sym
+    return true if thread.can_be_edited_by?(user) && (mod_perm == :e || mod_perm == :d)
+
+    comment_del = thread.config.comment_deletion.to_sym
+    !thread.is_closed? && user == creator && (!is_deleted? || editor == user) &&
+    comment_del != :n && (is_latest? || comment_del == :a) && thread.can_be_read_by?(user)
+  end
+
+  def can_be_voted_on?
+    !thread.is_closed? && !is_deleted? &&
+    thread.config.comment_voting.to_sym != :n && self.class.is_votable?
+  end
+
+  def can_be_voted_on_by?(user)
+    !user.nil? && user.is_commontator && user != creator &&
+    thread.can_be_read_by?(user) && can_be_voted_on?
+  end
+
+  protected
+
+  def parent_is_not_self
+    return if parent != self
+    errors.add :parent, 'must be a different comment'
+    throw :abort
+  end
+
+  def parent_belongs_to_the_same_thread
+    return if parent.thread_id == thread_id
+    errors.add :parent, 'must belong to the same thread'
+    throw :abort
+  end
+
+  def remove_ancestor_descendant_ids
+    return if ancestor_ids.empty?
+
+    # Remove id and descendant_ids from ancestors
+    self.class.where(id: ancestor_ids).order(:id).update_all("descendant_ids = #{
+      ([ id ] + descendant_ids).reduce(self.class.arel_table[:descendant_ids]) do |memo, descendant_id|
+        Arel::Nodes::NamedFunction.new('REPLACE', [
+          Arel::Nodes::NamedFunction.new('REPLACE', [
+            Arel::Nodes::NamedFunction.new('REPLACE', [
+              Arel::Nodes::NamedFunction.new('REPLACE', [
+                memo, Arel::Nodes.build_quoted("[#{descendant_id}]"), Arel::Nodes.build_quoted('[]')
+              ]), Arel::Nodes.build_quoted("[#{descendant_id},"), Arel::Nodes.build_quoted('[')
+            ]), Arel::Nodes.build_quoted(",#{descendant_id},"), Arel::Nodes.build_quoted(',')
+          ]), Arel::Nodes.build_quoted(",#{descendant_id}]"), Arel::Nodes.build_quoted(']')
+        ])
+      end.to_sql
+    }")
+
+    association(:parent).reset
+  end
 
-    def can_be_voted_on?
-      !thread.is_closed? && !is_deleted? &&\
-      thread.config.comment_voting.to_sym != :n && is_votable?
+  def set_ancestor_ids_and_ancestor_descendant_ids
+    return if ancestor_ids.first == parent_id
+
+    pa = parent
+
+    remove_ancestor_descendant_ids
+
+    # Remove ancestor_ids from descendants
+    unless ancestor_ids.empty? || descendant_ids.empty?
+      self.class.where(id: descendant_ids).order(:id).update_all("ancestor_ids = #{
+        ancestor_ids.reduce(self.class.arel_table[:ancestor_ids]) do |memo, ancestor_id|
+          Arel::Nodes::NamedFunction.new('REPLACE', [
+            Arel::Nodes::NamedFunction.new('REPLACE', [
+              Arel::Nodes::NamedFunction.new('REPLACE', [
+                Arel::Nodes::NamedFunction.new('REPLACE', [
+                  memo, Arel::Nodes.build_quoted("[#{ancestor_id}]"), Arel::Nodes.build_quoted('[]')
+                ]), Arel::Nodes.build_quoted("[#{ancestor_id},"), Arel::Nodes.build_quoted('[')
+              ]), Arel::Nodes.build_quoted(",#{ancestor_id},"), Arel::Nodes.build_quoted(',')
+            ]), Arel::Nodes.build_quoted(",#{ancestor_id}]"), Arel::Nodes.build_quoted(']')
+          ])
+        end.to_sql
+      }")
+
+      children.reset
     end
 
-    def can_be_voted_on_by?(user)
-      !user.nil? && user.is_commontator && user != creator &&\
-      thread.can_be_read_by?(user) && can_be_voted_on?
+    if pa.nil?
+      self.ancestor_ids = []
+    else
+      self.ancestor_ids = [ pa.id ] + pa.ancestor_ids
+
+      # Add id and descendant_ids to ancestors
+      descendant_ids_str = ([ id ] + descendant_ids).to_json[1..-2]
+      self.class.where(id: ancestor_ids).order(:id).update_all("descendant_ids = #{
+        Arel::Nodes::NamedFunction.new('REPLACE', [
+          Arel::Nodes::NamedFunction.new('REPLACE', [
+            Arel::Nodes::NamedFunction.new('COALESCE', [
+              self.class.arel_table[:descendant_ids], Arel::Nodes.build_quoted('[]')
+            ]), Arel::Nodes.build_quoted(']'), Arel::Nodes.build_quoted(",#{descendant_ids_str}]")
+          ]), Arel::Nodes.build_quoted('[,'), Arel::Nodes.build_quoted('[')
+        ]).to_sql
+      }")
+
+      association(:parent).reset
+
+      # Add ancestor_ids to descendants
+      unless descendant_ids.empty?
+        ancestor_ids_str = ancestor_ids.to_json[1..-2]
+        self.class.where(id: descendant_ids).order(:id).update_all("ancestor_ids = #{
+          Arel::Nodes::NamedFunction.new('REPLACE', [
+            Arel::Nodes::NamedFunction.new('REPLACE', [
+              Arel::Nodes::NamedFunction.new('COALESCE', [
+                self.class.arel_table[:ancestor_ids], Arel::Nodes.build_quoted('[]')
+              ]), Arel::Nodes.build_quoted(']'), Arel::Nodes.build_quoted(",#{ancestor_ids_str}]")
+            ]), Arel::Nodes.build_quoted('[,'), Arel::Nodes.build_quoted('[')
+          ]).to_sql
+        }")
+
+        children.reset
+      end
     end
   end
 end

data/app/models/commontator/json_array_coder.rb

@@ -0,0 +1,10 @@
+module Commontator::JsonArrayCoder
+  def self.load(data)
+    obj = JSON.load(data)
+    obj.is_a?(Array) ? obj : []
+  end
+
+  def self.dump(obj)
+    obj.is_a?(Array) ? JSON.dump(obj) : '[]'
+  end
+end