radiant-forum-extension 1.2.1 → 2.0.0

data/spec/controllers/admin/forums_controller_spec.rb

@@ -34,7 +34,7 @@ describe Admin::ForumsController do
       it "should deny you access to #{action} action if you are not an admin" do
         lambda { 
           send(method, action, :id => forum_id(:public)) 
-        }.should restrict_access(:deny => [users(:developer), users(:existing)],
+        }.should restrict_access(:deny => [users(:designer), users(:existing)],
                                  :url => '/admin/page')
       end
     end
@@ -47,7 +47,7 @@ describe Admin::ForumsController do
       it "should allow you to access to #{action} action even if you are not an admin" do
         lambda { 
           send(method, action, :id => forum_id(:public)) 
-        }.should restrict_access(:allow => [users(:developer), users(:admin), users(:existing)], :url => '/admin/pages')
+        }.should restrict_access(:allow => [users(:designer), users(:admin), users(:existing)], :url => '/admin/pages')
       end
     end
   end

data/spec/controllers/forums_controller_spec.rb

@@ -1,8 +1,6 @@
 require File.dirname(__FILE__) + '/../spec_helper'
-Radiant::Config['reader.layout'] = 'Main'
 
 describe ForumsController do
-  dataset :forum_readers
   dataset :forums
 
   before do
@@ -33,10 +31,9 @@ describe ForumsController do
   end
   
   [:new, :edit, :update, :create, :destroy].each do |action|
-    it "should redirect #{action} requests to admin login" do
-      get action, :id => forum_id(:public)
-      response.should be_redirect
-      response.should redirect_to(admin_forums_url)
+    it "should fail #{action} requests" do
+      lambda { get action, :id => forum_id(:public) }.should raise_error ActionController::RoutingError
     end
   end
+
 end

data/spec/controllers/posts_controller_spec.rb

@@ -1,9 +1,7 @@
 require File.dirname(__FILE__) + '/../spec_helper'
-Radiant::Config['reader.layout'] = 'Main'
 
 describe PostsController do
-  dataset :layouts
-  dataset :posts
+  dataset :forums
   
   before do
     Page.current_site = sites(:test) if defined? Site
@@ -24,41 +22,45 @@ describe PostsController do
       response.should render_template("index")
     end  
   end
-
-  describe "on get to search" do
-    before do
-      get :search
-    end
-
-    it "should redirect to login" do
-      response.should be_redirect
-      response.should redirect_to(reader_login_url)
-    end  
-  end
     
   describe "on get to show" do
     
     describe "for a page comment" do
       before do
+        Radiant::Config['forum.public?'] = true
         @comment = posts(:comment)
         @page = pages(:commentable)
-        get :show, :id => post_id(:comment), :topic_id => topic_id(:comments), :forum_id => forum_id(:comments)
+        get :show, :id => post_id(:comment)
       end
       it "should redirect to the page address and post anchor" do
         response.should be_redirect
-        response.should redirect_to(@page.url + "##{@comment.dom_id}")
+        response.should redirect_to(@page.url + "?page=1##{@comment.dom_id}")
       end
     end
     
-    describe "for a normal post" do
+    describe "for a first post" do
+      before do
+        Radiant::Config['forum.public?'] = true
+        get :show, :id => post_id(:first)
+      end
+      it "should redirect to the topic" do
+        response.should be_redirect
+        response.should redirect_to(forum_topic_url(@topic.forum, @topic))
+      end
+    end
+
+    describe "for a reply" do
       before do
-        get :show, :id => @post.id, :topic_id => @topic.id, :forum_id => @forum.id
+        Radiant::Config['forum.public?'] = true
+        get :show, :id => post_id(:second)
       end
-      it "should redirect to the topic address, post page and post anchor" do
+      it "should redirect to the topic with the page and anchor of the post" do
         response.should be_redirect
-        response.should redirect_to(forum_topic_url(@topic.forum, @topic, {:page => @post.topic_page, :anchor => "post_#{@post.id}"}))
+        response.should redirect_to(forum_topic_url(@topic.forum, @topic, {:page => posts(:second).page_when_paginated, :anchor => "post_#{posts(:second).id}"}))
       end
     end
+
+
   end
   
   describe "on get to new" do
@@ -82,12 +84,12 @@ describe PostsController do
         end
       end
       
-      describe "by xmlhttprequest" do
+      describe "over xmlhttp" do
         before do
           xhr :get, :new, {:topic_id => topic_id(:older), :forum_id => forum_id(:public)}
         end
 
-        it "should render a bare login form for inclusion in the page" do
+        it "should render a bare login form" do
           response.should be_success
           response.should render_template('reader_sessions/_login_form')
           response.layout.should be_nil
@@ -125,19 +127,19 @@ describe PostsController do
 
         it "should render the new post form in the normal way" do
           response.should be_success
-          response.should render_template("new")
+          response.should render_template("posts/new")
           response.layout.should == 'layouts/radiant'
         end
       end
 
-      describe "by xmlhttprequest" do
+      describe "over xmlhttp" do
         before do
           xhr :get, :new, :topic_id => @topic.id, :forum_id => forum_id(:public)
         end
 
-        it "should render a bare comment form for inclusion in the page" do
+        it "should render a bare post form" do
           response.should be_success
-          response.should render_template('posts/_reply')
+          response.should render_template('posts/_form')
           response.layout.should be_nil
         end
       end
@@ -182,12 +184,12 @@ describe PostsController do
             flash[:error].should =~ /locked/
           end
         end
-        describe "by xmlhttprequest" do
+        describe "over xmlhttp" do
           before do
             xhr :post, :create, :post => {:body => 'otherwise complete'}, :topic_id => @topic.id, :forum_id => forum_id(:public)
           end
 
-          it "should render a bare 'locked' template for inclusion in the page" do
+          it "should render a bare 'locked' template" do
             response.should be_success
             response.should render_template('topics/_locked')
             response.layout.should be_nil
@@ -219,7 +221,7 @@ describe PostsController do
 
           it "should re-render the bare post form" do
             response.should be_success
-            response.should render_template('new')
+            response.should render_template('posts/_form')
             response.layout.should be_nil
           end
           
@@ -232,58 +234,58 @@ describe PostsController do
         login_as_reader(:normal)
       end
 
-      it "should create the post" do
-        post :create, :post => {:body => 'test post body'}, :topic_id => @topic.id, :forum_id => forum_id(:public)
-        topic = Topic.find(@topic.id)
-        topic.should_not be_nil
-        topic.posts[-1].body.should == 'test post body'
-      end
-      
-      describe "over xmlhttp" do
+      describe "over normal http" do
         before do
-          xhr :post, :create, :post => {:body => 'test post body'}, :topic_id => @topic.id, :forum_id => forum_id(:public)
+          alphabet = ("a".."z").to_a
+          @body = Array.new(64, '').collect{alphabet[rand(alphabet.size)]}.join
+          post :create, :post => {:body => @body}, :topic_id => @topic.id, :forum_id => forum_id(:public)
+          @post = Post.find_by_body(@body)
         end
-        it "should return the formatted message for inclusion in the page" do
-          response.should be_success
-          response.should render_template('show')
-          response.layout.should be_nil
+
+        it "should create the post" do
+          @post.should_not be_nil
         end
-      end
 
-      describe "over normal http" do
-        before do
-          alphabet = ("a".."z").to_a
-          body = Array.new(64, '').collect{alphabet[rand(alphabet.size)]}.join
-          post :create, :post => {:body => body}, :topic_id => @topic.id, :forum_id => forum_id(:public)
-          @post = Post.find_by_body(body)
+        it "should associate the post with its topic" do
+          @post.topic.should == @topic
         end
 
         it "should redirect to the right topic and page" do
           response.should be_redirect
-          response.should redirect_to(forum_topic_url(@forum, @topic, {:page => @post.topic_page, :anchor => "post_#{@post.id}"}))
+          response.should redirect_to(forum_topic_url(@forum, @topic, {:page => @post.page_when_paginated, :anchor => "post_#{@post.id}"}))
+        end
+      end
+
+      describe "over xmlhttp" do
+        before do
+          xhr :post, :create, :post => {:body => 'test post body'}, :topic_id => @topic.id, :forum_id => forum_id(:public)
+        end
+
+        it "should return the formatted message for inclusion in the page" do
+          response.should be_success
+          response.should render_template('posts/_post')
+          response.layout.should be_nil
         end
       end
 
       describe "to attach a comment to a page" do
         before do
           login_as_reader(:normal)
-          post :create, :post => {:body => "I ain't getting in no plane."}, :page_id => page_id(:commentable)
-          @topic = pages(:commentable).topic
+          post :create, :post => {:body => "I ain't getting in no plane.", :page_id => page_id(:commentable)}
           @post = Post.find_by_body("I ain't getting in no plane.")
         end
         
-        it "should create a page topic" do
-          @topic.should_not be_nil
-        end
-        
-        it "should reuse the page topic if it already exists" do
-          post :create, :post => {:body => 'barbecue'}, :page_id => page_id(:commentable)
-          Post.find_by_body('barbecue').topic.should == @topic
+        it "should create the post" do
+          @post.should_not be_nil
         end
 
         it "should attach the post to the page" do
           @post.page.should == pages(:commentable)
         end
+
+        it "should not associate the post with a topic" do
+          @post.topic.should be_nil
+        end
         
         it "should clear the cache" do
           Radiant::Cache.should_receive(:clear)
@@ -305,6 +307,21 @@ describe PostsController do
         end
       end
       
+      describe "to start a new topic" do
+        before do
+          login_as_reader(:normal)
+          post :create, :post => {:body => "Madam, I would drink it.", :topic_attributes => {:name => "Winston, I would poison your tea.", :forum_id => forum_id(:public)}}
+          @topic = Topic.find_by_name("Winston, I would poison your tea.")
+          @post = Post.find_by_body("Madam, I would drink it.")
+        end
+        
+        it "should create the joined topic and post" do
+          @topic.should_not be_nil
+          @post.should_not be_nil
+          @post.topic.should == @topic
+          @topic.posts.first.should == @post
+        end
+      end
     end
   end
 end

data/spec/controllers/topics_controller_spec.rb

@@ -1,10 +1,7 @@
 require File.dirname(__FILE__) + '/../spec_helper'
-Radiant::Config['reader.layout'] = 'Main'
 
 describe TopicsController do
-  dataset :forum_readers
-  dataset :layouts
-  dataset :topics
+  dataset :forums
 
   before do
     Page.current_site = sites(:test) if defined? Site
@@ -35,99 +32,11 @@ describe TopicsController do
       response.should render_template("show")
     end
   end
-  
-  describe "on get to new" do
-    describe "without a logged-in reader" do
-      before do
-        logout_reader
-        get :new, :forum_id => forum_id(:public)
-      end
-      it "should redirect to login" do
-        response.should be_redirect
-        response.should redirect_to(reader_login_url)
-      end
-      it "should store the return address in the session" do
-        request.session[:return_to].should == request.request_uri
-      end
-    end
 
-    describe "with a logged-in reader" do
-      before do
-        login_as_reader(:normal)
-        get :new, :forum_id => forum_id(:public)
-      end
-      it "should render the new topic form" do
-        response.should be_success
-        response.should render_template("new")
-      end  
+  [:new, :edit, :update, :create, :destroy].each do |action|
+    it "should fail #{action} requests" do
+      lambda { get action, :id => forum_id(:public) }.should raise_error ActionController::RoutingError
     end
   end
 
-  describe "on post to create" do
-    describe "without a logged-in reader" do
-      before do
-        logout_reader
-        post :create, :forum_id => forum_id(:public), :topic => {:name => 'another test topic', :body => 'topic body'}
-      end
-      it "should redirect to login" do
-        response.should be_redirect
-        response.should redirect_to(reader_login_url)
-      end
-    end
-
-    describe "with a logged-in reader" do
-      before do
-        Page.current_site = sites(:test) if defined? Site
-        login_as_reader(:normal)
-      end
-      describe "but an invalid topic field" do
-        before do
-          post :create, :forum_id => forum_id(:public), :topic => {:name => '', :body => 'topic body'}
-        end
-        it "should rerender the topic form" do
-          response.should be_success
-          response.should render_template("new")
-        end
-      end
-
-      describe "but an invalid post" do
-        before do
-          post :create, :forum_id => forum_id(:public), :topic => {:name => 'topic name', :body => ''}
-        end
-        it "should rerender the topic form" do
-          response.should be_success
-          response.should render_template("new")
-        end
-      end
-
-      describe "and a valid request" do
-        before do
-          post :create, :forum_id => forum_id(:public), :topic => {:name => 'another test topic', :body => 'topic body'}
-          @topic = Topic.find_by_name('another test topic')
-        end
-        it "should create the topic" do
-          @topic.should_not be_nil
-          @topic.forum.should == forums(:public)
-          @topic.posts.first.should_not be_nil
-          @topic.posts.first.body.should == 'topic body'
-        end
-        it "should assign the topic to the current reader" do
-          @topic.reader.should_not be_nil
-          @topic.reader.should == readers(:normal)
-        end
-        it "should create the topic's first post" do
-          @topic.first_post.should_not be_nil
-          @topic.first_post.body.should == 'topic body'
-          @topic.first_post.topic.should == @topic
-        end
-        it "should redirect to the topic page" do
-          response.should be_redirect
-          response.should redirect_to(forum_topic_url(@topic.forum, @topic))
-        end
-      end
-    end
-  end
-
-
-
 end

data/spec/datasets/forum_readers_dataset.rb

@@ -7,6 +7,7 @@ class ForumReadersDataset < Dataset::Base
   def load
     create_reader "Normal"
     create_reader "Idle"
+    create_reader "Notable"
     create_reader "Activated"
     create_reader "User", :user_id => user_id(:existing)
     create_reader "Admin", :user_id => user_id(:admin)

data/spec/datasets/forums_dataset.rb

@@ -1,28 +1,109 @@
 class ForumsDataset < Dataset::Base
-  uses :forum_sites if defined? Site
+  uses :forum_readers, :home_page, :users
   
-  def load
-    create_forum "Public"
-    create_forum "Private"
-    create_forum "Misc"
-    create_forum "Comments", :for_comments => true
+  def load  
+    create_layout "Forum"
+
+    create_forum "Public" do
+      create_topic "older", :reader => readers(:normal), :replied_at => 2.days.ago do
+        add_post "First", :created_at => 2.days.ago, :body => 'original topic message'
+        add_post "Second", :created_at => 1.day.ago, :body => 'first reply to public topic'
+      end
+      create_topic "newer", :reader => readers(:normal), :replied_at => 1.day.ago
+    end
+      
+    create_forum "Private" do
+      create_topic "sticky", :reader => readers(:normal), :replied_at => 3.days.ago, :sticky => true
+      create_topic "locked", :reader => readers(:normal), :locked => true, :replied_at => 1.year.ago
+      create_topic "private", :reader => readers(:normal), :replied_at => 1.day.ago do
+        add_post "Third", :created_at => 4.hours.ago, :body => 'Reply to private topic'
+      end
+    end
+    
+    create_forum "Misc" do
+      create_topic "empty", :reader => readers(:notable)
+    end
+    
+    create_page "Commentable", :commentable => true, :comments_closed => false, :created_by => users(:admin) do
+      add_post "Comment", :created_at => 2.days.ago, :body => 'first comment on page'
+      add_post "Recomment", :created_at => 1.day.ago, :body => 'second comment on page'
+    end
+
+    create_page "Uncommented", :commentable => true, :comments_closed => false, :created_by => users(:admin)
+    create_page "Uncommentable", :commentable => false, :comments_closed => false, :created_by => users(:admin)
+    create_page "Comments closed", :commentable => true, :comments_closed => true, :created_by => users(:admin)
   end
   
   helpers do
+    def create_layout(name, attributes={})
+      create_model :layout, name.symbolize, attributes.update(:name => name)
+    end
+
     def create_forum(name, attributes={})
-      create_model :forum, name.symbolize, attributes.update(:name => name)
+      attributes = forum_attributes(attributes.update(:name => name))
+      symbol = name.symbolize
+      create_model :forum, symbol, attributes
+      if block_given?
+        @forum_id = forum_id(symbol)
+        yield
+        @forum_id = nil
+      end
     end
     
+    def create_topic(name, attributes={})
+      attributes = topic_attributes(attributes.update(:name => name))
+      symbol = name.symbolize
+      reader = attributes.delete(:reader)
+      create_model :topic, symbol, attributes
+      @topic_id = topic_id(symbol)
+      add_post("#{name}_first_post", :reader => reader)
+      yield if block_given?
+      @topic_id = nil
+    end
+  
+    def add_post(name, attributes={})
+      attributes = post_attributes(attributes)
+      symbol = name.symbolize
+      create_model :post, symbol, attributes
+      if block_given?
+        @post_id = post_id(symbol)
+        yield
+        @post_id = nil
+      end
+    end
+ 
     def forum_attributes(attributes={})
       name = attributes[:name] || "Forum"
       symbol = name.symbolize
       attributes = { 
         :name => name,
+        :created_at => Time.now
       }.merge(attributes)
-      attributes[:site] = sites(:test) if defined? Site
+      attributes[:site_id] = site_id(:test) if Forum.reflect_on_association(:site)
       attributes
     end
-    
+
+    def topic_attributes(attributes={})
+      name = attributes[:name] || "A topic"
+      att = {
+        :name => name,
+        :forum_id => @forum_id
+      }.merge(attributes)
+      attributes[:site_id] ||= site_id(:test) if Topic.reflect_on_association(:site)
+      att
+    end
+  
+    def post_attributes(attributes={})
+      att = {
+        :body => "Message body",
+        :reader => readers(:normal),
+        :created_at => 1.day.ago,
+        :topic_id => @topic_id,
+        :page_id => @current_page_id
+      }.merge(attributes)
+      att[:site_id] ||= site_id(:test) if Post.reflect_on_association(:site)
+      att
+    end
   end
- 
+  
 end