commontator 4.11.0 → 4.11.1

data/config/locales/en.yml~

@@ -1,101 +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: 
-        one: comment
-        other: comments
-      commontator/subscription: 
-        one: subscription
-        other: subscriptions
-      commontator/thread: 
-        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=\"%{comment_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"
-        hide: "Hide 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/config/locales/ru.yml~

@@ -1,79 +0,0 @@
-ru: 
-  activerecord: 
-    attributes: 
-      commontator/comment: 
-        body: Комментарий
-        creator: Создал
-        editor: Редактировал
-        thread: Обсуждение
-      commontator/subscription: 
-        subscriber: Подписчик
-        thread: Обсуждение
-      commontator/thread: 
-        commontable: Комментируем
-    models: 
-      commontator/comment: 
-        one: комментарий
-        other: комментарии
-      commontator/subscription: 
-        one: подписка
-        other: подписки
-      commontator/thread: 
-        one: обсуждение
-        other: обсуждения
-  commontator: 
-    anonymous: Аноним
-    comment: 
-      actions: 
-        cancel: Отменить
-        confirm_delete: "Вы уверены, что хотите удалить комментарий?"
-        create: "Оставить Комментарий"
-        delete: Удалить
-        edit: Редактировать
-        new: "Новый Комментарий"
-        undelete: Восстановить
-        update: "Изменить Комментарий"
-      errors: 
-        already_deleted: "Этот комментарий был удален."
-        create: "Комментарий нельзя оставить потому что"
-        double_posted: "этот комментарий уже есть."
-        not_deleted: "Этот комментарий не удален."
-        update: "Этот комментарий нельзя изменить потому что"
-      status: 
-        created_at: "Создан %{created_at}."
-        deleted_by: "Комментарий был удален %{deleter_name}."
-        updated_at: "Редактировал %{editor_name}, %{updated_at}."
-    email: 
-      comment_created: 
-        body: "%{creator_name} комментировал %{commontable_name}:"
-        subject: "%{creator_name} оставил комментарий к %{commontable_name}"
-      thread_link_html: "<a href=\"%{comment_url}\">Нажмите здесь</a> чтобы посмотреть все комментарии к %{commontable_name}."
-      undisclosed_recipients: "Не указан получатель"
-    require_login: "Вы должны залогиниться прежде чем оставить комментарий."
-    subscription: 
-      actions: 
-        confirm_unsubscribe: "Вы уверены, что хотите отписать от обсуждения?"
-        subscribe: Подписаться
-        unsubscribe: Отписаться
-      errors: 
-        already_subscribed: "Вы уже подписаны на это обсуждение."
-        not_subscribed: "Вы не подписаны на это обсуждение."
-    thread: 
-      actions: 
-        show_all: "Показать все комментарии"
-        filter: "Фильтровать комментарии"
-        close: "Закрыть обсуждение"
-        confirm_close: "Вы уверены, что хотите закрыть обсуждение?"
-        reopen: "Открыть заново обсуждение"
-        show: "Показать комментарии"
-        hide: "скрыть комментарии"
-      errors:
-        already_closed: "Это обсуждение было закрыто."
-        not_closed: "Это обсуждение не закрыто."
-      status: 
-        cannot_post: "Новый комментарии нельзя разместить в данный момент."
-        closed: "Комментарии (Закрыты %{closer_name})"
-        open: Комментарии
-  time: 
-    formats: 
-      commontator: "%b %d %Y в %I:%M%p %Z"

data/config/locales/zh.yml~

@@ -1,79 +0,0 @@
-zh: 
-  activerecord: 
-    attributes: 
-      commontator/comment: 
-        body: "留言"
-        creator: "留言者"
-        editor: "編輯"
-        thread: "討論"
-      commontator/subscription: 
-        subscriber: "訂閱者"
-        thread: "討論"
-      commontator/thread: 
-        commontable: "可以留言"
-    models: 
-      commontator/comment: 
-        one: "留言"
-        other: "留言"
-      commontator/subscription: 
-        one: "訂閱"
-        other: "訂閱"
-      commontator/thread: 
-        one: "討論"
-        other: "討論"
-  commontator: 
-    anonymous: "匿名"
-    comment: 
-      actions: 
-        cancel: "取消"
-        confirm_delete: "確定要刪除這筆留言嗎？"
-        create: "發佈"
-        delete: "刪除"
-        edit: "編輯"
-        new: "新留言"
-        undelete: "未刪除"
-        update: "修改留言"
-      errors: 
-        already_deleted: "此留言已經被刪除了"
-        create: "此留言無法發佈因為:"
-        double_posted: "已經有一筆相同的留言。"
-        not_deleted: "此留言未被刪除"
-        update: "此留言無法被修改因為:"
-      status: 
-        created_at: "於%{created_at}發佈"
-        deleted_by: "被%{deleter_name}刪除"
-        updated_at: "最在於%{updated_at}被%{editor_name}修改"
-    email: 
-      comment_created: 
-        body: "%{creator_name}留言於%{commontable_name}"
-        subject: "%{creator_name}於%{commontable_name}發佈了一則留言"
-      thread_link_html: "<a href=\"%{commontable_url}\">點此處</a>看%{commontable_name}的所有留言"
-      undisclosed_recipients: "收件者"
-    require_login: "你需要先登入"
-    subscription: 
-      actions: 
-        confirm_unsubscribe: "你確定要去取消訂閱此則討論嗎？"
-        subscribe: "訂閱"
-        unsubscribe: "取消訂閱"
-      errors: 
-        already_subscribed: "你已經訂閱過了"
-        not_subscribed: "你沒有訂閱過"
-    thread: 
-      actions: 
-        show_all: "列出所有留言"
-        filter: "過濾留言"
-        close: "關閉討論"
-        confirm_close: "你確定要關閉此討論嗎？?"
-        reopen: "回復討論"
-        show: "打開留言"
-        hide: "隐藏评论"
-      errors: 
-        already_closed: "此討論已經被關閉"
-        not_closed: "此討論尚未被關閉"
-      status: 
-        cannot_post: "現在還不能發佈"
-        closed: "留言已經被%{closer_name}關閉"
-        open: 留言
-  time: 
-    formats: 
-      commontator: "%b %d %Y 於 %I:%M%p %Z"

data/config/routes.rb~

@@ -1,25 +0,0 @@
-Commontator::Engine.routes.draw do
-  resources :threads, :only => [:show] do
-    resources :comments, :except => [:index, :destroy], :shallow => true do
-      member do
-        put 'delete'
-        put 'undelete'
-        
-        put 'upvote'
-        put 'downvote'
-        put 'unvote'
-      end
-    end
-    
-    member do
-      get 'mentions' if Commontator.mentions_enabled
-
-      get 'hide'
-      put 'close'
-      put 'reopen'
-      
-      put 'subscribe', :to => 'subscriptions#subscribe'
-      put 'unsubscribe', :to => 'subscriptions#unsubscribe'
-    end
-  end
-end

data/db/migrate/0_install_commontator.rb~

@@ -1,52 +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_up, :default => 0
-      t.integer :cached_votes_down, :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, :created_at]
-
-    add_index  :commontator_comments, :cached_votes_up
-    add_index  :commontator_comments, :cached_votes_down
-    
-    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/db/migrate/1_add_parent_comment_id_to_commontator_comments.rb~

@@ -1,9 +0,0 @@
-class AddParentCommentIdToCommontatorComments < ActiveRecord::Migration
-  def change
-    change_table :commontator_comments do |t|
-      t.integer :parent_comment_id
-    end
-
-    add_index :commontator_comments, :parent_comment_id
-  end
-end

data/lib/commontator.rb~

@@ -1,145 +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,
-    :mentions_enabled
-  ]
-
-  # 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,
-    :user_mentions_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,
-    :new_comment_style,
-    :comments_per_page,
-    :thread_subscription,
-    :email_from_proc,
-    :commontable_name_proc,
-    :comment_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],
-    [:commontable_url_proc, :comment_url_proc]
-  ]
-  
-  (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(obj)
-    (obj && obj.is_commontable) ? obj.commontable_config : self
-  end
-
-  def self.commontator_name(user)
-    commontator_config(user).user_name_proc.call(user)
-  end
-
-  def self.commontator_link(user, routing_proxy)
-    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.commontator_mentions(user, search_phrase)
-    commontator_config(user).user_mentions_proc.call(user, search_phrase)
-  end
-
-  def self.commontable_name(commontable)
-    commontable_config(commontable).commontable_name_proc.call(commontable)
-  end
-
-  def self.comment_url(comment, routing_proxy)
-    commontable_config(comment.thread.commontable).comment_url_proc.call(comment, routing_proxy)
-  end
-end
-
-require 'commontator/acts_as_commontator'
-require 'commontator/acts_as_commontable'