commontator 4.6.0 → 4.6.1

data/config/locales/commontator/en.yml~

@@ -1,104 +0,0 @@
-# Files in the config/locales directory are used for internationalization
-# and are automatically loaded by Rails. If you want to use locales other
-# than English, add the necessary files in this directory.
-#
-# To use the locales, use `I18n.t`:
-#
-#     I18n.t 'hello'
-#
-# In views, this is aliased to just `t`:
-#
-#     <%= t('hello') %>
-#
-# To use a different locale, set it with `I18n.locale`:
-#
-#     I18n.locale = :es
-#
-# This would use the information in config/locales/es.yml.
-#
-# To learn more, please read the Rails Internationalization guide
-# available at http://guides.rubyonrails.org/i18n.html.
-
---- 
-en: 
-  activerecord: 
-    attributes: 
-      commontator/comment: 
-        body: Comment
-        creator: Creator
-        editor: Editor
-        thread: Discussion
-      commontator/subscription: 
-        subscriber: Subscriber
-        thread: Discussion
-      commontator/thread: 
-        commontable: Commontable
-    models: 
-      commontator/comment: 
-        zero: comments
-        one: comment
-        other: comments
-      commontator/subscription: 
-        zero: subscriptions
-        one: subscription
-        other: subscriptions
-      commontator/thread: 
-        zero: threads
-        one: thread
-        other: threads
-  commontator: 
-    anonymous: Anonymous
-    comment: 
-      actions: 
-        cancel: Cancel
-        confirm_delete: "Are you sure you want to delete this comment?"
-        create: "Post Comment"
-        delete: Delete
-        edit: Edit
-        new: "New Comment"
-        undelete: Undelete
-        update: "Modify Comment"
-      errors: 
-        already_deleted: "This comment has already been deleted."
-        create: "This comment could not be posted because:"
-        double_posted: "is a duplicate of another comment."
-        not_deleted: "This comment is not deleted."
-        update: "This comment could not be modified because:"
-      status: 
-        created_at: "Posted on %{created_at}."
-        deleted_by: "Comment deleted by %{deleter_name}."
-        updated_at: "Last modified by %{editor_name} on %{updated_at}."
-    email: 
-      comment_created: 
-        body: "%{creator_name} commented on %{commontable_name}:"
-        subject: "%{creator_name} posted a comment on %{commontable_name}"
-      thread_link_html: "<a href=\"%{commontable_url}\">Click here</a> to view all comments on %{commontable_name}."
-      undisclosed_recipients: "Undisclosed Recipients"
-    require_login: "You must login before you can post a comment."
-    subscription: 
-      actions: 
-        confirm_unsubscribe: "Are you sure you want to unsubscribe from this discussion?"
-        subscribe: Subscribe
-        unsubscribe: Unsubscribe
-      errors: 
-        already_subscribed: "You are already subscribed to this discussion."
-        not_subscribed: "You are not subscribed to this discussion."
-    thread: 
-      actions: 
-        show_all: "Show All Comments"
-        filter: "Filter Comments"
-        close: "Close Discussion"
-        confirm_close: "Are you sure you want to close this discussion?"
-        reopen: "Reopen Discussion"
-        show: "Show Comments"
-      errors: 
-        already_closed: "This discussion has already been closed."
-        not_closed: "This discussion is not closed."
-      status: 
-        cannot_post: "New comments cannot be posted at this time."
-        closed: "Comments (Closed by %{closer_name})"
-        open: Comments
-  time: 
-    formats: 
-      commontator: "%b %d %Y at %I:%M%p %Z"
-

data/db/migrate/0_install_commontator.rb~

@@ -1,54 +0,0 @@
-class InstallCommontator < ActiveRecord::Migration
-  def change
-    create_table 'commontator_comments' do |t|
-      t.string   'creator_type'
-      t.integer  'creator_id'
-      t.string   'editor_type'
-      t.integer  'editor_id'
-      t.integer  'thread_id', :null => false
-      t.text     'body', :null => false
-      t.datetime 'deleted_at'
-      
-      t.integer :cached_votes_total, :default => 0
-      t.integer :cached_votes_score, :default => 0
-      t.integer :cached_votes_up, :default => 0
-      t.integer :cached_votes_down, :default => 0
-      t.integer :cached_weighted_score, :default => 0
-
-      t.timestamps
-    end
-
-    add_index :commontator_comments, [:creator_id, :creator_type, :thread_id], :name => 'index_commontator_comments_on_c_id_and_c_type_and_t_id'
-    add_index :commontator_comments, :thread_id
-
-    add_index  :commontator_comments, :cached_votes_total
-    add_index  :commontator_comments, :cached_votes_score
-    add_index  :commontator_comments, :cached_votes_up
-    add_index  :commontator_comments, :cached_votes_down
-    add_index  :commontator_comments, :cached_weighted_score
-    
-    create_table 'commontator_subscriptions' do |t|
-      t.string   'subscriber_type', :null => false
-      t.integer  'subscriber_id', :null => false
-      t.integer  'thread_id', :null => false
-
-      t.timestamps
-    end
-
-    add_index :commontator_subscriptions, [:subscriber_id, :subscriber_type, :thread_id], :unique => true, :name => 'index_commontator_subscriptions_on_s_id_and_s_type_and_t_id'
-    add_index :commontator_subscriptions, :thread_id
-
-    create_table 'commontator_threads' do |t|
-      t.string   'commontable_type'
-      t.integer  'commontable_id'
-      t.datetime 'closed_at'
-      t.string   'closer_type'
-      t.integer  'closer_id'
-
-      t.timestamps
-    end
-
-    add_index :commontator_threads, [:commontable_id, :commontable_type], :unique => true, :name => 'index_commontator_threads_on_c_id_and_c_type'
-  end
-end
-

data/lib/commontator.rb~

@@ -1,142 +0,0 @@
-require 'commontator/engine'
-require 'commontator/controller_includes'
-
-module Commontator
-  # Attributes
-
-  # Can be set in initializer only
-  ENGINE_ATTRIBUTES = [
-    :current_user_proc,
-    :javascript_proc
-  ]
-
-  # Can be set in initializer or passed as an option to acts_as_commontator
-  COMMONTATOR_ATTRIBUTES = [
-    :user_name_proc,
-    :user_link_proc,
-    :user_avatar_proc,
-    :user_email_proc
-  ]
-  
-  # Can be set in initializer or passed as an option to acts_as_commontable
-  COMMONTABLE_ATTRIBUTES = [
-    :comment_filter,
-    :thread_read_proc,
-    :thread_moderator_proc,
-    :comment_editing,
-    :comment_deletion,
-    :moderator_permissions,
-    :comment_voting,
-    :vote_count_proc,
-    :comment_order,
-    :comments_per_page,
-    :thread_subscription,
-    :email_from_proc,
-    :commontable_name_proc,
-    :commontable_url_proc
-  ]
-  
-  DEPRECATED_ATTRIBUTES = [
-    [:moderators_can_edit_comments, :moderator_permissions],
-    [:hide_deleted_comments, :comment_filter],
-    [:hide_closed_threads, :thread_read_proc],
-    [:wp_link_renderer_proc],
-    [:voting_text_proc, :vote_count_proc],
-    [:user_name_clickable, :user_link_proc],
-    [:user_admin_proc, :thread_moderator_proc],
-    [:auto_subscribe_on_comment, :thread_subscription],
-    [:can_edit_own_comments, :comment_editing],
-    [:can_edit_old_comments, :comment_editing],
-    [:can_delete_own_comments, :comment_deletion],
-    [:can_delete_old_comments, :comment_deletion],
-    [:can_subscribe_to_thread, :thread_subscription],
-    [:can_vote_on_comments, :comment_voting],
-    [:combine_upvotes_and_downvotes, :vote_count_proc],
-    [:comments_order, :comment_order],
-    [:closed_threads_are_readable, :thread_read_proc],
-    [:deleted_comments_are_visible, :comment_filter],
-    [:can_read_thread_proc, :thread_read_proc],
-    [:can_edit_thread_proc, :thread_moderator_proc],
-    [:admin_can_edit_comments, :moderator_permissions],
-    [:subscription_email_enable_proc, :user_email_proc],
-    [:comment_name, 'config/locales'],
-    [:comment_create_verb_present, 'config/locales'],
-    [:comment_create_verb_past, 'config/locales'],
-    [:comment_edit_verb_present, 'config/locales'],
-    [:comment_edit_verb_past, 'config/locales'],
-    [:timestamp_format, 'config/locales'],
-    [:subscription_email_to_proc, 'config/locales'],
-    [:subscription_email_from_proc, :email_from_proc],
-    [:subscription_email_subject_proc, 'config/locales'],
-    [:comments_ordered_by_votes, :comment_order],
-    [:current_user_method, :current_user_proc],
-    [:user_missing_name, 'config/locales'],
-    [:user_email_method, :user_email_proc],
-    [:user_name_method, :user_name_proc],
-    [:commontable_name, :commontable_name_proc],
-    [:commontable_id_method]
-  ]
-  
-  (ENGINE_ATTRIBUTES + COMMONTATOR_ATTRIBUTES + \
-    COMMONTABLE_ATTRIBUTES).each do |attribute|
-    mattr_accessor attribute
-  end
-
-  DEPRECATED_ATTRIBUTES.each do |deprecated, replacement|
-    define_singleton_method(deprecated) do
-      @deprecated_method_called = true
-      replacement_string = (replacement.nil? ? 'No replacement is available. You can safely remove it from your configuration file.' : "Use `#{replacement.to_s}` instead.")
-      warn "\n[COMMONTATOR] Deprecation: `config.#{deprecated.to_s}` is deprecated and has been disabled. #{replacement_string}\n"
-    end
-
-    define_singleton_method("#{deprecated.to_s}=") do |obj|
-      send(deprecated)
-    end
-  end
-  
-  def self.configure
-    @deprecated_method_called = false
-    yield self
-    warn "\n[COMMONTATOR] We recommend that you backup the config/initializers/commontator.rb file, rename or remove it, run rake commontator:install:initializers to copy the new default one, then configure it to your liking.\n" if @deprecated_method_called
-  end
-
-  def self.commontator_config(user)
-    (user && user.is_commontator) ? user.commontator_config : self
-  end
-
-  def self.commontable_config(user)
-    (user && user.is_commontable) ? user.commontable_config : self
-  end
-
-  def self.app_routes
-    Commontator::ApplicationController.app_routes
-  end
-
-  def self.commontator_name(user)
-    commontator_config(user).user_name_proc.call(user)
-  end
-
-  def self.commontator_link(user, routing_proxy = app_routes)
-    commontator_config(user).user_link_proc.call(user, routing_proxy)
-  end
-
-  def self.commontator_email(user, mailer = nil)
-    commontator_config(user).user_email_proc.call(user, mailer)
-  end
-
-  def self.commontator_avatar(user, view)
-    commontator_config(user).user_avatar_proc.call(user, view)
-  end
-
-  def self.commontable_name(commontable)
-    commontable_config(commontable).commontable_name_proc.call(commontable)
-  end
-
-  def self.commontable_url(commontable, routing_proxy = app_routes)
-    commontable_config(commontable).commontable_url_proc.call(commontable, app_routes)
-  end
-end
-
-require 'commontator/acts_as_commontator'
-require 'commontator/acts_as_commontable'
-

data/spec/app/models/commontator/comment_spec.rb~

@@ -1,74 +0,0 @@
-require 'spec_helper'
-require 'acts_as_votable'
-
-module Commontator
-  describe Comment do
-    before do
-      setup_model_spec
-      @comment = Comment.new
-      @comment.thread = @thread
-      @comment.creator = @user
-      @comment.body = 'Something'
-    end
-    
-    it 'must be votable if acts_as_votable is installed' do
-      Comment.must_respond_to(:acts_as_votable)
-      @comment.is_votable?.must_equal true
-      @comment.acts_as_votable_initialized.must_equal true
-    end
-    
-    it 'must know if it has been modified' do
-      @comment.save!
-      
-      @comment.is_modified?.must_equal false
-      
-      @comment.body = 'Something else'
-      @comment.editor = @user
-      @comment.save!
-      
-      @comment.is_modified?.must_equal true
-    end
-    
-    it 'must know if it has been deleted' do
-      user = DummyUser.new
-      
-      @comment.is_deleted?.must_equal false
-      @comment.editor.must_be_nil
-      
-      @comment.delete_by(user)
-      
-      @comment.is_deleted?.must_equal true
-      @comment.editor.must_equal user
-      
-      @comment.undelete_by(user)
-      
-      @comment.is_deleted?.must_equal false
-    end
-
-    it 'must make proper timestamps' do
-      @comment.save!
-
-      @comment.created_timestamp.must_equal I18n.t('commontator.comment.status.created_at',
-                                                   :created_at => I18n.l(@comment.created_at,
-                                                                         :format => :commontator))
-      @comment.updated_timestamp.must_equal I18n.t('commontator.comment.status.updated_at',
-                                                   :editor_name => @user.name,
-                                                   :updated_at => I18n.l(@comment.updated_at,
-                                                                         :format => :commontator))
-
-      user2 =   @user = DummyUser.create
-      @comment.body = 'Something else'
-      @comment.editor = user2
-      @comment.save!
-
-      @comment.created_timestamp.must_equal I18n.t('commontator.comment.status.created_at',
-                                                   :created_at => I18n.l(@comment.created_at,
-                                                                         :format => :commontator))
-      @comment.updated_timestamp.must_equal I18n.t('commontator.comment.status.updated_at',
-                                                   :editor_name => user2.name,
-                                                   :updated_at => I18n.l(@comment.updated_at,
-                                                                         :format => :commontator))
-    end
-  end
-end
-

data/spec/dummy/app/models/dummy_user.rb~

@@ -1,16 +0,0 @@
-class DummyUser < ActiveRecord::Base
-  acts_as_commontator
-  
-  attr_accessor :is_admin, :can_edit, :can_read
-
-  def email
-    "dummy_user#{id}@example.com"
-  end
-
-  def name
-    "Dummy User ##{id}"
-  end
-
-
-end
-

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

@@ -1,15 +0,0 @@
-# Dummy application configuration file
-Commontator.configure do |config|
-  config.javascript_proc = lambda { |view| '// Some javascript' }
-
-  config.user_name_proc = lambda { |user| user.try(:name) ||  }
-
-  config.thread_read_proc = lambda { |thread, user| user && user.can_read }
-
-  config.thread_moderator_proc = lambda { |thread, user| user.is_admin || user.can_edit }
-
-  config.comment_voting = :ld
-
-  config.thread_subscription = :m
-end
-