radiant-forum-extension 2.1.4 → 2.1.6

data/VERSION

@@ -1 +1 @@
-2.1.4
+2.1.6

data/app/controllers/forum_base_controller.rb

@@ -14,16 +14,12 @@ protected
   
   def establish_context
     @reader = Reader.find(params[:reader_id]) unless params[:reader_id].blank?
-    @topic = Topic.find(params[:topic_id]) unless params[:topic_id].blank?
-    @forum = Forum.find(params[:forum_id]) unless params[:forum_id].blank?
-    @page = Page.find(params[:page_id]) unless params[:page_id].blank?
+    @topic = Topic.visible_to(current_reader).find(params[:topic_id]) unless params[:topic_id].blank?
+    @forum = Forum.visible_to(current_reader).find(params[:forum_id]) unless params[:forum_id].blank?
+    @page = Page.visible_to(current_reader).find(params[:page_id]) unless params[:page_id].blank?
   end
 
   def redirect_to_post
-    
-    Rails.logger.warn "!!! redirecting to post #{@post.inspect}"
-    Rails.logger.warn "!   which will have topic #{@post.topic} and within it page #{@post.page_when_paginated}"
-    
     if (@post.page)
       redirect_to "#{@post.page.url}?#{WillPaginate::ViewHelpers.pagination_options[:param_name]}=#{@post.page_when_paginated}##{@post.dom_id}"
     elsif @post.first?
@@ -54,9 +50,17 @@ protected
 
   def render_page_or_feed(template_name = action_name)
     respond_to do |format|
-      format.html { render :action => template_name }
-      format.rss { render :action => template_name, :layout => 'feed' }
-      format.js { render :action => template_name, :layout => false }
+      format.html { 
+        expires_now
+        render :action => template_name 
+      }
+      format.rss { 
+        expires_now
+        render :action => template_name, :layout => 'feed' 
+      }
+      format.js { 
+        render :action => template_name, :layout => false 
+      }
     end
   end
   
@@ -67,6 +71,7 @@ protected
   def render_locked
     respond_to do |format|
       format.html { 
+        expires_now
         flash[:error] = t('topic_locked')
         redirect_to_page_or_topic 
       }

data/app/controllers/forums_controller.rb

@@ -1,11 +1,12 @@
 class ForumsController < ForumBaseController
   
   def index
-    @forums = Forum.all.paginate(pagination_parameters)
+    @forums = Forum.visible_to(current_reader).paginate(pagination_parameters)
+    render_page_or_feed
   end
 
   def show
-    @forum = Forum.find(params[:id])
+    @forum = Forum.visible_to(current_reader).find(params[:id])
     @topics = @forum.topics.stickyfirst.paginate(pagination_parameters)
     render_page_or_feed
   end

data/app/controllers/posts_controller.rb

@@ -8,9 +8,10 @@ class PostsController < ForumBaseController
 
   def index
     @term = params[:q]
-    posts = @forum ? Post.in_forum(@forum) : Post.scoped
+    posts = Post.visible_to(current_reader)
     posts = posts.containing(@term) unless @term.blank?
     posts = posts.from_reader(@reader) if @reader
+    posts = posts.in_forum(@forum) if @forum
     posts = posts.in_topic(@topic) if @topic
     @posts = posts.paginate(pagination_parameters)
     render_page_or_feed
@@ -29,9 +30,7 @@ class PostsController < ForumBaseController
       @post.topic = @forum.topics.new
     end
     respond_to do |format|
-      format.html { 
-        expires_now
-      }
+      format.html { expires_now }
       format.js {
         if @post.page
           render :partial => 'pages/add_comment', :layout => false
@@ -82,7 +81,7 @@ class PostsController < ForumBaseController
 
   def remove
     respond_to do |format|
-      format.html {}
+      format.html { expires_now }
       format.js { render :partial => 'confirm_delete' }
     end
   end
@@ -107,7 +106,7 @@ class PostsController < ForumBaseController
 protected
 
   def find_post
-    @post ||= Post.find(params[:id])
+    @post ||= Post.visible_to(current_reader).find(params[:id])
   end
 
   def require_authority

data/app/controllers/topics_controller.rb

@@ -1,12 +1,13 @@
 class TopicsController < ForumBaseController
   
   def index
-    @topics = Topic.bydate.paginate(pagination_parameters)
+    @topics = Topic.visible_to(current_reader).bydate.paginate(pagination_parameters)
     render_page_or_feed
   end
 
   def show
-    @topic = Topic.find(params[:id])
+    @topic = Topic.visible_to(current_reader).find(params[:id])
+    @forum = @topic.forum
     @posts = @topic.replies.paginate(pagination_parameters)
     render_page_or_feed
   end

data/app/models/forum.rb

@@ -2,10 +2,15 @@ class Forum < ActiveRecord::Base
   has_site if respond_to? :has_site
   has_many :topics, :dependent => :destroy
 
-  default_scope :order => 'position ASC'
+  default_scope :order => 'name ASC'
   named_scope :imported, :conditions => "old_id IS NOT NULL"
   validates_presence_of :name
   
+  # other extensions can attach chains here to limit access
+  def self.visible_to(reader)
+    self.scoped
+  end
+  
   def dom_id
     "forum_#{self.id}"
   end

data/app/models/post.rb

@@ -14,7 +14,7 @@ class Post < ActiveRecord::Base
   after_create :notify_holder_of_creation
   after_destroy :notify_holder_of_destruction
   
-  default_scope :order => "created_at DESC"
+  default_scope :order => "posts.created_at DESC"
   
   named_scope :comments, :conditions => "page_id IS NOT NULL"
   named_scope :non_comments, :conditions => "page_id IS NULL"
@@ -39,6 +39,11 @@ class Post < ActiveRecord::Base
     }
   }
 
+  # other extensions can attach chains here to limit access
+  def self.visible_to(reader)
+    self.scoped
+  end
+
   def self.in_forum(forum)
     in_topics(forum.topics)
   end

data/app/models/topic.rb

@@ -8,13 +8,18 @@ class Topic < ActiveRecord::Base
   validates_presence_of :name
   validates_uniqueness_of :old_id, :allow_nil => true
 
+  named_scope :bydate, :order => 'replied_at DESC'
   named_scope :imported, :conditions => "old_id IS NOT NULL"
   named_scope :stickyfirst, :order => "topics.sticky DESC, topics.replied_at DESC"
-  named_scope :bydate, :order => 'replied_at DESC'
   named_scope :latest, lambda { |count|
     { :order => 'replied_at DESC', :limit => count }
   }
 
+  # other extensions can attach chains here to limit access
+  def self.visible_to(reader)
+    self.scoped
+  end
+
   def dom_id
     "topic_#{self.id}"
   end
@@ -30,11 +35,7 @@ class Topic < ActiveRecord::Base
   def body
     posts.first.body
   end
-  
-  def created_at
-    posts.first.created_at if posts.first
-  end
-  
+    
   def title
     name
   end

data/app/views/forums/_forum.html.haml

@@ -5,11 +5,12 @@
         %h2
           = link_to forum.name, forum_url(forum), :class => 'main'
         %p.context
-          = t("topic_count", :count => forum.topics.count)
-          - if topic = forum.topics.first
-            = link_to topic.name, forum_topic_url(forum, topic)
-            = time_ago_in_words(topic.replied_at || topic.created_at)
-            = t('ago')
-      .forum_description
-        = truncate_and_textilize(forum.description, 40)
+          = forum.description
+      .forum_contents
+        - if forum.topics.any?
+          %ul
+            - forum.topics.latest(3).each do |topic|
+              = render :partial => 'topics/minimal', :locals => {:topic => topic}
+
+
     

data/app/views/forums/_forum.rss.builder

@@ -0,0 +1,8 @@
+xm.item do
+  suffix = 
+  xm.title h("#{forum.name}")
+  xm.description forum.description
+  xm.pubDate forum.created_at.to_s(:rfc822)
+  xm.guid [ActionController::Base.session_options[:session_key], forum.id.to_s].join(":"), "isPermaLink" => "false"
+  xm.link forum_url(forum)
+end

data/app/views/forums/_standard_parts.html.haml

@@ -26,8 +26,9 @@
   = link_to t('navigation.topics'), topics_url
   = link_to t('navigation.forums'), forums_url
   = link_to t('navigation.search'), posts_url
-  = link_to t('navigation.new_topic'), new_post_url
-  = link_to t('navigation.loading'), reader_session_url, :class => "remotecontent"
+  - if current_reader
+    = link_to t('navigation.new_topic'), new_post_url
+  = render :partial => 'readers/controls'
   - if Radiant::Config['forum.help_url']
     = link_to t('navigation.forum_help'), Radiant::Config['forum.help_url']
 

data/app/views/forums/index.rss.builder

@@ -0,0 +1,14 @@
+xml.channel do
+  xml.atom :link, nil, {
+    :href => forums_url(:format => 'rss'),
+    :rel => 'self', :type => 'application/rss+xml'
+  }
+
+  xml.title "#{@site_title} : #{t('forums')}"
+  xml.description t('forums')
+  xml.link forums_url
+  xml.language I18n.locale.to_s
+  xml.ttl "60"
+
+  render :partial => "forums/forum", :collection => @forums, :locals => {:xm => xml}
+end

data/app/views/topics/_latest.html.haml

@@ -2,17 +2,4 @@
   = t('recent_topics')
 %ul
   - Topic.latest(5).each do |topic|
-    %li.topic
-      = link_to_post(topic.posts.last, :class => 'title')
-      %br
-      %span.context
-        - if topic.has_replies?
-          - if topic.replied_by
-            = t('new_reply_from')
-            = link_to topic.replied_by.name, reader_url(topic.replied_by)
-            = friendly_date(topic.replied_at)
-        - else
-          = t('started_by')
-          = link_to topic.reader.name, reader_url(topic.reader)
-          = friendly_date(topic.created_at)
-        
+    = render :partial => 'topics/minimal', :locals => {:topic => topic}

data/app/views/topics/_minimal.html.haml

@@ -0,0 +1,15 @@
+- topic ||= @topic
+
+%li.topic
+  = link_to_post(topic.posts.last, :class => 'title')
+  %br
+  %span.context
+    - if topic.has_replies?
+      - if topic.replied_by
+        = t('new_reply_from')
+        = link_to topic.replied_by.name, reader_url(topic.replied_by)
+        = friendly_date(topic.replied_at)
+    - else
+      = t('started_by')
+      = link_to topic.reader.name, reader_url(topic.reader)
+      = friendly_date(topic.created_at)

data/config/locales/en.yml

@@ -92,8 +92,8 @@ en:
     search: "Search"
     topics: "Latest"
   new_forum: "New forum"
-  new_reply_to: "new reply to"
-  new_reply_from: "new reply from"
+  new_reply_to: "New reply to"
+  new_reply_from: "New reply from"
   new_topic: "Start a new discussion"
   new_topic_button: "Submit topic"
   new_topic_heading: "Start a new topic"

data/db/migrate/20110105103827_topic_merely_associative.rb

@@ -6,8 +6,6 @@ class TopicMerelyAssociative < ActiveRecord::Migration
     remove_column :topics, :posts_count
     remove_column :topics, :updated_by_id
     remove_column :topics, :created_by_id
-    remove_column :topics, :updated_at
-    remove_column :topics, :created_at
   end
 
   def self.down
@@ -15,8 +13,6 @@ class TopicMerelyAssociative < ActiveRecord::Migration
     add_column :topics, :first_post_id, :integer
     add_column :topics, :last_post_id, :integer
     add_column :topics, :posts_count, :integer
-    add_column :topics, :updated_at, :datetime
-    add_column :topics, :created_at, :datetime
     add_column :topics, :updated_by_id, :integer
     add_column :topics, :created_by_id, :integer
   end

data/forum_extension.rb

@@ -1,7 +1,7 @@
 require_dependency 'application_controller'
 
 class ForumExtension < Radiant::Extension
-  version "2.1.4"
+  version "2.1.6"
   description "Nice clean forums and page comments for inclusion in your radiant site. Requires the reader extension and share_layouts."
   url "http://spanner.org/radiant/forum"
 

data/public/stylesheets/sass/admin/forum.sass

@@ -0,0 +1,5 @@
+td
+  padding: 3px
+td.actions
+  white-space: nowrap
+  min-width: 75px

data/public/stylesheets/sass/forum.sass

@@ -3,14 +3,12 @@
 @import gallery.sass
 
 div#forum
+  h2
+    line-height: 1
+    margin: 0
   div.forum
     div.forum_wrapper
       margin: 2em 0
-      div.forum_header
-        h2
-          +strong
-          line-height: 1
-          margin: 0
       div.forum_description
         p
           margin: 0
@@ -21,24 +19,17 @@ div#forum
     &.deleted
       text-decoration: line-through
       color: $mid
-    div.post_wrapper
+    div.wrapper
       margin: 1em 0 2em 0
       div.post_header
-        h2
-          line-height: 1
-          margin: 0
-          &.reply
-            a
-              color: $mid
-              &:hover
-                color: $accent
+        h2.reply
+          a
+            color: $mid
+            &:hover
+              color: $accent
         a
           &:hover
             color: $accent
-          &.waiting
-            color: $mid
-            padding-left: 18px
-            background: transparent url(/images/furniture/wait_16_grey.gif) no-repeat left top
           &.edit_post, &.delete_post
             color: white
             padding: 1px 3px
@@ -75,12 +66,12 @@ div#forum
         a
           color: $pale
     &.first
-      div.post_wrapper
+      div.wrapper
         margin-top: 0
         padding-bottom: 1em
         border-bottom: 3px dotted $mid
 
-    div.post_form
+    div.remote_form
       margin: 0
       p
         margin: 0
@@ -104,8 +95,6 @@ div#forum
   div#search
     overflow: hidden
     margin: 0 0 2em 0
-    h2
-      margin: 0
     p
       width: 24%
       margin-right: 1%
@@ -192,7 +181,7 @@ a.rssfeed
   +functional
   color: $pale
 
-p.waiting, span.waiting
+p.waiting, span.waiting, a.waiting
   color: $mid
   padding-left: 18px
   background: transparent url(/images/furniture/wait_16_grey.gif) no-repeat left top
@@ -207,6 +196,9 @@ div.speaker
   width: 50px
   height: 50px
   margin-right: 8px
+  
+p.add_comment, p.add_reply
+  font-size: 200%
 
 // emoticons in message display are interpolated by our redcloth extension as <img class="emoticon something" />
 
@@ -243,3 +235,5 @@ img.emoticon
   &.cool
     background-position: -176px 0
 
+.punymce_emoticons
+  z-index: 2000

data/radiant-forum-extension.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{radiant-forum-extension}
-  s.version = "2.1.4"
+  s.version = "2.1.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["spanner"]
-  s.date = %q{2011-02-15}
+  s.date = %q{2011-02-16}
   s.description = %q{Nice clean forums and page comments for inclusion in your radiant site. Derived long ago from beast. Requires the reader extension and share_layouts.}
   s.email = %q{will@spanner.org}
   s.extra_rdoc_files = [
@@ -50,10 +50,12 @@ Gem::Specification.new do |s|
      "app/views/admin/topics/edit.html.haml",
      "app/views/admin/topics/index.html.haml",
      "app/views/forums/_forum.html.haml",
+     "app/views/forums/_forum.rss.builder",
      "app/views/forums/_latest.html.haml",
      "app/views/forums/_standard_parts.html.haml",
      "app/views/forums/_statistics.html.haml",
      "app/views/forums/index.html.haml",
+     "app/views/forums/index.rss.builder",
      "app/views/forums/show.html.haml",
      "app/views/forums/show.rss.builder",
      "app/views/layouts/feed.rss.builder",
@@ -84,6 +86,7 @@ Gem::Specification.new do |s|
      "app/views/topics/_context.html.haml",
      "app/views/topics/_latest.html.haml",
      "app/views/topics/_locked.html.haml",
+     "app/views/topics/_minimal.html.haml",
      "app/views/topics/_replies.html.haml",
      "app/views/topics/_reply.html.haml",
      "app/views/topics/_topic.html.haml",
@@ -206,6 +209,7 @@ Gem::Specification.new do |s|
      "public/punymce/puny_mce.js",
      "public/punymce/puny_mce_full.js",
      "public/punymce/puny_mce_src.js",
+     "public/stylesheets/sass/admin/forum.sass",
      "public/stylesheets/sass/forum.sass",
      "public/stylesheets/sass/gallery.sass",
      "radiant-forum-extension.gemspec",

data/spec/controllers/posts_controller_spec.rb

@@ -6,17 +6,13 @@ describe PostsController do
   before do
     Page.current_site = sites(:test) if defined? Site
     controller.stub!(:request).and_return(request)
-    @forum = forums(:public)
-    @topic = topics(:older)
-    @post = posts(:first)
-    @comment = posts(:comment)
   end
 
   describe "on get to index" do
     before do
       get :index
     end
-
+  
     it "should render the index page" do
       response.should be_success
       response.should render_template("index")
@@ -24,17 +20,14 @@ describe PostsController do
   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)
       end
       it "should redirect to the page address and post anchor" do
+        get :show, :id => post_id(:comment)
         response.should be_redirect
-        response.should redirect_to(@page.url + "?page=1##{@comment.dom_id}")
+        response.should redirect_to(pages(:commentable).url + "?page=1##{posts(:comment).dom_id}")
       end
     end
     
@@ -45,7 +38,8 @@ describe PostsController do
       end
       it "should redirect to the topic" do
         response.should be_redirect
-        response.should redirect_to(forum_topic_url(@topic.forum, @topic))
+        topic = topics(:older)
+        response.should redirect_to(forum_topic_url(topic.forum, topic))
       end
     end
 
@@ -56,11 +50,10 @@ describe PostsController do
       end
       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 => posts(:second).page_when_paginated, :anchor => "post_#{posts(:second).id}"}))
+        topic = topics(:older)
+        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
@@ -104,14 +97,13 @@ describe PostsController do
 
       describe "but to a locked topic" do
         before do
-          @topic.locked = true
-          @topic.save!
-          get :new, :topic_id => @topic.id, :forum_id => forum_id(:public)
+          get :new, :topic_id => topic_id(:locked), :forum_id => forum_id(:public)
         end
         
         it "should redirect to the topic page" do 
           response.should be_redirect
-          response.should redirect_to(forum_topic_url(@topic.forum, @topic))
+          topic = topics(:locked)
+          response.should redirect_to(forum_topic_url(topic.forum, topic))
         end
         
         it "should flash an appropriate message" do 
@@ -122,7 +114,7 @@ describe PostsController do
 
       describe "over normal http" do
         before do
-          get :new, :topic_id => @topic.id, :forum_id => forum_id(:public)
+          get :new, :topic_id => topic_id(:older), :forum_id => forum_id(:public)
         end
 
         it "should render the new post form in the normal way" do
@@ -134,7 +126,7 @@ describe PostsController do
 
       describe "over xmlhttp" do
         before do
-          xhr :get, :new, :topic_id => @topic.id, :forum_id => forum_id(:public)
+          xhr :get, :new, :topic_id => topic_id(:older), :forum_id => forum_id(:public)
         end
 
         it "should render a bare reply form" do
@@ -150,7 +142,7 @@ describe PostsController do
     describe "without a logged-in reader" do
       before do
         logout_reader
-        post :create, :post => {:body => 'otherwise complete'}, :topic_id => @topic.id, :forum_id => forum_id(:public)
+        post :create, :post => {:body => 'otherwise complete'}, :topic_id => topic_id(:older), :forum_id => forum_id(:public)
       end
       
       it "should redirect to login" do
@@ -165,18 +157,14 @@ describe PostsController do
       end
 
       describe "but to a locked topic" do
-        before do
-          @topic.locked = true
-          @topic.save!
-        end
-        
         describe "over normal http" do
           before do 
-            post :create, :post => {:body => ''}, :topic_id => @topic.id, :forum_id => forum_id(:public)
+            post :create, :post => {:body => ''}, :topic_id => topic_id(:locked)
           end
           it "should redirect to the topic page" do 
             response.should be_redirect
-            response.should redirect_to(forum_topic_url(@topic.forum, @topic))
+            topic = topics(:locked)
+            response.should redirect_to(forum_topic_url(topic.forum, topic))
           end
           
           it "should flash an appropriate error" do 
@@ -186,7 +174,7 @@ describe PostsController do
         end
         describe "over xmlhttp" do
           before do
-            xhr :post, :create, :post => {:body => 'otherwise complete'}, :topic_id => @topic.id, :forum_id => forum_id(:public)
+            xhr :post, :create, :post => {:body => 'otherwise complete'}, :topic_id => topic_id(:locked), :forum_id => forum_id(:public)
           end
 
           it "should render a bare 'locked' template" do
@@ -200,7 +188,7 @@ describe PostsController do
       describe "with an invalid message" do
         describe "over normal http" do
           before do 
-            post :create, :post => {:body => ''}, :topic_id => @topic.id, :forum_id => forum_id(:public)
+            post :create, :post => {:body => ''}, :topic_id => topic_id(:older), :forum_id => forum_id(:public)
           end
           
           it "should re-render the post form with layout" do
@@ -216,7 +204,7 @@ describe PostsController do
         
         describe "over xmlhttp" do
           before do
-            xhr :post, :create, :post => {:body => ''}, :topic_id => @topic.id, :forum_id => forum_id(:public)
+            xhr :post, :create, :post => {:body => ''}, :topic_id => topic_id(:older), :forum_id => forum_id(:public)
           end
 
           it "should re-render the bare post form" do
@@ -238,7 +226,7 @@ describe PostsController 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 :create, :post => {:body => @body}, :topic_id => topic_id(:older), :forum_id => forum_id(:public)
           @post = Post.find_by_body(@body)
         end
 
@@ -247,18 +235,19 @@ describe PostsController do
         end
 
         it "should associate the post with its topic" do
-          @post.topic.should == @topic
+          @post.topic.should == topics(:older)
         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.page_when_paginated, :anchor => "post_#{@post.id}"}))
+          topic = topics(:older)
+          response.should redirect_to(forum_topic_url(topic.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)
+          xhr :post, :create, :post => {:body => 'test post body'}, :topic_id => topics(:older), :forum_id => forum_id(:public)
         end
 
         it "should return the formatted message for inclusion in the page" do
@@ -290,7 +279,6 @@ describe PostsController do
         it "should clear the cache" do
           Radiant::Cache.should_receive(:clear)
           post :create, :post => {:body => 'marmalade'}, :page_id => page_id(:commentable)
-          Post.find_by_body('marmalade').should_not be_nil
         end
       end
 

data/spec/lib/forum_page_spec.rb

@@ -7,25 +7,40 @@ describe 'Forum-extended page' do
     login_as_reader(:normal)
   end
   
-  it "should normally be commentable" do
-    pages(:uncommented).locked?.should be_false
-  end
+  describe "when pages are commentable" do
+    before do
+      Radiant::Config['forum.allow_page_comments?'] = true
+    end
+    
+    it "should normally be commentable" do
+      pages(:uncommented).locked?.should be_false
+    end
   
-  it "should be locked if marked not commentable" do
-    pages(:uncommentable).locked?.should be_true
-  end
+    it "should be locked if marked not commentable" do
+      pages(:uncommentable).locked?.should be_true
+    end
   
-  it "should be locked if marked comments_closed" do
-    pages(:comments_closed).locked?.should be_true
-  end
+    it "should be locked if marked comments_closed" do
+      pages(:comments_closed).locked?.should be_true
+    end
   
-  it "should be locked if there is a commentable period and it has expired" do
-    Radiant::Config['forum.commentable_period'] = 28
-    page = pages(:commentable)
-    page.commentable_period.should == 28.days
-    page.locked?.should be_false
-    page.created_at = Time.now - 30.days
-    page.locked?.should be_true
+    it "should be locked if there is a commentable period and it has expired" do
+      Radiant::Config['forum.commentable_period'] = 28
+      page = pages(:commentable)
+      page.send(:commentable_period).should == 28.days
+      page.locked?.should be_false
+      page.created_at = Time.now - 30.days
+      page.locked?.should be_true
+    end
   end
+  
+  describe "when pages are not commentable" do
+    before do
+      Radiant::Config['forum.allow_page_comments?'] = false
+    end
     
+    it "should not be commentable" do
+      pages(:uncommented).locked?.should be_true
+    end
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-forum-extension
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 7
   prerelease: false
   segments: 
   - 2
   - 1
-  - 4
-  version: 2.1.4
+  - 6
+  version: 2.1.6
 platform: ruby
 authors: 
 - spanner
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-15 00:00:00 +00:00
+date: 2011-02-16 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -93,10 +93,12 @@ files:
 - app/views/admin/topics/edit.html.haml
 - app/views/admin/topics/index.html.haml
 - app/views/forums/_forum.html.haml
+- app/views/forums/_forum.rss.builder
 - app/views/forums/_latest.html.haml
 - app/views/forums/_standard_parts.html.haml
 - app/views/forums/_statistics.html.haml
 - app/views/forums/index.html.haml
+- app/views/forums/index.rss.builder
 - app/views/forums/show.html.haml
 - app/views/forums/show.rss.builder
 - app/views/layouts/feed.rss.builder
@@ -127,6 +129,7 @@ files:
 - app/views/topics/_context.html.haml
 - app/views/topics/_latest.html.haml
 - app/views/topics/_locked.html.haml
+- app/views/topics/_minimal.html.haml
 - app/views/topics/_replies.html.haml
 - app/views/topics/_reply.html.haml
 - app/views/topics/_topic.html.haml
@@ -249,6 +252,7 @@ files:
 - public/punymce/puny_mce.js
 - public/punymce/puny_mce_full.js
 - public/punymce/puny_mce_src.js
+- public/stylesheets/sass/admin/forum.sass
 - public/stylesheets/sass/forum.sass
 - public/stylesheets/sass/gallery.sass
 - radiant-forum-extension.gemspec