radiant-forum-extension 1.2.1 → 2.0.0

data/app/controllers/topics_controller.rb

@@ -1,71 +1,14 @@
-class TopicsController < ReaderActionController
-  include Radiant::Pagination::Controller
-  helper :forum
+class TopicsController < ForumBaseController
   
-  before_filter :private_forum
-  before_filter :find_forum_and_topic, :except => :index
-  before_filter :require_activated_reader, :except => [:index, :show]
-
-  radiant_layout { |controller| Radiant::Config['forum.layout'] || Radiant::Config['reader.layout'] }
-
   def index
-    params[:per_page] ||= 20
-    @topics = Topic.paginate(:all, pagination_parameters.merge(:order => "topics.sticky desc, topics.replied_at desc", :include => [:forum, :reader]))
+    @topics = Topic.bydate.paginate(pagination_parameters)
     render_page_or_feed
   end
 
-  def new
-    @topic = Topic.new
-    @topic.forum = @forum || Forum.find_by_name(Radiant::Config['forum.default_forum'])
-  end
-  
   def show
-    if @page && request.format == 'text/html'
-      redirect_to "#{@page.url}#forum"
-      return false
-    end
-    @topic.hit! unless current_reader and @topic.reader == current_reader
-    store_location((request.format == 'text/html') ? request.request_uri : request.referer)
-    @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
-    @forum = Forum.find(params[:topic][:forum_id]) if params[:topic][:forum_id]
-    @topic = @forum.topics.create!(params[:topic])
-    respond_to do |format|
-      format.html { redirect_to forum_topic_path(@forum, @topic) }
-    end
-  end
-  
-  def update
-    @topic.attributes = params[:topic]
-    @topic.save!
-    respond_to do |format|
-      format.html { redirect_to forum_topic_path(@forum, @topic) }
-    end
-  end
-  
-  def destroy
-    @topic.destroy
-    flash[:notice] = "Topic '{name}' was deleted."[:topic_deleted_message, CGI::escapeHTML(@topic.name)]
-    respond_to do |format|
-      format.html { redirect_to forum_path(@forum) }
-    end
+    @topic = Topic.find(params[:id])
+    @posts = @topic.replies.paginate(pagination_parameters)
+    render_page_or_feed
   end
-  
-  protected
-    
-    def private_forum
-      return false unless Radiant::Config['forum.public?'] || require_reader && require_activated_reader
-    end
-    
-    def find_forum_and_topic
-      @topic = Topic.find(params[:id]) if params[:id]
-      @page = @topic.page if @topic
-      @forum = @topic.forum if @topic
-      @forum ||= Forum.find(params[:forum_id]) if params[:forum_id]
-    end
-    
+
 end

data/app/helpers/forum_helper.rb

@@ -1,10 +1,7 @@
 require 'sanitize'
-module ForumHelper
+require "sanitize/config/forum"
 
-  def home_page_link(options={})
-    home_page = (defined? Site && Site.current) ? Site.current.home_page : Page.find_by_parent_id(nil)
-    link_to home_page.title, home_page.url, options
-  end
+module ForumHelper
   
   def feed_tag(text, url, options={})
     link_to text, url, options.merge(:class => 'floating feedlink')
@@ -20,7 +17,7 @@ module ForumHelper
     else
       textilized = RedCloth.new(text, [ :hard_breaks ])
       textilized.hard_breaks = true if textilized.respond_to?("hard_breaks=")
-      Sanitize.clean(textilized.to_html(:textile, :smilies), Sanitize::Config::RELAXED)
+      Sanitize.clean(textilized.to_html(:textile, :smilies), Sanitize::Config::FORUM)
     end
   end
   
@@ -38,13 +35,20 @@ module ForumHelper
     end
   end
 
-  def paged_post_url(post)
-    if post.first?
-      topic_post_url(post.topic, post, :page => post.topic_page, :anchor => post.dom_id)
+  def paginated_post_url(post)
+    param_name = WillPaginate::ViewHelpers.pagination_options[:param_name]
+    if post.page
+      "post.page.url?#{param_name}=#{post.page_when_paginated}##{post.dom_id}"
+    elsif post.first?
+      topic_post_url(post.topic, post)
     else
-      topic_post_url(post.topic, post, :page => post.topic_page, :anchor => post.dom_id)
+      topic_post_url(post.topic, post, {param_name => post.page_when_paginated, :anchor => post.dom_id})
     end
   end
+  
+  def link_to_post(post, options={})
+    link_to post.holder.title, paginated_post_url(post), options
+  end
 
   def edit_link(post)
     link_to t('edit'), edit_topic_post_url(post.topic, post), :class => 'edit_post', :id => "edit_post_#{post.id}", :title => t("edit_post")
@@ -55,49 +59,21 @@ module ForumHelper
   end
   
   def friendly_date(datetime)
-    if datetime
-      date = datetime.to_date
+    I18n.l(datetime, :format => friendly_date_format(datetime)) if datetime
+  end
+  
+  def friendly_date_format(datetime)
+    if datetime && date = datetime.to_date
       if (date.to_datetime == Date.today)
-        format = t('time_today')
+        :today
       elsif (date.to_datetime == Date.yesterday)
-        format = t('time_yesterday')
+        :yesterday
       elsif (date.to_datetime > 6.days.ago)
-        format = t('date_recently')
+        :recently
       elsif (date.year == Date.today.year)
-        format = t('date_this_year')
-      else
-        format = t('standard_date')
-      end
-      datetime.strftime(format)
-    else 
-      t("unknown_date")
-    end
-  end
-  
-  def pagination_and_summary_for(list, name='')
-    %{<div class="pagination">
-        #{will_paginate list, :container => false}
-        <span class="pagination_summary">
-          #{pagination_summary(list, name)}
-        </span>
-      </div>
-    }
-  end
-    
-  def pagination_summary(list, name='')
-    total = list.total_entries
-    if list.empty?
-      %{#{t('no')} #{name.pluralize}}
-    else      
-      name ||= t(list.first.class.to_s.underscore.gsub('_', ' '))
-      if total == 1
-        %{#{t('showing')} #{t('one')} #{name}}
-      elsif list.current_page == 1 && total < list.per_page
-        %{#{t('all')} #{total} #{name.pluralize}}
+        :this_year
       else
-        start = list.offset + 1
-        finish = ((list.offset + list.per_page) < list.total_entries) ? list.offset + list.per_page : list.total_entries
-        %{#{start} #{t('to')} #{finish} #{t('of')} #{total} #{name.pluralize}}
+        :standard
       end
     end
   end

data/app/models/forum.rb

@@ -1,30 +1,17 @@
 class Forum < ActiveRecord::Base
   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, :dependent => :destroy
 
-  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(
-      :name => 'Page Comments',
-      :description => 'This forum automatically gathers up all comments on pages. You can reply here or on the page.',
-      :created_by => User.find_by_admin(true),
-      :position => 999,
-      :created_at => Time.now,
-      :for_comments => true
-    )
-  end
+  default_scope :order => 'position ASC'
+  named_scope :imported, :conditions => "old_id IS NOT NULL"
+  validates_presence_of :name
   
   def dom_id
     "forum_#{self.id}"
   end
   
   def visible_to?(reader=nil)
-    true
+    return true if reader || Radiant::Config['forum.public?']
   end
 
 end

data/app/models/post.rb

@@ -2,62 +2,67 @@ require 'sanitize'
 class Post < ActiveRecord::Base
   has_site if respond_to? :has_site
   
-  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'
+  belongs_to :reader
+  belongs_to :topic
+  belongs_to :page
   has_many :attachments, :class_name => 'PostAttachment', :order => :position, :dependent => :destroy
-  accepts_nested_attributes_for :attachments, :allow_destroy => true
 
-  before_validation :set_reader
-  after_create :update_topic_reply_data
-  after_destroy :revert_topic_reply_data
-  
+  accepts_nested_attributes_for :topic
+  accepts_nested_attributes_for :attachments, :allow_destroy => true
   validates_presence_of :reader, :body
-  # validates_presence_of :topic
 
+  after_create :notify_holder_of_creation
+  after_destroy :notify_holder_of_destruction
+  
   default_scope :order => "created_at DESC"
-  named_scope :visible, {}
-  named_scope :latest, lambda { |count|
-    {
-      :order => 'created_at DESC',
-      :limit => count
-    }
-  }
-  named_scope :except, lambda { |post|
-    {
-      :conditions => ["NOT posts.id = ?", post.id]
+  
+  named_scope :comments, :conditions => "page_id IS NOT NULL"
+  named_scope :non_comments, :conditions => "page_id IS NULL"
+  named_scope :imported, :conditions => "old_id IS NOT NULL"
+  named_scope :in_topic, lambda { |topic| { :conditions => ["topic_id = ?", topic.id] }}
+  named_scope :in_topics, lambda { |topics| { :conditions => ["topic_id IN (#{topics.map("?").join(',')})", topics.map(&:id)] }}
+  named_scope :in_forum, lambda { |forum| in_topics(forum.topics) }
+  named_scope :from, lambda { |reader| { :conditions => ["reader_id = ?", reader.id] }}
+  named_scope :latest, lambda { |count| { :order => 'created_at DESC', :limit => count }}
+  named_scope :except, lambda { |post| { :conditions => ["NOT posts.id = ?", post.id] }}
+  named_scope :distinct_readers, :select => "DISTINCT posts.reader_id" do
+    def count
+      self.length  # replacing a SQL shortcut that omits the distinct clause
+    end
+  end
+  named_scope :containing, lambda { |term|
+    { 
+      :conditions => "posts.body LIKE :term OR topics.name LIKE :term", :term => "%#{term}%",
+      :joins => "LEFT OUTER JOIN topics on posts.topic_id = topics.id"
     }
   }
 
-  def topic_page
-    self.topic.page_for(self)
+  def holder
+    page || topic
   end
-  
-  def to_xml(options = {})
-    options[:except] ||= []
-    options[:except] << :topic_title << :forum_name
-    super
+    
+  def comment?
+    !!page
   end
   
-  def dom_id
-    "post_#{self.id}"
+  def page_when_paginated
+    holder.page_for(self)
   end
   
-  def first?
-    self.topic.first_post == self
+  def forum
+    topic.forum unless comment?
   end
   
-  def has_replies?
-    self.topic.last_post != self
+  def first?
+    !holder || holder.new_record? || holder.posts.first == self
   end
-  
-  def is_comment?
-    !self.topic.page.nil?
+
+  def locked?
+    holder && holder.locked?
   end
   
-  def page
-    return self.topic.page if is_comment?
+  def has_replies?
+    holder.posts.last != self
   end
   
   def editable_interval
@@ -80,13 +85,12 @@ class Post < ActiveRecord::Base
     return false unless reader
     still_editable? && reader && (reader.id == reader_id)
   end
-  
+
   def visible_to?(reader=nil)
-    topic.forum.visible_to?(reader)
+    return true if reader || Radiant::Config['forum.public?']
   end
-
-  # we shouldn't have formatting in here, but page comments need to be rendered from a radius tag
   
+  # so that page comments can be rendered from a radius tag
   def body_html
     if body
       html = RedCloth.new(body, [ :hard_breaks, :filter_html ]).to_html(:textile, :smilies)
@@ -103,23 +107,17 @@ class Post < ActiveRecord::Base
   def save_attachments(files=nil)
     files.collect {|file| self.attachments.create(:file => file) unless file.blank? } if files
   end
-  
-protected
 
-  def set_reader
-    self.reader ||= Reader.current
+  def notify_holder_of_destruction
+    holder.notice_destruction_of(self)
   end
 
-  def set_forum
-    self.forum ||= self.topic.forum
-  end
-  
-  def update_topic_reply_data
-    self.topic.refresh_reply_data if self.topic   # topic association not set during initial topic creation because of nested create
+  def notify_holder_of_creation
+    holder.notice_creation_of(self)
   end
 
-  def revert_topic_reply_data
-    self.topic.refresh_reply_data if self.topic   # topic association not set during initial topic creation because of nested create
+  def dom_id
+    "post_#{self.id}"
   end
-  
+
 end

data/app/models/post_attachment.rb

@@ -1,5 +1,7 @@
 class PostAttachment < ActiveRecord::Base
 
+  named_scope :imported, :conditions => "old_id IS NOT NULL"
+
   @@image_content_types = ['image/jpeg', 'image/pjpeg', 'image/gif', 'image/png', 'image/x-png', 'image/jpg']
   cattr_reader :image_content_types
 
@@ -9,11 +11,12 @@ class PostAttachment < ActiveRecord::Base
     end
     
     def thumbnail_sizes
-      {
-        :icon => ['24x24#', :png],
-        :thumbnail => ['100x100>', :png],
-        :inline => ['640x640>']
-      }
+      { :icon => ['24x24#', :png], :thumbnail => ['100x100>', :png] }.merge(configured_styles)
+    end
+    
+    def configured_styles
+      styles = Radiant::Config["assets.additional_thumbnails"].gsub(/\s+/,'').split(',') if Radiant::Config["assets.additional_thumbnails"]
+      styles.collect{|s| s.split('=')}.inject({}) {|ha, (k, v)| ha[k.to_sym] = v; ha}
     end
     
     def thumbnail_names
@@ -37,7 +40,7 @@ class PostAttachment < ActiveRecord::Base
     :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 => t('no_file')
+  validates_attachment_presence :file, :message => t('error.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"]
 

data/app/models/topic.rb

@@ -1,135 +1,42 @@
 class Topic < ActiveRecord::Base
   has_site if respond_to? :has_site
-
-  belongs_to :forum, :counter_cache => true
-  belongs_to :page
-  belongs_to :reader
-  belongs_to :created_by, :class_name => 'User'
-  belongs_to :updated_by, :class_name => 'User'
-
-  belongs_to :first_post, :class_name => 'Post'
-  accepts_nested_attributes_for :first_post
-                                                                                                                    
-  belongs_to :last_post, :class_name => 'Post', :include => :reader
+  has_comments
+  
+  belongs_to :forum
   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
-  end
 
-  validates_presence_of :forum, :reader, :name
+  validates_presence_of :name
   validates_uniqueness_of :old_id, :allow_nil => true
 
-  before_validation :set_reader
-  before_validation :echo_inspection
-  before_create :set_defaults
-  after_create :capture_first_post
-  
-  attr_accessor :body
-
-  default_scope :order => "replied_at DESC, created_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
-    }
+    { :order => 'replied_at DESC', :limit => count }
   }
-  
-  def replies
-    page ? posts : posts.except(first_post)
-  end
 
-  def voice_count
-    posts.count(:select => "DISTINCT reader_id")
-  end
-  
-  def voices
-    # 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
-  end
-
-  def sticky?() sticky == 1 end
-
-  def views() hits end
-
-  def paged?() posts_count > posts_per_page end
-  
-  def posts_per_page
-    ppp = Radiant::Config['forum.posts_per_page'] || 25
-    ppp.to_i.to_f
-  end
-  
-  def last_page
-    (posts_count.to_f/posts_per_page).ceil.to_i
-  end
-  
-  def page_for(post)
-    return nil unless post.topic == self
-    return 1 unless paged?
-    (posts.index(post)/posts_per_page).ceil.to_i
+  def dom_id
+    "topic_#{self.id}"
   end
 
-  def editable_by?(user)
-    reader && (reader.id == reader_id)
+  def visible_to?(reader=nil)
+    return true if reader || Radiant::Config['forum.public?']
   end
   
-  def has_posts?
-    replies.any?
+  def reader
+    posts.first.reader
   end
   
-  def refresh_reply_data
-    if post = posts.last
-      self.last_post = post
-      self.replied_by = post.reader
-      self.replied_at = post.created_at
-      self.save!
-    end
+  def body
+    posts.first.body
   end
   
-  def last_post_with_fetch
-    if lp = last_post_without_fetch
-      lp
-    elsif has_posts? && lp = posts.last
-      update_attribute(:last_post_id, lp.id)
-      lp
-    end
-  end
-  alias_method_chain :last_post, :fetch
-
-  def dom_id
-    "topic_#{self.id}"
+  def created_at
+    posts.first.created_at if posts.first
   end
   
-  def visible_to?(reader=nil)
-    forum.visible_to?(reader)
+  def title
+    name
   end
-  
-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 capture_first_post
-    self.first_post.topic = self
-    self.first_post.save
-  end
 end