commontator 2.0.1 → 2.0.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 8e80641594c9354508803c783181a053cadf8d5b
+  data.tar.gz: 656bda25be213ff0f5186c363d02ac8f63667e07
+SHA512:
+  metadata.gz: afe7369d598e62151110282f724582724e261e44814bf57582ad86221c0a8b3d25b8f530a95023526f8529fc4fb284debafd38c24dcf8e8db7d09b5a33af88cb
+  data.tar.gz: 295d8301ae86ad273f2604dafcf257f88b44593dc74e105dcb32461c14ee856aa56faf4a5cf99c28743c64ac80fcb919592556e835422f25fc8c0fa0a2f8c581

data/README.md

@@ -13,7 +13,7 @@ There are 4 steps you must follow to install commontator:
   Add this line to your application's Gemfile:
 
   ```ruby
-  gem 'commontator', '~> 1.1.0'
+  gem 'commontator', '~> 2.0.2'
   ```
 
   And then execute:

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

@@ -0,0 +1,27 @@
+module Commontator
+  class CommontatorController < ActionController::Base
+    before_filter :get_user
+    
+    cattr_accessor :commontable_url
+    
+    rescue_from SecurityTransgression, :with => lambda { head(:forbidden) }
+    
+    protected
+    
+    def get_user
+      @user = self.send Commontator.current_user_method	
+      raise SecurityTransgression unless (@user.nil? || @user.is_commontator)
+    end
+    
+    def get_thread
+      @thread = params[:thread_id].blank? ? \
+        Commontator::Thread.find(params[:id]) : \
+        Commontator::Thread.find(params[:thread_id])
+      raise SecurityTransgression if @thread.commontable.nil?
+    end
+    
+    def set_commontable_url
+      self.commontable_url = @thread.config.commontable_url_proc.call(main_app, @thread.commontable)
+    end
+  end
+end

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

@@ -1,10 +1,10 @@
 module Commontator
-  class CommentsController < ApplicationController
+  class CommentsController < Commontator::ApplicationController
     before_filter :get_thread, :only => [:new, :create]
     before_filter :get_comment_and_thread, :except => [:new, :create]
     before_filter :set_commontable_url, :only => :create
 
-    # GET /1/comments/new
+    # GET /threads/1/comments/new
     def new
       @comment = Comment.new
       @comment.thread = @thread
@@ -19,9 +19,10 @@ module Commontator
      
     end
 
-    # POST /1/comments
+    # POST /threads/1/comments
     def create
-      @comment = Comment.new(params[:comment])
+      @comment = Comment.new
+      @comment.body = params[:comment][:body] unless params[:comment].nil?
       @comment.thread = @thread
       @comment.creator = @user
       
@@ -29,6 +30,12 @@ module Commontator
       
       respond_to do |format|
         if @comment.save
+          @thread.subscribe(@user) if @thread.config.auto_subscribe_on_comment
+          @thread.add_unread_except_for(@user)
+          recipients = @thread.active_subscribers.reject{|s| s == @user}
+          SubscriptionsMailer.comment_created(@comment, recipients).deliver \
+            unless recipients.empty?
+
           format.html { redirect_to @thread }
           format.js
         else
@@ -48,13 +55,14 @@ module Commontator
       end
     end
 
-    # PUT /comments/1
+    # PATCH /comments/1
     def update
       raise SecurityTransgression unless @comment.can_be_edited_by?(@user)
+      @comment.body = params[:comment][:body] unless params[:comment].nil?
       @comment.editor = @user
 
       respond_to do |format|
-        if @comment.update_attributes(params[:comment])
+        if @comment.save
           format.html { redirect_to @thread }
           format.js
         else
@@ -64,12 +72,12 @@ module Commontator
       end
     end
 
-    # PUT /comments/1/delete
+    # PATCH /comments/1/delete
     def delete
       raise SecurityTransgression unless @comment.can_be_deleted_by?(@user)
 
       @comment.errors.add(:base, 'This comment has already been deleted.') \
-        unless @comment.delete(@user)
+        unless @comment.delete_by(@user)
 
       respond_to do |format|
         format.html { redirect_to @thread }
@@ -77,7 +85,7 @@ module Commontator
       end
     end
     
-    # PUT /comments/1/undelete
+    # PATCH /comments/1/undelete
     def undelete
       raise SecurityTransgression unless @comment.can_be_deleted_by?(@user)
 
@@ -90,7 +98,7 @@ module Commontator
       end
     end
     
-    # PUT /comments/1/upvote
+    # PATCH /comments/1/upvote
     def upvote
       raise SecurityTransgression unless @comment.can_be_voted_on_by?(@user)
       
@@ -102,7 +110,7 @@ module Commontator
       end
     end
     
-    # PUT /comments/1/downvote
+    # PATCH /comments/1/downvote
     def downvote
       raise SecurityTransgression unless @comment.can_be_voted_on_by?(@user)
       
@@ -114,7 +122,7 @@ module Commontator
       end
     end
     
-    # PUT /comments/1/unvote
+    # PATCH /comments/1/unvote
     def unvote
       raise SecurityTransgression unless @comment.can_be_voted_on_by?(@user)
       

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

@@ -0,0 +1,32 @@
+module Commontator
+  class SubscriptionsController < Commontator::ApplicationController
+    before_filter :get_thread
+
+    # PATCH threads/1/subscribe
+    def subscribe
+      raise SecurityTransgression unless @thread.can_subscribe?(@user)
+
+      @thread.errors.add(:subscription, "You are already subscribed to this thread") \
+        unless @thread.subscribe(@user)
+
+      respond_to do |format|
+        format.html { redirect_to @thread }
+        format.js { render :subscribe }
+      end
+
+    end
+
+    # PATCH threads/1/unsubscribe
+    def unsubscribe
+      raise SecurityTransgression unless @thread.can_subscribe?(@user)
+
+      @thread.errors.add(:subscription, "You are not subscribed to this thread") \
+        unless @thread.unsubscribe(@user)
+
+      respond_to do |format|
+        format.html { redirect_to @thread }
+        format.js { render :subscribe }
+      end
+    end
+  end
+end

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

@@ -0,0 +1,42 @@
+module Commontator
+  class ThreadsController < Commontator::ApplicationController
+    before_filter :get_thread
+    before_filter :set_commontable_url, :only => :show
+
+    # GET /threads/1
+    def show
+      commontator_thread_show(@thread.commontable)
+
+      respond_to do |format|
+        format.html { redirect_to commontable_url }
+        format.js
+      end
+    end
+    
+    # PATCH /threads/1/close
+    def close
+      raise SecurityTransgression unless @thread.can_be_edited_by?(@user)
+
+      @thread.errors.add(:base, 'This thread has already been closed.') \
+        unless @thread.close(@user)
+
+      respond_to do |format|
+        format.html { redirect_to @thread }
+        format.js { render :show }
+      end
+    end
+    
+    # PUT /threads/1/reopen
+    def reopen
+      raise SecurityTransgression unless @thread.can_be_edited_by?(@user)
+
+      @thread.errors.add(:base, 'This thread is not closed.') \
+        unless @thread.reopen
+
+      respond_to do |format|
+        format.html { redirect_to @thread }
+        format.js { render :show }
+      end
+    end
+  end
+end

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

@@ -0,0 +1,50 @@
+module Commontator
+  class SubscriptionsMailer < ActionMailer::Base
+    include SharedHelper
+    include ThreadsHelper
+  
+    def comment_created(comment, recipients)
+      setup_variables(comment, recipients)
+
+      mail :to => 'Undisclosed Recipients'
+           :bcc => @bcc,
+           :from => @from,
+           :subject => @subject
+    end
+
+    protected
+
+    def setup_variables(comment, recipients)
+      @comment = comment
+      @thread = @comment.thread
+      @creator = @comment.creator
+      
+      @commontable = @thread.commontable
+      @config = @thread.config
+      
+      @creator_name = commontator_name(@creator)
+      @comment_timestamp = @comment.timestamp
+      
+      @commontable_name = commontable_name(@thread)
+      @commontable_id = commontable_id(@thread).to_s
+      
+      @commontable_url = ApplicationController.commontable_url
+      
+      params = Hash.new
+      params[:comment] = @comment
+      params[:thread] = @thread
+      params[:creator] = @creator
+      params[:commontable] = @commontable
+      params[:config] = @config
+      params[:creator_name] = @creator_name
+      params[:comment_timestamp] = @comment_timestamp
+      params[:commontable_name] = @commontable_name
+      params[:commontable_id] = @commontable_id
+      params[:commontable_url] = @commontable_url
+      
+      @bcc = recipients.collect{|s| commontator_email(s)}
+      @from = @config.subscription_email_from_proc.call(params)
+      @subject = @config.subscription_email_subject_proc.call(params)
+    end
+  end
+end

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

@@ -2,16 +2,14 @@ module Commontator
   class Comment < ActiveRecord::Base
     belongs_to :creator, :polymorphic => true
     belongs_to :editor, :polymorphic => true
-
     belongs_to :thread
 
     has_one :commontable, :through => :thread
 
-    attr_accessible :body
+    attr_accessible :body if respond_to?(:attr_accessible)
 
     validates_presence_of :creator, :on => :create
     validates_presence_of :editor, :on => :update
-
     validates_presence_of :thread
     validates_presence_of :body
 
@@ -60,7 +58,7 @@ module Commontator
 
     def timestamp
       config = thread.config
-      "#{config.comment_create_verb_past.capitalize} on ") + \
+      "#{config.comment_create_verb_past.capitalize} on " + \
         created_at.strftime(config.timestamp_format) + \
         (is_modified? ? " | Last #{config.comment_edit_verb_past} on " + \
           updated_at.strftime(config.timestamp_format) : '')
@@ -103,6 +101,4 @@ module Commontator
       can_be_voted_on? && thread.can_be_read_by?(user) && user != creator
     end
   end
-
-  CommentObserver.instance
 end

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

@@ -4,18 +4,15 @@ module Commontator
 
     belongs_to :thread
 
-    attr_accessible :subscriber, :thread
-
     validates_presence_of :subscriber, :thread
-
     validates_uniqueness_of :thread_id, :scope => [:subscriber_type, :subscriber_id]
 
     def mark_as_read
-      self.update_attribute(:unread, 0)
+      update_attribute(:unread, 0)
     end
 
     def add_unread
-      self.update_attribute(:unread, unread + 1)
+      update_attribute(:unread, unread + 1)
     end
   end
 end

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

@@ -1,17 +1,12 @@
 module Commontator
   class Thread < ActiveRecord::Base
     belongs_to :closer, :polymorphic => true
-
     belongs_to :commontable, :polymorphic => true
 
     has_many :comments, :dependent => :destroy
-
     has_many :subscriptions, :dependent => :destroy
 
-    attr_accessible :is_closed
-
     validates_presence_of :commontable, :unless => :is_closed?
-
     validates_uniqueness_of :commontable_id, :scope => :commontable_type, :allow_nil => true
 
     def config
@@ -28,6 +23,7 @@ module Commontator
     end
 
     def subscribers
+      subscriptions.collect{|s| s.subscriber}
     end
 
     def active_subscribers
@@ -45,8 +41,10 @@ module Commontator
 
     def subscribe(subscriber)
       return false if is_subscribed?(subscriber) || !subscriber.is_commontator
-      subscription = Subscription.create(
-        :subscriber => subscriber, :thread => self)
+      subscription = Subscription.new
+      subscription.subscriber = subscriber
+      subscription.thread => self
+      subscription.save
     end
 
     def unsubscribe(subscriber)

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

@@ -0,0 +1,30 @@
+<% # Clients of this partial must supply the following variables:
+   # comment
+   # user
+%>
+
+<% can_edit = comment.can_be_edited_by?(user)
+   can_delete = comment.can_be_deleted_by?(user) %>
+
+<% if can_edit %>
+  <%= link_to 'Edit', commontator.edit_comment_path(comment),
+                      :id => "comment_#{comment.id.to_s}_edit_link",
+                      :class => "comment_edit_link",
+                      :remote => true %>
+<% end %>
+
+&nbsp;
+
+<% if can_delete %>
+  <% is_deleted = comment.is_deleted? %>
+  <% del_string = is_deleted ? "undelete" : "delete" %>
+  <%= link_to del_string.capitalize,
+              commontator.polymorphic_path([del_string, comment]),
+              :confirm => (!is_deleted ? \
+                            "Are you sure you want to delete this " + \
+                            "#{comment.thread.config.comment_name}?" : nil),
+              :method => :put,
+              :id => "comment_#{comment.id.to_s}_#{del_string}_link",
+              :class => "comment_#{del_string}_link",
+              :remote => true %>
+<% end %>

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

@@ -5,7 +5,7 @@
 
 <% if comment.can_be_voted_on? %>
   <% can_vote = comment.can_be_voted_on_by?(user) %>
-  <% vote = comment.get_vote_from(user) %>
+  <% vote = comment.get_vote_by(user) %>
 
   <span id="comment_<%= comment.id %>_upvote_span" class="comment_upvote">
     <% if can_vote && (vote.blank? || !vote.vote_flag) %>

data/app/views/commontator/shared/_thread.html.erb~

@@ -0,0 +1,20 @@
+<% # Clients of this partial must supply the following variables:
+   # thread
+   # user
+%>
+
+<% subscription = thread.subscription_for(user) %>
+
+<% if thread.can_be_read_by?(user) %>
+  <%= stylesheet_link_tag "commontator/application.CSS", :media => "all" %>
+
+  <div id="thread_<%= thread.id %>_div" class="thread" style="display: none;">
+    <% if @commontator_thread_show %>
+      <%= render :partial => 'commontator/threads/show', :locals => {:thread => thread,
+                                                                     :user => user} %>
+    <% else %>
+      <%= link_to "Show #{thread.config.comment_name.pluralize} (#{subscription ? subscription.unread + '/' + thread.comments.count : thread.comments.count})", \
+                  commontator.thread_path(thread), :remote => true %>
+    <% end %>
+  </div>
+<% end %>

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

@@ -0,0 +1,16 @@
+<% # Clients of this partial must supply the following variable:
+   # thread
+   # user
+%>
+
+<% is_subscribed = thread.is_subscribed?(user) %>
+<% sub_string = is_subscribed ? "unsubscribe" : "subscribe" %>
+<%= link_to sub_string.capitalize,
+            commontator.polymorphic_path([sub_string, thread]),
+            :confirm => (is_subscribed ? \
+                          "Are you sure you want to unsubscribe from this thread?" : \
+                          nil),
+            :method => :put,
+            :id => "thread_#{thread.id.to_s}_#{sub_string}_link",
+            :class => "thread_#{sub_string}_link",
+            :remote => true %>