radiant-forum-extension 3.0.0.rc6 → 3.0.0

data/app/views/admin/pages/_edit_commentability.html.haml

@@ -2,8 +2,11 @@
 
 - fields_for :page do |f|
   .commentability
+    %label
+      = t('forum_extension.comments').titlecase
+    %br
     = f.check_box :commentable, {:onclick => "if (this.checked) { $('page_comments_closed').enable(); $('comments_closed_label').removeClassName('disabled'); } else { $('page_comments_closed').disable(); $('comments_closed_label').addClassName('disabled'); }"}
-    = f.label :commentable, "Show comments"
+    = f.label :commentable
     %br
     = f.check_box :comments_closed, :disabled => !@page.commentable?
-    = f.label :comments_closed, 'Comments closed', :id => 'comments_closed_label', :class => !@page.commentable? ? 'disabled' : ''
+    = f.label :comments_closed, nil, :id => 'comments_closed_label', :class => !@page.commentable? ? 'disabled' : ''

data/app/views/posts/_post.html.haml

@@ -22,7 +22,7 @@
           = link_to_post(post)
       - else
         %h2
-          = post.reader.name
+          = post.reader.name if post.reader
 
     %p.context
       - if with_context

data/config/locales/en.yml

@@ -1,6 +1,9 @@
 en:
   activerecord:
     attributes:
+      page:
+        commentable: 'visible'
+        comments_closed: 'closed'
       post:
         body: "Your message"
       topic:

data/config/routes.rb

@@ -1,5 +1,7 @@
+forum_prefix = Radiant.config['forum.path'] || "forum"
+
 ActionController::Routing::Routes.draw do |map|
-  map.with_options :path_prefix => '/forum' do |forum|
+  map.with_options :path_prefix => forum_prefix do |forum|
     forum.resources :forums, :only => [:index, :show], :has_many => [:topics]
     forum.resources :topics, :only => [:index, :show], :has_many => [:posts]
     forum.resources :posts, :member => { :remove => :get }
@@ -12,7 +14,6 @@ ActionController::Routing::Routes.draw do |map|
     admin.resources :posts
   end
   
-  map.forum_home "/forum.:format", :controller => 'topics', :action => 'index'
+  map.forum_home "#{forum_prefix}.:format", :controller => 'topics', :action => 'index'
   map.add_comment "/pages/:page_id/posts/new.:format", :controller => 'posts', :action => 'new'
-
 end

data/forum_extension.rb

@@ -6,10 +6,6 @@ class ForumExtension < Radiant::Extension
   description RadiantForumExtension::DESCRIPTION
   url RadiantForumExtension::URL
 
-  extension_config do |config|
-    config.gem 'acts_as_list', :version => "~> 0.1.2"
-  end
-
   def activate
     ActiveRecord::Base.send :include, CommentableModel                         # provides has_comments class method that is used here by topics and pages but can be called from any model
     Reader.send :include, ForumReader                                          # has topics and posts

data/lib/commentable_model.rb

@@ -64,11 +64,11 @@ module CommentableModel # for inclusion into ActiveRecord::Base
     end
 
     def paged?
-      Radiant::Config['forum.paginate_posts?'] && posts.count > posts_per_page
+      Radiant.config['forum.paginate_posts?'] && posts.count > posts_per_page
     end
 
     def posts_per_page
-      (Radiant::Config['forum.posts_per_page'] || 25).to_i
+      (Radiant.config['forum.posts_per_page'] || 25).to_i
     end
   
     def last_page

data/lib/forum_page.rb

@@ -28,7 +28,8 @@ module ForumPage
       return false unless Radiant::Config['forum.allow_page_comments?'] && commentable?
       return false if comments_closed?
       return true unless commentable_period && commentable_period > 0
-      return Time.now - self.published_at < commentable_period
+      age = (Time.now - self.published_at).to_i
+      return age < commentable_period
     end
     
     def locked?

data/lib/forum_reader_sessions_controller.rb

@@ -2,8 +2,12 @@ module ForumReaderSessionsController
 
   def self.included(base)
     base.class_eval do
-      def default_welcome_url_with_forum
-        topics_url
+      def default_welcome_url_with_forum(reader=nil)
+        if Radiant.config['reader.login_to'] == 'forum'
+          topics_url
+        else
+          default_welcome_url_without_forum(reader)
+        end
       end
       alias_method_chain :default_welcome_url, :forum
     end

data/lib/radiant-forum-extension.rb

@@ -1,5 +1,5 @@
 module RadiantForumExtension
-  VERSION = '3.0.0.rc6'
+  VERSION = '3.0.0'
   SUMMARY = %q{Forum and Comment Extension for Radiant CMS}
   DESCRIPTION = %q{Nice clean forums and page comments for inclusion in your radiant site.}
   URL = "http://radiant.spanner.org/forum"

data/radiant-forum-extension.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.summary     = RadiantForumExtension::SUMMARY
   s.description = RadiantForumExtension::DESCRIPTION
 
-  s.add_dependency 'radiant-reader-extension', "~> 3.0.0.rc1"
+  s.add_dependency 'radiant-reader-extension', "~> 3.0.0"
   s.add_dependency 'acts_as_list', "~> 0.1.2"
 
   ignores = if File.exist?('.gitignore')
@@ -26,9 +26,9 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.post_install_message = %{
-  Add this to your radiant project with:
+  Add this to the Gemfile in your radiant project:
 
-    config.gem 'radiant-forum-extension', :version => '~> #{RadiantForumExtension::VERSION}'
+    gem 'radiant-forum-extension', '~> #{RadiantForumExtension::VERSION}'
 
   }
 end

data/spec/lib/forum_page_spec.rb

@@ -29,7 +29,7 @@ describe 'Forum-extended page' do
       page = pages(:commentable)
       page.send(:commentable_period).should == 28.days
       page.locked?.should be_false
-      page.created_at = Time.now - 30.days
+      page.published_at = Time.now - 30.days
       page.locked?.should be_true
     end
   end

data/spec/models/post_spec.rb

@@ -82,13 +82,14 @@ describe Post do
   end
   
   it "should report on which page of its topic it can be found" do
-    Radiant::Config['forum.paginate_posts?'] = true
-    Radiant::Config['forum.posts_per_page'] = 25
-    firstpost = topics(:older).posts.create!(:body => 'foo', :reader => readers(:normal))
+    Radiant.config['forum.paginate_posts?'] = true
+    Radiant.config['forum.posts_per_page'] = 25
+    topic = topics(:older)
+    firstpost = topic.posts.create!(:body => 'foo', :reader => readers(:normal))
     55.times do |i| 
-      topics(:older).posts.create!(:body => 'rhubarb', :reader => readers(:normal))
+      topic.posts.create!(:body => "rhubarb_#{i}", :reader => readers(:normal))
     end
-    lastpost = topics(:older).posts.create!(:body => 'bar', :reader => readers(:normal))
+    lastpost = topic.posts.create!(:body => 'bar', :reader => readers(:normal))
     firstpost.page_when_paginated.should == 1
     lastpost.page_when_paginated.should == 3
   end

metadata

@@ -1,15 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-forum-extension
 version: !ruby/object:Gem::Version 
-  hash: 15424121
-  prerelease: 6
+  hash: 7
+  prerelease: 
   segments: 
   - 3
   - 0
   - 0
-  - rc
-  - 6
-  version: 3.0.0.rc6
+  version: 3.0.0
 platform: ruby
 authors: 
 - William Ross
@@ -17,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-28 00:00:00 +01:00
+date: 2011-09-06 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,14 +26,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15424119
+        hash: 7
         segments: 
         - 3
         - 0
         - 0
-        - rc
-        - 1
-        version: 3.0.0.rc1
+        version: 3.0.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -265,7 +261,7 @@ has_rdoc: true
 homepage: http://radiant.spanner.org/forum
 licenses: []
 
-post_install_message: "\n  Add this to your radiant project with:\n\n    config.gem 'radiant-forum-extension', :version => '~> 3.0.0.rc6'\n\n  "
+post_install_message: "\n  Add this to the Gemfile in your radiant project:\n\n    gem 'radiant-forum-extension', '~> 3.0.0'\n\n  "
 rdoc_options: []
 
 require_paths: 
@@ -282,14 +278,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: