commontator 1.1.1 → 1.1.2

data/app/views/commontator/comments/delete.js.erb~

@@ -1,17 +0,0 @@
-$("#comment_<%= @comment.id.to_s %>_body_div").html("<%= escape_javascript(
-  render :partial => 'body', :locals => {:comment => @comment}) %>");
-
-$("#comment_<%= @comment.id.to_s %>_timestamp_span").html("<%= escape_javascript(
-                                                           comment_timestamp(@comment)) %>");
-                                                           
-$("#comment_<%= @comment.id.to_s %>_actions_span").html("<%= escape_javascript(
-  render :partial => 'actions',
-         :locals => {:comment => @comment,
-                     :user => @user}) %>");
-         
-$("#comment_<%= @comment.id %>_votes_span").html("<%= escape_javascript(
-  render :partial => 'votes',
-         :locals => {:comment => @comment,
-                     :user => @user}) %>");
-
-<%= javascript_proc %>

data/app/views/commontator/comments/update.js.erb~

@@ -1,7 +0,0 @@
-$("#comment_<%= @comment.id.to_s %>_body_div").html("<%= escape_javascript(
-  render :partial => 'body', :locals => {:comment => @comment}) %>");
-
-$("#comment_<%= @comment.id.to_s %>_timestamp_span").html("<%= escape_javascript(
-                                                           comment_timestamp(@comment)) %>");
-
-<%= javascript_proc %>

data/app/views/commontator/shared/_thread.html.erb~

@@ -1,20 +0,0 @@
-<% # Clients of this partial must supply the following variables:
-   # thread
-   # user
-%>
-
-<% subscription = thread.subscription_for(user) %>
-
-<% if thread.can_be_read_by?(user) %>
-  <%= stylesheet_link_tag "commontator/application", :media => "all" %>
-
-  <div id="thread_<%= thread.id %>_div" class="thread" style="display: none;">
-    <% if @commontator_thread_show %>
-      <%= render :partial => 'commontator/threads/show', :locals => {:thread => thread,
-                                                                     :user => user} %>
-    <% else %>
-      <%= link_to "Show #{thread.config.comment_name.pluralize} (#{subscription ? subscription.unread + '/' + thread.comments.count : thread.comments.count})", \
-                    commontator.thread_path(thread), :remote => true %>
-    <% end %>
-  </div>
-<% end %>

data/app/views/commontator/shared/_thread_link.html.erb~

@@ -1,16 +0,0 @@
-<% # Clients of this partial must supply the following variables:
-   # thread
-   # user
-%>
-
-<% if thread.can_be_read_by?(user) %>
-  <%= stylesheet_link_tag "commontator/application", :media => "all" %>
-
-  <div id="thread_<%= thread.id %>_div" class="thread">
-    <% if @commontator_show_thread %>
-      <%= render :partial => 'commontator/threads/show', :locals => {:thread => thread} %>
-    <% else %>
-      <%= link_to "Show #{thread.config.comment_name.pluralize} (#{thread.comments.count})", commontator.thread_path(thread), :remote => true %>
-    <% end %>
-  </div>
-<% end %>

data/app/views/commontator/subscriptions_mailer/comment_created_email.html.erb~

@@ -1,6 +0,0 @@
-<h4><%= @creator_name %>'s <%= @thread.config.comment_name %> on <%= @commontable_name %> #<%= @commontable_id %>:</h4>
-
-<%= render :partial => 'commontator/comments/body',
-           :locals => { :comment => @comment } %>
-
-<p><a href="<%= @commontable_url %>">Click here</a> to visit this thread.</p>

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

@@ -1,61 +0,0 @@
-<% # Clients of this partial must supply the following variables:
-   # thread
-   # user
-%>
-
-<% can_subscribe = thread.can_subscribe?(user) %>
-<% can_edit = thread.can_be_edited_by?(user) %>
-
-<span id="thread_<%= thread.id.to_s %>_header_span" class="thread_header">
-  <%= thread.config.comment_name.capitalize.pluralize + (thread.is_closed? ? ' (closed)' : '') %>
-</span>
-
-<span id="thread_<%= thread.id.to_s %>_actions_span" class="thread_actions">
-  <% if can_subscribe %>
-    <span id="thread_<%= thread.id.to_s %>_subscription_span" class="thread_subscription">
-      <%= render :partial => 'commontator/subscriptions/link',
-                 :locals => {:thread => thread,
-                             :user => user} %>
-    </span>
-  <% end %>
-  
-  &nbsp;
-
-  <% if can_edit %>
-    <% is_closed = thread.is_closed? %>
-    <% close_string = is_closed ? "reopen" : "close" %>
-    <%= link_to close_string.capitalize,
-                commontator.polymorphic_path([close_string, thread]),
-                :confirm => (!is_closed ? \
-                              'Are you sure you want to close this thread?' : nil),
-                :method => :put,
-                :id => "thread_#{thread.id.to_s}_#{close_string}_link",
-                :class => "thread_#{close_string}_link" %>
-  <% end %>
-</span>
-
-<div id="thread_<%= thread.id.to_s %>_comment_list_div" class="thread_comment_list">
-  <% thread.ordered_comments.each do |comment| %>
-    <% next unless comment.can_be_read_by?(user) %>
-    <%= render :partial => 'commontator/comments/show',
-               :locals => {:comment => comment,
-                           :user => user} %>
-  <% end %>
-</div>
-
-<br/>
-
-<% if thread.is_closed? %>
-
-  <p><%= thread.config.comment_name.capitalize.pluralize %> cannot be <%= thread.config.comment_create_verb_past %> at this time.</p>
-
-<% else %>
-
-  <div id="thread_<%= thread.id %>_new_comment_div" class="thread_new_comment"></div>
-
-  <span id="thread_<%= thread.id %>_new_comment_link_span" class="thread_new_comment_link">
-    <%= link_to thread.config.comment_create_verb_present.capitalize + ' ' + thread.config.comment_name,
-        commontator.new_thread_comment_path(thread), :remote => true %>
-  </span>
-  
-<% end %>

data/config/initializers/commontator.rb~

@@ -1,164 +0,0 @@
-# Change the settings below to suit your needs
-# All settings are initially set to their default values
-Commontator.configure do |config|
-
-  # Engine Configuration
-
-  # Name of the ApplicationController helper method that returns the current user
-  # Default: 'current_user'
-  config.current_user_method = 'current_user'
-
-  # Proc that is called after any javascript runs (e.g. to display/clear flash messages)
-  # It is passed the view_context object (self from the view template), so you should be able to
-  # access anything you normally could in a view template (by using, e.g. view.flash)
-  # However, be aware that it does not have access to the main application's helpers
-  # Should return a string containing JS to be appended to all Commontator JS responses
-  # Default: lambda { |view| '$("#error_explanation").remove();' }
-  config.javascript_proc = lambda { |view| '$("#error_explanation").hide();' }
-
-
-  # User (acts_as_commontator) Configuration
-  
-  # The name used if the user's name cannot be retrieved
-  # Default: 'Anonymous'
-  config.user_missing_name = 'Anonymous'
-
-  # Whether the comment creator's name is clickable in the comment view
-  # If enabled, the link will point to the comment creator's show page
-  # Default: false
-  config.user_name_clickable = false
-
-  # The method that returns the user's email address
-  # Default: 'email'
-  config.user_email_method = 'email'
-
-  # The method that returns the user's name
-  # Default: '' (use user_missing_name)
-  config.user_name_method = ''
-
-  # Proc called with user as argument that returns true if the user is an admin
-  # Admins can always delete other users' comments and close threads
-  # Note: user can be nil
-  # Default: lambda { |user| false } (no admins)
-  config.user_admin_proc = lambda { |user| false }
-  
-  # Proc called with user as argument that returns true
-  # if the user should receive subscription emails
-  # Default: lambda { |user| true } (always receive subscription emails)
-  config.subscription_email_enable_proc = lambda { |user| true }
-
-
-  # Commontable (acts_as_commontable) Configuration
-
-  # What a comment is called in your application
-  # Default: 'comment'
-  config.comment_name = 'comment'
-
-  # Verb used when creating comments (present)
-  # Default: 'post'
-  config.comment_create_verb_present = 'post'
-
-  # Verb used when creating comments (past)
-  # Default: 'posted'
-  config.comment_create_verb_past = 'posted'
-
-  # What a commontable is called in your application
-  # If you have multiple commontable models,
-  # you might want to pass this configuration value
-  # as an argument to acts_as_commontable in each one
-  # Default: 'commontable'
-  config.commontable_name = 'commontable'
-
-  # The format of the timestamps used by Commontator
-  # Default: '%b %d %Y, %I:%M %p'
-  config.timestamp_format = '%b %d %Y, %I:%M %p'
-
-  # Whether admins can edit other users' comments
-  # Default: false
-  config.admin_can_edit_comments = false
-
-  # Whether users automatically subscribe to a thread when commenting
-  # Default: false
-  config.auto_subscribe_on_comment = false
-
-  # Whether users can edit their own comments
-  # Default: true
-  config.can_edit_own_comments = true
-
-  # Whether users can edit their own comments
-  # after someone posted a newer comment
-  # Default: false
-  config.can_edit_old_comments = false
-
-  # Whether users can delete their own comments
-  # Default: true
-  config.can_delete_own_comments = true
-
-  # Whether users can delete their own comments
-  # after someone posted a newer comment
-  # Default: false
-  config.can_delete_old_comments = false
-
-  # Whether users can manually subscribe or unsubscribe to threads
-  # Default: true
-  config.can_subscribe_to_thread = true
-
-  # Whether users can vote on other users' comments
-  # Note: requires acts_as_votable gem installed
-  # and configured for your application
-  # Default: false
-  config.can_vote_on_comments = false
-
-  # Whether comments should be ordered by vote score
-  # instead of by order posted
-  # Default: false
-  config.comments_ordered_by_votes = false
-
-  # Whether users can read threads closed by admins
-  # Default: true
-  config.closed_threads_are_readable = true
-
-  # Whether comments deleted by admins can be seen
-  # (the content will still be hidden)
-  # Default: true
-  config.deleted_comments_are_visible = true
-
-  # The method which returns the commontable's id, sent to users in email messages
-  # Default: 'id'
-  config.commontable_id_method = 'id'
-
-  # Proc called with thread and user as arguments
-  # If it returns true, that user is a moderator for that particular thread
-  # and is given admin-like capabilities for that thread only
-  # Note: user can be nil
-  # Default: lambda { |thread, user| false } (no thread-specific moderators)
-  config.can_edit_thread_proc = lambda { |thread, user| false }
-
-  # Proc called with thread and user as arguments
-  # If it returns true, that user is allowed to read that thread
-  # Note: user can be nil
-  # Default: lambda { |thread, user| true } (no read restrictions)
-  config.can_read_thread_proc = lambda { |thread, user| true }
-
-  # 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) }
-  
-  # Proc that returns the subscription email 'from' address
-  # Default:
-  # lambda { |params| 'no-reply@example.com' }
-  config.subscription_email_from_proc = lambda { |params| 'no-reply@example.com' }
-
-  # Proc that returns the subscription email 'subject' string
-  # Default:
-  # lambda do |params|
-  #   "#{params[:creator_name]} #{params[:config].comment_create_verb_past} a " + \
-  #   "#{params[:config].comment_name} on #{params[:commontable_name]} #{params[:commontable_id]}"
-  # end
-  config.subscription_email_subject_proc = lambda do |params|
-    "#{params[:creator_name]} #{params[:config].comment_create_verb_past} a " + \
-    "#{params[:config].comment_name} on #{params[:commontable_name]} #{params[:commontable_id]}"
-  end
-end

data/db/migrate/0_install_commontator.rb~

@@ -1,48 +0,0 @@
-class InstallCommontator < ActiveRecord::Migration
-  def change
-    create_table "commontator_comments" do |t|
-      t.text     "body"
-      t.integer  "creator_id"
-      t.string   "creator_type"
-      t.datetime "deleted_at"
-      t.integer  "deleter_id"
-      t.string   "deleter_type"
-      t.integer  "thread_id"
-      
-      t.integer  "cached_votes_total", :default => 0
-      t.integer  "cached_votes_up", :default => 0
-      t.integer  "cached_votes_down", :default => 0
-
-      t.timestamps
-    end
-    
-    create_table "commontator_subscriptions" do |t|
-      t.integer  "subscriber_id"
-      t.string   "subscriber_type"
-      t.integer  "thread_id"
-      t.integer  "unread"
-
-      t.timestamps
-    end
-
-    create_table "commontator_threads" do |t|
-      t.integer  "commontable_id"
-      t.string   "commontable_type"
-      t.datetime "closed_at"
-      t.integer  "closer_id"
-      t.string   "closer_type"
-
-      t.timestamps
-    end
-    
-    add_index :commontator_comments, [:creator_id, :creator_type, :thread_id], :name => "index_c_c_on_c_id_and_c_type_and_t_id"
-    add_index :commontator_comments, :thread_id
-    add_index :commontator_subscriptions, [:subscriber_id, :subscriber_type, :thread_id], :unique => true, :name => "index_c_s_on_s_id_and_s_type_and_t_id"
-    add_index :commontator_subscriptions, :thread_id
-    add_index :commontator_threads, [:commontable_id, :commontable_type]
-    
-    add_index :commontator_comments, :cached_votes_total
-    add_index :commontator_comments, :cached_votes_up
-    add_index :commontator_comments, :cached_votes_down
-  end
-end

data/lib/commontator/commontable_config.rb~

@@ -1,13 +0,0 @@
-module Commontator
-  class CommontableConfig
-    Commontator::COMMONTABLE_ATTRIBUTES.each do |attribute|
-      cattr_accessor attribute
-    end
-  
-    def initialize(options = {})
-      Commontator::COMMONTABLE_ATTRIBUTES.each do |attribute|
-        self.send attribute.to_s + '=', options[attribute] || Commontator.send(attribute)
-      end
-    end
-  end
-end

data/lib/commontator/commontator_config.rb~

@@ -1,13 +0,0 @@
-module Commontator
-  class CommontatorConfig
-    Commontator::COMMONTATOR_ATTRIBUTES.each do |attribute|
-      cattr_accessor attribute
-    end
-  
-    def initialize(options = {})
-      Commontator::COMMONTATOR_ATTRIBUTES.each do |attribute|
-        self.send attribute.to_s + '=', options[attribute] || Commontator.send(attribute)
-      end
-    end
-  end
-end

data/lib/commontator/controller_includes.rb~

@@ -1,23 +0,0 @@
-require 'commontator/shared_helper'
-
-module Commontator
-  module ControllerIncludes
-    def self.included(base)
-      base.helper Commontator::SharedHelper
-    end
-    
-    protected
-    
-    def commontator_thread_show(commontable)
-      user = send Commontator.current_user_method	
-      raise SecurityTransgression unless (user.nil? || user.is_commontator)
-      
-      thread = commontable.thread
-      raise SecurityTransgression unless thread.can_be_read_by?(user)
-      thread.mark_as_read_for(user)
-      @commontator_thread_show = true
-    end
-  end
-end
-
-ActionController::Base.send :include, Commontator::ControllerIncludes

data/lib/commontator/engine.rb~

@@ -1,7 +0,0 @@
-module Commontator
-  class Engine < ::Rails::Engine
-    isolate_namespace Commontator
-    
-    config.active_record.observers = :comment_observer
-  end
-end

data/lib/commontator/shared_helper.rb~

@@ -1,42 +0,0 @@
-module Commontator
-  module SharedHelper
-    def commontator_thread(commontable)
-      user = Commontator.current_user_proc.call
-      
-      render(:partial => 'commontator/shared/thread',
-             :locals => {:thread => commontable.thread,
-                         :user => user}).html_safe
-    end
-    
-    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 commontator_email(user)
-      return '' if user.nil?
-      config = user.commontator_config
-      config.user_email_method.blank? ? '' : user.send(config.user_email_method)
-    end
-    
-    def commontator_gravatar_url(user, options = {})
-      options[:secure] ||= request.ssl?
-      options[:size] ||= 50
-    
-      hash = Digest::MD5.hexdigest(commontator_email(user))
-      base = options[:secure] ? "s://secure" : "://www"
-      
-      "http#{base}.gravatar.com/avatar/#{hash}?s=#{options[:size]}"
-    end
-  
-    def commontator_gravatar_image(user, options = {})
-      name = commontator_name(user)
-      image_tag(commontator_gravatar_url(user, options), 
-                { :alt => name, 
-                  :title => name,
-                  :border => 1 })
-    end
-  end
-end