commontator 0.2.4 → 0.3.10

data/app/helpers/commontator/application_helper.rb

@@ -1,11 +1,7 @@
 module Commontator
   module ApplicationHelper
-    def heading(string)
-      Commontator.heading_proc.call(string) unless Commontator.heading_proc.blank?
-    end
-    
-    def javascript_callback
-      Commontator.javascript_proc.call unless Commontator.javascript_proc.blank?
+    def javascript_proc
+      Commontator.javascript_proc.call(self).html_safe
     end
   end
 end

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

@@ -1,11 +1,11 @@
 module Commontator
   module ApplicationHelper
-    def heading(string)
-      Commontator.heading_proc.call unless Commontator.heading_proc.blank?
+    def commontable_url(thread)
+      thread.config.commontable_url_proc.call(main_app, thread.commontable)
     end
     
-    def javascript_callback
-      Commontator.javascript_proc.call unless Commontator.javascript_proc.blank?
+    def javascript_proc
+      Commontator.javascript_proc.call(self).html_safe
     end
   end
 end

data/app/helpers/commontator/commontator_helper.rb

@@ -1,8 +1,8 @@
 module Commontator
   module CommontatorHelper
     def commontator_thread_link(commontable)
-      render(:partial => 'commontator/commontator/thread',
-             :locals => {:commontable => commontable}).html_safe
+      render(:partial => 'commontator/shared/thread_link',
+             :locals => {:thread => commontable.thread}).html_safe
     end
   end
 end

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

@@ -1,8 +1,8 @@
 module Commontator
   module CommontatorHelper
     def commontator_thread_link(commontable)
-      render(:partial => 'commontator/shared/thread',
-             :locals => {:commontable => commontable}).html_safe
+      render(:partial => 'commontator/shared/link',
+             :locals => {:thread => commontable.thread}).html_safe
     end
   end
 end

data/app/helpers/commontator/threads_helper.rb

@@ -1,5 +1,5 @@
 module Commontator
-  module ThreadsHelper    
+  module ThreadsHelper
     def commontable_name(thread)
       config = thread.config
       config.commontable_name.blank? ? \

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

@@ -1,5 +1,9 @@
 module Commontator
-  module ThreadsHelper    
+  module ThreadsHelper
+    def commontable_url(thread)
+      thread.config.commontable_url_proc.call(main_app, thread.commontable)
+    end
+    
     def commontable_name(thread)
       config = thread.config
       config.commontable_name.blank? ? \
@@ -17,16 +21,5 @@ module Commontator
       config.commontator_name_method.blank? ? config.anonymous_name : \
       closer.send(config.commontator_name_method)
     end
-    
-    def refresh_thread_actions(thread)
-      output = ""
-      thread.comments.each do |comment|
-        output << "$('#comment_#{comment.id.to_s}_actions_span').html('" + \
-                    escape_javascript(
-                      render :partial => :actions,
-                             :locals => { :comment => comment }) + "');\n\n"
-      end
-      output.slice(0..-3).html_safe
-    end
   end
 end

data/app/mailers/commontator/subscriptions_mailer.rb

@@ -1,35 +1,39 @@
 module Commontator
   class SubscriptionsMailer < ActionMailer::Base
-  
     include CommentsHelper
     include ThreadsHelper
   
-    def comment_created_email(comment) 
-      setup_variables(comment)
+    def comment_created_email(comment, commontable_url) 
+      setup_variables(comment, commontable_url)
 
-      mail(:bcc => @bcc,
-           :subject => @subject)
+      mail(:bcc => @bcc, :subject => @subject) \
+        unless @bcc.empty?
     end
 
 protected
 
-    def setup_variables(comment)
+    def setup_variables(comment, commontable_url)
       
       @comment = comment
       @thread = @comment.thread
-      
       @commontator = @comment.commontator
+      
+      @bcc = @thread.subscribers.reject{|s| s == @commontator}\
+                                .collect{|s| email(s)}
+      
+      return if @bcc.empty?
+      
       @commontable = @thread.commontable
       @config = @thread.config
-      @bcc = @thread.subscribers.reject{|s| s == @commontator}\
-                                        .collect{|s| email(s)}
-                                
+      
       @commontator_name = commontator_name(@comment)
       @comment_timestamp = comment_timestamp(@comment)
       
       @commontable_name = commontable_name(@thread)
       @commontable_id = commontable_id(@thread).to_s
       
+      @commontable_url = commontable_url
+      
       params = Hash.new
       params[:comment] = @comment
       params[:thread] = @thread
@@ -40,9 +44,9 @@ protected
       params[:comment_timestamp] = @comment_timestamp
       params[:commontable_name] = @commontable_name
       params[:commontable_id] = @commontable_id
+      params[:commontable_url] = @commontable_url
       
       @subject = @config.subscription_email_subject_proc.call(params)
     end
-
   end
 end

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

@@ -1,36 +1,39 @@
 module Commontator
   class SubscriptionsMailer < ActionMailer::Base
-  
     include CommentsHelper
     include ThreadsHelper
   
-    def comment_created_email(comment) 
-      setup_variables(comment)
+    def comment_created_email(comment, commontable_url) 
+      setup_variables(comment, commontable_url)
 
-      mail(:bcc => @bcc,
-           :subject => @subject,
-           :body => @body)
+      mail(:bcc => @bcc, :subject => @subject) \
+        unless @bcc.empty?
     end
 
 protected
 
-    def setup_variables(comment)
+    def setup_variables(comment, commontable_url)
       
       @comment = comment
       @thread = @comment.thread
-      
       @commontator = @comment.commontator
+      
+      @bcc = @thread.subscribers.reject{|s| s == @commontator}\
+                                .collect{|s| email(s)}
+      
+      return if @bcc.empty?
+      
       @commontable = @thread.commontable
       @config = @thread.config
-      @bcc = @thread.subscribers.reject{|s| s == @commontator}\
-                                        .collect{|s| email(s)}
-                                
+      
       @commontator_name = commontator_name(@comment)
       @comment_timestamp = comment_timestamp(@comment)
       
       @commontable_name = commontable_name(@thread)
       @commontable_id = commontable_id(@thread).to_s
       
+      @commontable_url = commontable_url
+      
       params = Hash.new
       params[:comment] = @comment
       params[:thread] = @thread
@@ -39,11 +42,11 @@ protected
       params[:config] = @config
       params[:commontator_name] = @commontator_name
       params[:comment_timestamp] = @comment_timestamp
+      params[:commontable_url] = @commontable_url
       params[:commontable_name] = @commontable_name
       params[:commontable_id] = @commontable_id
       
       @subject = @config.subscription_email_subject_proc.call(params)
     end
-
   end
 end

data/app/models/commontator/comment.rb

@@ -64,9 +64,9 @@ module Commontator
     end
 
     def can_be_deleted_by?(user)
-      !thread.is_closed? &&\
+      (!thread.is_closed? &&\
         ((user == commontator && thread.config.can_delete_own_comments) &&\
-        (thread.comments.last == self || thread.config.can_delete_old_comments)) ||\
+        (thread.comments.last == self || thread.config.can_delete_old_comments))) ||\
         thread.can_be_edited_by?(user)
     end
     

data/app/models/commontator/thread.rb

@@ -23,20 +23,20 @@ module Commontator
       subscriptions.collect{|s| s.subscriber}
     end
     
-    def subscription_for(user)
-      Subscription.find_by_thread_id_and_subscriber_id_and_subscriber_type(self.id, user.id, user.class.name)
+    def subscription_for(subscriber)
+      Subscription.find_by_thread_id_and_subscriber_id_and_subscriber_type(self.id, subscriber.id, subscriber.class.name)
     end
     
     def is_closed?
       !closed_at.blank?
     end
     
-    def is_subscribed?(user)
+    def is_subscribed?(subscriber)
       !subscription_for(subscriber).blank?
     end
 
     def subscribe(subscriber)
-      return false if is_subscribed?(user)
+      return false if is_subscribed?(subscriber)
       subscription = Subscription.create(
         :subscriber => subscriber, :thread => self)
       subscribe_callback(subscriber)
@@ -97,27 +97,27 @@ module Commontator
     ####################
     
     def comment_created_callback(user, comment)
-      commontable.send(config.comment_created_callback, user, comment) unless commontable.blank? || config.comment_created_callback.blank?
+      commontable.blank? || config.comment_created_callback.blank? || commontable.send(config.comment_created_callback, user, comment)
     end
     
     def comment_edited_callback(user, comment)
-      commontable.send(config.comment_edited_callback, user, comment) unless commontable.blank? || config.comment_edited_callback.blank?
+      commontable.blank? || config.comment_edited_callback.blank? || commontable.send(config.comment_edited_callback, user, comment)
     end
     
     def comment_deleted_callback(user, comment)
-      commontable.send(config.comment_deleted_callback, user, comment) unless commontable.blank? || config.comment_deleted_callback.blank?
+      commontable.blank? || config.comment_deleted_callback.blank? || commontable.send(config.comment_deleted_callback, user, comment)
     end
     
     def thread_closed_callback(user)
-      commontable.send(config.thread_closed_callback, user) unless commontable.blank? || config.thread_closed_callback.blank?
+      commontable.blank? || config.thread_closed_callback.blank? || commontable.send(config.thread_closed_callback, user)
     end
     
     def subscribe_callback(user)
-      commontable.send(config.subscribe_callback, user) unless commontable.blank? || config.subscribe_callback.blank?
+      commontable.blank? || config.subscribe_callback.blank? || commontable.send(config.subscribe_callback, user)
     end
           
     def unsubscribe_callback(user)
-      commontable.send(config.unsubscribe_callback, user) unless commontable.blank? || config.unsubscribe_callback.blank?
+      commontable.blank? || config.unsubscribe_callback.blank? || commontable.send(config.unsubscribe_callback, user)
     end
 
     ##########################
@@ -137,7 +137,7 @@ module Commontator
     end
 
     def can_subscribe?(user)
-      !commontable.blank? && config.can_subscribe_to_thread && can_be_read_by?(user)
+      !commontable.blank? && config.can_subscribe_to_thread && !is_closed? && can_be_read_by?(user)
     end
   end
 end

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

@@ -10,35 +10,33 @@ module Commontator
     
     attr_accessible :is_closed
     
-    alias_method :default_comments, :comments
-    
     def config
       commontable.try(:commontable_config)
     end
     
     def ordered_comments
       (!commontable.blank? && config.comments_can_be_voted_on && config.comments_ordered_by_votes) ? \
-        default_comments.order("cached_votes_down - cached_votes_up") : default_comments
+        comments.order("cached_votes_down - cached_votes_up") : comments
     end
     
     def subscribers
       subscriptions.collect{|s| s.subscriber}
     end
     
-    def subscription_for(user)
-      Subscription.find_by_thread_id_and_subscriber_id_and_subscriber_type(self.id, user.id, user.class.name)
+    def subscription_for(subscriber)
+      Subscription.find_by_thread_id_and_subscriber_id_and_subscriber_type(self.id, subscriber.id, subscriber.class.name)
     end
     
     def is_closed?
       !closed_at.blank?
     end
     
-    def is_subscribed?(user)
+    def is_subscribed?(subscriber)
       !subscription_for(subscriber).blank?
     end
 
     def subscribe(subscriber)
-      return false if is_subscribed?(user)
+      return false if is_subscribed?(subscriber)
       subscription = Subscription.create(
         :subscriber => subscriber, :thread => self)
       subscribe_callback(subscriber)
@@ -99,7 +97,7 @@ module Commontator
     ####################
     
     def comment_created_callback(user, comment)
-      commontable.send(config.comment_created_callback, user, comment) unless commontable.blank? || config.comment_created_callback.blank?
+      commontable.blank? || config.comment_created_callback.blank? || commontable.send(config.comment_created_callback, user, comment)
     end
     
     def comment_edited_callback(user, comment)
@@ -139,7 +137,7 @@ module Commontator
     end
 
     def can_subscribe?(user)
-      !commontable.blank? && config.can_subscribe_to_thread && can_be_read_by?(user)
+      !commontable.blank? && config.can_subscribe_to_thread && !is_closed? && can_be_read_by?(user)
     end
   end
 end

data/app/views/commontator/comments/_actions.html.erb

@@ -7,26 +7,23 @@
 
 <% if can_edit %>
   <%= link_to 'Edit', edit_comment_path(comment),
-                      :id => "edit_comment_#{comment.id.to_s}_link",
-                      :class => "edit_comment_link",
+                      :id => "comment_#{comment.id.to_s}_edit_link",
+                      :class => "comment_edit_link",
                       :remote => true %>
 <% end %>
 
 &nbsp;
 
 <% if can_delete %>
-  <% if !comment.is_deleted? %>
-    <%= link_to('Delete', delete_comment_path(comment),
-                :confirm => 'Are you sure you want to delete this ' + @thread.config.comment_name + '?',
-                :method => :put,
-                :id => "delete_comment_#{comment.id.to_s}_link",
-                :class => "delete_comment_link",
-                :remote => true) %>
-  <% else %>
-    <%= link_to('Undelete', undelete_comment_path(comment),
-                :method => :put,
-                :id => "undelete_comment_#{comment.id.to_s}_link",
-                :class => "undelete_comment_link",
-                :remote => true) %>
-  <% end %>
+  <% is_deleted = comment.is_deleted? %>
+  <% del_string = is_deleted ? "undelete" : "delete" %>
+  <%= link_to del_string.capitalize,
+              polymorphic_path([del_string, comment]),
+              :confirm => (!is_deleted ? \
+                            "Are you sure you want to delete this " + \
+                            "#{@thread.config.comment_name}?" : nil),
+              :method => :put,
+              :id => "comment_#{comment.id.to_s}_#{del_string}_link",
+              :class => "comment_#{del_string}_link",
+              :remote => true %>
 <% end %>

data/app/views/commontator/comments/_actions.html.erb~

@@ -7,27 +7,23 @@
 
 <% if can_edit %>
   <%= link_to 'Edit', edit_comment_path(comment),
-                      :id => "edit_comment_#{comment.id.to_s}_link",
-                      :class => "edit_comment_link",
+                      :id => "comment_#{comment.id.to_s}_edit_link",
+                      :class => "comment_edit_link",
                       :remote => true %>
 <% end %>
 
 &nbsp;
 
 <% if can_delete %>
-  <% if !comment.is_deleted? %>
-    <%= link_to('Delete', delete_comment_path(comment), 
-                :confirm => 'Are you sure you want to delete this ' + @thread.config.comment_name + '?', 
-                :method => :put,
-                :id => "delete_comment_#{comment.id.to_s}_link",
-                :class => "delete_comment_link",
-                :remote => true) %>
-  <% else %>
-    <%= link_to('Undelete', undelete_comment_path(comment), 
-                :confirm => 'Are you sure you want to delete this ' + @thread.config.comment_name + '?', 
-                :method => :put,
-                :id => "delete_comment_#{comment.id.to_s}_link",
-                :class => "delete_comment_link",
-                :remote => true) %>
-  <% end %>
+  <% is_deleted = comment.is_deleted?
+  <% del_string = is_deleted ? "undelete" : "delete" %>
+  <%= link_to del_string.capitalize,
+              polymorphic_path([del_string, comment]),
+              :confirm => (!is_deleted ? \
+                            "Are you sure you want to delete this " + \
+                            "#{@thread.config.comment_name}?" : nil),
+              :method => :put,
+              :id => "comment_#{comment.id.to_s}_#{del_string}_link",
+              :class => "comment_#{del_string}_link",
+              :remote => true %>
 <% end %>

data/app/views/commontator/comments/create.js.erb

@@ -12,4 +12,4 @@ $("#thread_<%= @thread.id %>_new_comment_div").hide();
 
 $("#thread_<%= @thread.id %>_new_comment_link_span").show();
 
-<%= javascript_callback %>
+<%= javascript_proc %>