Use filter to reject if user is banned

Extract checking whether a user is banned from making Comments on an
InfoRequest to a filter in CommentController.

Removes responsibility from the #new method.

Adds a missing spec.

1 files changed, 9 insertions, 7 deletions

diff --git a/app/controllers/comment_controller.rb b/app/controllers/comment_controller.rb
index ce022f000..5e39c3a2c 100644
--- a/app/controllers/comment_controller.rb
+++ b/app/controllers/comment_controller.rb
@@ -9,6 +9,7 @@ class CommentController < ApplicationController
     before_filter :find_info_request, :only => [ :new ]
     before_filter :create_track_thing, :only => [ :new ]
     before_filter :reject_unless_comments_allowed, :only => [ :new ]
+    before_filter :reject_if_user_banned, :only => [ :new ]
     protect_from_forgery :only => [ :new ]
 
     def new
@@ -19,13 +20,6 @@ class CommentController < ApplicationController
             }))
         end
 
-        # Banned from adding comments?
-        if !authenticated_user.nil? && !authenticated_user.can_make_comments?
-            @details = authenticated_user.can_fail_html
-            render :template => 'user/banned'
-            return
-        end
-
         if params[:comment]
             # XXX this check should theoretically be a validation rule in the model
             @existing_comment = Comment.find_existing(@info_request.id, params[:comment][:body])
@@ -106,4 +100,12 @@ class CommentController < ApplicationController
         end
     end
 
+    # Banned from adding comments?
+    def reject_if_user_banned
+        if authenticated_user && !authenticated_user.can_make_comments?
+            @details = authenticated_user.can_fail_html
+            render :template => 'user/banned'
+        end
+    end
+
 end