commontator 4.8.0 → 4.9.0

data/app/views/commontator/threads/_reply.html.erb

@@ -2,18 +2,31 @@
    # thread
    # user
    # per_page
-%>
 
-<% if thread.is_closed? %>
-  <p><%= t 'commontator.thread.status.cannot_post' %></p>
-<% elsif !user %>
-  <p><%= t 'commontator.require_login' %>.</p>
-<% else %>
-  <div id="thread_<%= thread.id %>_new_comment_div" class="thread_new_comment"></div>
+   hidden_class = @new_comment.nil? ? ' hidden' : '' %>
 
-  <span id="thread_<%= thread.id %>_new_comment_link_span" class="thread_new_comment_link">
-    <%= link_to t('commontator.comment.actions.new'),
-        commontator.new_thread_comment_path(thread, :per_page => per_page), :remote => true %>
-  </span>
-<% end %>
+<div id="thread_<%= thread.id %>_reply" class="thread_reply">
+  <% if thread.is_closed? %>
+    <p><%= t 'commontator.thread.status.cannot_post' %></p>
+  <% elsif !user %>
+    <p><%= t 'commontator.require_login' %>.</p>
+  <% else %>
+    <div id="thread_<%= thread.id %>_new_comment_form_div" class="thread_new_comment_form<%=
+    hidden_class %>">
+      <% unless @new_comment.nil? %>
+        <%= render :partial => 'commontator/comments/form',
+                   :locals => { :comment => @new_comment,
+                                :thread => thread,
+                                :per_page => per_page } %>
+      <% end %>
+    </div>
 
+    <% if @new_comment.nil? %>
+      <div id="thread_<%= thread.id %>_new_comment_link_div" class="thread_new_comment_link">
+        <%= link_to t('commontator.comment.actions.new'),
+            commontator.new_thread_comment_path(thread, :per_page => per_page),
+            :remote => true %>
+      </div>
+    <% end %>
+  <% end %>
+</div>

data/app/views/commontator/threads/_show.html.erb

@@ -14,8 +14,8 @@
   <% if can_subscribe %>
     <span id="thread_<%= thread.id.to_s %>_subscription_span" class="thread_subscription">
       <%= render :partial => 'commontator/subscriptions/link',
-                 :locals => {:thread => thread,
-                             :user => user} %>
+                 :locals => { :thread => thread,
+                              :user => user } %>
     </span>
   <% end %>
   
@@ -53,25 +53,25 @@
 
 <% if thread.config.comment_order == :l %>
   <%= render :partial => 'commontator/threads/reply',
-             :locals => {:thread => thread, :user => user, :per_page => per_page} %>
+             :locals => { :thread => thread, :user => user, :per_page => per_page } %>
 <% end %>
 
 <div id="thread_<%= thread.id.to_s %>_comment_list_div" class="thread_comment_list">
   <% comments = show_all ? thread.ordered_comments(true) : thread.paginated_comments(page, per_page) %>
   <%= render :partial => 'commontator/comments/list',
-             :locals => {:comments => comments,
-                         :user => user} %>
+             :locals => { :comments => comments,
+                          :user => user } %>
 </div>
 
 <% if thread.will_paginate? && !show_all %>
   <div id="thread_<%= thread.id.to_s %>_pagination_div" class="thread_pagination">
     <div id="thread_<%= thread.id.to_s %>_page_entries_info_div" class="thread_page_entries_info">
       <%= page_entries_info comments,
-                        :params => {:controller => 'commontator/threads',
-                                    :action => 'show',
-                                    :id => thread.id,
-                                    :page => page,
-                                    :per_page => per_page} %>.
+                        :params => { :controller => 'commontator/threads',
+                                     :action => 'show',
+                                     :id => thread.id,
+                                     :page => page,
+                                     :per_page => per_page } %>.
     </div>
 
     <div id="thread_<%= thread.id.to_s %>_will_paginate_div" class="thread_will_paginate">
@@ -79,17 +79,16 @@
                         :renderer => Commontator::LinkRenderer,
                         :routes_proxy => commontator,
                         :remote => true,
-                        :params => {:controller => 'commontator/threads',
-                                    :action => 'show',
-                                    :id => thread.id,
-                                    :page => page,
-                                    :per_page => per_page} %>
+                        :params => { :controller => 'commontator/threads',
+                                     :action => 'show',
+                                     :id => thread.id,
+                                     :page => page,
+                                     :per_page => per_page } %>
     </div>
   </div>
 <% end %>
 
 <% if thread.config.comment_order != :l %>
   <%= render :partial => 'commontator/threads/reply',
-             :locals => {:thread => thread, :user => user, :per_page => per_page} %>
+             :locals => { :thread => thread, :user => user, :per_page => per_page } %>
 <% end %>
-

data/app/views/commontator/threads/_show.js.erb

@@ -11,9 +11,8 @@ $("#thread_<%= thread.id %>_div").html(
   "<%= escape_javascript(
     render :partial => 'commontator/threads/show',
            :formats => [:html],
-           :locals => {:thread => thread,
-                       :user => user,
-                       :page => page,
-                       :per_page => per_page,
-                       :show_all => show_all}) %>");
-
+           :locals => { :thread => thread,
+                        :user => user,
+                        :page => page,
+                        :per_page => per_page,
+                        :show_all => show_all }) %>");

data/app/views/commontator/threads/show.js.erb

@@ -1,9 +1,8 @@
 <%= render :partial => 'show',
-           :locals => {:thread => @thread,
-                       :user => @user,
-                       :page => @commontator_page,
-                       :per_page => @commontator_per_page,
-                       :show_all => @show_all} %>
+           :locals => { :thread => @thread,
+                        :user => @user,
+                        :page => @commontator_page,
+                        :per_page => @commontator_per_page,
+                        :show_all => @show_all } %>
 
 <%= javascript_proc %>
-

data/config/initializers/commontator.rb

@@ -19,6 +19,7 @@ Commontator.configure do |config|
   # Arguments: a view (ActionView::Base)
   # Returns: a String that is appended to Commontator JS views
   # Can be used, for example, to display/clear Rails error messages
+  # or to reapply JQuery UI styles after Ajax calls
   # Objects visible in view templates can be accessed
   # through the view object (for example, view.flash)
   # However, the view does not include the main application's helpers
@@ -182,6 +183,17 @@ Commontator.configure do |config|
   # Default: :e
   config.comment_order = :e
 
+  # new_comment_style
+  # Type: Symbol
+  # How to display the "new comment" form
+  # Valid options:
+  #   :t (always present in the thread's page)
+  #   :l (link to the form; opens in the same page using JS)
+  # Not yet implemented:
+  #   :n (link to the form; opens in a new window)
+  # Default: :l
+  config.new_comment_style = :l
+
   # comments_per_page
   # Type: Fixnum or nil
   # Number of comments to display in each page
@@ -235,4 +247,3 @@ Commontator.configure do |config|
   config.commontable_url_proc = lambda { |thread, app_routes|
     app_routes.polymorphic_url(thread.commontable) }
 end
-

data/config/locales/commontator/en.yml

@@ -98,4 +98,3 @@ en:
   time: 
     formats: 
       commontator: "%b %d %Y at %I:%M%p %Z"
-

data/config/routes.rb

@@ -20,4 +20,3 @@ Commontator::Engine.routes.draw do
     end
   end
 end
-

data/db/migrate/0_install_commontator.rb

@@ -1,13 +1,13 @@
 class InstallCommontator < ActiveRecord::Migration
   def change
-    create_table 'commontator_comments' do |t|
-      t.string   'creator_type'
-      t.integer  'creator_id'
-      t.string   'editor_type'
-      t.integer  'editor_id'
-      t.integer  'thread_id', :null => false
-      t.text     'body', :null => false
-      t.datetime 'deleted_at'
+    create_table :commontator_comments do |t|
+      t.string   :creator_type
+      t.integer  :creator_id
+      t.string   :editor_type
+      t.integer  :editor_id
+      t.integer  :thread_id, :null => false
+      t.text     :body, :null => false
+      t.datetime :deleted_at
 
       t.integer :cached_votes_up, :default => 0
       t.integer :cached_votes_down, :default => 0
@@ -15,34 +15,38 @@ class InstallCommontator < ActiveRecord::Migration
       t.timestamps
     end
 
-    add_index :commontator_comments, [:creator_id, :creator_type, :thread_id], :name => 'index_commontator_comments_on_c_id_and_c_type_and_t_id'
+    add_index :commontator_comments, [:creator_id, :creator_type, :thread_id],
+              :name => 'index_commontator_comments_on_c_id_and_c_type_and_t_id'
     add_index :commontator_comments, [:thread_id, :created_at]
 
     add_index  :commontator_comments, :cached_votes_up
     add_index  :commontator_comments, :cached_votes_down
     
-    create_table 'commontator_subscriptions' do |t|
-      t.string   'subscriber_type', :null => false
-      t.integer  'subscriber_id', :null => false
-      t.integer  'thread_id', :null => false
+    create_table :commontator_subscriptions do |t|
+      t.string   :subscriber_type, :null => false
+      t.integer  :subscriber_id, :null => false
+      t.integer  :thread_id, :null => false
 
       t.timestamps
     end
 
-    add_index :commontator_subscriptions, [:subscriber_id, :subscriber_type, :thread_id], :unique => true, :name => 'index_commontator_subscriptions_on_s_id_and_s_type_and_t_id'
+    add_index :commontator_subscriptions, [:subscriber_id, :subscriber_type, :thread_id],
+              :unique => true,
+              :name => 'index_commontator_subscriptions_on_s_id_and_s_type_and_t_id'
     add_index :commontator_subscriptions, :thread_id
 
-    create_table 'commontator_threads' do |t|
-      t.string   'commontable_type'
-      t.integer  'commontable_id'
-      t.datetime 'closed_at'
-      t.string   'closer_type'
-      t.integer  'closer_id'
+    create_table :commontator_threads do |t|
+      t.string   :commontable_type
+      t.integer  :commontable_id
+      t.datetime :closed_at
+      t.string   :closer_type
+      t.integer  :closer_id
 
       t.timestamps
     end
 
-    add_index :commontator_threads, [:commontable_id, :commontable_type], :unique => true, :name => 'index_commontator_threads_on_c_id_and_c_type'
+    add_index :commontator_threads, [:commontable_id, :commontable_type],
+              :unique => true,
+              :name => 'index_commontator_threads_on_c_id_and_c_type'
   end
 end
-

data/lib/commontator.rb

@@ -29,6 +29,7 @@ module Commontator
     :comment_voting,
     :vote_count_proc,
     :comment_order,
+    :new_comment_style,
     :comments_per_page,
     :thread_subscription,
     :email_from_proc,
@@ -135,4 +136,3 @@ end
 
 require 'commontator/acts_as_commontator'
 require 'commontator/acts_as_commontable'
-

data/lib/commontator/acts_as_commontable.rb

@@ -43,4 +43,3 @@ module Commontator
 end
 
 ActiveRecord::Base.send :include, Commontator::ActsAsCommontable
-

data/lib/commontator/acts_as_commontator.rb

@@ -29,4 +29,3 @@ module Commontator
 end
 
 ActiveRecord::Base.send :include, Commontator::ActsAsCommontator
-

data/lib/commontator/commontable_config.rb

@@ -11,4 +11,3 @@ module Commontator
     end
   end
 end
-

data/lib/commontator/commontator_config.rb

@@ -11,4 +11,3 @@ module Commontator
     end
   end
 end
-

data/lib/commontator/controller_includes.rb

@@ -8,6 +8,14 @@ module Commontator
     end
     
     protected
+
+    def commontator_set_new_comment(thread, user)
+      return if thread.nil? || thread.config.new_comment_style != :t
+      new_comment = Comment.new
+      new_comment.thread = thread
+      new_comment.creator = user
+      @new_comment = new_comment if new_comment.can_be_created_by?(user)
+    end
     
     def commontator_thread_show(commontable)
       user = Commontator.current_user_proc.call(self)	
@@ -17,6 +25,7 @@ module Commontator
       @commontator_page = params[:page] || 1
       @commontator_per_page = params[:per_page] || thread.config.comments_per_page
       @commontator_thread_show = true
+      commontator_set_new_comment(thread, user)
     end
   end
 end

data/lib/commontator/engine.rb

@@ -6,4 +6,3 @@ module Commontator
     config.i18n.load_path += Dir[root.join('config', 'locales', '**', '*.{rb,yml}')]
   end
 end
-

data/lib/commontator/link_renderer.rb

@@ -26,4 +26,3 @@ module Commontator
     end
   end
 end
-

data/lib/commontator/security_transgression.rb

@@ -2,4 +2,3 @@ module Commontator
   class SecurityTransgression < StandardError
   end
 end
-

data/lib/commontator/shared_helper.rb

@@ -2,10 +2,11 @@ module Commontator
   module SharedHelper
     def commontator_thread(commontable)
       user = Commontator.current_user_proc.call(self)
+      thread = commontable.thread
       
       render(:partial => 'commontator/shared/thread',
-             :locals => {:thread => commontable.thread,
-                         :user => user}).html_safe
+             :locals => { :thread => thread,
+                          :user => user }).html_safe
     end
 
     def commontator_gravatar_image_tag(user, border = 1, options = {})
@@ -22,4 +23,3 @@ module Commontator
     end
   end
 end
-

data/lib/commontator/version.rb

@@ -1,4 +1,3 @@
 module Commontator
-  VERSION = "4.8.0"
+  VERSION = "4.9.0"
 end
-

data/lib/tasks/commontator_tasks.rake

@@ -42,4 +42,3 @@ namespace :commontator do
     end
   end
 end
-

data/spec/app/controllers/commontator/comments_controller_spec.rb

@@ -546,7 +546,7 @@ module Commontator
       @user.can_read = true
       sign_in @user
 
-      attributes = {:body => 'Something else'}
+      attributes = { :body => 'Something else' }
       post :create, :thread_id => @thread.id, :comment => attributes, :use_route => :commontator
       assigns(:comment).errors.must_be_empty
 
@@ -571,7 +571,7 @@ module Commontator
       @user.can_read = true
       sign_in @user
 
-      attributes = {:body => 'Something else'}
+      attributes = { :body => 'Something else' }
       post :create, :thread_id => @thread.id, :comment => attributes, :use_route => :commontator
       assigns(:comment).errors.must_be_empty
 
@@ -580,4 +580,3 @@ module Commontator
     end
   end
 end
-

data/spec/app/controllers/commontator/subscriptions_controller_spec.rb

@@ -97,4 +97,3 @@ module Commontator
     end
   end
 end
-

data/spec/app/controllers/commontator/threads_controller_spec.rb

@@ -125,4 +125,3 @@ module Commontator
     end
   end
 end
-

data/spec/app/helpers/commontator/application_helper_spec.rb

@@ -7,4 +7,3 @@ module Commontator
     end
   end
 end
-

data/spec/app/mailers/commontator/subscriptions_mailer_spec.rb

@@ -28,4 +28,3 @@ module Commontator
     end
   end
 end
-

data/spec/app/models/commontator/comment_spec.rb

@@ -71,4 +71,3 @@ module Commontator
     end
   end
 end
-

data/spec/app/models/commontator/subscription_spec.rb

@@ -35,4 +35,3 @@ module Commontator
     end
   end
 end
-

data/spec/app/models/commontator/thread_spec.rb

@@ -118,4 +118,3 @@ module Commontator
     end
   end
 end
-

data/spec/dummy/README.md

@@ -1,4 +1,3 @@
 ## Dummy
 
 A dummy application used to test the Commontator engine.
-

data/spec/dummy/Rakefile

@@ -4,4 +4,3 @@
 require File.expand_path('../config/application', __FILE__)
 
 Dummy::Application.load_tasks
-