@@ -4,7 +4,7 @@ class ModerationsController < ApplicationController cache_sweeper :post_sweeper, :only => %w(update destroy) def index - @comments = Comment.find_unmoderated(:all,:include => :post) + @comments = Comment.unmoderated.find(:all, :include => :post) end def show @@ -35,6 +35,6 @@ class ModerationsController < ApplicationController end private def find_comment - @comment = Comment.find_unmoderated(params[:id]) + @comment = Comment.unmoderated.find(params[:id]) end end app/controllers/moderations_controller.rb @@ -1,21 +1,13 @@ class Comment < ActiveRecord::Base belongs_to :post - # after_create :increment_moderated_comments_counter before_save :convert_body before_destroy :decrement_moderated_comments_counter attr_protected :post_id,:body,:moderated validates_presence_of :author - def Comment.moderated - find(:all,:conditions => {:moderated => true }) - end - - def Comment.find_unmoderated(*args) - with_scope(:find => {:conditions => "moderated = 'f'"}) do - find(*args) - end - end + named_scope :moderated, :conditions => {:moderated => true} + named_scope :unmoderated, :conditions => {:moderated => false} def moderate unless moderated? @@ -34,12 +26,8 @@ private self.post.update_attribute("moderated_comments_count",new_count) end end - def increment_moderated_comments_counter - # Post.increment_count(:moderated_comments_count,self.post_id) if moderated - update_moderated_comment_count if moderated - end + def decrement_moderated_comments_counter - # Post.decrement_count(:moderated_comments_count,self.post_id) if moderated update_moderated_comment_count(-1) if moderated? end end app/models/comment.rb @@ -1,17 +1,18 @@ -# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html +sample_post_moderated_comment: + moderated: true + author: Author + body: <p>Templates are <strong>funky</strong>.</p> + body_raw: Templates are *funky*. + post: sample_post + author_email: "" + author_site: "" -one: - post_id: 1 - author: MyString - author_email: MyString +sample_post_unmoderated_comment: moderated: false - body: MyText - body_raw: MyText + author: Author + body: <p>Templates are <strong>funky</strong>.</p> + body_raw: Templates are *funky*. + post: sample_post + author_email: "" + author_site: "" -two: - post_id: 1 - author: MyString - author_email: MyString - moderated: false - body: MyText - body_raw: MyText test/fixtures/comments.yml @@ -3,9 +3,9 @@ one: title: MyString body: MyText - has_attachment: false + attachment: false two: title: MyString body: MyText - has_attachment: false + attachment: false test/fixtures/pages.yml @@ -35,3 +35,13 @@ non_unique_slug_non_unique_date2: body: MyText body_raw: MyText +sample_post: + slug: new-rails-234-post + category: + body: <p><em>This</em> is a <strong>test</strong> of Rails 2.3.4</p> + body_raw: _This_ is a *test* of Rails 2.3.4 + title: New Rails 2.3.4 Post + closed: false + published: true + moderated_comments_count: 1 + test/fixtures/posts.yml @@ -1,8 +1,45 @@ require File.dirname(__FILE__) + '/../test_helper' class CommentTest < ActiveSupport::TestCase - # Replace this with your real tests. - def test_truth - assert true + + def test_moderated + post = posts(:sample_post) + assert post.comments.moderated.include?(comments(:sample_post_moderated_comment)) + assert !post.comments.moderated.any?{|c| c.moderated == false} + end + + def test_unmoderated + post = posts(:sample_post) + assert post.comments.unmoderated.include?(comments(:sample_post_unmoderated_comment)) + assert !post.comments.unmoderated.any?{|c| c.moderated == true} + end + + def test_moderated + post = posts(:sample_post) + comment = comments(:sample_post_unmoderated_comment) + + assert_equal false, comment.moderated? + comment.moderate + assert comment.moderated? + end + + def test_moderation_increments_comment_counter + post = posts(:sample_post) + comment = comments(:sample_post_unmoderated_comment) + + before = post.moderated_comments_count + comment.moderate + post.reload + assert_equal before + 1, post.moderated_comments_count + end + + def test_destorying_comment_decrements_comment_counter + post = posts(:sample_post) + comment = comments(:sample_post_moderated_comment) + + before = post.moderated_comments_count + comment.destroy + post.reload + assert_equal before - 1, post.moderated_comments_count end end test/unit/comment_test.rb @@ -1,7 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' class PostTest < ActiveSupport::TestCase - fixtures :posts def test_one_post_matching_permalink post = posts(:unique_slug) test/unit/post_test.rb @@ -1,10 +1,9 @@ require File.dirname(__FILE__) + '/../test_helper' -class UserTest < Test::Unit::TestCase +class UserTest < ActiveSupport::TestCase # Be sure to include AuthenticatedTestHelper in test/test_helper.rb instead. # Then, you can remove it from this and the functional test. include AuthenticatedTestHelper - fixtures :users def test_should_create_user assert_difference 'User.count' do test/unit/user_test.rb 918ec2b14bc65e3f4a1ab72e896793866200a142 mrchucho mrchucho@mrchucho.net http://github.com/mrchucho/bbot/commit/30331424d9beb381e6ab22e904a30aeb077435c7 30331424d9beb381e6ab22e904a30aeb077435c7 2009-10-09T08:54:52-07:00 2009-10-09T08:54:52-07:00 Replacing some custom finders with named_scope. Added/Updated Unit Tests. 75d8d12fe4a2112bc8fccc55a3c35cd18282219c mrchucho mrchucho@mrchucho.net