radiant-forum-extension 1.2.1 → 2.0.0

data/spec/spec_helper.rb

@@ -41,4 +41,13 @@ Spec::Runner.configure do |config|
   #
   # If you declare global fixtures, be aware that they will be declared
   # for all of your examples, even those that don't use them.
-end
+end
+
+# class NilClass
+#   def method_missing(method, *args)
+#     p "NilClass##{method} called with args #{args.inspect}" 
+#     p "Stack:" 
+#     p caller.inspect
+#     raise
+#   end
+# end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-forum-extension
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 15
   prerelease: false
   segments: 
-  - 1
   - 2
-  - 1
-  version: 1.2.1
+  - 0
+  - 0
+  version: 2.0.0
 platform: ruby
 authors: 
 - spanner
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-08 00:00:00 +00:00
+date: 2011-01-27 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -65,6 +65,7 @@ files:
 - app/controllers/admin/forums_controller.rb
 - app/controllers/admin/posts_controller.rb
 - app/controllers/admin/topics_controller.rb
+- app/controllers/forum_base_controller.rb
 - app/controllers/forums_controller.rb
 - app/controllers/posts_controller.rb
 - app/controllers/topics_controller.rb
@@ -91,6 +92,8 @@ files:
 - app/views/admin/topics/edit.html.haml
 - app/views/admin/topics/index.html.haml
 - app/views/forums/_forum.html.haml
+- app/views/forums/_latest.html.haml
+- app/views/forums/_standard_parts.html.haml
 - app/views/forums/index.html.haml
 - app/views/forums/show.html.haml
 - app/views/forums/show.rss.builder
@@ -101,34 +104,36 @@ files:
 - app/views/pages/_comment.html.haml
 - app/views/pages/_comments.html.haml
 - app/views/posts/_attachment.html.haml
+- app/views/posts/_attachments.html.haml
+- app/views/posts/_confirm_delete.html.haml
+- app/views/posts/_context.html.haml
+- app/views/posts/_edit_links.html.haml
 - app/views/posts/_form.html.haml
 - app/views/posts/_latest.html.haml
+- app/views/posts/_new_attachment.html.haml
 - app/views/posts/_post.html.haml
 - app/views/posts/_post.rss.builder
-- app/views/posts/_reply.html.haml
-- app/views/posts/_search.html.haml
-- app/views/posts/_upload.html.haml
+- app/views/posts/_search_form.html.haml
 - app/views/posts/_uploader.html.haml
 - app/views/posts/edit.html.haml
 - app/views/posts/index.html.haml
 - app/views/posts/index.rss.builder
 - app/views/posts/new.html.haml
-- app/views/posts/preview.html.haml
-- app/views/posts/search.html.haml
-- app/views/posts/search.rss.builder
+- app/views/posts/remove.html.haml
 - app/views/posts/show.html.haml
 - app/views/reader_notifier/post.rhtml
-- app/views/topics/_form.html.haml
-- app/views/topics/_help.html.haml
+- app/views/readers/_forum_messages.html.haml
+- app/views/readers/_messages_summary.html.haml
+- app/views/topics/_context.html.haml
 - app/views/topics/_latest.html.haml
 - app/views/topics/_locked.html.haml
+- app/views/topics/_replies.html.haml
+- app/views/topics/_reply.html.haml
 - app/views/topics/_topic.html.haml
 - app/views/topics/_topic.rss.builder
-- app/views/topics/comments.html.haml
-- app/views/topics/edit.html.haml
+- app/views/topics/_voices.html.haml
 - app/views/topics/index.html.haml
 - app/views/topics/index.rss.builder
-- app/views/topics/new.html.haml
 - app/views/topics/show.html.haml
 - app/views/topics/show.rss.builder
 - config/initializers/radiant_config.rb
@@ -143,16 +148,24 @@ files:
 - db/migrate/007_reader_ownership.rb
 - db/migrate/008_first_posts.rb
 - db/migrate/20090824111005_import_helpers.rb
+- db/migrate/20101222160900_page_posts.rb
+- db/migrate/20101222163605_no_comment_forum.rb
+- db/migrate/20110105103827_topic_merely_associative.rb
+- db/migrate/20110111080550_detach_observer.rb
+- db/migrate/20110127113852_import_attachments.rb
 - forum_extension.rb
+- lib/commentable_model.rb
 - lib/forum_admin_ui.rb
 - lib/forum_page.rb
 - lib/forum_reader.rb
 - lib/forum_reader_notifier.rb
+- lib/forum_reader_sessions_controller.rb
 - lib/forum_readers_controller.rb
 - lib/forum_red_cloth3.rb
 - lib/forum_red_cloth4.rb
 - lib/forum_site.rb
 - lib/forum_tags.rb
+- lib/sanitize/config/forum.rb
 - lib/tasks/radiant_forum_extension_tasks.rake
 - public/images/admin/forum.png
 - public/images/admin/new-forum.png
@@ -175,8 +188,10 @@ files:
 - public/images/furniture/attachment.png
 - public/images/furniture/attachment_link.png
 - public/images/furniture/attachment_over.png
+- public/images/furniture/blank.png
 - public/images/furniture/chk_off.png
 - public/images/furniture/chk_on.png
+- public/images/furniture/emoticons.png
 - public/images/furniture/feed_14.png
 - public/images/furniture/feed_28.png
 - public/images/furniture/post.png
@@ -185,6 +200,55 @@ files:
 - public/images/furniture/rdo_on.png
 - public/images/furniture/wait_16_grey.gif
 - public/javascripts/forum.js
+- public/javascripts/jquery.tools.min.js
+- public/punymce/blank.htm
+- public/punymce/css/content.css
+- public/punymce/css/editor.css
+- public/punymce/i18n/sv.js
+- public/punymce/img/icons.gif
+- public/punymce/img/icons_uncompressed.png
+- public/punymce/plugins/bbcode.js
+- public/punymce/plugins/bbcode_src.js
+- public/punymce/plugins/editsource/css/editor.css
+- public/punymce/plugins/editsource/editsource.js
+- public/punymce/plugins/editsource/editsource_src.js
+- public/punymce/plugins/editsource/img/icons.gif
+- public/punymce/plugins/emoticons/css/content.css
+- public/punymce/plugins/emoticons/css/editor.css
+- public/punymce/plugins/emoticons/emoticons.js
+- public/punymce/plugins/emoticons/emoticons_src.js
+- public/punymce/plugins/emoticons/img/emoticons.gif
+- public/punymce/plugins/emoticons/img/emoticons.png
+- public/punymce/plugins/emoticons/img/trans.gif
+- public/punymce/plugins/entities.js
+- public/punymce/plugins/entities_src.js
+- public/punymce/plugins/forceblocks.js
+- public/punymce/plugins/forceblocks_src.js
+- public/punymce/plugins/forcenl.js
+- public/punymce/plugins/forcenl_src.js
+- public/punymce/plugins/image/css/editor.css
+- public/punymce/plugins/image/image.js
+- public/punymce/plugins/image/image_src.js
+- public/punymce/plugins/image/img/icons.gif
+- public/punymce/plugins/link/css/editor.css
+- public/punymce/plugins/link/img/icons.gif
+- public/punymce/plugins/link/link.js
+- public/punymce/plugins/link/link_src.js
+- public/punymce/plugins/paste.js
+- public/punymce/plugins/paste_src.js
+- public/punymce/plugins/protect.js
+- public/punymce/plugins/protect_src.js
+- public/punymce/plugins/safari2x.js
+- public/punymce/plugins/safari2x_src.js
+- public/punymce/plugins/tabfocus.js
+- public/punymce/plugins/tabfocus_src.js
+- public/punymce/plugins/textcolor/css/editor.css
+- public/punymce/plugins/textcolor/img/icons.gif
+- public/punymce/plugins/textcolor/textcolor.js
+- public/punymce/plugins/textcolor/textcolor_src.js
+- public/punymce/puny_mce.js
+- public/punymce/puny_mce_full.js
+- public/punymce/puny_mce_src.js
 - public/stylesheets/sass/forum.sass
 - radiant-forum-extension.gemspec
 - spec/controllers/admin/forums_controller_spec.rb
@@ -192,17 +256,16 @@ files:
 - spec/controllers/posts_controller_spec.rb
 - spec/controllers/topics_controller_spec.rb
 - spec/datasets/forum_layouts_dataset.rb
-- spec/datasets/forum_pages_dataset.rb
 - spec/datasets/forum_readers_dataset.rb
 - spec/datasets/forum_sites_dataset.rb
 - spec/datasets/forums_dataset.rb
-- spec/datasets/posts_dataset.rb
-- spec/datasets/topics_dataset.rb
+- spec/lib/commentable_model_spec.rb
 - spec/lib/forum_admin_ui_spec.rb
 - spec/lib/forum_page_spec.rb
 - spec/lib/forum_reader_notification_spec.rb
 - spec/lib/forum_reader_spec.rb
 - spec/lib/forum_site_spec.rb
+- spec/lib/forum_tags_spec.rb
 - spec/models/forum_spec.rb
 - spec/models/post_spec.rb
 - spec/models/topic_spec.rb
@@ -252,17 +315,16 @@ test_files:
 - spec/controllers/posts_controller_spec.rb
 - spec/controllers/topics_controller_spec.rb
 - spec/datasets/forum_layouts_dataset.rb
-- spec/datasets/forum_pages_dataset.rb
 - spec/datasets/forum_readers_dataset.rb
 - spec/datasets/forum_sites_dataset.rb
 - spec/datasets/forums_dataset.rb
-- spec/datasets/posts_dataset.rb
-- spec/datasets/topics_dataset.rb
+- spec/lib/commentable_model_spec.rb
 - spec/lib/forum_admin_ui_spec.rb
 - spec/lib/forum_page_spec.rb
 - spec/lib/forum_reader_notification_spec.rb
 - spec/lib/forum_reader_spec.rb
 - spec/lib/forum_site_spec.rb
+- spec/lib/forum_tags_spec.rb
 - spec/models/forum_spec.rb
 - spec/models/post_spec.rb
 - spec/models/topic_spec.rb

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

@@ -1,35 +0,0 @@
-- message_type = @page ? 'comment' : 'post'
-
-- if @topic.locked?
-  %p.administrative
-    This topic is closed.
-
-- else
-  - if current_reader
-    - if current_reader.activated?
-      - formurl = @page ? page_posts_url(@page) : topic_posts_url(@topic)
-      - @post ||= @topic.posts.build
-
-      %div.reply#replyform
-        %div.speaker
-          %a{:href => reader_url(current_reader), :class => 'main'}
-            = gravatar_for(current_reader, {:size => 40}, {:alt => current_reader.name, :class => 'gravatar', :width => '40', :height => '40'})
-        .post_wrapper
-          .post_header
-            %h2
-              = t('add_post', :message_type => message_type)
-            %p.context
-              = t('logged_in_as', :name => current_reader.name)
-              = t('if_not_you')
-              = link_to(t('log_out'), reader_logout_url) + '.'
-
-          - form_for :post, :url => formurl, :html => {:id => 'reply_form', :multipart => true, :class => 'friendly inline'} do |f|
-            = render :partial => 'posts/form', :object => f
-            %p.buttons
-              = f.submit t('post_post', :message_type => message_type)
-
-    - else
-      = render :partial => 'reader_activations/activation_required', :locals => {:purpose => t('to_add_post', :message_type => message_type)}
-      
-  - else
-    = render :partial => 'reader_sessions/login_form', :locals => {:purpose => t('to_add_post', :message_type => message_type)}

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

@@ -1,2 +0,0 @@
-- if uf
-  = uf.file_field :file, :class => 'filefield'

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

@@ -1,32 +0,0 @@
-/ this template is generally only where you don't want a reply form on the page by default,
-/ and instead bring it in with a remote call. most often this is for page comments, where
-/ it has the advantage that the page can still be cached. that's why a login form might be returned.
-
-- message_type = @page ? 'comment' : 'message'
-- formurl = @page ? page_posts_url(@page) : posts_url(@forum, @topic)
-
-#forum
-  - if response.layout
-    %p
-      Please check your message below. If it's ok, press 'post message' to add it to the site.
-  %div.post
-    %div{:class => 'reply'}
-      %div.post_header
-        %h2
-          %a{:href => reader_url(@post.reader), :class => 'main'}
-            = gravatar_for(@post.reader, {:size => 40}, {:alt => @post.reader.name, :class => 'gravatar', :width => '40', :height => '40'})
-            = @post.reader.name
-        %p.context
-          replied
-          = time_ago_in_words(@post.created_at)
-          ago
-      %div.post_body
-        = clean_textilize(@post.body)
-      %div.post_confirmation
-        - form_for :post, :url  => formurl, :html => {:id => 'reply_form', :class => 'friendly'} do |f|
-          = f.hidden_field :body
-          = submit_tag 'confirm', :class => 'confirm', :id => 'confirm'
-          or 
-          = submit_tag 'revise', :class => 'revise', :id => 'revise' 
-          or
-          = link_to 'cancel', @page ? @page.url : forum_topic_url(@topic.forum, @topic), :class => 'cancelform'

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

@@ -1,63 +0,0 @@
-- content_for :signals do
-  = render :partial => 'readers/flasher'
-
-- content_for :messages do
-  = render :partial => 'posts/post', :collection => @posts, :locals => {:with_context => true, :hide_author => false, :preview => true}
-
-- content_for :pagination do
-  = pagination_and_summary_for @posts, t('post')
-
-- content_for :breadcrumbs do
-  = link_to t('forum').titlecase, '/forum'
-  = t('separator')
-  = link_to t('posts').titlecase, '/forum/posts'
-
-- content_for :breadhead do
-  = link_to t("Posts"), posts_url, :class => 'breadhead'
-
-- if @searching
-  - content_for :title do
-    = t('search_results')
-    
-  - content_for :thing_title do
-    = t('search_results')
-      
-  - content_for :introduction do
-    - if @posts.empty?
-      %p 
-        =t('no_posts_found')
-    - else
-      %p
-        = t('posts_found', :count => @posts.total_entries)
-        - unless params[:q].blank?
-          = t('matching')
-          %strong
-            = params[:q]
-        - if @reader
-          = t('from_reader', :name => @reader.name)
-        - if @topic
-          = t('filed_in', :name => @topic.name)
-        - elsif @forum
-          = t('filed_in', :name => @forum.name)
-          
-  - content_for :feed do
-    = feed_link(search_posts_url(params.merge(:format => :rss)))
-
-- else
-  - content_for :title do
-    = t('search')
-  - content_for :introduction do
-    = t('search_introduction')
-
-- content_for :search do
-  = render :partial => 'search'
-
-
-
-#forum
-  #search
-    = yield :search
-  - if @searching
-    = yield :pagination if @posts.previous_page
-    = yield :messages
-    = yield :pagination if @posts.next_page

data/app/views/posts/search.rss.builder

@@ -1,14 +0,0 @@
-xml.channel do
-  xml.atom :link, nil, {
-    :href => search_posts_url(:rss),
-    :rel => 'self', :type => 'application/rss+xml'
-  }
-
-  xml.title "#{@site_title} : forum search"
-  xml.description @title
-  xml.link search_posts_url(params)
-  xml.language "en-us"
-  xml.ttl "60"
-
-  render :partial => "post", :collection => @posts, :locals => {:xm => xml}
-end

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

@@ -1,30 +0,0 @@
-%p.title
-  = form.label :name, t('label.topic_name'), :class => 'required'
-  %br
-  = form.text_field :name, :class => 'titular'
-  - if admin?
-    %br
-    %span.quiet
-      = form.check_box :sticky
-      %label{:for => 'topic_sticky', :class => 'admin'}
-        = t('sticky')
-      = form.check_box :locked
-      %label{:for => 'topic_locked', :class => 'admin'} 
-        = t('locked')
-
-- @topic.first_post ||= @topic.posts.build
-- form.fields_for :first_post, @topic.first_post do |fp|
-  %p.body
-    = fp.label :body, t('label.topic_body')
-    %br
-    = fp.text_area :body, :class=> 'standard', :rows => 12
-    
-  - unless @topic.page && !Radiant::Config['forum.comments_have_attachments']
-    = render :partial => 'posts/uploader', :locals => {:f => fp}
-
-- if @topic.new_record? || admin?
-  %p.forum
-    = form.label :forum_id, t('label.topic_category')
-    %br
-    = form.select :forum_id, Forum.visible.collect {|f| [ f.name, f.id ] }, :class=> 'standard'
-  

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

@@ -1,8 +0,0 @@
-- if helpforum = Forum.find_by_name('Help')
-  #marginalia
-    %h3
-      Help!
-    %ul.helplist
-      - helpforum.topics.find(:all, :limit => 10).each do |topic|
-        %li
-          = link_to topic.name, forum_topic_url(topic.forum, topic)          

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

@@ -1,6 +0,0 @@
-#forum
-  %h2 
-    =t('comments').titlecase
-
-  = render :partial => 'posts/post', :collection => @posts, :locals => { :with_context => false }
-  = render :partial => 'posts/reply'

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

@@ -1,26 +0,0 @@
-= render :partial => 'readers/flasher'
-
-#forum
-  %h1
-    = link_to "#{@forum.name} »", forum_url(@forum), {:class => 'breadhead'}
-    %br
-    Edit discussion 
-
-  #new_topic
-    = form_for :topic, :url  => forum_topic_path(@forum, @topic), :html => {:method => :put, :class => 'friendly'} do |f|
-      = render :partial => "form", :object => f
-	    = submit_tag 'Save Changes' 
-	    or 
-	    = link_to('cancel', forum_topic_path(@forum, @topic))
-
-= render :partial => 'readers/controls'
-
-- content_for :breadcrumbs do
-  = link_to 'Forum', topics_url
-  \>
-  = link_to @forum.name, forum_url(@forum) 
-  \>
-  Edit Discussion
-
-- content_for :pagetitle do
-  Edit Discussion