commontator 0.3.10 → 0.4.1

data/README.md

@@ -11,7 +11,7 @@ There are 4 steps you must follow to install commontator:
   Add this line to your application's Gemfile:
 
   ```ruby
-  gem 'commontator', '~> 0.2.0'
+  gem 'commontator', '~> 0.4.0'
   ```
 
   And then execute:

data/app/helpers/commontator/comments_helper.rb

@@ -2,16 +2,18 @@ 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.anonymous_name : \
-      commontator.send(config.commontator_name_method)
+      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.anonymous_name : \
-      deleter.send(config.commontator_name_method)
+      config.commontator_name_method.blank? ? config.commontator_missing_name : \
+        deleter.send(config.commontator_name_method)
     end
     
     def comment_timestamp(comment)
@@ -23,6 +25,7 @@ module Commontator
     
     def gravatar_url(comment, options = {})
       commontator = comment.commontator
+      return '' if commontator.nil?
       config = commontator.commontator_config
       
       options[:secure] ||= request.ssl?
@@ -36,6 +39,7 @@ module Commontator
   
     def gravatar_image(comment, options = {})
       commontator = comment.commontator
+      return '' if commontator.nil?
       config = commontator.commontator_config
       name = commontator.send(config.commontator_name_method)
       image_tag(gravatar_url(comment, options), 

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

@@ -2,16 +2,18 @@ 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.anonymous_name : \
-      commontator.send(config.commontator_name_method)
+      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.anonymous_name : \
-      deleter.send(config.commontator_name_method)
+      config.commontator_name_method.blank? ? config.commontator_missing_name : \
+        deleter.send(config.commontator_name_method)
     end
     
     def comment_timestamp(comment)
@@ -23,6 +25,7 @@ module Commontator
     
     def gravatar_url(comment, options = {})
       commontator = comment.commontator
+      return '' if commontator.nil?
       config = commontator.commontator_config
       
       options[:secure] ||= request.ssl?
@@ -36,6 +39,7 @@ module Commontator
   
     def gravatar_image(comment, options = {})
       commontator = comment.commontator
+      return '' if commontator.nil?
       config = commontator.commontator_config
       name = commontator.send(config.commontator_name_method)
       image_tag(gravatar_url(comment, options), 
@@ -43,16 +47,5 @@ module Commontator
                   :title => name,
                   :border => 1 })
     end
-    
-    def refresh_comment_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/helpers/commontator/threads_helper.rb

@@ -13,9 +13,10 @@ module Commontator
     
     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.anonymous_name : \
-      closer.send(config.commontator_name_method)
+      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~

@@ -1,9 +1,5 @@
 module Commontator
   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,9 +13,10 @@ module Commontator
     
     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.anonymous_name : \
-      closer.send(config.commontator_name_method)
+      config.commontator_name_method.blank? ? config.commontator_no_name : \
+        closer.send(config.commontator_name_method)
     end
   end
 end

data/app/models/commontator/comment.rb

@@ -5,13 +5,8 @@ module Commontator
     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 :commontator, :thread
 
     attr_accessible :body
     

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/views/commontator/comments/_show.html.erb

@@ -4,7 +4,7 @@
   
 <div id="comment_<%= comment.id.to_s %>_div" class="comment" style="clear:both">                 
   <span id="comment_<%= comment.id.to_s %>_commontator_span" class="comment_commontator">
-    <% if commontator.commontator_config.commontator_name_clickable %>
+    <% if !commontator.nil? && commontator.commontator_config.commontator_name_clickable %>
       <%= link_to commontator_name(comment), main_app.polymorphic_path(comment.commontator) %>
     <% else %>
       <%= commontator_name(comment) %>

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

@@ -1,12 +1,10 @@
 <% # Clients of this partial must supply the following variables:
    # comment
 %>
-
-<% enable_votes = comment.can_be_voted_on? %>
   
 <div id="comment_<%= comment.id.to_s %>_div" class="comment" style="clear:both">                 
   <span id="comment_<%= comment.id.to_s %>_commontator_span" class="comment_commontator">
-    <% if commontator.commontator_config.commontator_name_clickable %>
+    <% if !commontator.nil? && commontator.commontator_config.commontator_name_clickable &&  %>
       <%= link_to commontator_name(comment), main_app.polymorphic_path(comment.commontator) %>
     <% else %>
       <%= commontator_name(comment) %>
@@ -28,12 +26,10 @@
     <%= gravatar_image comment %>
   </span>
   
-  <% if enable_votes %>
-    <span id="comment_<%= comment.id.to_s %>_votes_span" class="comment_votes">
-      <%= render :partial => 'commontator/comments/votes',
-                 :locals => {:comment => comment} %>
-    </span>
-  <% end %>
+  <span id="comment_<%= comment.id.to_s %>_votes_span" class="comment_votes">
+    <%= render :partial => 'commontator/comments/votes',
+               :locals => {:comment => comment} %>
+  </span>
   
   <div id="comment_<%= comment.id.to_s %>_body_div" class="comment_body">
     <%= render :partial => 'commontator/comments/body',

data/config/initializers/commontator.rb

@@ -17,6 +17,10 @@ Commontator.configure do |config|
 
 
   # Commontator (User model) Configuration
+  
+  # The name used if the commontator's name cannot be retrieved
+  # Default: 'Anonymous'
+  config.commontator_missing_name = 'Anonymous'
 
   # Whether the commontator's name is clickable in the comment view
   # Default: false
@@ -27,7 +31,7 @@ Commontator.configure do |config|
   config.commontator_email_method = 'email'
 
   # The method that return the commontator's name
-  # Default: '' (Anonymous)
+  # Default: '' (use missing name)
   config.commontator_name_method = ''
 
   # Method that returns true if the commontator is an admin for all threads

data/config/initializers/commontator.rb~

@@ -17,6 +17,10 @@ Commontator.configure do |config|
 
 
   # Commontator (User model) Configuration
+  
+  # The name used if the commontator's name cannot be retrieved
+  # Default: 'Anonymous'
+  config.commontator_missing_name = 'Anonymous'
 
   # Whether the commontator's name is clickable in the comment view
   # Default: false
@@ -27,7 +31,7 @@ Commontator.configure do |config|
   config.commontator_email_method = 'email'
 
   # The method that return the commontator's name
-  # Default: '' (Anonymous)
+  # Default: ''
   config.commontator_name_method = ''
 
   # Method that returns true if the commontator is an admin for all threads
@@ -57,7 +61,8 @@ Commontator.configure do |config|
   # Default: 'commontable'
   config.commontable_name = 'commontable'
   
-  # Proc that returns the url to the thread's view (defaults to the commontable show url)
+  # Proc that returns the commontable url that contains the thread
+  # (defaults to the commontable show url)
   # Main application's routes can be accessed using main_app object
   # Default: lambda { |main_app, commontable| main_app.polymorphic_url(commontable) }
   config.commontable_url_proc = lambda { |main_app, commontable| main_app.polymorphic_url(commontable) }

data/lib/commontator.rb

@@ -9,6 +9,7 @@ module Commontator
 
   # Can be set in initializer or passed as an option to acts_as_commontator
   COMMONTATOR_ATTRIBUTES = [
+    :commontator_missing_name,
     :commontator_name_clickable,
     :commontator_email_method,
     :commontator_name_method,

data/lib/commontator.rb~

@@ -9,6 +9,7 @@ module Commontator
 
   # Can be set in initializer or passed as an option to acts_as_commontator
   COMMONTATOR_ATTRIBUTES = [
+    :commontator_no_name,
     :commontator_name_clickable,
     :commontator_email_method,
     :commontator_name_method,
@@ -21,7 +22,7 @@ module Commontator
     :comment_create_verb_present,
     :comment_create_verb_past,
     :commontable_name,
-    :thread_url_proc,
+    :commontable_url_proc,
     :subscription_email_subject_proc,
     :timestamp_format,
     :admin_can_edit_comments,

data/lib/commontator/acts_as_commontable.rb

@@ -9,7 +9,7 @@ module Commontator
     module ClassMethods
       def acts_as_commontable(options = {})
         class_eval do
-          has_one :thread, :as => :commontable, :class_name => 'Commontator::Thread', :dependent => :destroy
+          has_one :thread, :as => :commontable, :class_name => 'Commontator::Thread'
           has_many :comments, :class_name => 'Commontator::Comment', :through => :thread
           has_many :subscriptions, :class_name => 'Commontator::Subscription', :through => :thread
           

data/lib/commontator/acts_as_commontable.rb~

@@ -32,9 +32,6 @@ module Commontator
       end
       
       alias_method :acts_as_commentable, :acts_as_commontable
-      def acts_as_commentable(options = {})
-        acts_as_commontable(options)
-      end
     end
   end
 end

data/lib/commontator/acts_as_commontator.rb

@@ -9,7 +9,7 @@ module Commontator
     module ClassMethods
       def acts_as_commontator(options = {})
         class_eval do
-          has_many :comments, :as => :commontator, :class_name => 'Commontator::Comment', :dependent => :destroy
+          has_many :comments, :as => :commontator, :class_name => 'Commontator::Comment'
           has_many :subscriptions, :as => :subscriber, :class_name => 'Commontator::Subscription', :dependent => :destroy
           
           cattr_accessor :commontator_config

data/lib/commontator/acts_as_commontator.rb~

@@ -19,17 +19,8 @@ module Commontator
       end
       
       alias_method :acts_as_commonter, :acts_as_commontator
-      def acts_as_commonter(options = {})
-        acts_as_commontator(options)
-      end
-      
-      def acts_as_commentator(options = {})
-        acts_as_commontator(options)
-      end
-      
-      def acts_as_commenter(options = {})
-        acts_as_commontator(options)
-      end
+      alias_method :acts_as_commentator, :acts_as_commontator
+      alias_method :acts_as_commenter, :acts_as_commontator
     end
   end
 end

data/lib/commontator/version.rb

@@ -1,3 +1,3 @@
 module Commontator
-  VERSION = "0.3.10"
+  VERSION = "0.4.1"
 end

data/lib/commontator/version.rb~

@@ -1,3 +1,3 @@
 module Commontator
-  VERSION = "0.3.9"
+  VERSION = "0.4.0"
 end

data/test/dummy/config/initializers/commontator.rb

@@ -17,6 +17,10 @@ Commontator.configure do |config|
 
 
   # Commontator (User model) Configuration
+  
+  # The name used if the commontator's name cannot be retrieved
+  # Default: 'Anonymous'
+  config.commontator_missing_name = 'Anonymous'
 
   # Whether the commontator's name is clickable in the comment view
   # Default: false
@@ -27,7 +31,7 @@ Commontator.configure do |config|
   config.commontator_email_method = 'email'
 
   # The method that return the commontator's name
-  # Default: '' (Anonymous)
+  # Default: '' (use missing name)
   config.commontator_name_method = ''
 
   # Method that returns true if the commontator is an admin for all threads

data/test/dummy/config/initializers/commontator.rb~

@@ -17,6 +17,10 @@ Commontator.configure do |config|
 
 
   # Commontator (User model) Configuration
+  
+  # The name used if the commontator's name cannot be retrieved
+  # Default: 'Anonymous'
+  config.commontator_missing_name = 'Anonymous'
 
   # Whether the commontator's name is clickable in the comment view
   # Default: false
@@ -27,7 +31,7 @@ Commontator.configure do |config|
   config.commontator_email_method = 'email'
 
   # The method that return the commontator's name
-  # Default: '' (Anonymous)
+  # Default: ''
   config.commontator_name_method = ''
 
   # Method that returns true if the commontator is an admin for all threads
@@ -57,7 +61,8 @@ Commontator.configure do |config|
   # Default: 'commontable'
   config.commontable_name = 'commontable'
 
-  # Proc that returns the url to the thread's view (defaults to the commontable show url)
+  # Proc that returns the commontable url that contains the thread
+  # (defaults to the commontable show url)
   # Main application's routes can be accessed using main_app object
   # Default: lambda { |main_app, commontable| main_app.polymorphic_url(commontable) }
   config.commontable_url_proc = lambda { |main_app, commontable| main_app.polymorphic_url(commontable) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: commontator
 version: !ruby/object:Gem::Version
-  version: 0.3.10
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors: