radiant-forum-extension 1.1.2 → 1.2.1

data/VERSION

@@ -1 +1 @@
-1.1.2
+1.2.1

data/app/controllers/admin/forums_controller.rb

@@ -1,11 +1,10 @@
 class Admin::ForumsController < Admin::ResourceController
-
-  # # I have no idea where this default is being overridden
-  # skip_before_filter :verify_authenticity_token if ENV["RAILS_ENV"] == "test"
+  helper :forum
+  paginate_models
 
   only_allow_access_to :new, :create, :edit, :update, :remove, :destroy,
     :when => :admin,
     :denied_url => { :controller => 'pages', :action => 'index' },
-    :denied_message => 'You must be an administrator to add or change discussion categories.'
+    :denied_message => 'You must be an administrator to edit topics.'
   
 end

data/app/controllers/admin/posts_controller.rb

@@ -0,0 +1,10 @@
+class Admin::PostsController < Admin::ResourceController
+  helper :forum
+  paginate_models
+  
+  only_allow_access_to :new, :create, :edit, :update, :remove, :destroy,
+    :when => :admin,
+    :denied_url => { :controller => 'pages', :action => 'index' },
+    :denied_message => 'You must be an administrator to edit posts.'
+  
+end

data/app/controllers/admin/topics_controller.rb

@@ -0,0 +1,10 @@
+class Admin::TopicsController < Admin::ResourceController
+  helper :forum
+  paginate_models
+
+  only_allow_access_to :new, :create, :edit, :update, :remove, :destroy,
+    :when => :admin,
+    :denied_url => { :controller => 'pages', :action => 'index' },
+    :denied_message => 'You must be an administrator to add or change discussion categories.'
+  
+end

data/app/controllers/posts_controller.rb

@@ -6,7 +6,7 @@ class PostsController < ReaderActionController
   before_filter :require_activated_reader, :except => [:index, :show, :search]
   before_filter :find_topic_or_page, :except => [:index, :search]
   before_filter :require_unlocked_topic_and_page, :only => [:new, :create]
-  before_filter :find_post, :except => [:index, :search]
+  before_filter :find_post, :except => [:index, :search, :new, :create]
   before_filter :build_post, :only => [:new]
   before_filter :require_authority, :only => [:edit, :update, :destroy]
 
@@ -42,19 +42,7 @@ class PostsController < ReaderActionController
     @forums = @posts.collect(&:forum).uniq
     @topics = @posts.collect(&:topic).uniq
     @readers = @posts.collect(&:reader).uniq
-    
-    if @searching
-      @title = "Search Results"
-      @description = "Posts"
-      @description << " matching '#{params[:q]}'" unless params[:q].blank?
-      @description << " from #{@reader.name}" if @reader
-      if @topic
-        @description << " under #{@topic.name}"
-      elsif @forum
-        @description << " in #{@forum.name}"
-      end
-    end
-    
+
     render_page_or_feed
   end
 
@@ -88,29 +76,17 @@ class PostsController < ReaderActionController
   def create
     if @topic.new_record?
       # only happens if it's a page comment and the topic has just been built
-      # in that case we can let the topic-creation routines do the post work
-      @topic.body = params[:post][:body]
       @topic.reader = current_reader
       @topic.save!
-      @post = @topic.first_post
-    else
-      @post = @topic.posts.create!(params[:post])
     end
+    @post = @topic.posts.create!(params[:post])
 
-    @post.save_attachments(params[:files]) unless @page && !Radiant::Config['forum.comments_have_attachments']
     Radiant::Cache.clear if @page
 
     respond_to do |format|
       format.html { redirect_to_page_or_topic }
       format.js { render :action => 'show', :layout => false }
     end
-    
-  rescue ActiveRecord::RecordInvalid
-    flash[:error] = 'Problem!'
-    respond_to do |format|
-      format.html { render :action => 'new' }
-      format.js { render :action => 'new', :layout => false }
-    end
   end
 
   def topic_locked

data/app/controllers/topics_controller.rb

@@ -10,13 +10,12 @@ class TopicsController < ReaderActionController
 
   def index
     params[:per_page] ||= 20
-    @topics = Topic.visible.paginate(:all, pagination_parameters.merge(:order => "topics.sticky desc, topics.replied_at desc", :include => [:forum, :reader]))
+    @topics = Topic.paginate(:all, pagination_parameters.merge(:order => "topics.sticky desc, topics.replied_at desc", :include => [:forum, :reader]))
     render_page_or_feed
   end
 
   def new
     @topic = Topic.new
-    @topic.first_post = @topic.posts.build
     @topic.forum = @forum || Forum.find_by_name(Radiant::Config['forum.default_forum'])
   end
   
@@ -27,33 +26,20 @@ class TopicsController < ReaderActionController
     end
     @topic.hit! unless current_reader and @topic.reader == current_reader
     store_location((request.format == 'text/html') ? request.request_uri : request.referer)
-    
-    params[:per_page] ||= 20
-    params[:page] = 1 if params[:page] == 'first'
-    params[:page] = (@topic.posts.count.to_f / params[:per_page].to_f).ceil if params[:page] == 'last'
-    @posts = Post.paginate_by_topic_id(@topic.id, :page => params[:page], :per_page => params[:per_page], :include => :reader, :order => 'posts.created_at asc')
+    @first_post = @topic.first_post
+    @posts = @topic.replies.paginate(pagination_parameters.merge(:include => :reader, :order => 'posts.created_at asc'))
     render_page_or_feed(@page ? 'comments' : 'show')
   end
   
   def create
-    # post creation is handled by a before_create in the topic model
-    # and then calls back to set initial reply data in the topic
     @forum = Forum.find(params[:topic][:forum_id]) if params[:topic][:forum_id]
     @topic = @forum.topics.create!(params[:topic])
-    @topic.first_post.save_attachments(params[:files]) unless @topic.page && !Radiant::Config['forum.comments_have_attachments']
-    
     respond_to do |format|
       format.html { redirect_to forum_topic_path(@forum, @topic) }
     end
-  rescue ActiveRecord::RecordInvalid => invalid
-    flash[:error] = "Sorry: #{invalid}. Please check the form"
-    respond_to do |format|
-      format.html { render :action => 'new' }
-    end
   end
   
   def update
-    # post update is handled by a before_update in the topic model
     @topic.attributes = params[:topic]
     @topic.save!
     respond_to do |format|

data/app/helpers/forum_helper.rb

@@ -62,7 +62,7 @@ module ForumHelper
       elsif (date.to_datetime == Date.yesterday)
         format = t('time_yesterday')
       elsif (date.to_datetime > 6.days.ago)
-        format = t('time_recently')
+        format = t('date_recently')
       elsif (date.year == Date.today.year)
         format = t('date_this_year')
       else
@@ -101,5 +101,5 @@ module ForumHelper
       end
     end
   end
-
+  
 end  

data/app/models/forum.rb

@@ -1,34 +1,12 @@
 class Forum < ActiveRecord::Base
-  is_site_scoped if defined? ActiveRecord::SiteNotFound
+  has_site if respond_to? :has_site
   default_scope :order => 'name ASC'
   belongs_to :created_by, :class_name => 'User'
   belongs_to :updated_by, :class_name => 'User'
   validates_presence_of :name
   named_scope :visible, {}
 
-  has_many :topics, :order => 'sticky desc, replied_at desc', :dependent => :destroy do
-    def first
-      @first_topic ||= find(:first)
-    end
-  end
-
-  has_many :recent_topics, :class_name => 'Topic', :order => 'replied_at desc' do 
-    def first 
-      @first_recent_topic ||= find(:first) 
-    end 
-    def latest
-      @latest_topics ||= find(:all, :limit => 5)
-    end
-  end
-
-  has_many :posts, :order => 'posts.created_at desc' do
-    def last
-      @last_post ||= find(:first, :include => :reader)
-    end
-    def latest
-      @latest_posts ||= find(:all, :limit => 5)
-    end
-  end
+  has_many :topics, :order => 'topics.sticky desc, topics.replied_at desc', :dependent => :destroy
   
   def self.find_or_create_comments_forum
     @comments_forum = self.find_by_for_comments(true) || self.create(

data/app/models/post.rb

@@ -1,24 +1,22 @@
 require 'sanitize'
 class Post < ActiveRecord::Base
+  has_site if respond_to? :has_site
   
-  is_site_scoped if defined? ActiveRecord::SiteNotFound
-  
-  belongs_to :forum, :counter_cache => true
   belongs_to :reader,  :counter_cache => true
   belongs_to :topic, :counter_cache => true
   belongs_to :created_by, :class_name => 'User'
   belongs_to :updated_by, :class_name => 'User'
   has_many :attachments, :class_name => 'PostAttachment', :order => :position, :dependent => :destroy
-  
-  attr_writer :name
+  accepts_nested_attributes_for :attachments, :allow_destroy => true
 
   before_validation :set_reader
-  before_create :set_forum
   after_create :update_topic_reply_data
   after_destroy :revert_topic_reply_data
   
-  validates_presence_of :reader, :topic, :body
+  validates_presence_of :reader, :body
+  # validates_presence_of :topic
 
+  default_scope :order => "created_at DESC"
   named_scope :visible, {}
   named_scope :latest, lambda { |count|
     {
@@ -26,6 +24,11 @@ class Post < ActiveRecord::Base
       :limit => count
     }
   }
+  named_scope :except, lambda { |post|
+    {
+      :conditions => ["NOT posts.id = ?", post.id]
+    }
+  }
 
   def topic_page
     self.topic.page_for(self)
@@ -112,11 +115,11 @@ protected
   end
   
   def update_topic_reply_data
-    self.topic.refresh_reply_data(self)
+    self.topic.refresh_reply_data if self.topic   # topic association not set during initial topic creation because of nested create
   end
 
   def revert_topic_reply_data
-    self.topic.refresh_reply_data
+    self.topic.refresh_reply_data if self.topic   # topic association not set during initial topic creation because of nested create
   end
   
 end

data/app/models/post_attachment.rb

@@ -25,21 +25,21 @@ class PostAttachment < ActiveRecord::Base
   belongs_to :reader
   acts_as_list :scope => :post_id
   has_attached_file :file,
-                    :styles => lambda { |attachment| 
-                      if image_content_types.include? attachment.instance_read(:content_type)
-                        thumbnail_sizes
-                      else
-                        {}
-                      end
-                    },
-                    :whiny_thumbnails => false,
-                    :url => "/:class/:id/:basename:no_original_style.:extension",
-                    :path => ":rails_root/public/:class/:id/:basename:no_original_style.:extension"
+    :styles => lambda { |attachment| 
+      if image_content_types.include? attachment.instance_read(:content_type)
+        thumbnail_sizes
+      else
+        {}
+      end
+    },
+    :whiny_thumbnails => false,
+    :url => "/:class/:id/:basename:no_original_style.:extension",
+    :path => ":rails_root/public/:class/:id/:basename:no_original_style.:extension"
 
   attr_protected :file_file_name, :file_content_type, :file_file_size
-  validates_attachment_presence :file, :message => "You must choose a file to upload!"
-  validates_attachment_content_type :file, :content_type => Radiant::Config["forum.attachment_content_types"].split(', ') if Radiant::Config.table_exists? && Radiant::Config["forum.attachment_content_types"]
-  validates_attachment_size :file, :less_than => Radiant::Config["forum.max_attachment_size"].to_i.megabytes if Radiant::Config.table_exists? && Radiant::Config["forum.max_attachment_size"]
+  validates_attachment_presence :file, :message => t('no_file')
+  validates_attachment_content_type :file, :content_type => Radiant::Config["forum.attachment.content_types"].split(', ') if Radiant::Config.table_exists? && !Radiant::Config["forum.attachment.content_types"].blank?
+  validates_attachment_size :file, :less_than => Radiant::Config["forum.attachment.max_size"].to_i.megabytes if Radiant::Config.table_exists? && Radiant::Config["forum.attachment.max_size"]
 
   named_scope :images, :conditions => ["file_content_type IN (#{image_content_types.map{'?'}.join(',')})", *image_content_types]
   named_scope :non_images, :conditions => ["file_content_type NOT IN (#{image_content_types.map{'?'}.join(',')})", *image_content_types]

data/app/models/topic.rb

@@ -1,5 +1,5 @@
 class Topic < ActiveRecord::Base
-  is_site_scoped if defined? ActiveRecord::SiteNotFound
+  has_site if respond_to? :has_site
 
   belongs_to :forum, :counter_cache => true
   belongs_to :page
@@ -7,10 +7,12 @@ class Topic < ActiveRecord::Base
   belongs_to :created_by, :class_name => 'User'
   belongs_to :updated_by, :class_name => 'User'
 
-  belongs_to :first_post, :class_name => 'Post', :include => :reader                                                # aka topic.body. should not change
-  belongs_to :last_post, :class_name => 'Post', :include => :reader                                                 # this is just for display efficiency.
-  belongs_to :replied_by, :class_name => 'Reader'                                                                   # this too.
-  has_many :posts, :order => 'posts.created_at', :include => :reader, :dependent => :destroy do
+  belongs_to :first_post, :class_name => 'Post'
+  accepts_nested_attributes_for :first_post
+                                                                                                                    
+  belongs_to :last_post, :class_name => 'Post', :include => :reader
+  belongs_to :replied_by, :class_name => 'Reader'
+  has_many :posts, :order => 'posts.created_at ASC', :include => :reader, :dependent => :destroy do
     def last
       @last_post ||= find(:last)
     end
@@ -20,21 +22,23 @@ class Topic < ActiveRecord::Base
   validates_uniqueness_of :old_id, :allow_nil => true
 
   before_validation :set_reader
+  before_validation :echo_inspection
   before_create :set_defaults
-  before_update :check_for_changing_forums
-  before_validation_on_create :post_valid?
-  after_create :save_post
-  before_update :update_post
+  after_create :capture_first_post
   
   attr_accessor :body
 
-  named_scope :visible, {}
+  default_scope :order => "replied_at DESC, created_at DESC"
   named_scope :latest, lambda { |count|
     {
       :order => 'replied_at DESC',
       :limit => count
     }
   }
+  
+  def replies
+    page ? posts : posts.except(first_post)
+  end
 
   def voice_count
     posts.count(:select => "DISTINCT reader_id")
@@ -44,6 +48,10 @@ class Topic < ActiveRecord::Base
     # TODO - move into sql
     posts.map { |p| p.reader }.uniq
   end
+  
+  def other_voices
+    replies.map { |p| p.reader }.uniq
+  end
     
   def hit!
     self.class.increment_counter :hits, id
@@ -75,14 +83,11 @@ class Topic < ActiveRecord::Base
   end
   
   def has_posts?
-    posts_count > (page ? 0 : 1)
+    replies.any?
   end
   
-  def refresh_reply_data(post=nil)
-    if !post && posts.empty?
-      self.destroy
-    elsif has_posts?
-      post ||= posts.last
+  def refresh_reply_data
+    if post = posts.last
       self.last_post = post
       self.replied_by = post.reader
       self.replied_at = post.created_at
@@ -113,50 +118,18 @@ protected
   def set_reader
     self.reader ||= Reader.current
   end
+  
+  def echo_inspection
+    Rails.logger.warn "+++ creating new topic: #{self.inspect}."
+  end
 
   def set_defaults
     self.sticky ||= 0
     self.locked ||= 0
   end
 
-  def check_for_changing_forums
-    old = Topic.find(id)
-    if old.forum_id != forum_id
-      set_posts_forum_id
-      Forum.update_all ["posts_count = posts_count - ?", posts_count], ["id = ?", old.forum_id]
-      Forum.update_all ["posts_count = posts_count + ?", posts_count], ["id = ?", forum_id]
-    end
-  end
-
-  def set_posts_forum_id
-    Post.update_all ['forum_id = ?', forum_id], ['topic_id = ?', id]
+  def capture_first_post
+    self.first_post.topic = self
+    self.first_post.save
   end
-
-  def post_valid?
-    post = Post.new(:body => self.body, :reader => self.reader, :topic => self)
-    unless post.valid?
-      self.errors.add(:body, post.errors.on(:body))
-      self.errors.add(:reader, post.errors.on(:reader))
-      raise ActiveRecord::RecordInvalid.new(self)
-    end
-    true
-  end
-
-  def save_post
-    self.first_post = self.posts.create!(:body => self.body, :created_at => self.created_at, :reader => self.reader)
-    self.replied_at ||= Time.now();
-    self.save(false)
-  end
-  
-  def update_post
-    post = self.first_post
-    if !self.body.nil? && self.body != post.body
-      post.body = self.body
-      post.save!
-    end
-  rescue ActiveRecord::RecordInvalid => ow
-    self.errors.add(:body, post.errors.on(:body))
-    raise
-  end
-
 end

data/app/views/admin/forums/edit.html.haml

@@ -1,5 +1,6 @@
 - render_region :main do |main|
   - main.edit_header do
-    %h1 Edit Forum
+    %h1
+      = t('edit_forum').titlecase
   - main.edit_form do
     = render :partial => 'form'