commontator 1.1.3 → 2.0.0

data/app/models/commontator/thread.rb

@@ -1,47 +1,51 @@
 module Commontator
   class Thread < ActiveRecord::Base
     belongs_to :closer, :polymorphic => true
+
     belongs_to :commontable, :polymorphic => true
 
     has_many :comments, :dependent => :destroy
+
     has_many :subscriptions, :dependent => :destroy
 
-    validates_presence_of :commontable, :on => :create
-    
     attr_accessible :is_closed
-    
+
+    validates_presence_of :commontable, :unless => :is_closed?
+
+    validates_uniqueness_of :commontable_id, :scope => :commontable_type, :allow_nil => true
+
     def config
-      commontable.try(:commontable_config)
+      commontable.try(:commontable_config) || Commontator
     end
-    
+
     def ordered_comments
-      (!commontable.blank? && config.can_vote_on_comments && config.comments_ordered_by_votes) ? \
+      (config.can_vote_on_comments && config.comments_ordered_by_votes) ? \
         comments.order("cached_votes_down - cached_votes_up") : comments
     end
-    
+
+    def is_closed?
+      !closed_at.blank?
+    end
+
     def subscribers
       subscriptions.collect{|s| s.subscriber}
     end
-    
+
     def active_subscribers
-      subscribers.select{|s| s.commontator_config.subscription_email_enable_proc.call(s)}
+      subscribers.select{|s| s.is_commontator && s.commontator_config.subscription_email_enable_proc.call(s)}
     end
-    
+
     def subscription_for(subscriber)
-      return nil if subscriber.nil?
-      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?
+      return nil if subscriber.nil? || !subscriber.is_commontator
+      subscriber.subscriptions.where(:thread_id => self.id).first
     end
-    
+
     def is_subscribed?(subscriber)
       !subscription_for(subscriber).blank?
     end
 
     def subscribe(subscriber)
-      return false if is_subscribed?(subscriber)
+      return false if is_subscribed?(subscriber) || !subscriber.is_commontator
       subscription = Subscription.create(
         :subscriber => subscriber, :thread => self)
     end
@@ -52,58 +56,57 @@ module Commontator
       subscription.destroy
     end
 
-    def mark_as_read_for(subscriber)
-      return if !subscription_for(subscriber)
-      subscription_for(subscriber).mark_as_read
-    end
-    
     def add_unread_except_for(subscriber)
       Subscription.transaction do
         subscriptions.each{|s| s.add_unread unless s.subscriber == subscriber}
       end
     end
-    
+
+    def mark_as_read_for(subscriber)
+      return if !subscription_for(subscriber)
+      subscription_for(subscriber).mark_as_read
+    end
+
     def close(user = nil)
       return false if is_closed?
       self.closed_at = Time.now
       self.closer = user
-      self.save!
+      save
     end
-    
+
     def reopen
-      return false unless is_closed?
+      return false unless is_closed? && !commontable.nil?
       self.closed_at = nil
-      self.save!
+      save
     end
-    
+
     # Creates a new empty thread and assigns it to the commontable
     # The old thread is kept in the database for archival purposes
-    
     def clear(user = nil)
       return if commontable.blank?
       new_thread = Thread.new
       new_thread.commontable = commontable
-      self.with_lock do
+      with_lock do
+        self.commontable = nil
+        self.closed_at = Time.now
+        self.closer = user
+        save!
         new_thread.save!
-        commontable.thread = new_thread
-        commontable.save!
         subscriptions.each do |s|
           s.thread = new_thread
           s.save!
           s.mark_as_read
         end
-        self.commontable = nil
-        self.close(user)
       end
     end
 
-    ##########################
-    # Access control methods #
-    ##########################
-    
+    ##################
+    # Access Control #
+    ##################
+
     # Reader and poster capabilities
     def can_be_read_by?(user)
-      (!commontable.blank? && \
+      (!commontable.nil? && \
         (!is_closed? || config.closed_threads_are_readable) && \
         config.can_read_thread_proc.call(self, user)) || \
         can_be_edited_by?(user)
@@ -111,13 +114,14 @@ module Commontator
 
     # Thread moderator capabilities
     def can_be_edited_by?(user)
-      !commontable.blank? && \
-        (config.can_edit_thread_proc.call(self, user) || \
-        (!user.nil? && user.commontator_config.user_admin_proc.call(user)))
+      (!commontable.nil? && \
+        config.can_edit_thread_proc.call(self, user)) || \
+        (!user.nil? && user.is_commontator && \
+        user.commontator_config.user_admin_proc.call(user))
     end
 
     def can_subscribe?(user)
-      !commontable.blank? && config.can_subscribe_to_thread && !is_closed? && can_be_read_by?(user)
+      !commontable.nil? && config.can_subscribe_to_thread && !is_closed? && can_be_read_by?(user)
     end
   end
 end

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

@@ -1,49 +1,50 @@
-puts 'b'
-
 module Commontator
   class Thread < ActiveRecord::Base
     belongs_to :closer, :polymorphic => true
+
     belongs_to :commontable, :polymorphic => true
 
     has_many :comments, :dependent => :destroy
+
     has_many :subscriptions, :dependent => :destroy
 
-    validates_presence_of :commontable, :on => :create
-    
     attr_accessible :is_closed
-    
+
+    validates_presence_of :commontable, :unless => :is_closed?
+
+    validates_uniqueness_of :commontable_id, :scope => :commontable_type, :allow_nil => true
+
     def config
-      commontable.try(:commontable_config)
+      commontable.try(:commontable_config) || Commontator
     end
-    
+
     def ordered_comments
-      (!commontable.blank? && config.can_vote_on_comments && config.comments_ordered_by_votes) ? \
+      (config.can_vote_on_comments && config.comments_ordered_by_votes) ? \
         comments.order("cached_votes_down - cached_votes_up") : comments
     end
-    
+
+    def is_closed?
+      !closed_at.blank?
+    end
+
     def subscribers
-      subscriptions.collect{|s| s.subscriber}
     end
-    
+
     def active_subscribers
-      subscribers.select{|s| s.commontator_config.subscription_email_enable_proc.call(s)}
+      subscribers.select{|s| s.is_commontator && s.commontator_config.subscription_email_enable_proc.call(s)}
     end
-    
+
     def subscription_for(subscriber)
-      return nil if subscriber.nil?
-      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?
+      return nil if subscriber.nil? || !subscriber.is_commontator
+      subscriber.subscriptions.where(:thread_id => self.id).first
     end
-    
+
     def is_subscribed?(subscriber)
       !subscription_for(subscriber).blank?
     end
 
     def subscribe(subscriber)
-      return false if is_subscribed?(subscriber)
+      return false if is_subscribed?(subscriber) || !subscriber.is_commontator
       subscription = Subscription.create(
         :subscriber => subscriber, :thread => self)
     end
@@ -54,58 +55,57 @@ module Commontator
       subscription.destroy
     end
 
-    def mark_as_read_for(subscriber)
-      return if !subscription_for(subscriber)
-      subscription_for(subscriber).mark_as_read
-    end
-    
     def add_unread_except_for(subscriber)
       Subscription.transaction do
         subscriptions.each{|s| s.add_unread unless s.subscriber == subscriber}
       end
     end
-    
+
+    def mark_as_read_for(subscriber)
+      return if !subscription_for(subscriber)
+      subscription_for(subscriber).mark_as_read
+    end
+
     def close(user = nil)
       return false if is_closed?
       self.closed_at = Time.now
       self.closer = user
-      self.save!
+      save
     end
-    
+
     def reopen
-      return false unless is_closed?
+      return false unless is_closed? && !commontable.nil?
       self.closed_at = nil
-      self.save!
+      save
     end
-    
+
     # Creates a new empty thread and assigns it to the commontable
     # The old thread is kept in the database for archival purposes
-    
     def clear(user = nil)
       return if commontable.blank?
       new_thread = Thread.new
       new_thread.commontable = commontable
-      self.with_lock do
+      with_lock do
+        self.commontable = nil
+        self.closed_at = Time.now
+        self.closer = user
+        save!
         new_thread.save!
-        commontable.thread = new_thread
-        commontable.save!
         subscriptions.each do |s|
           s.thread = new_thread
           s.save!
           s.mark_as_read
         end
-        self.commontable = nil
-        self.close(user)
       end
     end
 
-    ##########################
-    # Access control methods #
-    ##########################
-    
+    ##################
+    # Access Control #
+    ##################
+
     # Reader and poster capabilities
     def can_be_read_by?(user)
-      (!commontable.blank? && \
+      (!commontable.nil? && \
         (!is_closed? || config.closed_threads_are_readable) && \
         config.can_read_thread_proc.call(self, user)) || \
         can_be_edited_by?(user)
@@ -113,13 +113,14 @@ module Commontator
 
     # Thread moderator capabilities
     def can_be_edited_by?(user)
-      !commontable.blank? && \
-        (config.can_edit_thread_proc.call(self, user) || \
-        (!user.nil? && user.commontator_config.user_admin_proc.call(user)))
+      (!commontable.nil? && \
+        config.can_edit_thread_proc.call(self, user)) || \
+        (!user.nil? && user.is_commontator && \
+        user.commontator_config.user_admin_proc.call(user))
     end
 
     def can_subscribe?(user)
-      !commontable.blank? && config.can_subscribe_to_thread && !is_closed? && can_be_read_by?(user)
+      !commontable.nil? && config.can_subscribe_to_thread && !is_closed? && can_be_read_by?(user)
     end
   end
 end

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

@@ -4,5 +4,5 @@
 
 <%= simple_format comment.is_deleted? ? \
       comment.thread.config.comment_name.capitalize + \
-      ' deleted by ' + commontator_name(comment.deleter) : \
+      ' deleted by ' + commontator_name(comment.editor) : \
       comment.body %>

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

@@ -0,0 +1,8 @@
+<% # Clients of this partial must provide the following variable:
+   # comment
+%>
+
+<%= simple_format comment.is_deleted? ? \
+      comment.thread.config.comment_name.capitalize + \
+      ' deleted by ' + commontator_name(comment.deleter) : \
+      comment.body %>

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

@@ -31,7 +31,7 @@
   <div class="comment_form_actions">
     <%= f.submit (comment.id.blank? ? \
                    config.comment_create_verb_present : \
-                   'update').capitalize + \
+                   config.comment_edit_verb_present).capitalize + \
           ' ' + config.comment_name %>
   </div>
   

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

@@ -0,0 +1,38 @@
+<% # Clients of this partial must provide the following variables:
+   # comment
+   #
+   # Additionally, they can override the following variables:
+   thread ||= nil
+   no_remote ||= false
+%>
+
+<% config = comment.thread.config %>
+
+<% if comment.errors.any? %>
+  <div class="comment_error_explanation">
+    <h3>This <%= config.comment_name %> could not be
+          <%= comment.id.blank? ? config.comment_create_verb_past : 'updated' %> because of the following error<%= comment.errors.count == 1 ? '' : 's' %>:</h3>
+
+    <ul>
+      <% comment.errors.full_messages.each do |msg| %>
+        <li><%= msg %></li>
+      <% end %>
+    </ul>
+  </div>
+<% end %>
+
+<%= form_for([commontator, thread, comment],
+             :remote => !no_remote) do |f| %>
+  
+  <div class="comment_form_field">
+    <%= f.text_area :body, :rows => '7' %>
+  </div>
+  
+  <div class="comment_form_actions">
+    <%= f.submit (comment.id.blank? ? \
+                   config.comment_create_verb_present : \
+                   'update').capitalize + \
+          ' ' + config.comment_name %>
+  </div>
+  
+<% end %>

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

@@ -12,7 +12,7 @@
     <% end %>
     &nbsp;&nbsp;
     <span id="comment_<%= comment.id.to_s %>_timestamp_span" class="comment_timestamp">
-      <%= comment.timestamp %>
+      <%= comment.timestamp %><%= " by #{commontator_name(comment.editor)}" if comment.is_modified? %>
     </span>
   </span>
   

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

@@ -0,0 +1,44 @@
+<% # Clients of this partial must supply the following variables:
+   # comment
+   # user
+%>
+  
+<div id="comment_<%= comment.id.to_s %>_div" class="comment">
+  <span id="comment_<%= comment.id.to_s %>_commontator_span" class="comment_commontator">
+    <% if !user.nil? && user.commontator_config.user_name_clickable %>
+      <%= link_to commontator_name(comment.creator), main_app.polymorphic_path(comment.creator) %>
+    <% else %>
+      <%= commontator_name(comment.creator) %>
+    <% end %>
+    &nbsp;&nbsp;
+    <span id="comment_<%= comment.id.to_s %>_timestamp_span" class="comment_timestamp">
+      <%= comment.timestamp %><%= " by #{commontator_name(comment.editor)}" %>
+    </span>
+  </span>
+  
+  <span id="comment_<%= comment.id.to_s %>_actions_span" class="comment_actions">
+    <%= render :partial => 'commontator/comments/actions',
+               :locals => {:comment => comment,
+                           :user => user} %>
+  </span>
+  
+  <br clear="all"/>
+  
+  <span id="comment_<%= comment.id.to_s %>_gravatar_image_span" class="comment_gravatar_image">
+    <%= commontator_gravatar_image comment.creator %>
+  </span>
+  
+  <span id="comment_<%= comment.id.to_s %>_votes_span" class="comment_votes">
+    <%= render :partial => 'commontator/comments/votes',
+               :locals => {:comment => comment,
+                           :user => user} %>
+  </span>
+  
+  <div id="comment_<%= comment.id.to_s %>_body_div" class="comment_body">
+    <%= render :partial => 'commontator/comments/body',
+               :locals => {:comment => comment} %>
+  </div>
+
+</div>
+
+<br clear="all"/>