@@ -1,10 +1,11 @@ class Forum < ActiveRecord::Base acts_as_list + has_permalink :name, :slug named_scope :ordered, {:order => "#{Forum.table_name}.position ASC"} - has_many :topics, :order => "#{Topic.table_name}.sticky DESC, #{Topic.table_name}.last_updated_at DESC", :dependent => :delete_all + has_many :topics, :order => "#{Topic.table_name}.sticky DESC, #{Topic.table_name}.last_updated_at DESC", :dependent => :destroy validates_presence_of :name app/models/forum.rb @@ -1,21 +1,42 @@ +module Posts + module Callbacks + def self.included(base) + base.send :include, Posts::Callbacks::InstanceMethods + base.before_validation_on_create :set_forum_from_topic + end + + module InstanceMethods + protected + + def set_forum_from_topic + self.forum = self.topic.forum + end + end + end + module Validations + def self.included(base) + base.send :include, Posts::Validations::InstanceMethods + base.validate :topic_is_not_locked, :if => lambda {|post| post.topic && post.topic.posts_count > 0} + base.validates_presence_of :author_id, :forum_id, :topic_id, :body + end + + module InstanceMethods + protected + + def topic_is_not_locked + errors.add(:topic_id, "is locked") if self.topic.locked? + end + end + end +end + class Post < ActiveRecord::Base + include Posts::Callbacks + include Posts::Validations + belongs_to :author, :class_name => "User", :foreign_key => :author_id, :counter_cache => true belongs_to :forum, :counter_cache => true belongs_to :topic, :counter_cache => true - before_validation_on_create :set_forum_from_topic - validate :topic_is_not_locked, :if => lambda {|post| post.topic && post.topic.posts_count > 0} - validates_presence_of :author_id, :forum_id, :topic_id, :body - delegate :name, :to => :forum, :prefix => true - - protected - - def set_forum_from_topic - self.forum = self.topic.forum - end - - def topic_is_not_locked - errors.add(:topic_id, "is locked") if self.topic.locked? - end end \ No newline at end of file app/models/post.rb @@ -1,8 +1,37 @@ +module Topics + module Callbacks + def self.included(base) + base.send :include, Topics::Callbacks::InstanceMethods + base.after_create :create_initial_post + end + + module InstanceMethods + protected + def create_initial_post + self.posts.create(:author => self.creator, :body => self.body) + end + end + end + module Validations + def self.included(base) + base.validates_presence_of :title, :creator_id, :forum_id + base.validates_presence_of :body, :on => :create + end + end + module NamedScopes + def self.included(base) + base.named_scope :sticky, { :conditions => {:sticky => true} } + base.named_scope :not_sticky, { :conditions => {:sticky => false} } + end + end +end + class Topic < ActiveRecord::Base - has_permalink :title, :slug, :scope => :forum_id + include Topics::Callbacks + include Topics::Validations + include Topics::NamedScopes - named_scope :sticky, { :conditions => {:sticky => true} } - named_scope :not_sticky, { :conditions => {:sticky => false}} + has_permalink :title, :slug, :scope => :forum_id belongs_to :forum, :counter_cache => true belongs_to :creator, :class_name => "User", :foreign_key => :creator_id @@ -12,13 +41,7 @@ class Topic < ActiveRecord::Base belongs_to :last_post, :class_name => "Post", :foreign_key => :last_post_id belongs_to :last_user, :class_name => "User", :foreign_key => :last_user_id - validates_presence_of :title, :creator_id, :forum_id - validates_presence_of :body, :on => :create - - after_create :create_initial_post - attr_accessible :title, :body, :forum, :creator, :sticky, :locked - attr_accessor :body def view! @@ -28,10 +51,4 @@ class Topic < ActiveRecord::Base def to_param self.slug end - - protected - - def create_initial_post - self.posts.create(:author => self.creator, :body => self.body) - end end app/models/topic.rb @@ -8,11 +8,11 @@ class ForumPresenter end def can_be_edited_by_current_user? - !!(@current_user && @current_user.has_privilege?(:admin)) + is_current_user_admin? end def can_be_deleted_by_current_user? - false + is_current_user_admin? end def can_topic_be_created_by_current_user? @@ -22,4 +22,10 @@ class ForumPresenter def method_missing(call, *args) @forum.send call, *args end + + private + + def is_current_user_admin? + !!(@current_user && @current_user.has_privilege?(:admin)) + end end \ No newline at end of file app/presenters/forum_presenter.rb @@ -5,8 +5,9 @@ class ForumsPresenter def initialize(options = {}) options.assert_valid_keys(:forums, :current_user) - @forums = options[:forums] || Forum.ordered @current_user = options[:current_user] + @forums = options[:forums] || Forum.ordered + @forums = @forums.map {|forum| ForumPresenter.new(:forum => forum, :current_user => @current_user) } end def can_be_created_by_current_user? app/presenters/forums_presenter.rb @@ -3,7 +3,9 @@ <% forums.each do |forum| %> <% zebra_row :id => dom_id(forum), :class => ("grabbable" if forums.can_be_reordered_by_current_user?) do %> <td> - <%= link_to forum.name, forum %> + <%= link_to forum.name, forum %> + <%= link_to "Delete", forum, :method => :delete, :confirm => "Are you sure?" if forum.can_be_deleted_by_current_user? %> + <%= textilize forum.description %> </td> <td class="number"><%= forum.topics_count %></td> app/views/forums/_recordset.html.erb @@ -2,11 +2,15 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') describe Post do before(:each) do - @valid_attributes = { - } - end - - it "should create a new instance given valid attributes" do - Post.create!(@valid_attributes) + @post = Generate.post end + + it { @post.should be_valid } + it { @post.should belong_to(:forum) } + it { @post.should belong_to(:topic) } + it { @post.should belong_to(:author) } + it { @post.should validate_presence_of(:author_id) } + it { @post.should validate_presence_of(:forum_id) } + it { @post.should validate_presence_of(:topic_id) } + it { @post.should validate_presence_of(:body) } end spec/models/post_spec.rb @@ -9,8 +9,8 @@ class Generate def self.admin_user(attributes = {}) Generate.user(attributes.reverse_merge({ - :role => "admin", - :privilege => "admin" + :role => "admin", + :privilege => "admin" })) end @@ -20,13 +20,13 @@ class Generate key = ActiveSupport::SecureRandom.hex(16) user = User.new(attributes.reverse_merge({ - :first_name => "John", - :last_name => "Doe", - :password => "password", - :password_confirmation => "password", - :active => true, - :username => key, - :email_address => "#{key}@test.com"})) + :first_name => "John", + :last_name => "Doe", + :password => "password", + :password_confirmation => "password", + :active => true, + :username => key, + :email_address => "#{key}@test.com"})) role = Role.find_or_create_by_name(default_role) privs = [] default_privileges.each {|p| privs << Privilege.find_or_create_by_name(p)} @@ -39,12 +39,22 @@ class Generate def self.topic(attributes = {}) topic = Topic.new(attributes.reverse_merge({ - :body => "Body text", - :forum => Generate.forum, - :creator => Generate.user, - :title => "Random Title" + :body => "Body text", + :forum => Generate.forum, + :creator => Generate.user, + :title => "Random Title" })) topic.save! topic end + + def self.post(attributes = {}) + post = Post.new(attributes.reverse_merge({ + :body => "Test post", + :author => (author = Generate.user), + :topic => Generate.topic(:creator => author) + })) + post.save! + post + end end \ No newline at end of file spec/spec_helpers/generate.rb README 631cc5ddabba7267b513eb5f4a36084a8522e4ed Joshua Clayton jclayton@fusionary.com http://github.com/joshuaclayton/fuzzy-monster/commit/dd7a0751752aa3547d74c770ac16234746c8a7ed dd7a0751752aa3547d74c770ac16234746c8a7ed

2008-11-30T19:05:08-08:00

Updated models to be more modular, updated model factory and a basic post specs 47d963ddda3df7d0ff4b513980599439075b41fe Joshua Clayton jclayton@fusionary.com