db/migrate/20090208061237_add_allow_comments_to_posts.rb @@ -10,6 +10,8 @@ class Post < ActiveRecord::Base validates_presence_of :user_id, :unless => :feed_id validates_presence_of :feed_id, :unless => :user_id + before_save :mark_uncommentable, :if => :from_feed? + class << self def paginate_index(options={}) active.paginate({:order => 'posts.created_at DESC', :include => [:comments, :feed]}.merge(options)) @@ -27,7 +29,7 @@ class Post < ActiveRecord::Base end def type - attributes['type'] + self[:type] end def to_param @@ -49,9 +51,16 @@ class Post < ActiveRecord::Base def to_html text = case format - when 'HTML' then content - else RedCloth.new(content, [:filter_styles, :no_span_caps]).to_html - end + when 'HTML' then content + else RedCloth.new(content, [:filter_styles, :no_span_caps]).to_html + end + end + + private + + def mark_uncommentable + self.allow_comments = false + self # otherwise this returns false and we can't save end end app/models/post.rb @@ -9,14 +9,6 @@ class Article < Post attr_accessible :content, :header, :permalink, :allow_comments - def allow_comments=(status) - self.feed_id = (status == '0') ? 0 : nil - end - - def allow_comments? - feed_id.nil? - end - def link(root='') from_feed? ? permalink : super end app/models/posts/article.rb @@ -21,7 +21,7 @@ <%- else -%> -<%= render :partial => "/posts/types/comments.html.erb" %> +<%= render :partial => "/posts/types/comments.html.erb" if post.allow_comments? %> <small><%= link_to 'Click here to go home', root_path %></small> app/views/posts/types/_snippet.html.erb @@ -9,7 +9,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 7) do +ActiveRecord::Schema.define(:version => 20090208061237) do create_table "comments", :force => true do |t| t.integer "commentable_id" @@ -52,6 +52,7 @@ ActiveRecord::Schema.define(:version => 7) do t.datetime "updated_at" t.datetime "deleted_at" t.string "format" + t.boolean "allow_comments", :default => true end create_table "users", :force => true do |t| db/schema.rb @@ -30,7 +30,7 @@ class CommentsControllerTest < ActionController::TestCase def test_should_clear_spammy_comments login_as :quentin - Comment.update_all(['spam = ?', true]) + Comment.update_all(['spam = ?', 1]) assert_difference('Comment.count', -2) do delete :spammy end test/functional/comments_controller_test.rb @@ -27,14 +27,6 @@ class ArticleTest < ActiveSupport::TestCase assert_not_nil article.permalink end - def test_should_have_allow_comments_boolean_helper - article = create_article - assert article.allow_comments? - article.user_id = nil - article.feed_id = feeds(:one).id - assert ! article.allow_comments? - end - def test_should_have_from_feed_boolean_helper article = create_article assert ! article.from_feed? test/unit/article_test.rb @@ -15,17 +15,10 @@ class BlogTest < ActiveSupport::TestCase def test_should_create_articles assert_difference 'Article.count', 9 do - blog = create_blog - blog.refresh! - end - - blog_articles = Article.find(:all, :conditions => 'feed_id NOT NULL') - assert blog_articles.size >= 9 - blog_articles.each do |j| - assert_equal "HTML", j.format + create_blog.refresh! end end - + def test_should_not_create_posts_twice blog = create_blog blog.refresh! test/unit/blog_test.rb @@ -4,7 +4,7 @@ class PostTest < ActiveSupport::TestCase def test_should_create_post assert_difference 'Post.count' do - post = create_post + create_post end end @@ -35,6 +35,11 @@ class PostTest < ActiveSupport::TestCase post = create_post :feed_id => 1 assert_equal post.id.to_s, post.to_param end + + def test_not_allow_comments_if_from_feed + post = create_post :feed_id => 1 + assert ! post.allow_comments? + end def test_should_be_deleted_not_destroyed post = posts(:one) test/unit/post_test.rb 000e160b78780c034e2963031d2159e5146ec45c Pat Nakajima patnakajima@gmail.com http://github.com/nakajima/aintablog/commit/cec423e5af97125f0fa938cdceaf2aa470bdce0d cec423e5af97125f0fa938cdceaf2aa470bdce0d 2009-02-07T22:38:59-08:00 2009-02-07T22:38:59-08:00 Made Post#allow_comments a proper attribute. This was a long time coming. Instead of the hacky "feed_id = 0", there's a proper attribute to determine whether or not a given post should allow comments. 83881e25b3a996692053bc5e918f27e68e6a2d76 Pat Nakajima patnakajima@gmail.com