radiant-forum-extension 0.6.1 → 1.1.0

data/Rakefile

@@ -8,9 +8,7 @@ begin
     gem.homepage = "http://github.com/spanner/radiant-forum-extension"
     gem.authors = ["spanner"]
     gem.add_dependency "radiant", ">= 0.9.0"
-    gem.add_dependency 'radiant-reader-extension'
-    gem.add_dependency 'paperclip'
-    gem.add_dependency 'will_paginate'
+    gem.add_dependency 'radiant-reader-extension', "~> 1.1.0"
   end
 rescue LoadError
   puts "Jeweler (or a dependency) not available. This is only required if you plan to package forum as a gem."

data/VERSION

@@ -1 +1 @@
-0.6.1
+1.1.0

data/app/controllers/forums_controller.rb

@@ -1,21 +1,25 @@
 class ForumsController < ReaderActionController
-  skip_before_filter :require_reader
+  include Radiant::Pagination::Controller
+  helper :forum
+  
+  before_filter :private_forum
   before_filter :find_forum, :only => :show
   before_filter :no_changes_here, :except => [:index, :show]
 
-  radiant_layout { |controller| controller.layout_for(:forum) }
+  radiant_layout { |controller| Radiant::Config['forum.layout'] || Radiant::Config['reader.layout'] }
 
   def index
-    @forums = Forum.visible.paginate(:all, :order => "position", :page => params[:page] || 1, :per_page => params[:per_page])
+    # visible is an open scope that can be overridden in other extensions, ie group_forum
+    @forums = Forum.visible.paginate(:all, pagination_parameters.merge(:order => "position"))
   end
 
   def show
     respond_to do |format|
       format.html { 
-        @topics = Topic.paginate_by_forum_id(params[:id], :page => params[:page] || 1, :per_page => params[:per_page] || 20, :include => :replied_by, :order => 'sticky desc, replied_at desc')
+        @topics = Topic.paginate_by_forum_id(params[:id], pagination_parameters.merge(:include => :replied_by, :order => 'sticky desc, replied_at desc'))
       }
       format.rss  {
-        @topics = Topic.paginate_by_forum_id(params[:id], :page => params[:page] || 1, :per_page => params[:per_page] || 20, :include => :replied_by, :order => 'replied_at desc')
+        @topics = Topic.paginate_by_forum_id(params[:id], pagination_parameters.merge(:include => :replied_by, :order => 'replied_at desc'))
         render :layout => 'feed'
       }
     end
@@ -27,6 +31,10 @@ class ForumsController < ReaderActionController
 
 protected
 
+  def private_forum
+    return false unless Radiant::Config['forum.public?'] || require_reader && require_activated_reader
+  end
+
   def find_forum
     @forum = Forum.find(params[:id])
   end

data/app/controllers/posts_controller.rb

@@ -1,6 +1,8 @@
 class PostsController < ReaderActionController
+  include Radiant::Pagination::Controller
+  helper :forum
 
-  before_filter :set_site_title
+  before_filter :private_forum
   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]
@@ -8,7 +10,7 @@ class PostsController < ReaderActionController
   before_filter :build_post, :only => [:new]
   before_filter :require_authority, :only => [:edit, :update, :destroy]
 
-  radiant_layout { |controller| controller.layout_for(:forum) }
+  radiant_layout { |controller| Radiant::Config['forum.layout'] || Radiant::Config['reader.layout'] }
 
   @@default_query_options = { 
     :page => 1,
@@ -18,7 +20,7 @@ class PostsController < ReaderActionController
   }
   
   def index
-    @posts = Post.visible.paginate(:all, @@default_query_options.merge(:page => params[:page], :per_page => params[:per_page]))
+    @posts = Post.visible.paginate(:all, @@default_query_options.merge(pagination_parameters))
     render_page_or_feed
   end
 
@@ -164,6 +166,10 @@ class PostsController < ReaderActionController
 
 protected
 
+  def private_forum
+    return false unless Radiant::Config['forum.public?'] || require_reader && require_activated_reader
+  end
+
   def require_authority
     (current_user && current_user.admin?) || @post.editable_by?(current_reader)      # includes an editable-interval check
   end

data/app/controllers/topics_controller.rb

@@ -1,13 +1,16 @@
 class TopicsController < ReaderActionController
+  include Radiant::Pagination::Controller
+  helper :forum
   
+  before_filter :private_forum
   before_filter :find_forum_and_topic, :except => :index
   before_filter :require_activated_reader, :except => [:index, :show]
 
-  radiant_layout { |controller| controller.layout_for(:forum) }
+  radiant_layout { |controller| Radiant::Config['forum.layout'] || Radiant::Config['reader.layout'] }
 
   def index
     params[:per_page] ||= 20
-    @topics = Topic.visible.paginate(:all, :order => "topics.sticky desc, topics.replied_at desc", :page => params[:page] || 1, :per_page => params[:per_page], :include => [:forum, :reader])
+    @topics = Topic.visible.paginate(:all, pagination_parameters.merge(:order => "topics.sticky desc, topics.replied_at desc", :include => [:forum, :reader]))
     render_page_or_feed
   end
 
@@ -67,7 +70,11 @@ class TopicsController < ReaderActionController
   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

data/app/helpers/forum_helper.rb

@@ -0,0 +1,105 @@
+require 'sanitize'
+module ForumHelper
+
+  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
+  
+  def feed_tag(text, url, options={})
+    link_to text, url, options.merge(:class => 'floating feedlink')
+  end
+
+  def feed_link(url)
+    link_to image_tag('/images/forum/feed_14.png', :class => 'feedicon', :alt => t('rss_feed'), :size => '14x20'), url
+  end
+
+  def clean_textilize(text) # adding smilies to the default reader method
+    if text.blank?
+      ""
+    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)
+    end
+  end
+  
+  def watch_tag(topic, label='watching', formclass=nil)
+    if current_user
+      monitoring = current_user.monitoring?(topic)
+    	%{
+    	  <form action="#{monitorship_path(topic.forum, topic)}" method="post" class="#{formclass}"><div>
+    	  <input id="monitor_checkbox_#{topic.id}" name="monitor_checkbox" class="monitor_checkbox" type="checkbox"#{ ' checked="checked"' if monitoring } />
+    	  <label class="monitor_label" for="monitor_checkbox_#{topic.id}">#{label}</label>
+    	  #{hidden_field_tag '_method', monitoring ? 'delete' : ''}
+    	  #{submit_tag :set, :class => 'monitor_submit'}
+    	  </div></form>
+    	}
+    end
+  end
+
+  def paged_post_url(post)
+    if post.first?
+      topic_post_url(post.topic, post, :page => post.topic_page, :anchor => post.dom_id)
+    else
+      topic_post_url(post.topic, post, :page => post.topic_page, :anchor => post.dom_id)
+    end
+  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")
+  end
+
+  def remove_link(post)
+    link_to t('delete'), topic_post_url(post.topic, post), :method => 'delete', :class => 'delete_post', :id => "delete_post_#{post.id}", :title => t("remove_post"), :confirm => t('really_remove_post')
+  end
+  
+  def friendly_date(datetime)
+    if datetime
+      date = datetime.to_date
+      if (date.to_datetime == Date.today)
+        format = t('time_today')
+      elsif (date.to_datetime == Date.yesterday)
+        format = t('time_yesterday')
+      elsif (date.to_datetime > 6.days.ago)
+        format = t('time_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}}
+      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}}
+      end
+    end
+  end
+
+end  

data/app/models/post_attachment.rb

@@ -9,15 +9,11 @@ class PostAttachment < ActiveRecord::Base
     end
     
     def thumbnail_sizes
-      if Radiant::Config.table_exists? && Radiant::Config["assets.additional_thumbnails"]
-        thumbnails = Radiant::Config["assets.additional_thumbnails"].split(', ').collect{|s| s.split('=')}.inject({}) {|ha, (k, v)| ha[k.to_sym] = v; ha}
-      else
-        thumbnails = {}
-      end
-      thumbnails.merge({
+      {
         :icon => ['24x24#', :png],
-        :thumbnail => ['100x100>', :png]
-      })
+        :thumbnail => ['100x100>', :png],
+        :inline => ['640x640>']
+      }
     end
     
     def thumbnail_names
@@ -29,7 +25,13 @@ class PostAttachment < ActiveRecord::Base
   belongs_to :reader
   acts_as_list :scope => :post_id
   has_attached_file :file,
-                    :styles => thumbnail_sizes,
+                    :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"
@@ -39,6 +41,9 @@ class PostAttachment < ActiveRecord::Base
   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"]
 
+  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]
+
   def image?
     self.class.image?(file_content_type)
   end
@@ -54,14 +59,17 @@ class PostAttachment < ActiveRecord::Base
   def extension
     filename.split('.').last.downcase if filename
   end
-    
+  
+  def thumbnail
+    file.url(:thumbnail) if image?
+  end
+  
   def icon
     iconpath = Radiant::Config.table_exists? && Radiant::Config['forum.icon_path'] ? Radiant::Config['forum.icon_path'] : '/images/forum/icons'
     if image?
-      return file.url(:icon)
+      file.url(:icon)
     else
       icon = File.join(RAILS_ROOT, 'public', iconpath, "#{extension}.png")
-      logger.warn "!!  looking for #{icon}"
       if File.exists? icon
         "#{iconpath}/#{extension}.png"
       else

data/app/models/topic.rb

@@ -79,7 +79,7 @@ class Topic < ActiveRecord::Base
   end
   
   def refresh_reply_data(post=nil)
-    if !post && posts.empty?     # ie. the post has just been deleted and there are no others
+    if !post && posts.empty?
       self.destroy
     elsif has_posts?
       post ||= posts.last

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

@@ -1,73 +1,71 @@
 - include_stylesheet('admin/forum')
 = render_region :top 
 
-%h1 Discussion Categories
-%p This is where you sort out the discussion filing. To edit or remove messages or whole discussions, use the links on forum pages. 
+#forums_table.outset
+  %table#forums.index{:cellspacing=>"0", :border=>"0", :cellpadding=>"0"}
+    %thead
+      %tr
+        - render_region :thead do |thead|
+          - thead.title_header do
+            %th.forum Forum
+          - thead.latest_header do
+            %th.forum_latest Latest activity
+          - thead.modify_header do
+            %th.action Action
+    %tbody
+      - @forums.each do |forum|
+        %tr.node.level-1
+          - render_region :tbody do |tbody|
 
-%table#forums.index{:cellspacing=>"0", :border=>"0", :cellpadding=>"0"}
-  %thead
-    %tr
-      - render_region :thead do |thead|
-        - thead.title_header do
-          %th.forum Forum
-        - thead.latest_header do
-          %th.forum_latest Latest activity
-        - thead.modify_header do
-          %th.action Action
-  %tbody
-    - @forums.each do |forum|
-      %tr.node.level-1
-        - render_region :tbody do |tbody|
-
-          - tbody.title_cell do
-            %td.forum
-              %h3
-                = link_to forum.name, edit_admin_forum_url(:id => forum)
-              -if forum.for_comments
-                %p.context
-                  (comments forum)
-              = textilize(forum.description)
-              %p
-                - if forum.respond_to?(:site)
-                  = link_to "→ browse discussions", 'http://' + forum.site.base_domain + forum_path(forum)
-                - else
-                  = link_to "→ browse discussions", forum_path(forum)
-
-          - tbody.latest_cell do
-            %td.forum_latest
-              - if forum.posts_count > 0
-                %ul.latest
-                  - forum.recent_topics.latest.each do |topic|
-                    %li.topic
-                      - if topic.page
-                        = link_to topic.page.title, "#{topic.page.url}", {:class => 'topic'}
-                      - else
-                        = link_to topic.name, forum_topic_url(topic.forum, topic, :page => 'last'), {:class => 'topic'}
-                      %br
-                      %span.context
-                        from
-                        - if topic.posts.count > 1
-                          = link_to topic.reader.name + '.', reader_url(topic.reader)
-                          = topic.posts.count
-                          = pluralize(topic.posts.count, 'comment') + ','
-                          most recently from
-                          = link_to topic.replied_by.name, reader_url(topic.replied_by)
-                          = friendly_date(topic.replied_at)
-                        - else 
-                          = link_to topic.reader.name, reader_url(topic.reader)
-                          = friendly_date(topic.created_at)
-              -else
+            - tbody.title_cell do
+              %td.forum
+                %h3
+                  = link_to forum.name, edit_admin_forum_url(:id => forum)
+                -if forum.for_comments
+                  %p.context
+                    (comments forum)
+                = textilize(forum.description)
                 %p
-                  No topics yet.
-          - tbody.modify_cell do
-            %td.remove
-              -if forum.for_comments
-                = image('noremove', :alt => 'Remove Forum')
-              -else
-                - if admin?
-                  = link_to image('remove', :alt => 'Remove Forum'), remove_admin_forum_url(:id => forum) 
-                - else
-                  = image('noremove', :alt => 'only admin can remove forums')
+                  - if forum.respond_to?(:site)
+                    = link_to "→ browse discussions", 'http://' + forum.site.base_domain + forum_path(forum)
+                  - else
+                    = link_to "→ browse discussions", forum_path(forum)
+
+            - tbody.latest_cell do
+              %td.forum_latest
+                - if forum.posts_count > 0
+                  %ul.latest
+                    - forum.recent_topics.latest.each do |topic|
+                      %li.topic
+                        - if topic.page
+                          = link_to topic.page.title, "#{topic.page.url}", {:class => 'topic'}
+                        - else
+                          = link_to topic.name, forum_topic_url(topic.forum, topic, :page => 'last'), {:class => 'topic'}
+                        %br
+                        %span.context
+                          from
+                          - if topic.posts.count > 1
+                            = link_to topic.reader.name + '.', reader_url(topic.reader)
+                            = topic.posts.count
+                            = pluralize(topic.posts.count, 'comment') + ','
+                            most recently from
+                            = link_to topic.replied_by.name, reader_url(topic.replied_by)
+                            = friendly_date(topic.replied_at)
+                          - else 
+                            = link_to topic.reader.name, reader_url(topic.reader)
+                            = friendly_date(topic.created_at)
+                -else
+                  %p
+                    No topics yet.
+            - tbody.modify_cell do
+              %td.remove
+                -if forum.for_comments
+                  = image('noremove', :alt => 'Remove Forum')
+                -else
+                  - if admin?
+                    = link_to image('remove', :alt => 'Remove Forum'), remove_admin_forum_url(:id => forum) 
+                  - else
+                    = image('noremove', :alt => 'only admin can remove forums')
 
 - render_region :bottom do |bottom|
   - bottom.new_button do

data/app/views/admin/reader_configuration/_edit_forum.html.haml

@@ -8,3 +8,9 @@
     = edit_config 'forum.public?'
   %p
     = edit_config 'forum.allow_page_comments?'
+  %p
+    = edit_config 'forum.comments_have_attachments?'
+  %p
+    = edit_config 'forum.attachment_content_types'
+  %p
+    = edit_config 'forum.max_attachment_size'