commontator 4.6.0 → 4.6.1

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

@@ -1,39 +0,0 @@
-<% # Clients of this partial must provide the following variables:
-   # comment
-   #
-   # Optionally, they can also supply the following variables:
-   per_page ||= nil
-   thread ||= nil
-   no_remote ||= false
-%>
-
-<% config = comment.thread.config %>
-
-<% if comment.errors.any? %>
-  <div class="comment_error_explanation">
-    <h3><%= t "commontator.comment.errors.#{comment.id.blank? ? 'create' : 'update'}" %></h3>
-
-    <ul>
-      <% comment.errors.full_messages.each do |msg| %>
-        <li><%= msg %></li>
-      <% end %>
-    </ul>
-  </div>
-<% end %>
-
-<%= form_for([commontator, thread, comment],
-             :remote => !no_remote) do |f| %>
-
-  <%= f.hidden_field :per_page, per_page %>
-  
-  <div class="comment_form_field">
-    <%= f.text_area :body, :rows => '7' %>
-  </div>
-  
-  <div class="comment_form_actions">
-    <%= f.submit t("commontator.comment.actions.#{comment.id.blank? ? 'create' : 'update'}") %>
-    <%= f.submit t('commontator.comment.actions.cancel'), :name => 'cancel' %>
-  </div>
-  
-<% end %>
-

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

@@ -1,49 +0,0 @@
-<% # Clients of this partial must supply the following variables:
-   # comment
-   # user
-%>
-
-<% creator = comment.creator
-   name = Commontator.commontator_name(creator) || ''
-   link = Commontator.commontator_link(creator) || ''
-   avatar = Commontator.commontator_avatar(creator, self) || ''
-%>
-
-<div id="comment_<%= comment.id.to_s %>_div" class="comment">
-  <div id="comment_<%= comment.id.to_s %>_top_div" class="comment_div">
-    <span id="comment_<%= comment.id.to_s %>_commontator_span" class="comment_commontator">
-      <%= link.blank? ? name : link_to(name, link) %>
-    </span>
-    <span id="comment_<%= comment.id.to_s %>_actions_span" class="comment_actions">
-      <%= render :partial => 'commontator/comments/actions',
-                 :locals => {:comment => comment,
-                             :user => user} %>
-    </span>
-  </div>
-  <div id="comment_<%= comment.id.to_s %>_middle_div" class="comment_div">
-    <span id="comment_<%= comment.id.to_s %>_avatar_span" class="comment_avatar">
-      <%= avatar %>
-    </span>
-    <span id="comment_<%= comment.id.to_s %>_votes_span" class="comment_votes">
-      <%= render :partial => 'commontator/comments/votes',
-                 :locals => {:comment => comment,
-                             :user => user} %>
-    </span>
-    <div id="comment_<%= comment.id.to_s %>_body_div" class="comment_body">
-      <%= render :partial => 'commontator/comments/body',
-                 :locals => {:comment => comment} %>
-    </div>
-  </div>
-  <div id="comment_<%= comment.id.to_s %>_bottom_div" class="comment_div">
-    <span id="comment_<%= comment.id.to_s %>_created_timestamp_span" class="comment_timestamp">
-      <%= comment.created_timestamp %>
-    </span>
-    <br/>
-    <span id="comment_<%= comment.id.to_s %>_updated_timestamp_span" class="comment_timestamp">
-    <% if comment.is_modified? %>
-      <%= comment.updated_timestamp %>
-    <% end %>
-    </span>
-  </div>
-</div>
-

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

@@ -1,69 +0,0 @@
-<% # Clients of this partial must provide the following variables:
-   # comment
-   # user
-%>
-
-<% if comment.can_be_voted_on? %>
-  <% can_vote = comment.can_be_voted_on_by?(user) %>
-  <% vote = comment.get_vote_by(user) %>
-  <% comment_voting = comment.thread.config.comment_voting.to_sym %>
-
-  <% if comment_voting == :ld || comment_voting == :l %>
-  <% vtype = (comment_voting == :ld) ? 'upvote' : 'like' %>
-  <span id="comment_<%= comment.id %>_<%= vtype %>_span"
-        class="comment_<%= vtype %>">
-    <% if can_vote && (vote.blank? || !vote.vote_flag) %>
-      <%= form_tag commontator.upvote_comment_path(comment),
-            :method => :put,
-            :remote => true do %>
-        <%= image_submit_tag "commontator/upvote.png",
-              :onmouseover => "this.src='/assets/commontator/upvote_hover.png'",
-              :onmouseout => "this.src='/assets/commontator/upvote.png'" %>
-      <% end %>
-    <% elsif can_vote %>
-      <%= form_tag commontator.unvote_comment_path(comment),
-            :method => :put,
-            :remote => true do %>
-        <%= image_submit_tag "commontator/upvote_active.png",
-              :onmouseover => "this.src='/assets/commontator/upvote.png'",
-              :onmouseout => "this.src='/assets/commontator/upvote_active.png'"
-        %>
-      <% end %>
-    <% else %>
-      <%= image_tag "commontator/upvote_disabled.png" %>
-    <% end %>
-  </span>
-  <% end %>
-
-  <span id="comment_<%= comment.id %>_vote_count_span" class="comment_vote_count">
-    <% config = comment.thread.config %>
-    <%= config.vote_count_proc.call(config.comment_voting,
-          comment.upvotes.size, comment.downvotes.size) %>
-  </span>
-
-  <% if comment_voting == :ld %>
-  <span id="comment_<%= comment.id %>_downvote_span" class="comment_downvote">
-    <% if can_vote && (vote.blank? || vote.vote_flag) %>
-      <%= form_tag commontator.downvote_comment_path(comment),
-            :method => :put,
-            :remote => true do %>
-        <%= image_submit_tag "commontator/downvote.png",
-              :onmouseover => "this.src='/assets/commontator/downvote_hover.png'",
-              :onmouseout => "this.src='/assets/commontator/downvote.png'" %>
-      <% end %>
-    <% elsif can_vote %>
-      <%= form_tag commontator.unvote_comment_path(comment),
-            :method => :put,
-            :remote => true do %>
-        <%= image_submit_tag "commontator/downvote_active.png",
-              :onmouseover => "this.src='/assets/commontator/downvote.png'",
-              :onmouseout => "this.src='/assets/commontator/downvote_active.png'"
-        %>
-      <% end %>
-    <% else %>
-      <%= image_tag "commontator/downvote_disabled.png" %>
-    <% end %>
-  </span>
-  <% end %>
-<% end %>
-

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

@@ -1,14 +0,0 @@
-<%= render :partial => 'commontator/threads/show',
-           :locals => {:thread => @thread,
-                       :user => @user,
-                       :page => @thread.new_comment_page_for(@comment, @per_page),
-                       :per_page => @per_page} %>
-
-$("#thread_<%= @thread.id %>_new_comment_div").hide();
-
-$("#thread_<%= @thread.id %>_new_comment_link_span").fadeIn();
-
-$("#comment_<%= @comment.id.to_s %>_div").hide().fadeIn()[0].scrollIntoView();
-
-<%= javascript_proc %>
-

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

@@ -1,13 +0,0 @@
-$("#thread_<%= @thread.id %>_new_comment_div").html("<%= escape_javascript(
-  render :partial => 'form',
-         :locals => {
-                       :comment => @comment,
-                       :thread => @thread
-                    }) %>");
-                    
-$("#thread_<%= @thread.id %>_new_comment_div").fadeIn()[0].scrollIntoView();
-
-$("#thread_<%= @thread.id %>_new_comment_link_span").hide();
-
-<%= javascript_proc %>
-

data/app/views/commontator/subscriptions/_link.html.erb~

@@ -1,16 +0,0 @@
-<% # Clients of this partial must supply the following variables:
-   # thread
-   # user
-%>
-
-<% is_subscribed = thread.subscription_for(user) %>
-<% sub_string = is_subscribed ? "unsubscribe" : "subscribe" %>
-<%= link_to t("commontator.subscription.actions.#{sub_string}"),
-            commontator.polymorphic_path([sub_string, thread]),
-            :confirm => (is_subscribed ? t('commontator.subscription.actions.confirm_unsubscribe') : \
-                          nil),
-            :method => :put,
-            :id => "thread_#{thread.id.to_s}_#{sub_string}_link",
-            :class => "thread_#{sub_string}_link",
-            :remote => true %>
-

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

@@ -1,19 +0,0 @@
-<% # Clients of this partial must supply the following variables:
-   # thread
-   # user
-   # per_page
-%>
-
-<% if thread.is_closed? %>
-  <p><%= t 'commontator.thread.status.cannot_post' %></p>
-<% elsif !user %>
-  <p><%= t 'commontator.require_login' %>.</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 t('commontator.comment.actions.new'),
-        commontator.new_thread_comment_path(thread, :per_page => @commontator_per_page), :remote => true %>
-  </span>
-<% end %>
-

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

@@ -1,95 +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
-%>
-
-<% can_subscribe = thread.can_subscribe?(user) %>
-<% can_edit = thread.can_be_edited_by?(user) %>
-
-<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 %>
-    <% filter_string = show_all ? 'filter' : 'show_all'
-       is_closed = thread.is_closed?
-       close_string = is_closed ? 'reopen' : 'close' %>
-
-    <% if thread.is_filtered? %>
-      <%= link_to t("commontator.thread.actions.#{filter_string}"),
-                  commontator.thread_path(thread, :show_all => (show_all ? nil : true)),
-                  :id => "thread_#{thread.id.to_s}_#{filter_string}_link",
-                  :class => "thread_#{filter_string}_link",
-                  :remote => true %>
-
-      &nbsp;
-    <% end %>
-
-    <%= link_to t("commontator.thread.actions.#{close_string}"),
-                commontator.polymorphic_path([close_string, thread]),
-                :confirm => (!is_closed ? t('commontator.thread.actions.confirm_close') : nil),
-                :method => :put,
-                :id => "thread_#{thread.id.to_s}_#{close_string}_link",
-                :class => "thread_#{close_string}_link",
-                :remote => true %>
-  <% end %>
-</span>
-
-<span id="thread_<%= thread.id.to_s %>_header_span" class="thread_header">
-  <%= t "commontator.thread.status.#{thread.is_closed? ? 'closed' : 'open'}",
-        :closer_name => Commontator.commontator_name(thread.closer) %>
-</span>
-
-<% if thread.config.comment_order == :l %>
-  <%= render :partial => 'commontator/threads/reply',
-             :locals => {:thread => thread, :user => user, :per_page => per_page} %>
-<% end %>
-
-<div id="thread_<%= thread.id.to_s %>_comment_list_div" class="thread_comment_list">
-  <% comments = show_all ? thread.ordered_comments(true) : thread.paginated_comments(page, per_page) %>
-  <%= render :partial => 'commontator/comments/list',
-             :locals => {:comments => comments,
-                         :user => user} %>
-</div>
-
-<% if thread.will_paginate? && !show_all %>
-  <div id="thread_<%= thread.id.to_s %>_pagination_div" class="thread_pagination">
-    <div id="thread_<%= thread.id.to_s %>_page_entries_info_div" class="thread_page_entries_info">
-      <%= page_entries_info comments,
-                        :params => {:controller => 'commontator/threads',
-                                    :action => 'show',
-                                    :id => thread.id,
-                                    :page => page,
-                                    :per_page => per_page} %>
-    </div>
-
-    <div id="thread_<%= thread.id.to_s %>_will_paginate_div" class="thread_will_paginate">
-      <%= will_paginate comments,
-                        :renderer => Commontator::LinkRenderer,
-                        :routes_proxy => commontator,
-                        :remote => true,
-                        :params => {:controller => 'commontator/threads',
-                                    :action => 'show',
-                                    :id => thread.id,
-                                    :page => page,
-                                    :per_page => per_page} %>
-    </div>
-  </div>
-<% end %>
-
-<% if thread.config.comment_order != :l %>
-  <%= render :partial => 'commontator/threads/reply',
-             :locals => {:thread => thread, :user => user, :per_page => per_page} %>
-<% end %>
-

data/config/initializers/commontator.rb~

@@ -1,238 +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
-  # 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.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
-
-  # 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}" }
-
-  # commontable_url_proc
-  # Type: Proc
-  # Arguments: a thread (Commontator::Thread),
-  #            the app_routes (ActionDispatch::Routing::RoutesProxy)
-  # Returns: a String containing the url of the view that displays the given thread
-  # This usually is the commontable's "show" page
-  # The main application's routes can be accessed through the app_routes object
-  # Default: lambda { |commontable, app_routes|
-  #            app_routes.polymorphic_url(commontable) }
-  # (defaults to the commontable's show url)
-  config.commontable_url_proc = lambda { |thread, app_routes|
-    app_routes.polymorphic_url(thread.commontable) }
-end
-