0
@@ -4,7 +4,9 @@ class CommentSweeper < ArticleSweeper
0
   def after_save(record)
0
     @event.update_attributes :title => record.article.title, :body => record.body, :site => record.article.site,
0
       :article => record.article, :author => record.author, :comment => record if record.approved?
0
+  end
0
 
0
+  def after_update(record)
0
     return if controller.nil?
0
     expire_overview_feed!
0
     pages = CachedPage.find_by_reference(record.article)

0
@@ -1,11 +1,17 @@
0
 class CommentsController < ApplicationController
0
+  cache_sweeper :comment_sweeper
0
   verify :params => [:year, :month, :day, :permalink], :redirect_to => { :controller => 'mephisto', :action => 'list', :sections => [] }
0
+  before_filter :find_article
0
+
0
+  def show
0
+    show_article_with 'message' => 'Thank you for comment.  Your comment requires approval from the blog author before showing up.'
0
+  end
0
 
0
   def create
0
     @article  = site.articles.find_by_permalink(params[:year], params[:month], params[:day], params[:permalink])
0
     
0
     redirect_to(section_url(:sections => [])) and return unless @article
0
-    if request.get? or params[:comment].blank?
0
+    if request.get? || params[:comment].blank?
0
       redirect_to(article_url(@article.hash_for_permalink)) and return
0
     end
0
 
0
@@ -23,15 +29,23 @@ class CommentsController < ApplicationController
0
       logger.info "Checking Akismet (#{Akismet.api_key}) for new comment on Article #{@article.id}.  #{@comment.approved ? 'Approved' : 'Blocked'}"
0
     end
0
 
0
-    assigns = @comment.save ?
0
-      { 'message'  => 'Thank you for comment.  Your comment requires approval from the blog author before showing up.' } :
0
-      { 'errors'   => @comment.errors.full_messages }
0
-
0
-    @comments = @article.comments.reject(&:new_record?).collect(&:to_liquid)
0
-    @article  = @article.to_liquid(:single)
0
-    render_liquid_template_for(:single, assigns.merge('articles' => [@article], 
0
-                                        'article'  => @article, 
0
-                                        'comments' => @comments))
0
-    
0
+    if @comment.save
0
+      redirect_to comment_preview_url(@article.hash_for_permalink(:comment => @comment))
0
+    else
0
+      show_article_with 'errors' => @comment.errors.full_messages
0
+    end
0
   end
0
+  
0
+  protected
0
+    def find_article
0
+      @article = site.articles.find_by_permalink(params[:year], params[:month], params[:day], params[:permalink])
0
+    end
0
+
0
+    def show_article_with(assigns)
0
+      @comments = @article.comments.reject(&:new_record?).collect(&:to_liquid)
0
+      @article  = @article.to_liquid(:single)
0
+      render_liquid_template_for(:single, assigns.merge('articles' => [@article], 
0
+                                          'article'  => @article, 
0
+                                          'comments' => @comments))
0
+    end
0
 end

0
@@ -14,9 +14,12 @@ ActionController::Routing::Routes.draw do |map|
0
   map.connect ':controller/:action/:id/:version', :version => nil, 
0
       :controller => /account|(admin\/\w+)/
0
   
0
-  map.comment ':year/:month/:day/:permalink/comment', :controller => 'comments', :action => 'create',    
0
+  map.comment ':year/:month/:day/:permalink/comment', :controller => 'comments', :action => 'create',
0
       :year => /\d{4}/, :month => /\d{1,2}/, :day => /\d{1,2}/
0
-  
0
+
0
+  map.comment_preview ':year/:month/:day/:permalink/comment/:comment', :controller => 'comments', :action => 'show',
0
+      :year => /\d{4}/, :month => /\d{1,2}/, :day => /\d{1,2}/
0
+
0
   map.with_options :controller => 'mephisto' do |m|
0
     m.article ':year/:month/:day/:permalink', :action => 'show',    
0
       :year => /\d{4}/, :month => /\d{1,2}/, :day => /\d{1,2}/

0
@@ -29,9 +29,7 @@ class CommentsControllerTest < Test::Unit::TestCase
0
           :author_ip => '127.0.0.1'
0
         })
0
         assert_response :redirect
0
-        assert_redirected_to @controller.url_for(contents(:welcome).hash_for_permalink(:controller => 'mephisto', 
0
-                                                                                       :action     => 'show', 
0
-                                                                                       :anchor     => "comment_#{assigns(:comment).id}"))
0
+        assert_redirected_to comment_preview_url(contents(:welcome).hash_for_permalink(:comment => assigns(:comment)))
0
         contents(:welcome).reload
0
       end
0
     end
0
@@ -46,9 +44,7 @@ class CommentsControllerTest < Test::Unit::TestCase
0
           :author    => 'approved bob',
0
           :author_ip => '127.0.0.1'
0
         })
0
-        assert_redirected_to @controller.url_for(contents(:cupcake_welcome).hash_for_permalink(:controller => 'mephisto', 
0
-                                                                                       :action     => 'show', 
0
-                                                                                       :anchor     => "comment_#{assigns(:comment).id}"))
0
+        assert_redirected_to comment_preview_url(contents(:cupcake_welcome).hash_for_permalink(:comment => assigns(:comment)))
0
         contents(:cupcake_welcome).reload
0
       end
0
     end