commontator 5.1.0 → 6.0.0.pre.1

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

@@ -1,18 +0,0 @@
-<% # Clients of this partial must supply the following variables:
-   # thread
-   # user
-   # page
-   # per_page
-   # Optionally, they can also supply the following variable:
-   show_all ||= false
-%>
-
-$("#thread_<%= thread.id %>_div").replaceWith(
-  "<%= escape_javascript(
-    render :partial => 'commontator/threads/show',
-           :formats => [:html],
-           :locals => { :thread => thread,
-                        :user => user,
-                        :page => page,
-                        :per_page => per_page,
-                        :show_all => show_all }) %>");

data/config/initializers/commontator.rb~

@@ -1,290 +0,0 @@
-# Change the settings below to suit your needs
-# All settings are initially set to their default values
-
-# Note: Do not "return" from a Proc, use "next" instead if necessary
-#       "return" in a lambda is OK
-Commontator.configure do |config|
-  # Engine Configuration
-
-  # current_user_proc
-  # Type: Proc
-  # Arguments: the current controller (ActionController::Base)
-  # Returns: the current user (acts_as_commontator)
-  # The default works for Devise and similar authentication plugins
-  # Default: lambda { |controller| controller.current_user }
-  config.current_user_proc = lambda { |controller| controller.current_user }
-
-  # javascript_proc
-  # Type: Proc
-  # Arguments: a view (ActionView::Base)
-  # Returns: a String that is appended to Commontator JS views
-  # Can be used, for example, to display/clear Rails error messages
-  # or to reapply JQuery UI styles after Ajax calls
-  # Objects visible in view templates can be accessed
-  # through the view object (for example, view.flash)
-  # However, the view does not include the main application's helpers
-  # Default: lambda { |view| '$("#error_explanation").remove();' }
-  config.javascript_proc = lambda { |view|
-                                    '$("#error_explanation").remove();' }
-
-
-
-  # User (acts_as_commontator) Configuration
-
-  # user_name_proc
-  # Type: Proc
-  # Arguments: a user (acts_as_commontator)
-  # Returns: the user's name (String)
-  # Default: lambda { |user| I18n.t('commontator.anonymous') } (all users are anonymous)
-  config.user_name_proc = lambda { |user| I18n.t('commontator.anonymous') }
-
-  # user_link_proc
-  # Type: Proc
-  # Arguments: a user (acts_as_commontator),
-  #            the app_routes (ActionDispatch::Routing::RoutesProxy)
-  # Returns: a path to the user's `show` page (String)
-  # If anything non-blank is returned, the user's name in comments
-  # comments will become a hyperlink pointing to this path
-  # The main application's routes can be accessed through the app_routes object
-  # Default: lambda { |user, app_routes| '' } (no link)
-  config.user_link_proc = lambda { |user, app_routes| '' }
-
-  # user_avatar_proc
-  # Type: Proc
-  # Arguments: a user (acts_as_commontator), a view (ActionView::Base)
-  # Returns: a String containing a HTML <img> tag pointing to the user's avatar image
-  # The commontator_gravatar_image_tag helper takes a user object,
-  # a border size and an options hash for Gravatar, and produces a Gravatar image tag
-  # See available options at http://en.gravatar.com/site/implement/images/)
-  # Note: Gravatar has several security implications for your users
-  #       It makes your users trackable across different sites and
-  #       allows de-anonymization attacks against their email addresses
-  #       If you absolutely want to keep users' email addresses or identities secret,
-  #       do not use Gravatar or similar services
-  # Default: lambda { |user, view|
-  #            view.commontator_gravatar_image_tag(
-  #              user, 1, :s => 60, :d => 'mm') }
-  config.user_avatar_proc = lambda { |user, view|
-                                     view.commontator_gravatar_image_tag(
-                                       user, 1, :s => 60, :d => 'mm') }
-
-  # user_email_proc
-  # Type: Proc
-  # Arguments: a user (acts_as_commontator), a mailer (ActionMailer::Base)
-  # Returns: the user's email address (String)
-  # The default works for Devise's defaults
-  # If the mailer argument is nil, Commontator intends to hash the email and send the hash
-  # to Gravatar, so you should always return the user's email address (if using Gravatar)
-  # If the mailer argument is not nil, then Commontator intends to send an email to
-  # the address returned; you can prevent it from being sent by returning a blank String
-  # Default: lambda { |user, mailer| user.try(:email) || '' }
-  config.user_email_proc = lambda { |user, mailer| user.try(:email) || '' }
-
-
-
-  # Thread/Commontable (acts_as_commontable) Configuration
-
-  # comment_filter
-  # Type: Arel node (Arel::Nodes::Node) or nil
-  # Arel that filters visible comments
-  # If specified, visible comments will be filtered according to this Arel node
-  # A value of nil will cause no filtering to be done
-  # Moderators can manually override this filter for themselves
-  # Example: Commontator::Comment.arel_table[:deleted_at].eq(nil) (hides deleted comments)
-  #          This is not recommended, as it can cause confusion over deleted comments
-  #          If using pagination, it can also cause comments to change pages
-  # Default: nil (no filtering - all comments are visible)
-  config.comment_filter = nil
-
-  # thread_read_proc
-  # Type: Proc
-  # Arguments: a thread (Commontator::Thread), a user (acts_as_commontator)
-  # Returns: a Boolean, true iif the user should be allowed to read that thread
-  # Note: can be called with a user object that is nil (if they are not logged in)
-  # Default: lambda { |thread, user| true } (anyone can read any thread)
-  config.thread_read_proc = lambda { |thread, user| true }
-
-  # thread_moderator_proc
-  # Type: Proc
-  # Arguments: a thread (Commontator::Thread), a user (acts_as_commontator)
-  # Returns: a Boolean, true iif the user is a moderator for that thread
-  # If you want global moderators, make this proc true for them regardless of thread
-  # Default: lambda { |thread, user| false } (no moderators)
-  config.thread_moderator_proc = lambda { |thread, user| false }
-
-  # comment_editing
-  # Type: Symbol
-  # Whether users can edit their own comments
-  # Valid options:
-  #   :a (always)
-  #   :l (only if it's the latest comment)
-  #   :n (never)
-  # Default: :l
-  config.comment_editing = :l
-
-  # comment_deletion
-  # Type: Symbol
-  # Whether users can delete their own comments
-  # Valid options:
-  #   :a (always)
-  #   :l (only if it's the latest comment)
-  #   :n (never)
-  # Note: For moderators, see the next option
-  # Default: :l
-  config.comment_deletion = :l
-
-  # moderator_permissions
-  # Type: Symbol
-  # What permissions moderators have
-  # Valid options:
-  #   :e (delete and edit comments and close threads)
-  #   :d (delete comments and close threads)
-  #   :c (close threads only)
-  # Default: :d
-  config.moderator_permissions = :d
-
-  # comment_voting
-  # Type: Symbol
-  # Whether users can vote on other users' comments
-  # Valid options:
-  #   :n  (no voting)
-  #   :l  (likes - requires acts_as_votable gem)
-  #   :ld (likes/dislikes - requires acts_as_votable gem)
-  # Not yet implemented:
-  #   :s  (star ratings)
-  #   :r  (reputation system)
-  # Default: :n
-  config.comment_voting = :n
-
-  # vote_count_proc
-  # Type: Proc
-  # Arguments: a thread (Commontator::Thread), pos (Fixnum), neg (Fixnum)
-  # Returns: vote count to be displayed (String)
-  # pos is the number of likes, or the rating, or the reputation
-  # neg is the number of dislikes, if applicable, or 0 otherwise
-  # Default: lambda { |thread, pos, neg| "%+d" % (pos - neg) }
-  config.vote_count_proc = lambda { |thread, pos, neg| "%+d" % (pos - neg) }
-
-  # comment_order
-  # Type: Symbol
-  # What order to use for comments
-  # Valid options:
-  #   :e  (earliest comment first)
-  #   :l  (latest comment first)
-  #   :ve (highest voted first; earliest first if tied)
-  #   :vl (highest voted first; latest first if tied)
-  # Notes:
-  #   :e is usually used in forums (discussions)
-  #   :l is usually used in blogs (opinions)
-  #   :ve and :vl are usually used where it makes sense to rate comments
-  #     based on usefulness (q&a, reviews, guides, etc.)
-  # If :l is selected, the "reply to thread" form will appear before the comments
-  # Otherwise, it will appear after the comments
-  # Default: :e
-  config.comment_order = :e
-
-  # new_comment_style
-  # Type: Symbol
-  # How to display the "new comment" form
-  # Valid options:
-  #   :t (always present in the thread's page)
-  #   :l (link to the form; opens in the same page using JS)
-  # Not yet implemented:
-  #   :n (link to the form; opens in a new window)
-  # Default: :l
-  config.new_comment_style = :l
-
-  # comments_per_page
-  # Type: Fixnum or nil
-  # Number of comments to display in each page
-  # Set to nil to disable pagination
-  # Any other value requires the will_paginate gem
-  # Default: nil (no pagination)
-  config.comments_per_page = nil
-
-  # thread_subscription
-  # Type: Symbol
-  # Whether users can subscribe to threads to receive activity email notifications
-  # Valid options:
-  #   :n (no subscriptions)
-  #   :a (automatically subscribe when you comment; cannot do it manually)
-  #   :m (manual subscriptions only)
-  #   :b (both automatic, when commenting, and manual)
-  # Default: :n
-  config.thread_subscription = :n
-
-  # email_from_proc
-  # Type: Proc
-  # Arguments: a thread (Commontator::Thread)
-  # Returns: the address emails are sent "from" (String)
-  # Important: If using subscriptions, change this to at least match your domain name
-  # Default: lambda { |thread|
-  #                   "no-reply@#{Rails.application.class.parent.to_s.downcase}.com" }
-  config.email_from_proc = lambda { |thread|
-    "no-reply@#{Rails.application.class.parent.to_s.downcase}.com" }
-
-  # commontable_name_proc
-  # Type: Proc
-  # Arguments: a thread (Commontator::Thread)
-  # Returns: a name that refers to the commontable object (String)
-  # If you have multiple commontable models, you can also pass this
-  # configuration value as an argument to acts_as_commontable for each one
-  # Default: lambda { |thread|
-  #                   "#{thread.commontable.class.name} ##{thread.commontable.id}" }
-  config.commontable_name_proc = lambda { |thread|
-    "#{thread.commontable.class.name} ##{thread.commontable.id}" }
-
-  # comment_url_proc
-  # Type: Proc
-  # Arguments: a comment (Commontator::Comment),
-  #            the app_routes (ActionDispatch::Routing::RoutesProxy)
-  # Returns: a String containing the url of the view that displays the given comment
-  # This usually is the commontable's "show" page
-  # The main application's routes can be accessed through the app_routes object
-  # Default: lambda { |comment, app_routes|
-<<<<<<< Updated upstream
-  #            app_routes.polymorphic_url(comment.thread.commontable) }
-  # Link to comment:
-  #          lambda { |comment, app_routes|
-  #            app_routes.polymorphic_url(comment.thread.commontable, anchor: "comment_#{comment.id}_div") }
-  # (defaults to the commontable's show url)
-  config.commontable_url_proc = lambda { |comment, app_routes|
-    app_routes.polymorphic_url(comment.thread.commontable) }
-=======
-  #                   app_routes.polymorphic_url(comment.thread.commontable,
-  #                                              anchor: "comment_#{comment.id}_div") }
-  # (defaults to the commontable's show url with an anchor pointing to the comment's div)
-  config.comment_url_proc = lambda { |comment, app_routes|
-    app_routes.polymorphic_url(comment.thread.commontable, anchor: "comment_#{comment.id}_div") }
->>>>>>> Stashed changes
-
-  # mentions_enabled
-  # Type: Boolean
-  # Whether users can mention other users to subscribe them to the thread
-  # Valid options:
-  #   false (no mentions)
-  #   true  (mentions enabled)
-  # Default: false
-  config.mentions_enabled = false
-
-  # user_mentions_proc
-  # Type: Proc
-  # Arguments:
-  #   the current user (acts_as_commontator)
-  #   the search query inputted by user (String)
-  # Returns: an ActiveRecord Relation object
-  # Important notes:
-  #
-  #  - The proc will be called internally with an empty search string.
-  #    In that case, it MUST return all users that can be mentioned.
-  #
-  #  - With mentions enabled, any registered user in your app is able
-  #    to call this proc with any search query >= 3 characters.
-  #    Make sure to handle SQL escaping properly and that the
-  #    attribute being searched does not contain sensitive information.
-  #
-  # Default: lambda { |current_user, query|
-  #                   current_user.class.where('username LIKE ?', "#{query}%") }
-  config.user_mentions_proc = lambda { |current_user, query|
-    current_user.class.where('username LIKE ?', "#{query}%") }
-end

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"