commontator 1.1.3 → 2.0.0

data/app/controllers/commontator/comments_controller.rb

@@ -51,6 +51,7 @@ module Commontator
     # PUT /comments/1
     def update
       raise SecurityTransgression unless @comment.can_be_edited_by?(@user)
+      @comment.editor = @user
 
       respond_to do |format|
         if @comment.update_attributes(params[:comment])
@@ -68,7 +69,7 @@ module Commontator
       raise SecurityTransgression unless @comment.can_be_deleted_by?(@user)
 
       @comment.errors.add(:base, 'This comment has already been deleted.') \
-        unless @comment.delete(@user)
+        unless @comment.delete_by(@user)
 
       respond_to do |format|
         format.html { redirect_to @thread }
@@ -81,7 +82,7 @@ module Commontator
       raise SecurityTransgression unless @comment.can_be_deleted_by?(@user)
 
       @comment.errors.add(:base, 'This comment is not deleted.') \
-        unless @comment.undelete
+        unless @comment.undelete_by(@user)
 
       respond_to do |format|
         format.html { redirect_to @thread }

data/app/controllers/commontator/comments_controller.rb~

@@ -0,0 +1,136 @@
+module Commontator
+  class CommentsController < ApplicationController
+    before_filter :get_thread, :only => [:new, :create]
+    before_filter :get_comment_and_thread, :except => [:new, :create]
+    before_filter :set_commontable_url, :only => :create
+
+    # GET /1/comments/new
+    def new
+      @comment = Comment.new
+      @comment.thread = @thread
+      @comment.creator = @user
+
+      raise SecurityTransgression unless @comment.can_be_created_by?(@user)
+
+      respond_to do |format|
+        format.html { redirect_to @thread }
+        format.js
+      end
+     
+    end
+
+    # POST /1/comments
+    def create
+      @comment = Comment.new(params[:comment])
+      @comment.thread = @thread
+      @comment.creator = @user
+      
+      raise SecurityTransgression unless @comment.can_be_created_by?(@user)
+      
+      respond_to do |format|
+        if @comment.save
+          format.html { redirect_to @thread }
+          format.js
+        else
+          format.html { redirect_to @thread }
+          format.js { render :new }
+        end
+      end
+    end
+
+    # GET /comments/1/edit
+    def edit
+      raise SecurityTransgression unless @comment.can_be_edited_by?(@user)
+
+      respond_to do |format|
+        format.html { redirect_to @thread }
+        format.js
+      end
+    end
+
+    # PUT /comments/1
+    def update
+      raise SecurityTransgression unless @comment.can_be_edited_by?(@user)
+      @comment.editor = @user
+
+      respond_to do |format|
+        if @comment.update_attributes(params[:comment])
+          format.html { redirect_to @thread }
+          format.js
+        else
+          format.html { redirect_to @thread }
+          format.js { render :edit }
+        end
+      end
+    end
+
+    # PUT /comments/1/delete
+    def delete
+      raise SecurityTransgression unless @comment.can_be_deleted_by?(@user)
+
+      @comment.errors.add(:base, 'This comment has already been deleted.') \
+        unless @comment.delete(@user)
+
+      respond_to do |format|
+        format.html { redirect_to @thread }
+        format.js { render :delete }
+      end
+    end
+    
+    # PUT /comments/1/undelete
+    def undelete
+      raise SecurityTransgression unless @comment.can_be_deleted_by?(@user)
+
+      @comment.errors.add(:base, 'This comment is not deleted.') \
+        unless @comment.undelete_by(@user)
+
+      respond_to do |format|
+        format.html { redirect_to @thread }
+        format.js { render :delete }
+      end
+    end
+    
+    # PUT /comments/1/upvote
+    def upvote
+      raise SecurityTransgression unless @comment.can_be_voted_on_by?(@user)
+      
+      @comment.upvote_from @user
+
+      respond_to do |format|
+        format.html { redirect_to @thread }
+        format.js { render :vote }
+      end
+    end
+    
+    # PUT /comments/1/downvote
+    def downvote
+      raise SecurityTransgression unless @comment.can_be_voted_on_by?(@user)
+      
+      @comment.downvote_from @user
+
+      respond_to do |format|
+        format.html { redirect_to @thread }
+        format.js { render :vote }
+      end
+    end
+    
+    # PUT /comments/1/unvote
+    def unvote
+      raise SecurityTransgression unless @comment.can_be_voted_on_by?(@user)
+      
+      @comment.unvote :voter => @user
+
+      respond_to do |format|
+        format.html { redirect_to @thread }
+        format.js { render :vote }
+      end
+    end
+    
+    protected
+    
+    def get_comment_and_thread
+      @comment = Comment.find(params[:id])
+      @thread = @comment.thread
+    end
+  end
+end

data/app/models/commontator/comment.rb

@@ -1,60 +1,78 @@
 module Commontator
   class Comment < ActiveRecord::Base
     belongs_to :creator, :polymorphic => true
-    belongs_to :deleter, :polymorphic => true
+    belongs_to :editor, :polymorphic => true
+
     belongs_to :thread
-    
+
     has_one :commontable, :through => :thread
-    
+
+    attr_accessible :body
+
     validates_presence_of :creator, :on => :create
+    validates_presence_of :editor, :on => :update
+
     validates_presence_of :thread
     validates_presence_of :body
 
-    attr_accessible :body
-    
+    validates_uniqueness_of :body, :scope => [:creator_type, :creator_id, :thread_id],
+                                   :message => 'has already been posted'
+
+    protected
+
     cattr_accessor :acts_as_votable_initialized
-    
+
+    public
+
     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 unless acts_as_votable_initialized
+      self.class.acts_as_votable
       self.class.acts_as_votable_initialized = true
     end
-    
+
+    def get_vote_by(user)
+      return nil unless is_votable?
+      votes.where(:voter_type => user.class.name, :voter_id => user.id).first
+    end
+
     def is_modified?
-      updated_at != created_at
+      !editor.nil?
     end
-    
+
     def is_deleted?
       !deleted_at.blank?
     end
-    
-    def timestamp
-      config = thread.config
-      (is_modified? ? 'Last modified on ' : \
-        "#{config.comment_create_verb_past.capitalize} on ") + \
-        updated_at.strftime(config.timestamp_format)
-    end
-    
-    def delete(user = nil)
+
+    def delete_by(user)
       return false if is_deleted?
       self.deleted_at = Time.now
-      self.deleter = user
-      self.save!
+      self.editor = user
+      self.save
     end
-    
-    def undelete
+
+    def undelete_by(user)
       return false unless is_deleted?
       self.deleted_at = nil
-      self.save!
+      self.editor = user
+      self.save
     end
 
-    ##########################
-    # Access control methods #
-    ##########################
-    
+    def timestamp
+      config = thread.config
+      "#{config.comment_create_verb_past.capitalize} on " + \
+        created_at.strftime(config.timestamp_format) + \
+        (is_modified? ? " | Last #{config.comment_edit_verb_past} on " + \
+          updated_at.strftime(config.timestamp_format) : '')
+    end
+
+    ##################
+    # Access Control #
+    ##################
+
     def can_be_read_by?(user)
-      (thread.can_be_read_by?(user) && (!is_deleted? ||\
-        thread.config.deleted_comments_are_visible)) ||\
+      (thread.can_be_read_by?(user) && \
+        (!is_deleted? || thread.config.deleted_comments_are_visible)) ||\
         thread.can_be_edited_by?(user)
     end
 
@@ -72,20 +90,19 @@ module Commontator
     def can_be_deleted_by?(user)
       (!thread.is_closed? &&\
         ((user == creator && thread.config.can_delete_own_comments && \
-        thread.can_be_read_by?(user) && (!is_deleted? || deleter == user)) &&\
+        thread.can_be_read_by?(user) && (!is_deleted? || editor == user)) &&\
         (thread.comments.last == self || thread.config.can_delete_old_comments))) ||\
         thread.can_be_edited_by?(user)
     end
-    
+
     def can_be_voted_on?
-      is_votable? && !is_deleted? && thread.config.can_vote_on_comments
+      !thread.is_closed? && is_votable? && !is_deleted? && thread.config.can_vote_on_comments
     end
 
     def can_be_voted_on_by?(user)
-      can_be_voted_on? && !thread.is_closed? &&\
-        thread.can_be_read_by?(user) && user != creator
+      can_be_voted_on? && thread.can_be_read_by?(user) && user != creator
     end
   end
-  
+
   CommentObserver.instance
 end

data/app/models/commontator/comment.rb~

@@ -0,0 +1,108 @@
+module Commontator
+  class Comment < ActiveRecord::Base
+    belongs_to :creator, :polymorphic => true
+    belongs_to :editor, :polymorphic => true
+
+    belongs_to :thread
+
+    has_one :commontable, :through => :thread
+
+    attr_accessible :body
+
+    validates_presence_of :creator, :on => :create
+    validates_presence_of :editor, :on => :update
+
+    validates_presence_of :thread
+    validates_presence_of :body
+
+    validates_uniqueness_of :body, :scope => [:creator_type, :creator_id, :thread_id],
+                                   :message => 'has already been posted'
+
+    protected
+
+    cattr_accessor :acts_as_votable_initialized
+
+    public
+
+    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
+
+    def get_vote_by(user)
+      return nil unless is_votable?
+      votes.where(:voter_type => user.class.name, :voter_id => user.id).first
+    end
+
+    def is_modified?
+      !editor.nil?
+    end
+
+    def is_deleted?
+      !deleted_at.blank?
+    end
+
+    def delete_by(user)
+      return false if is_deleted?
+      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 timestamp
+      config = thread.config
+      "#{config.comment_create_verb_past.capitalize} on ") + \
+        created_at.strftime(config.timestamp_format) + \
+        (is_modified? ? " | Last #{config.comment_edit_verb_past} on " + \
+          updated_at.strftime(config.timestamp_format) : '')
+    end
+
+    ##################
+    # Access Control #
+    ##################
+
+    def can_be_read_by?(user)
+      (thread.can_be_read_by?(user) && \
+        (!is_deleted? || thread.config.deleted_comments_are_visible)) ||\
+        thread.can_be_edited_by?(user)
+    end
+
+    def can_be_created_by?(user)
+      !thread.is_closed? && thread.can_be_read_by?(user) && user == creator
+    end
+
+    def can_be_edited_by?(user)
+      !thread.is_closed? && !is_deleted? &&\
+        ((user == creator && thread.config.can_edit_own_comments && thread.can_be_read_by?(user)) ||\
+        (thread.can_be_edited_by?(user) && thread.config.admin_can_edit_comments)) &&\
+        (thread.comments.last == self || thread.config.can_edit_old_comments)
+    end
+
+    def can_be_deleted_by?(user)
+      (!thread.is_closed? &&\
+        ((user == creator && thread.config.can_delete_own_comments && \
+        thread.can_be_read_by?(user) && (!is_deleted? || editor == user)) &&\
+        (thread.comments.last == self || thread.config.can_delete_old_comments))) ||\
+        thread.can_be_edited_by?(user)
+    end
+
+    def can_be_voted_on?
+      !thread.is_closed? && is_votable? && !is_deleted? && thread.config.can_vote_on_comments
+    end
+
+    def can_be_voted_on_by?(user)
+      can_be_voted_on? && thread.can_be_read_by?(user) && user != creator
+    end
+  end
+
+  CommentObserver.instance
+end

data/app/models/commontator/subscription.rb

@@ -1,19 +1,21 @@
 module Commontator
   class Subscription < ActiveRecord::Base
     belongs_to :subscriber, :polymorphic => true
+
     belongs_to :thread
 
-    validates_presence_of :subscriber, :thread
-    validates_uniqueness_of :thread_id, :scope => [:subscriber_id, :subscriber_type]
-    
     attr_accessible :subscriber, :thread
-    
+
+    validates_presence_of :subscriber, :thread
+
+    validates_uniqueness_of :thread_id, :scope => [:subscriber_type, :subscriber_id]
+
     def mark_as_read
-      self.update_attribute(:unread, 0)
+      update_attribute(:unread, 0)
     end
 
     def add_unread
-      self.update_attribute(:unread, unread + 1)
+      update_attribute(:unread, unread + 1)
     end
   end
 end

data/app/models/commontator/subscription.rb~

@@ -0,0 +1,21 @@
+module Commontator
+  class Subscription < ActiveRecord::Base
+    belongs_to :subscriber, :polymorphic => true
+
+    belongs_to :thread
+
+    attr_accessible :subscriber, :thread
+
+    validates_presence_of :subscriber, :thread
+
+    validates_uniqueness_of :thread_id, :scope => [:subscriber_type, :subscriber_id]
+
+    def mark_as_read
+      self.update_attribute(:unread, 0)
+    end
+
+    def add_unread
+      self.update_attribute(:unread, unread + 1)
+    end
+  end
+end