commontator 5.0.0 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fcd57c56f76291406b85f24de5a0ad2235c350ca
-  data.tar.gz: 8af611ffdae4c578f9a784b39f10a1d4a9860503
+  metadata.gz: acf6d8175a90bff17e463df97782fd7bf93b8565
+  data.tar.gz: 7320feebb54d1995b15e2d5627ff2845eac42756
 SHA512:
-  metadata.gz: 328b21764347f350e0bbef130ab82bf5d26bb5866d8e864261e6080fc9a1052368f505d1a5ff2fbd947c5bc9fe123fe95fd7f6d321e9809ad199f21e7d898681
-  data.tar.gz: 9db4ba13a3576b3629239496012bdf92c096aa0f5f6377919a249026da2097ceb9519ac3a55c25990c0539482fc40c0a903ee6d51e3d3a8f47a8e0bd9e9b4db5
+  metadata.gz: 2ce7dec91a95320fa1ee613a8a62021eba0d88501d7a740ee069a0ce886346a734bd1903bd332b84cc71ccbacf8c408fd8adf67d26d9ae7b24bf85b231b36fba
+  data.tar.gz: 8829fd206d56d284d9ea23d9fb781602de7f136479c4b2828ae04f4211bf8322954065193fe247b0ea3ee0a64458c12fae9b8c58482c5e073121e70b1aad203f

data/README.md

@@ -19,7 +19,7 @@ There are 4 steps you must follow to install commontator:
   Add this line to your application's Gemfile:
 
   ```rb
-  gem 'commontator', '~> 4.11.1'
+  gem 'commontator', '~> 5.1.0'
   ```
 
   And then execute:
@@ -92,6 +92,15 @@ Follow the steps below to add commontator to your models and views:
   ```rb
   acts_as_commontable
   ```
+  if you want the thread and all its comments removed when your commontable model is destroyed pass
+  :destroy as the :dependent option to`acts_as_commontable`:
+
+  ```rb
+  acts_as_commontable dependent: :destroy
+  ```
+
+  instead of `:destroy` you may use any other supported `:dependent` option from rails `has_one`
+  association.
 
 2. Views
 

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

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

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

@@ -0,0 +1,31 @@
+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~

@@ -0,0 +1,14 @@
+/*
+ * 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~

@@ -0,0 +1,71 @@
+.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~

@@ -0,0 +1,160 @@
+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~

@@ -0,0 +1,75 @@
+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~

@@ -0,0 +1,65 @@
+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