commontator 0.2.4 → 0.3.10

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

@@ -1,3 +1,7 @@
+.thread_actions {
+  float: right;
+}
+
 .thread_header {
   font-size: 16px;
   font-weight: bold;

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

@@ -1,6 +1,6 @@
 .thread_header {
   font-size: 16px;
-  font-weight: normal;
+  font-weight: bold;
   font-style: normal;
 }
 

data/app/controllers/commontator/application_controller.rb

@@ -13,6 +13,11 @@ module Commontator
       @thread = params[:thread_id].blank? ? \
         Commontator::Thread.find(params[:id]) : \
         Commontator::Thread.find(params[:thread_id])
+      get_commontable_url
+    end
+    
+    def get_commontable_url
+      @commontable_url = @thread.config.commontable_url_proc.call(main_app, @thread.commontable)
     end
   end
 end

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

@@ -10,7 +10,14 @@ module Commontator
     end
     
     def get_thread
-      @thread = params[:thread_id].blank? ? Commontator::Thread.find(params[:thread_id]) : Commontator::Thread.find(params[:id])
+      @thread = params[:thread_id].blank? ? \
+        Commontator::Thread.find(params[:id]) : \
+        Commontator::Thread.find(params[:thread_id])
+      get_commontable_url
+    end
+    
+    def get_commontable_url
+      @thread.config.commontable_url_proc.call(main_app, @thread.commontable)
     end
   end
 end

data/app/controllers/commontator/comments_controller.rb

@@ -1,7 +1,5 @@
 module Commontator
   class CommentsController < ApplicationController
-    include ThreadsHelper
-
     before_filter :get_thread, :only => [:new, :create]
     before_filter :get_comment_and_thread, :except => [:new, :create]
 
@@ -14,7 +12,7 @@ module Commontator
       raise SecurityTransgression unless @comment.can_be_created_by?(@commontator)
 
       respond_to do |format|
-        format.html
+        format.html { redirect_to @commontable_url }
         format.js
       end
      
@@ -27,21 +25,19 @@ module Commontator
       @comment.commontator = @commontator
       
       raise SecurityTransgression unless @comment.can_be_created_by?(@commontator)
+      
+      if @comment.save
+        @thread.subscribe(@commontator) if @thread.config.auto_subscribe_on_comment
+        @thread.mark_as_unread_except_for(@commontator)
+        SubscriptionsMailer.comment_created_email(@comment, @commontable_url)
+        @thread.comment_created_callback(@commontator, @comment)
+      else
+        @errors = @comment.errors
+      end
 
       respond_to do |format|
-        if @comment.save
-          @thread.subscribe(@commontator) if @thread.config.auto_subscribe_on_comment
-          @thread.mark_as_unread_except_for(@commontator)
-          SubscriptionsMailer.comment_created_email(@comment)
-          @thread.comment_created_callback(@commontator, @comment)
-          flash[:notice] = @thread.config.comment_name + ' ' + @thread.config.comment_create_verb_past
-          format.html { redirect_to @thread }
-          format.js
-        else
-          @errors = @comment.errors
-          format.html { render :action => 'new' }
-          format.js
-        end
+        format.html { redirect_to @commontable_url }
+        format.js
       end
     end
 
@@ -50,7 +46,7 @@ module Commontator
       raise SecurityTransgression unless @comment.can_be_edited_by?(@commontator)
 
       respond_to do |format|
-        format.html
+        format.html { redirect_to @commontable_url }
         format.js
       end
     end
@@ -58,17 +54,13 @@ module Commontator
     # PUT /comments/1
     def update
       raise SecurityTransgression unless @comment.can_be_edited_by?(@commontator)
+      
+      @thread.comment_edited_callback(@commontator, @comment) \
+        if @comment.update_attributes(params[:comment])
 
       respond_to do |format|
-        if @comment.update_attributes(params[:comment])
-          flash[:notice] = @thread.config.comment_name + ' updated'
-          @thread.comment_edited_callback(@commontator, @comment)
-          format.html { redirect_to @thread }
-          format.js
-        else
-          format.html { render :action => "edit" }
-          format.js
-        end
+        format.html { redirect_to @commontable_url }
+        format.js
       end
     end
 
@@ -80,7 +72,7 @@ module Commontator
       @thread.comment_deleted_callback(@commontator, @comment)
 
       respond_to do |format|
-        format.html { redirect_to @thread }
+        format.html { redirect_to @commontable_url }
         format.js { render :delete }
       end
     end
@@ -92,7 +84,7 @@ module Commontator
       @comment.undelete
 
       respond_to do |format|
-        format.html { redirect_to @thread }
+        format.html { redirect_to @commontable_url }
         format.js { render :delete }
       end
     end
@@ -104,7 +96,7 @@ module Commontator
       @comment.upvote_from @commontator
 
       respond_to do |format|
-        format.html { redirect_to @thread }
+        format.html { redirect_to @commontable_url }
         format.js { render :vote }
       end
     end
@@ -116,7 +108,7 @@ module Commontator
       @comment.downvote_from @commontator
 
       respond_to do |format|
-        format.html { redirect_to @thread }
+        format.html { redirect_to @commontable_url }
         format.js { render :vote }
       end
     end
@@ -128,7 +120,7 @@ module Commontator
       @comment.unvote :voter => @commontator
 
       respond_to do |format|
-        format.html { redirect_to @thread }
+        format.html { redirect_to @commontable_url }
         format.js { render :vote }
       end
     end
@@ -138,6 +130,7 @@ module Commontator
     def get_comment_and_thread
       @comment = Comment.find(params[:id])
       @thread = @comment.thread
+      get_commontable_url
     end
   end
 end

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

@@ -1,7 +1,5 @@
 module Commontator
   class CommentsController < ApplicationController
-    include ThreadsHelper
-
     before_filter :get_thread, :only => [:new, :create]
     before_filter :get_comment_and_thread, :except => [:new, :create]
 
@@ -14,7 +12,7 @@ module Commontator
       raise SecurityTransgression unless @comment.can_be_created_by?(@commontator)
 
       respond_to do |format|
-        format.html
+        format.html { redirect_to @commontable_url }
         format.js
       end
      
@@ -27,21 +25,19 @@ module Commontator
       @comment.commontator = @commontator
       
       raise SecurityTransgression unless @comment.can_be_created_by?(@commontator)
+      
+      if @comment.save
+        @thread.subscribe(@commontator) if @thread.config.auto_subscribe_on_comment
+        @thread.mark_as_unread_except_for(@commontator)
+        SubscriptionsMailer.comment_created_email(@comment)
+        @thread.comment_created_callback(@commontator, @comment)
+      else
+        @errors = @comment.errors
+      end
 
       respond_to do |format|
-        if @comment.save
-          @thread.subscribe(@commontator) if @thread.config.auto_subscribe_on_comment
-          @thread.mark_as_unread_except_for(@commontator)
-          SubscriptionsMailer.comment_created_email(@comment)
-          @thread.comment_created_callback(@commontator, @comment)
-          flash[:notice] = @thread.config.comment_name + ' ' + @thread.config.comment_create_verb_past
-          format.html { redirect_to @thread }
-          format.js
-        else
-          @errors = @comment.errors
-          format.html { render :action => 'new' }
-          format.js
-        end
+        format.html { redirect_to @commontable_url }
+        format.js
       end
     end
 
@@ -50,7 +46,7 @@ module Commontator
       raise SecurityTransgression unless @comment.can_be_edited_by?(@commontator)
 
       respond_to do |format|
-        format.html
+        format.html { redirect_to @commontable_url }
         format.js
       end
     end
@@ -58,17 +54,13 @@ module Commontator
     # PUT /comments/1
     def update
       raise SecurityTransgression unless @comment.can_be_edited_by?(@commontator)
+      
+      @thread.comment_edited_callback(@commontator, @comment) \
+        if @comment.update_attributes(params[:comment])
 
       respond_to do |format|
-        if @comment.update_attributes(params[:comment])
-          flash[:notice] = @thread.config.comment_name + ' updated'
-          @thread.comment_edited_callback(@commontator, @comment)
-          format.html { redirect_to @thread }
-          format.js
-        else
-          format.html { render :action => "edit" }
-          format.js
-        end
+        format.html { redirect_to @commontable_url }
+        format.js
       end
     end
 
@@ -80,7 +72,7 @@ module Commontator
       @thread.comment_deleted_callback(@commontator, @comment)
 
       respond_to do |format|
-        format.html { redirect_to @thread }
+        format.html { redirect_to @commontable_url }
         format.js { render :delete }
       end
     end
@@ -92,8 +84,8 @@ module Commontator
       @comment.undelete
 
       respond_to do |format|
-        format.html { redirect_to @thread }
-        format.js { render :update }
+        format.html { redirect_to @commontable_url }
+        format.js { render :delete }
       end
     end
     
@@ -104,7 +96,7 @@ module Commontator
       @comment.upvote_from @commontator
 
       respond_to do |format|
-        format.html { redirect_to @thread }
+        format.html { redirect_to @commontable_url }
         format.js { render :vote }
       end
     end
@@ -116,7 +108,7 @@ module Commontator
       @comment.downvote_from @commontator
 
       respond_to do |format|
-        format.html { redirect_to @thread }
+        format.html { redirect_to @commontable_url }
         format.js { render :vote }
       end
     end
@@ -128,7 +120,7 @@ module Commontator
       @comment.unvote :voter => @commontator
 
       respond_to do |format|
-        format.html { redirect_to @thread }
+        format.html { redirect_to @commontable_url }
         format.js { render :vote }
       end
     end
@@ -138,6 +130,7 @@ module Commontator
     def get_comment_and_thread
       @comment = Comment.find(params[:id])
       @thread = @comment.thread
+      get_commontable_url
     end
   end
 end

data/app/controllers/commontator/subscriptions_controller.rb

@@ -1,26 +1,17 @@
 module Commontator
   class SubscriptionsController < ApplicationController
-    include ThreadsHelper
-    
     before_filter :get_thread, :except => :index
 
-    # GET /subscriptions
-    def index
-      @threads = Subscription.find_all_by_subscriber_id(@commontator.id)\
-                             .collect { |cts| cts.thread }
-    end
-
     # POST /1/subscribe
     def create
       raise SecurityTransgression unless @thread.can_subscribe?(@commontator)
 
-      if !@thread.subscribe(@commontator)
-        flash[:alert] = "You are already subscribed to this " + commontable_name(@thread)
-      end
+      @thread.errors.add(:base, "You are already subscribed to this thread") \
+        unless @thread.subscribe(@commontator)
 
       respond_to do |format|
-        format.html { redirect_to @thread }
-        format.js
+        format.html { redirect_to @commontable_url }
+        format.js { render :subscribe }
       end
 
     end
@@ -29,13 +20,12 @@ module Commontator
     def destroy
       raise SecurityTransgression unless @thread.can_subscribe?(@commontator)
 
-      if !@thread.unsubscribe(@commontator)
-        flash[:alert] = "You are not subscribed to this " + commontable_name(@thread)
-      end
+      @thread.errors.add(:base, "You are not subscribed to this thread") \
+        unless @thread.unsubscribe(@commontator)
 
       respond_to do |format|
-        format.html { redirect_to @thread }
-        format.js
+        format.html { redirect_to @commontable_url }
+        format.js { render :subscribe }
       end
     end
   end

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

@@ -1,24 +1,19 @@
 module Commontator
   class SubscriptionsController < ApplicationController
+    helper ThreadsHelper
+    
     before_filter :get_thread, :except => :index
 
-    # GET /subscriptions
-    def index
-      @threads = Subscription.find_all_by_subscriber_id(@commontator.id)\
-                             .collect { |cts| cts.thread }
-    end
-
     # POST /1/subscribe
     def create
       raise SecurityTransgression unless @thread.can_subscribe?(@commontator)
 
-      if !@thread.subscribe(@commontator)
-        flash[:alert] = "You are already subscribed to this " + commontable_name(@thread)
-      end
+      @thread.errors.add(:base, "You are already subscribed to this thread") \
+        unless @thread.subscribe(@commontator)
 
       respond_to do |format|
-        format.html { redirect_to @thread }
-        format.js
+        format.html { redirect_to @commontable_url }
+        format.js { render :subscribe }
       end
 
     end
@@ -27,13 +22,12 @@ module Commontator
     def destroy
       raise SecurityTransgression unless @thread.can_subscribe?(@commontator)
 
-      if !@thread.unsubscribe(@commontator)
-        flash[:alert] = "You are not subscribed to this " + commontable_name(@thread)
-      end
+      @thread.errors.add(:base, "You are not subscribed to this thread") \
+        unless @thread.unsubscribe(@commontator)
 
       respond_to do |format|
-        format.html { redirect_to @thread }
-        format.js
+        format.html { redirect_to @commontable_url }
+        format.js { render :subscribe }
       end
     end
   end

data/app/controllers/commontator/threads_controller.rb

@@ -9,7 +9,7 @@ module Commontator
       @thread.mark_as_read_for(@commontator)
 
       respond_to do |format|
-        format.html
+        format.html { redirect_to @commontable_url }
         format.js
       end
     end
@@ -22,8 +22,7 @@ module Commontator
       @thread.thread_closed_callback(@commontator)
 
       respond_to do |format|
-        format.html { redirect_to @thread }
-        format.js
+        format.html { redirect_to @commontable_url }
       end
     end
     
@@ -34,8 +33,7 @@ module Commontator
       @thread.reopen
 
       respond_to do |format|
-        format.html { redirect_to @thread }
-        format.js
+        format.html { redirect_to @commontable_url }
       end
     end
   end

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

@@ -1,6 +1,5 @@
 module Commontator
   class ThreadsController < ApplicationController
-  
     before_filter :get_thread
 
     # GET /threads/1
@@ -10,7 +9,7 @@ module Commontator
       @thread.mark_as_read_for(@commontator)
 
       respond_to do |format|
-        format.html
+        format.html { redirect_to commontable_url(@thread) }
         format.js
       end
     end
@@ -23,8 +22,7 @@ module Commontator
       @thread.thread_closed_callback(@commontator)
 
       respond_to do |format|
-        format.html { redirect_to @thread }
-        format.js
+        format.html { redirect_to commontable_url(@thread) }
       end
     end
     
@@ -35,8 +33,7 @@ module Commontator
       @thread.reopen
 
       respond_to do |format|
-        format.html { redirect_to @thread }
-        format.js
+        format.html { redirect_to commontable_url(@thread) }
       end
     end
   end