commontator 4.11.0 → 4.11.1

data/app/assets/javascripts/commontator/application.js~

@@ -1,3 +0,0 @@
-//= require underscore/underscore
-//= require jquery.mentionsInput
-//= require commontator/mentions

data/app/assets/javascripts/commontator/mentions.js~

@@ -1,31 +0,0 @@
-window.Commontator = {};
-Commontator._ = window._.noConflict();
-Commontator.initMentions = function() {
-    $('.comment_form_field textarea:not(.mentions-added)').each(function(_index, textarea){
-        $textarea = $(textarea);
-        $form = $textarea.parents('form');
-        threadId = $textarea.parents('.thread').attr('id').match(/[\d]+/)[0];
-        $textarea.addClass('mentions-added');
-        currentValue = $textarea.val();
-        $textarea.mentionsInput({
-            elastic: false,
-            showAvatars: false,
-            allowRepeat: true,
-            onDataRequest:function (mode, query, callback) {
-                $.getJSON('commontator/threads/'+threadId+'/mentions.json', {q: query}, function(responseData) {
-                    callback.call(this, responseData.mentions);
-                });
-            }
-        });
-        $textarea.val(currentValue);
-        $textarea.on('focusout', function(){
-            $textarea.mentionsInput('getMentions', function(mentions){
-                $form.find('input[name="mentioned_ids[]"]').remove();
-                $(mentions).each(function(_index, mention){
-                    $input = $('<input>', { type: 'hidden', name: 'mentioned_ids[]', value: mention.id });
-                    $form.append($input)
-                });
-            });
-        });
-    });
-};

data/app/assets/stylesheets/commontator/application.css~

@@ -1,14 +0,0 @@
-/*
- * This is a manifest file that'll be compiled into application.css, which will include all the files
- * listed below.
- *
- * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
- * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
- *
- * You're free to add application-wide styles to this file and they'll appear at the top of the
- * compiled file, but it's generally better to create a new file per style scope.
- *
- *= require_self
- *= require mentionsInput/jquery.mentionsInput
- *= require_tree .
- */

data/app/assets/stylesheets/commontator/threads.css~

@@ -1,71 +0,0 @@
-.thread {
-  display: block !important;
-}
-
-.thread .commontator_hidden {
-  display: none;
-}
-
-.thread_actions {
-  float: right;
-}
-
-.thread_header {
-  font-size: 16px;
-  font-weight: bold;
-  font-style: normal;
-  margin-top: 5px;
-  margin-bottom: 5px;
-  display: block;
-}
-
-/* Modified from:
-http://www.strangerstudios.com/sandbox/pagination/diggstyle.php */
-.thread_page_entries_info {
-	margin-top: 10px;
-  margin-bottom: 10px;
-}
-
-.thread_will_paginate {
-	margin-top: 10px;
-  margin-bottom: 10px;
-}
-
-.thread_pagination a {
-	padding: 2px 5px 2px 5px;
-	margin-right: 4px;
-	border: 1px solid #999;
-	
-	text-decoration: none;
-	color: #666;
-}
-
-.thread_pagination a:hover,
-.thread_pagination a:active {
-	border: 1px solid #555;
-
-	color: #000;
-}
-
-.thread_pagination em {
-	padding: 2px 5px 2px 5px;
-	margin-right: 4px;
-  border: 1px solid #555;
-
-  font-weight: bold;
-  background-color: #555;
-  color: #FFF;
-}
-
-.thread_pagination span {
-  padding: 2px 5px 2px 5px;
-	margin-right: 4px;
-  border: 1px solid #EEE;
-
-  color: #DDD;
-}
-
-.thread .mentions-input-box .mentions {
-    left: -2px !important;
-    top: -2px !important;
-}

data/app/controllers/commontator/comments_controller.rb~

@@ -1,160 +0,0 @@
-module Commontator
-  class CommentsController < Commontator::ApplicationController
-    before_filter :set_thread, :only => [:new, :create]
-    before_filter :set_comment_and_thread, :except => [:new, :create]
-
-    # GET /threads/1/comments/new
-    def new
-      @comment = Comment.new
-      @comment.thread = @thread
-      @comment.creator = @user
-      security_transgression_unless @comment.can_be_created_by?(@user)
-
-      @per_page = params[:per_page] || @thread.config.comments_per_page
-
-      respond_to do |format|
-        format.html { redirect_to @thread }
-        format.js
-      end
-     
-    end
-
-    # POST /threads/1/comments
-    def create
-      @comment = Comment.new
-      @comment.thread = @thread
-      @comment.creator = @user
-      @comment.body = params[:comment].nil? ? nil : params[:comment][:body]
-      security_transgression_unless @comment.can_be_created_by?(@user)
-      subscribe_mentioned if Commontator.mentions_enabled
-      
-      respond_to do |format|
-        if  !params[:cancel].nil?
-          format.html { redirect_to @thread }
-          format.js { render :cancel }
-        elsif @comment.save
-          sub = @thread.config.thread_subscription.to_sym
-          @thread.subscribe(@user) if sub == :a || sub == :b
-          Subscription.comment_created(@comment)
-
-          @per_page = params[:per_page] || @thread.config.comments_per_page
-
-          format.html { redirect_to @thread }
-          format.js
-        else
-          format.html { redirect_to @thread }
-          format.js { render :new }
-        end
-      end
-    end
-
-    # GET /comments/1/edit
-    def edit
-      security_transgression_unless @comment.can_be_edited_by?(@user)
-
-      respond_to do |format|
-        format.html { redirect_to @thread }
-        format.js
-      end
-    end
-
-    # PUT /comments/1
-    def update
-      security_transgression_unless @comment.can_be_edited_by?(@user)
-      @comment.body = params[:comment].nil? ? nil : params[:comment][:body]
-      @comment.editor = @user
-      subscribe_mentioned if Commontator.mentions_enabled
-
-      respond_to do |format|
-        if !params[:cancel].nil?
-          format.html { redirect_to @thread }
-          format.js { render :cancel }
-        elsif @comment.save
-          format.html { redirect_to @thread }
-          format.js
-        else
-          format.html { redirect_to @thread }
-          format.js { render :edit }
-        end
-      end
-    end
-
-    # PUT /comments/1/delete
-    def delete
-      security_transgression_unless @comment.can_be_deleted_by?(@user)
-
-      @comment.errors.add(:base, t('commontator.comment.errors.already_deleted')) \
-        unless @comment.delete_by(@user)
-
-      respond_to do |format|
-        format.html { redirect_to @thread }
-        format.js { render :delete }
-      end
-    end
-    
-    # PUT /comments/1/undelete
-    def undelete
-      security_transgression_unless @comment.can_be_deleted_by?(@user)
-
-      @comment.errors.add(:base, t('commontator.comment.errors.not_deleted')) \
-        unless @comment.undelete_by(@user)
-
-      respond_to do |format|
-        format.html { redirect_to @thread }
-        format.js { render :delete }
-      end
-    end
-    
-    # PUT /comments/1/upvote
-    def upvote
-      security_transgression_unless @comment.can_be_voted_on_by?(@user)
-      
-      @comment.upvote_from @user
-
-      respond_to do |format|
-        format.html { redirect_to @thread }
-        format.js { render :vote }
-      end
-    end
-    
-    # PUT /comments/1/downvote
-    def downvote
-      security_transgression_unless @comment.can_be_voted_on_by?(@user) &&\
-        @comment.thread.config.comment_voting.to_sym == :ld
-      
-      @comment.downvote_from @user
-
-      respond_to do |format|
-        format.html { redirect_to @thread }
-        format.js { render :vote }
-      end
-    end
-    
-    # PUT /comments/1/unvote
-    def unvote
-      security_transgression_unless @comment.can_be_voted_on_by?(@user)
-      
-      @comment.unvote :voter => @user
-
-      respond_to do |format|
-        format.html { redirect_to @thread }
-        format.js { render :vote }
-      end
-    end
-    
-    protected
-    
-    def set_comment_and_thread
-      @comment = Comment.find(params[:id])
-      @thread = @comment.thread
-      commontator_set_new_comment(@thread, @user)
-    end
-
-    def subscribe_mentioned
-      debugger
-      Commontator.commontator_mentions(@user, '').where(id: params[:mentioned_ids]).each do |user|
-        @thread.subscribe(user)
-      end
-    end
-  end
-end

data/app/controllers/commontator/threads_controller.rb~

@@ -1,75 +0,0 @@
-module Commontator
-  class ThreadsController < Commontator::ApplicationController
-    skip_before_filter :ensure_user, :only => :show
-    before_filter :set_thread
-
-    # GET /threads/1
-    def show
-      commontator_thread_show(@thread.commontable)
-      @show_all = params[:show_all] && @thread.can_be_edited_by?(@user)
-
-      respond_to do |format|
-        format.html { redirect_to main_app.polymorphic_path(@thread.commontable) }
-        format.js
-      end
-    end
-
-    # GET /threads/1/hide
-    def hide
-      respond_to do |format|
-        format.js
-      end
-    end
-    
-    # PUT /threads/1/close
-    def close
-      security_transgression_unless @thread.can_be_edited_by?(@user)
-
-      @thread.errors.add(:base, t('commontator.thread.errors.already_closed')) \
-        unless @thread.close(@user)
-
-      @show_all = true
-
-      respond_to do |format|
-        format.html { redirect_to @thread }
-        format.js { render :show }
-      end
-    end
-    
-    # PUT /threads/1/reopen
-    def reopen
-      security_transgression_unless @thread.can_be_edited_by?(@user)
-
-      @thread.errors.add(:base, t('commontator.thread.errors.not_closed')) \
-        unless @thread.reopen
-
-      @show_all = true
-
-      respond_to do |format|
-        format.html { redirect_to @thread }
-        format.js { render :show }
-      end
-    end
-
-    # GET /threads/1/mentions.json
-    def mentions
-      security_transgression_unless @thread.can_be_read_by?(@user) && Commontator.mentions_enabled
-      query = params[:q].to_s
-
-      if query.size < 3
-        render json: { errors: ['Query string is too short (minimum 3 characters)'] },
-               status: :unprocessable_entity
-      else
-        render json: serialized_mentions(query)
-      end
-    end
-
-    protected
-
-    def serialized_mentions(query)
-      { mentions: Commontator.commontator_mentions(@user, query).map do |user|
-        { id: user.id, name: Commontator.commontator_name(user), type: 'user' }
-      end }
-    end
-  end
-end

data/app/mailers/commontator/subscriptions_mailer.rb~

@@ -1,65 +0,0 @@
-module Commontator
-  class SubscriptionsMailer < ActionMailer::Base
-    def comment_created(comment, recipients)
-      setup_variables(comment, recipients)
-      message = mail :to => @to,
-                     :bcc => @bcc,
-                     :from => @from,
-                     :subject => t('commontator.email.comment_created.subject',
-                                   :creator_name => @creator_name,
-                                   :commontable_name => @commontable_name,
-                                   :comment_url => @comment_url)
-
-      message.mailgun_recipient_variables = mailgun_recipient_variables(recipients) if uses_mailgun?
-    end
-
-    protected
-
-    def setup_variables(comment, recipients)
-      @comment = comment
-      @thread = @comment.thread
-      @creator = @comment.creator
-
-      @creator_name = Commontator.commontator_name(@creator)
-
-      @commontable_name = Commontator.commontable_name(@thread)
-
-<<<<<<< Updated upstream
-      @commontable_url = Commontator.commontable_url(@comment, main_app)
-=======
-      @comment_url = Commontator.comment_url(@comment, main_app)
->>>>>>> Stashed changes
-
-      params = Hash.new
-      params[:comment] = @comment
-      params[:thread] = @thread
-      params[:creator] = @creator
-      params[:creator_name] = @creator_name
-      params[:commontable_name] = @commontable_name
-      params[:comment_url] = @comment_url
-
-      if uses_mailgun?
-        @to = recipient_emails(recipients)
-      else
-        @to = t('commontator.email.undisclosed_recipients')
-        @bcc = recipient_emails(recipients)
-      end
-
-      @from = @thread.config.email_from_proc.call(@thread)
-    end
-
-    def recipient_emails(recipients)
-      recipients.collect{ |s| Commontator.commontator_email(s, self) }
-    end
-
-    def mailgun_recipient_variables(recipients)
-      recipient_emails(recipients).each_with_object({}) do |user_email, memo|
-        memo[user_email] = {}
-      end
-    end
-
-    def uses_mailgun?
-      Rails.application.config.action_mailer.delivery_method == :mailgun
-    end
-  end
-end

data/app/models/commontator/comment.rb~

@@ -1,124 +0,0 @@
-module Commontator
-  class Comment < ActiveRecord::Base
-    belongs_to :creator, :polymorphic => true
-    belongs_to :editor, :polymorphic => true
-    belongs_to :thread
-    belongs_to :parent_comment
-
-    validates_presence_of :creator, :on => :create
-    validates_presence_of :editor, :on => :update
-    validates_presence_of :thread
-    validates_presence_of :body
-
-    validates_uniqueness_of :body,
-      :scope => [:creator_type, :creator_id, :thread_id, :deleted_at],
-      :message => I18n.t('commontator.comment.errors.double_posted')
-
-    validate :parent_comment_in_same_thread
-
-    protected
-
-    cattr_accessor :acts_as_votable_initialized
-
-    def parent_comment_in_same_thread
-      return if parent_comment.nil? || parent_comment.thread_id == thread_id
-      errors.add(:parent_comment, 'must belong to the same thread')
-    end
-
-    public
-
-    def is_modified?
-      !editor.nil?
-    end
-
-    def is_latest?
-      thread.comments.last == self
-    end
-
-    def is_votable?
-      return true if acts_as_votable_initialized
-      return false unless self.class.respond_to?(:acts_as_votable)
-      self.class.acts_as_votable
-      self.class.acts_as_votable_initialized = true
-    end
-
-    def get_vote_by(user)
-      return nil unless is_votable? && !user.nil? && user.is_commontator
-      votes_for.where(:voter_type => user.class.name, :voter_id => user.id).first
-    end
-
-    def update_cached_votes(vote_scope = nil)
-      self.update_column(:cached_votes_up, count_votes_up(true))
-      self.update_column(:cached_votes_down, count_votes_down(true))
-    end
-
-    def is_deleted?
-      !deleted_at.blank?
-    end
-
-    def delete_by(user)
-      return false if is_deleted?
-      self.deleted_at = Time.now
-      self.editor = user
-      self.save
-    end
-
-    def undelete_by(user)
-      return false unless is_deleted?
-      self.deleted_at = nil
-      self.editor = user
-      self.save
-    end
-
-    def created_timestamp
-      I18n.t 'commontator.comment.status.created_at',
-             :created_at => I18n.l(created_at, :format => :commontator)
-    end
-    
-    def updated_timestamp
-      I18n.t 'commontator.comment.status.updated_at',
-             :editor_name => Commontator.commontator_name(editor || creator),
-             :updated_at => I18n.l(updated_at, :format => :commontator)
-    end
-
-    ##################
-    # Access Control #
-    ##################
-
-    def can_be_created_by?(user)
-      user == creator && !user.nil? && user.is_commontator &&\
-      !thread.is_closed? && thread.can_be_read_by?(user)
-    end
-
-    def can_be_edited_by?(user)
-      return true if thread.can_be_edited_by?(user) &&\
-                     thread.config.moderator_permissions.to_sym == :e
-      comment_edit = thread.config.comment_editing.to_sym
-      !thread.is_closed? && !is_deleted? && user == creator &&\
-      comment_edit != :n && (is_latest? || comment_edit == :a) &&\
-      thread.can_be_read_by?(user)
-    end
-
-    def can_be_deleted_by?(user)
-      mod_perm = thread.config.moderator_permissions.to_sym
-      return true if thread.can_be_edited_by?(user) &&\
-                     (mod_perm == :e ||\
-                       mod_perm == :d)
-      comment_del = thread.config.comment_deletion.to_sym
-      !thread.is_closed? && (!is_deleted? || editor == user) &&\
-      user == creator && comment_del != :n &&\
-      (is_latest? || comment_del == :a) &&\
-      thread.can_be_read_by?(user)
-    end
-
-    def can_be_voted_on?
-      !thread.is_closed? && !is_deleted? &&\
-      thread.config.comment_voting.to_sym != :n && is_votable?
-    end
-
-    def can_be_voted_on_by?(user)
-      !user.nil? && user.is_commontator && user != creator &&\
-      thread.can_be_read_by?(user) && can_be_voted_on?
-    end
-  end
-end