@@ -12,5 +12,7 @@ coverage coverage/* config/*.sphinx.conf config/deploy.rb +config/newrelic.yml .gitignore.swp public/avatars +vendor/plugins/newrelic_rpm .gitignore @@ -1,6 +1,7 @@ class ForumsController < ApplicationController before_filter :store_location, :only => [:index, :show] before_filter :find_category + before_filter :find_forum, :only => [:show] # Shows all root forums. # Limits this selection to forums the current user has access to. @@ -29,20 +30,21 @@ class ForumsController < ApplicationController # Shows a forum. # Checks first if the current user can see it. def show - @forum = Forum.find(params[:id], :include => [{ :topics => :posts }, :moderations, :permissions]) - if !current_user.can?(:see_forum, @forum) - flash[:notice] = t(:forum_permission_denied) - redirect_to forums_path - else - @topics = @forum.topics.sorted.paginate :page => params[:page], :per_page => 30, :order => "sticky DESC" - @forums = @forum.children - @all_forums = Forum.all(:select => "id, title", :order => "title ASC") - [@forum] if current_user.can?(:move_topics, @forum) - @moderated_topics_count = @forum.moderations.topics.for_user(current_user).count - end + @topics = @forum.topics.sorted.paginate :page => params[:page], :per_page => 30, :order => "sticky DESC" + @forums = @forum.children + @all_forums = Forum.all(:select => "id, title", :order => "title ASC") - [@forum] if current_user.can?(:move_topics, @forum) + @moderated_topics_count = @forum.moderations.topics.for_user(current_user).count end private - + def find_forum + @forum = Forum.find(params[:id], :include => [{ :topics => :posts }, :moderations, :permissions]) + if !current_user.can?(:see_forum, @forum) + flash[:notice] = t(:forum_permission_denied) + redirect_to forums_path + end + end + def find_category unless params[:category_id].blank? @category = Category.find(params[:category_id], :include => :forums) app/controllers/forums_controller.rb @@ -6,10 +6,6 @@ class Category < ActiveRecord::Base has_many :permissions has_many :groups, :through => :permissions - named_scope :without_parent, :conditions => { :parent_id => nil } - named_scope :viewable_to, lambda { |user| { :include => [:groups, :permissions], - :conditions => [ - "groups.id IN (?) AND permissions.can_see_category = ? ", - user.groups, true] } } + named_scope :without_parent, :conditions => { :parent_id => nil }, :include => :permissions end app/models/category.rb @@ -2,12 +2,8 @@ class Forum < ActiveRecord::Base acts_as_list :scope => :parent_id acts_as_tree :order => :position - named_scope :without_category, :conditions => { :category_id => nil }, :order => "position" - named_scope :without_parent, :conditions => { :parent_id => nil }, :order => "position" - named_scope :viewable_to, lambda { |user| { :include => [:groups, :permissions], - :conditions => [ - "groups.id IN (?) AND permissions.can_see_forum = ? ", - user.groups, true] } } + named_scope :without_category, :conditions => { :category_id => nil }, :include => :permissions, :order => "position" + named_scope :without_parent, :conditions => { :parent_id => nil }, :include => :permissions, :order => "position" has_many :moderations has_many :posts, :through => :topics, :source => :posts, :order => "posts.created_at DESC" has_many :topics, :order => "topics.created_at DESC", :dependent => :destroy app/models/forum.rb @@ -1,73 +1,42 @@ require File.dirname(__FILE__) + '/../spec_helper' describe ForumsController do - fixtures :users, :forums, :categories - + fixtures :users, :forums, :categories, :groups, :group_users, :permissions + before do + @category = mock_model(Category) + @categories = [@category] @forum = mock_model(Forum) @forums = [@forum] - @topic = mock_model(Topic) - @topics = [@topic] - @category = mock_model(Category) - @admin_forum = forums(:admins_only) - @everybody_forum = forums(:everybody) - @moderation = mock_model(Moderation) - @moderations = [@moderation] - end - - it "should gather forums" do - login_as(:plebian) - Forum.should_receive(:without_category).and_return(@forums) - get 'index' + @test_category = categories(:test) + @admin_category = categories(:admins_only) end - it "should gather forums for a category" do - login_as(:plebian) - Category.should_receive(:find).and_return(@category) - @category.should_receive(:forums).and_return(@forums) - get 'index', :category_id => 1 + describe "plebian" do + before do + login_as(:plebian) + end + + it "should be able to see a list of forums and categories" do + Category.should_receive(:without_parent).and_return(@categories) + Forum.should_receive(:without_category).and_return(@forums) + @forums.should_receive(:without_parent).and_return(@forums) + get 'index' + end + + it "should show a list of forums inside a specific category" do + Category.should_receive(:find).and_return(@category) + @category.should_receive(:forums).and_return(@forums) + @forums.should_receive(:without_parent).and_return(@forums) + get 'index', :category_id => @test_category.id + end + + it "should not be able to see anything inside a restricted category" do + get 'index', :category_id => @admin_category.id + flash[:notice].should eql(t(:category_permission_denied)) + response.should redirect_to(root_path) + end + end - it "should not show the admin forum to anonymous users" do - Forum.should_receive(:find).and_return(@forum) - @forum.should_receive(:viewable?).and_return(false) - get 'show', { :id => @admin_forum.id } - response.should redirect_to(forums_path) - flash[:notice].should_not be_blank - end - - it "should show the general forum to anonymous users" do - Forum.should_receive(:find).and_return(@forum) - @forum.should_receive(:viewable?).and_return(true) - @forum.should_receive(:children).and_return(@forums) - @topics.should_receive(:paginate).and_return(@topics) - @forum.should_receive(:topics).and_return(@topics) - @topics.should_receive(:sorted).and_return(@topics) - @forum.should_receive(:moderations).and_return(@moderations) - @moderations.should_receive(:topics).and_return(@moderations) - @moderations.should_receive(:for_user).and_return(@moderations) - @moderations.should_receive(:count).and_return(0) - @forum.stub!(:position) - get 'show', { :id => @everybody_forum.id } - flash[:notice].should be_blank - response.should render_template("show") - end - - it "should show the admin forum to the administrator" do - login_as(:administrator) - Forum.should_receive(:find).with(@admin_forum.id.to_s, :include => [{ :topics => :posts }, :moderations]).and_return(@forum) - Forum.should_receive(:find).with(:all, :select => "id, title", :order => "title ASC").and_return(@forums) - @forum.should_receive(:viewable?).and_return(true) - @forum.should_receive(:topics).and_return(@topics) - @topics.should_receive(:sorted).and_return(@topics) - @topics.should_receive(:paginate).and_return(@topics) - @forum.should_receive(:children).and_return(@forums) - @forum.should_receive(:moderations).and_return(@moderations) - @moderations.should_receive(:topics).and_return(@moderations) - @moderations.should_receive(:for_user).and_return(@moderations) - @moderations.should_receive(:count).and_return(0) - @forum.stub!(:position) - get 'show', { :id => @admin_forum.id } - response.should render_template("show") - end end spec/controllers/forums_controller_spec.rb @@ -1,3 +1,6 @@ test: name: test - is_visible_to_id: 1 \ No newline at end of file + +admins_only: + name: admins_only + \ No newline at end of file spec/fixtures/categories.yml @@ -2,7 +2,7 @@ admins_only: title: Administrators Only! description: Top secret admin stuff goes here! position: 1 - category: test + category: admins_only moderators_only: title: Moderators Only! spec/fixtures/forums.yml @@ -24,6 +24,11 @@ registered_users_admin_forum: can_see_forum: false forum: admins_only +registered_users_admin_category: + group_id: 2 + can_see_category: false + category: admins_only + registered_users_sub_of_everybody_forum: group_id: 2 can_see_forum: true spec/fixtures/permissions.yml e2f2eca9a2062d87051e26fcee5ba6fb5637d340 Ryan Bigg radarlistener@gmail.com http://github.com/radar/rboard/commit/213df5e5607cb466024652079c2357e658ea8aaf 213df5e5607cb466024652079c2357e658ea8aaf 2009-04-03T05:48:17-07:00 2009-04-03T05:48:17-07:00 Begin forum spec testing. e2fbde9c24745d8b8db835274c7755a0e7344159 Ryan Bigg radarlistener@gmail.com