commontator 0.4.1 → 0.5.12

data/app/controllers/commontator/subscriptions_controller.rb

@@ -1,16 +1,17 @@
 module Commontator
   class SubscriptionsController < ApplicationController
-    before_filter :get_thread, :except => :index
+    before_filter :get_thread
+    before_filter :get_commontable_url
 
     # POST /1/subscribe
     def create
-      raise SecurityTransgression unless @thread.can_subscribe?(@commontator)
+      raise SecurityTransgression unless @thread.can_subscribe?(@user)
 
       @thread.errors.add(:base, "You are already subscribed to this thread") \
-        unless @thread.subscribe(@commontator)
+        unless @thread.subscribe(@user)
 
       respond_to do |format|
-        format.html { redirect_to @commontable_url }
+        format.html { redirect_to @thread }
         format.js { render :subscribe }
       end
 
@@ -18,13 +19,13 @@ module Commontator
 
     # POST /1/unsubscribe
     def destroy
-      raise SecurityTransgression unless @thread.can_subscribe?(@commontator)
+      raise SecurityTransgression unless @thread.can_subscribe?(@user)
 
       @thread.errors.add(:base, "You are not subscribed to this thread") \
-        unless @thread.unsubscribe(@commontator)
+        unless @thread.unsubscribe(@user)
 
       respond_to do |format|
-        format.html { redirect_to @commontable_url }
+        format.html { redirect_to @thread }
         format.js { render :subscribe }
       end
     end

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

@@ -1,15 +1,14 @@
 module Commontator
   class SubscriptionsController < ApplicationController
-    helper ThreadsHelper
-    
-    before_filter :get_thread, :except => :index
+    before_filter :get_thread
+    before_filter :get_commontable_url
 
     # POST /1/subscribe
     def create
-      raise SecurityTransgression unless @thread.can_subscribe?(@commontator)
+      raise SecurityTransgression unless @thread.can_subscribe?(@user)
 
       @thread.errors.add(:base, "You are already subscribed to this thread") \
-        unless @thread.subscribe(@commontator)
+        unless @thread.subscribe(@user)
 
       respond_to do |format|
         format.html { redirect_to @commontable_url }
@@ -20,10 +19,10 @@ module Commontator
 
     # POST /1/unsubscribe
     def destroy
-      raise SecurityTransgression unless @thread.can_subscribe?(@commontator)
+      raise SecurityTransgression unless @thread.can_subscribe?(@user)
 
       @thread.errors.add(:base, "You are not subscribed to this thread") \
-        unless @thread.unsubscribe(@commontator)
+        unless @thread.unsubscribe(@user)
 
       respond_to do |format|
         format.html { redirect_to @commontable_url }

data/app/controllers/commontator/threads_controller.rb

@@ -1,12 +1,11 @@
 module Commontator
   class ThreadsController < ApplicationController
     before_filter :get_thread
+    before_filter :get_commontable_url, :only => :show
 
     # GET /threads/1
     def show
-      raise SecurityTransgression unless @thread.can_be_read_by?(@commontator)
-
-      @thread.mark_as_read_for(@commontator)
+      commontator_thread_show(@thread.commontable)
 
       respond_to do |format|
         format.html { redirect_to @commontable_url }
@@ -16,24 +15,24 @@ module Commontator
     
     # PUT /threads/1/close
     def close
-      raise SecurityTransgression unless @thread.can_be_edited_by?(@commontator)
+      raise SecurityTransgression unless @thread.can_be_edited_by?(@user)
 
-      @thread.close(@commontator)
-      @thread.thread_closed_callback(@commontator)
+      @thread.close(@user)
+      @thread.thread_closed_callback(@user)
 
       respond_to do |format|
-        format.html { redirect_to @commontable_url }
+        format.html { redirect_to @thread }
       end
     end
     
     # PUT /threads/1/reopen
     def reopen
-      raise SecurityTransgression unless @thread.can_be_edited_by?(@commontator)
+      raise SecurityTransgression unless @thread.can_be_edited_by?(@user)
 
       @thread.reopen
 
       respond_to do |format|
-        format.html { redirect_to @commontable_url }
+        format.html { redirect_to @thread }
       end
     end
   end

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

@@ -1,39 +1,38 @@
 module Commontator
   class ThreadsController < ApplicationController
     before_filter :get_thread
+    before_filter :get_commontable_url, :only => :show
 
     # GET /threads/1
     def show
-      raise SecurityTransgression unless @thread.can_be_read_by?(@commontator)
-
-      @thread.mark_as_read_for(@commontator)
+      commontator_thread_show(@thread.commontable, @user)
 
       respond_to do |format|
-        format.html { redirect_to commontable_url(@thread) }
+        format.html { redirect_to @commontable_url }
         format.js
       end
     end
     
     # PUT /threads/1/close
     def close
-      raise SecurityTransgression unless @thread.can_be_edited_by?(@commontator)
+      raise SecurityTransgression unless @thread.can_be_edited_by?(@user)
 
-      @thread.close(@commontator)
-      @thread.thread_closed_callback(@commontator)
+      @thread.close(@user)
+      @thread.thread_closed_callback(@user)
 
       respond_to do |format|
-        format.html { redirect_to commontable_url(@thread) }
+        format.html { redirect_to @thread }
       end
     end
     
     # PUT /threads/1/reopen
     def reopen
-      raise SecurityTransgression unless @thread.can_be_edited_by?(@commontator)
+      raise SecurityTransgression unless @thread.can_be_edited_by?(@user)
 
       @thread.reopen
 
       respond_to do |format|
-        format.html { redirect_to commontable_url(@thread) }
+        format.html { redirect_to @thread }
       end
     end
   end

data/app/helpers/commontator/comments_helper.rb~

@@ -1,19 +1,10 @@
 module Commontator
   module CommentsHelper
-    def commontator_name(comment)
-      commontator = comment.commontator
-      return Commontator.commontator_missing_name if commontator.nil?
-      config = commontator.commontator_config
-      config.commontator_name_method.blank? ? config.commontator_missing_name : \
-        commontator.send(config.commontator_name_method
-    end
-    
-    def deleter_name(comment)
-      deleter = comment.deleter
-      return Commontator.commontator_missing_name if deleter.nil?
-      config = deleter.commontator_config
-      config.commontator_name_method.blank? ? config.commontator_missing_name : \
-        deleter.send(config.commontator_name_method)
+    def commontator_name(user)
+      return Commontator.user_missing_name if user.nil?
+      config = user.commontator_config
+      config.user_name_method.blank? ? config.user_missing_name : \
+        user.send(config.user_name_method)
     end
     
     def comment_timestamp(comment)
@@ -23,25 +14,24 @@ module Commontator
         ' on ') + comment.updated_at.strftime(config.timestamp_format)
     end
     
-    def gravatar_url(comment, options = {})
-      commontator = comment.commontator
-      return '' if commontator.nil?
-      config = commontator.commontator_config
+    def commontator_gravatar_url(user, options = {})
+      return '' if user.nil?
+      config = user.commontator_config
       
       options[:secure] ||= request.ssl?
       options[:size] ||= 50
     
-      hash = Digest::MD5.hexdigest(commontator.send(config.commontator_email_method))
+      hash = Digest::MD5.hexdigest(user.send(config.user_email_method))
       base = options[:secure] ? "s://secure" : "://www"
       
       "http#{base}.gravatar.com/avatar/#{hash}?s=#{options[:size]}"
     end
   
-    def gravatar_image(comment, options = {})
-      commontator = comment.commontator
-      return '' if commontator.nil?
-      config = commontator.commontator_config
-      name = commontator.send(config.commontator_name_method)
+    def commontator_gravatar_image(comment, options = {})
+      user = comment.creator
+      return '' if user.nil?
+      config = user.commontator_config
+      name = user.send(config.user_name_method)
       image_tag(gravatar_url(comment, options), 
                 { :alt => name, 
                   :title => name,

data/app/helpers/commontator/subscriptions_helper.rb~

@@ -1,8 +1,8 @@
 module Commontator
   module SubscriptionsHelper
-    def email(subscriber)
-      config = subscriber.commontator_config
-      config.email_method.blank? ? '' : subscriber.send config.email_method
+    def commontator_email(user)
+      config = user.commontator_config
+      config.email_method.blank? ? '' : user.send(config.email_method)
     end
   end
 end

data/app/helpers/commontator/threads_helper.rb

@@ -10,13 +10,5 @@ module Commontator
     def commontable_id(thread)
       thread.commontable.send(thread.config.commontable_id_method)
     end
-    
-    def closer_name(thread)
-      closer = thread.closer
-      return Commontator.commontator_missing_name if closer.nil?
-      config = closer.commontator_config
-      config.commontator_name_method.blank? ? config.commontator_missing_name : \
-        closer.send(config.commontator_name_method)
-    end
   end
 end

data/app/helpers/commontator/threads_helper.rb~

@@ -12,11 +12,11 @@ module Commontator
     end
     
     def closer_name(thread)
-      closer = thread.closer
-      return Commontator.commontator_missing_name if closer.nil?
-      config = closer.commontator_config
-      config.commontator_name_method.blank? ? config.commontator_no_name : \
-        closer.send(config.commontator_name_method)
+      user = thread.closer
+      return Commontator.user_missing_name if user.nil?
+      config = user.commontator_config
+      config.user_name_method.blank? ? config.user_missing_name : \
+        user.send(config.user_name_method)
     end
   end
 end

data/app/mailers/commontator/subscriptions_mailer.rb

@@ -1,6 +1,6 @@
 module Commontator
   class SubscriptionsMailer < ActionMailer::Base
-    include CommentsHelper
+    include SharedHelper
     include ThreadsHelper
   
     def comment_created_email(comment, commontable_url) 
@@ -16,18 +16,18 @@ protected
       
       @comment = comment
       @thread = @comment.thread
-      @commontator = @comment.commontator
+      @creator = @comment.creator
       
-      @bcc = @thread.subscribers.reject{|s| s == @commontator}\
-                                .collect{|s| email(s)}
+      @bcc = @thread.subscribers.reject{|s| s == @creator}\
+                                .collect{|s| commontator_email(s)}
       
       return if @bcc.empty?
       
       @commontable = @thread.commontable
       @config = @thread.config
       
-      @commontator_name = commontator_name(@comment)
-      @comment_timestamp = comment_timestamp(@comment)
+      @creator_name = commontator_name(@creator)
+      @comment_timestamp = @comment.timestamp
       
       @commontable_name = commontable_name(@thread)
       @commontable_id = commontable_id(@thread).to_s
@@ -37,10 +37,10 @@ protected
       params = Hash.new
       params[:comment] = @comment
       params[:thread] = @thread
-      params[:commontator] = @commontator
+      params[:creator] = @creator
       params[:commontable] = @commontable
       params[:config] = @config
-      params[:commontator_name] = @commontator_name
+      params[:creator_name] = @creator_name
       params[:comment_timestamp] = @comment_timestamp
       params[:commontable_name] = @commontable_name
       params[:commontable_id] = @commontable_id

data/app/mailers/commontator/subscriptions_mailer.rb~

@@ -1,7 +1,6 @@
 module Commontator
   class SubscriptionsMailer < ActionMailer::Base
-    include CommentsHelper
-    include ThreadsHelper
+    include SharedHelper
   
     def comment_created_email(comment, commontable_url) 
       setup_variables(comment, commontable_url)
@@ -16,18 +15,18 @@ protected
       
       @comment = comment
       @thread = @comment.thread
-      @commontator = @comment.commontator
+      @creator = @comment.creator
       
-      @bcc = @thread.subscribers.reject{|s| s == @commontator}\
-                                .collect{|s| email(s)}
+      @bcc = @thread.subscribers.reject{|s| s == @creator}\
+                                .collect{|s| commontator_email(s)}
       
       return if @bcc.empty?
       
       @commontable = @thread.commontable
       @config = @thread.config
       
-      @commontator_name = commontator_name(@comment)
-      @comment_timestamp = comment_timestamp(@comment)
+      @creator_name = commontator_name(@creator)
+      @comment_timestamp = @comment.timestamp
       
       @commontable_name = commontable_name(@thread)
       @commontable_id = commontable_id(@thread).to_s
@@ -37,14 +36,14 @@ protected
       params = Hash.new
       params[:comment] = @comment
       params[:thread] = @thread
-      params[:commontator] = @commontator
+      params[:creator] = @creator
       params[:commontable] = @commontable
       params[:config] = @config
-      params[:commontator_name] = @commontator_name
+      params[:creator_name] = @creator_name
       params[:comment_timestamp] = @comment_timestamp
-      params[:commontable_url] = @commontable_url
       params[:commontable_name] = @commontable_name
       params[:commontable_id] = @commontable_id
+      params[:commontable_url] = @commontable_url
       
       @subject = @config.subscription_email_subject_proc.call(params)
     end

data/app/models/commontator/comment.rb

@@ -1,12 +1,13 @@
 module Commontator
   class Comment < ActiveRecord::Base
-    belongs_to :commontator, :polymorphic => true
+    belongs_to :creator, :polymorphic => true
     belongs_to :deleter, :polymorphic => true
     belongs_to :thread
     
     has_one :commontable, :through => :thread
     
-    validates_presence_of :commontator, :thread
+    validates_presence_of :creator, :on => :create
+    validates_presence_of :thread
 
     attr_accessible :body
     
@@ -26,6 +27,13 @@ module Commontator
       !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)
       self.deleted_at = Time.now
       self.deleter = user
@@ -48,19 +56,19 @@ module Commontator
     end
 
     def can_be_created_by?(user)
-      !thread.is_closed? && thread.can_be_read_by?(user) && user == commontator
+      !thread.is_closed? && thread.can_be_read_by?(user) && user == creator
     end
 
     def can_be_edited_by?(user)
       !thread.is_closed? && !is_deleted? &&\
-        ((user == commontator && thread.config.can_edit_own_comments) ||\
+        ((user == creator && thread.config.can_edit_own_comments) ||\
         (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 == commontator && thread.config.can_delete_own_comments) &&\
+        ((user == creator && thread.config.can_delete_own_comments) &&\
         (thread.comments.last == self || thread.config.can_delete_old_comments))) ||\
         thread.can_be_edited_by?(user)
     end
@@ -71,7 +79,7 @@ module Commontator
 
     def can_be_voted_on_by?(user)
       can_be_voted_on? && !thread.is_closed? &&\
-        thread.can_be_read_by?(user) && user != commontator
+        thread.can_be_read_by?(user) && user != creator
     end
   end
 end

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

@@ -1,17 +1,13 @@
 module Commontator
   class Comment < ActiveRecord::Base
-    belongs_to :commontator, :polymorphic => true
+    belongs_to :creator, :polymorphic => true
     belongs_to :deleter, :polymorphic => true
     belongs_to :thread
     
     has_one :commontable, :through => :thread
-    #has_one :subthread, :class_name => "Commontator::Thread",
-    #                    :as => :commontable,
-    #                    :dependent => :destroy
-
-    #before_validation :build_subthread, :on => :create
-    validates_presence_of :commontator, :thread#, :subthread
-    #validates_uniqueness_of :subthread
+    
+    validates_presence_of :creator, :on => :create
+    validates_presence_of :thread
 
     attr_accessible :body
     
@@ -31,6 +27,13 @@ module Commontator
       !deleted_at.blank?
     end
     
+    def timestamp
+      config = thread.config
+      (is_modified? ? 'Last modified on ' : \
+        "#{config.comment_create_verb_past.capitalize} on ") + \
+        comment.updated_at.strftime(config.timestamp_format)
+    end
+    
     def delete(user = nil)
       self.deleted_at = Time.now
       self.deleter = user
@@ -53,19 +56,19 @@ module Commontator
     end
 
     def can_be_created_by?(user)
-      !thread.is_closed? && thread.can_be_read_by?(user) && user == commontator
+      !thread.is_closed? && thread.can_be_read_by?(user) && user == creator
     end
 
     def can_be_edited_by?(user)
       !thread.is_closed? && !is_deleted? &&\
-        ((user == commontator && thread.config.can_edit_own_comments) ||\
+        ((user == creator && thread.config.can_edit_own_comments) ||\
         (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 == commontator && thread.config.can_delete_own_comments) &&\
+        ((user == creator && thread.config.can_delete_own_comments) &&\
         (thread.comments.last == self || thread.config.can_delete_old_comments))) ||\
         thread.can_be_edited_by?(user)
     end
@@ -76,7 +79,7 @@ module Commontator
 
     def can_be_voted_on_by?(user)
       can_be_voted_on? && !thread.is_closed? &&\
-        thread.can_be_read_by?(user) && user != commontator
+        thread.can_be_read_by?(user) && user != creator
     end
   end
 end