commontator 4.8.0 → 4.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae4add6fcbfeae98ccb312696fac609f609879f5
-  data.tar.gz: 7ec14c7b85e04679d3789ab9d81967b86595dcd7
+  metadata.gz: b2a812300839c474464d971d6b3ac2ef09c1552b
+  data.tar.gz: 1a4f7b752025697ea321f82a10043ff06dd15798
 SHA512:
-  metadata.gz: af8d162d73bb9818a19080d06078dbde9fe9a74c9a18952e959d02e8053b406d0de9135f3305207cfed430a9fab7820e7674c2d42369447e73b6ed3bfdc87825
-  data.tar.gz: f97a034bf1f58e18c5607be7f2c64a05a6d562c1d4ea308d56385bc8de7d0058058c6df2667b41671002b47b8a994265a868adcff2c209e618c076df9a3f860b
+  metadata.gz: 941be6a20d22ab89fad1c15908972ba0c858789748569540ffa5cb3ca831b6f540b61b023809331a35635c963faa2e1e736487c1360bc53ec72981ff6bb391ba
+  data.tar.gz: a8937a901b8dac241b58c18ad4158a3953821f466cc7f10228ba51cde2affbe98a2062e69d31515bcd950a6981d27fac40a948523b8a783908a3add03bfdf211

data/MIT-LICENSE

@@ -18,4 +18,3 @@ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-

data/README.md

@@ -18,7 +18,7 @@ There are 4 steps you must follow to install commontator:
   Add this line to your application's Gemfile:
 
   ```rb
-  gem 'commontator', '~> 4.7.2'
+  gem 'commontator', '~> 4.8.0'
   ```
 
   And then execute:
@@ -220,4 +220,3 @@ $ bundle exec rake
 
 This gem is distributed under the terms of the MIT license.
 See the MIT-LICENSE file for details.
-

data/app/assets/stylesheets/commontator/application.css

@@ -11,4 +11,3 @@
  *= require_self
  *= require_tree .
  */
-

data/app/assets/stylesheets/commontator/comments.css

@@ -119,4 +119,3 @@
 .comment_error_explanation ul {
   list-style-position: inside;
 }
-

data/app/assets/stylesheets/commontator/threads.css

@@ -2,6 +2,10 @@
   display: block !important;
 }
 
+.thread .hidden {
+  display: none;
+}
+
 .thread_actions {
   float: right;
 }
@@ -15,14 +19,6 @@
   display: block;
 }
 
-.thread_new_comment {
-  display: none;
-}
-
-.thread_new_comment_link {
-  display: block;
-}
-
 /* Modified from:
 http://www.strangerstudios.com/sandbox/pagination/diggstyle.php */
 .thread_page_entries_info {
@@ -68,4 +64,3 @@ http://www.strangerstudios.com/sandbox/pagination/diggstyle.php */
 
   color: #DDD;
 }
-

data/app/controllers/commontator/application_controller.rb

@@ -1,6 +1,6 @@
 module Commontator
   class ApplicationController < ActionController::Base
-    before_filter :get_user, :ensure_user
+    before_filter :set_user, :ensure_user
     
     rescue_from SecurityTransgression, :with => lambda { head(:forbidden) }
     
@@ -10,7 +10,7 @@ module Commontator
       raise SecurityTransgression unless check
     end
 
-    def get_user
+    def set_user
       @user = Commontator.current_user_proc.call(self)
     end
 
@@ -18,12 +18,12 @@ module Commontator
       security_transgression_unless(@user && @user.is_commontator)
     end
 
-    def get_thread
+    def set_thread
       @thread = params[:thread_id].blank? ? \
         Commontator::Thread.find(params[:id]) : \
         Commontator::Thread.find(params[:thread_id])
       security_transgression_unless @thread.can_be_read_by? @user
+      commontator_set_new_comment(@thread, @user)
     end
   end
 end
-

data/app/controllers/commontator/comments_controller.rb

@@ -1,14 +1,13 @@
 module Commontator
   class CommentsController < Commontator::ApplicationController
-    before_filter :get_thread, :only => [:new, :create]
-    before_filter :get_comment_and_thread, :except => [:new, :create]
+    before_filter :set_thread, :only => [:new, :create]
+    before_filter :set_comment_and_thread, :except => [:new, :create]
 
     # GET /threads/1/comments/new
     def new
       @comment = Comment.new
       @comment.thread = @thread
       @comment.creator = @user
-
       security_transgression_unless @comment.can_be_created_by?(@user)
 
       @per_page = params[:per_page] || @thread.config.comments_per_page
@@ -23,10 +22,9 @@ module Commontator
     # POST /threads/1/comments
     def create
       @comment = Comment.new
-      @comment.body = params[:comment].nil? ? nil : params[:comment][:body]
       @comment.thread = @thread
       @comment.creator = @user
-      
+      @comment.body = params[:comment].nil? ? nil : params[:comment][:body]
       security_transgression_unless @comment.can_be_created_by?(@user)
       
       respond_to do |format|
@@ -144,10 +142,10 @@ module Commontator
     
     protected
     
-    def get_comment_and_thread
+    def set_comment_and_thread
       @comment = Comment.find(params[:id])
       @thread = @comment.thread
+      commontator_set_new_comment(@thread, @user)
     end
   end
 end
-

data/app/controllers/commontator/subscriptions_controller.rb

@@ -1,6 +1,6 @@
 module Commontator
   class SubscriptionsController < Commontator::ApplicationController
-    before_filter :get_thread
+    before_filter :set_thread
 
     # PUT /threads/1/subscribe
     def subscribe
@@ -30,4 +30,3 @@ module Commontator
     end
   end
 end
-

data/app/controllers/commontator/threads_controller.rb

@@ -1,8 +1,7 @@
 module Commontator
   class ThreadsController < Commontator::ApplicationController
     skip_before_filter :ensure_user, :only => :show
-
-    before_filter :get_thread
+    before_filter :set_thread
 
     # GET /threads/1
     def show
@@ -46,4 +45,3 @@ module Commontator
     end
   end
 end
-

data/app/helpers/commontator/application_helper.rb

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

data/app/mailers/commontator/subscriptions_mailer.rb

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

data/app/models/commontator/comment.rb

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

data/app/models/commontator/subscription.rb

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

data/app/models/commontator/thread.rb

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

data/app/views/commontator/comments/_actions.html.erb

@@ -27,4 +27,3 @@
               :class => "comment_#{del_string}_link",
               :remote => true %>
 <% end %>
-

data/app/views/commontator/comments/_body.html.erb

@@ -6,4 +6,3 @@
       t('commontator.comment.status.deleted_by',
         :deleter_name => Commontator.commontator_name(comment.editor)) : \
       comment.body %>
-

data/app/views/commontator/comments/_form.html.erb

@@ -36,4 +36,3 @@
   </div>
   
 <% end %>
-

data/app/views/commontator/comments/_list.html.erb

@@ -5,7 +5,6 @@
 
 <% comments.each do |comment| %>
   <%= render :partial => 'commontator/comments/show',
-             :locals => {:comment => comment,
-                         :user => user} %>
+             :locals => { :comment => comment,
+                          :user => user } %>
 <% end %>
-

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

@@ -16,8 +16,8 @@
     </span>
     <span id="comment_<%= comment.id.to_s %>_actions_span" class="comment_actions">
       <%= render :partial => 'commontator/comments/actions',
-                 :locals => {:comment => comment,
-                             :user => user} %>
+                 :locals => { :comment => comment,
+                              :user => user } %>
     </span>
   </div>
   <div id="comment_<%= comment.id.to_s %>_middle_div" class="comment_div">
@@ -26,12 +26,12 @@
     </span>
     <span id="comment_<%= comment.id.to_s %>_votes_span" class="comment_votes">
       <%= render :partial => 'commontator/comments/votes',
-                 :locals => {:comment => comment,
-                             :user => user} %>
+                 :locals => { :comment => comment,
+                              :user => user } %>
     </span>
     <div id="comment_<%= comment.id.to_s %>_body_div" class="comment_body">
       <%= render :partial => 'commontator/comments/body',
-                 :locals => {:comment => comment} %>
+                 :locals => { :comment => comment } %>
     </div>
   </div>
   <div id="comment_<%= comment.id.to_s %>_bottom_div" class="comment_div">
@@ -46,4 +46,3 @@
     </span>
   </div>
 </div>
-

data/app/views/commontator/comments/_votes.html.erb

@@ -66,4 +66,3 @@
   </span>
   <% end %>
 <% end %>
-

data/app/views/commontator/comments/cancel.js.erb

@@ -1,12 +1,19 @@
 <% unless @comment.try(:id).blank? %>
   <% @comment.reload %>
   $("#comment_<%= @comment.id.to_s %>_body_div").html("<%= escape_javascript(
-    render :partial => 'body', :locals => {:comment => @comment}) %>");
+    render :partial => 'body', :locals => { :comment => @comment }) %>");
 <% end %>
 
-$("#thread_<%= @thread.id %>_new_comment_div").hide();
+<% unless @new_comment.nil? %>
+  $("#thread_<%= @thread.id %>_new_comment_form_div").html("<%= escape_javascript(
+    render :partial => 'form',
+           :locals => { :comment => @new_comment,
+                        :thread => @thread,
+                        :per_page => @per_page }) %>");
+<% else %>
+  $("#thread_<%= @thread.id %>_new_comment_form_div").hide();
 
-$("#thread_<%= @thread.id %>_new_comment_link_span").fadeIn();
+  $("#thread_<%= @thread.id %>_new_comment_link_div").fadeIn();
+<% end %>
 
 <%= javascript_proc %>
-

data/app/views/commontator/comments/create.js.erb

@@ -1,14 +1,21 @@
 <%= render :partial => 'commontator/threads/show',
-           :locals => {:thread => @thread,
-                       :user => @user,
-                       :page => @thread.new_comment_page(@per_page),
-                       :per_page => @per_page} %>
+           :locals => { :thread => @thread,
+                        :user => @user,
+                        :page => @thread.new_comment_page(@per_page),
+                        :per_page => @per_page } %>
 
-$("#thread_<%= @thread.id %>_new_comment_div").hide();
+<% unless @new_comment.nil? %>
+  $("#thread_<%= @thread.id %>_new_comment_form_div").html("<%= escape_javascript(
+    render :partial => 'form',
+           :locals => { :comment => @new_comment,
+                        :thread => @thread,
+                        :per_page => @per_page }) %>");
+<% else %>
+  $("#thread_<%= @thread.id %>_new_comment_form_div").hide();
 
-$("#thread_<%= @thread.id %>_new_comment_link_span").fadeIn();
+  $("#thread_<%= @thread.id %>_new_comment_link_div").fadeIn();
+<% end %>
 
 $("#comment_<%= @comment.id.to_s %>_div").hide().fadeIn()[0].scrollIntoView();
 
 <%= javascript_proc %>
-

data/app/views/commontator/comments/delete.js.erb

@@ -1,18 +1,17 @@
 $("#comment_<%= @comment.id.to_s %>_body_div").html("<%= escape_javascript(
-  render :partial => 'body', :locals => {:comment => @comment}) %>");
+  render :partial => 'body', :locals => { :comment => @comment }) %>");
 
 $("#comment_<%= @comment.id.to_s %>_updated_timestamp_span").html("<%= escape_javascript(
   @comment.updated_timestamp) %>");
                                                            
 $("#comment_<%= @comment.id.to_s %>_actions_span").html("<%= escape_javascript(
   render :partial => 'actions',
-         :locals => {:comment => @comment,
-                     :user => @user}) %>");
+         :locals => { :comment => @comment,
+                      :user => @user }) %>");
          
 $("#comment_<%= @comment.id %>_votes_span").html("<%= escape_javascript(
   render :partial => 'votes',
-         :locals => {:comment => @comment,
-                     :user => @user}) %>");
+         :locals => { :comment => @comment,
+                      :user => @user }) %>");
 
 <%= javascript_proc %>
-

data/app/views/commontator/comments/edit.js.erb

@@ -1,6 +1,5 @@
 $("#comment_<%= @comment.id.to_s %>_body_div").html("<%= escape_javascript(
   render :partial => 'form',
-         :locals => {:comment => @comment}) %>");
+         :locals => { :comment => @comment }) %>");
          
 <%= javascript_proc %>
-

data/app/views/commontator/comments/new.js.erb

@@ -1,14 +1,11 @@
-$("#thread_<%= @thread.id %>_new_comment_div").html("<%= escape_javascript(
+$("#thread_<%= @thread.id %>_new_comment_form_div").html("<%= escape_javascript(
   render :partial => 'form',
-         :locals => {
-                       :comment => @comment,
-                       :thread => @thread,
-                       :per_page => @per_page
-                    }) %>");
-                    
-$("#thread_<%= @thread.id %>_new_comment_div").fadeIn()[0].scrollIntoView();
+         :locals => { :comment => @comment,
+                      :thread => @thread,
+                      :per_page => @per_page }) %>");
 
-$("#thread_<%= @thread.id %>_new_comment_link_span").hide();
+$("#thread_<%= @thread.id %>_new_comment_form_div").fadeIn()[0].scrollIntoView();
 
-<%= javascript_proc %>
+$("#thread_<%= @thread.id %>_new_comment_link_div").hide();
 
+<%= javascript_proc %>

data/app/views/commontator/comments/update.js.erb

@@ -1,8 +1,7 @@
 $("#comment_<%= @comment.id.to_s %>_body_div").html("<%= escape_javascript(
-  render :partial => 'body', :locals => {:comment => @comment}) %>");
+  render :partial => 'body', :locals => { :comment => @comment }) %>");
 
 $("#comment_<%= @comment.id.to_s %>_updated_timestamp_span").html("<%= escape_javascript(
   @comment.updated_timestamp) %>");
 
 <%= javascript_proc %>
-

data/app/views/commontator/comments/vote.js.erb

@@ -1,7 +1,6 @@
 $("#comment_<%= @comment.id %>_votes_span").html("<%= escape_javascript(
   render :partial => 'votes',
-         :locals => {:comment => @comment,
-                     :user => @user}) %>");
+         :locals => { :comment => @comment,
+                      :user => @user }) %>");
 
 <%= javascript_proc %>
-

data/app/views/commontator/shared/_thread.html.erb

@@ -9,10 +9,10 @@
   <div id="thread_<%= thread.id %>_div" class="thread" style="display: none;">
     <% if @commontator_thread_show %>
       <%= render :partial => 'commontator/threads/show',
-                 :locals => {:thread => thread,
-                             :user => user,
-                             :page => @commontator_page,
-                             :per_page => @commontator_per_page} %>
+                 :locals => { :thread => thread,
+                              :user => user,
+                              :page => @commontator_page,
+                              :per_page => @commontator_per_page } %>
     <% else %>
       <% subscription = thread.subscription_for(user) %>
       <%= link_to "#{t 'commontator.thread.actions.show'} (#{(subscription.unread_comments.count.to_s + '/') \
@@ -21,4 +21,3 @@
     <% end %>
   </div>
 <% end %>
-

data/app/views/commontator/subscriptions/_link.html.erb

@@ -13,4 +13,3 @@
             :id => "thread_#{thread.id.to_s}_#{sub_string}_link",
             :class => "thread_#{sub_string}_link",
             :remote => true %>
-

data/app/views/commontator/subscriptions/subscribe.js.erb

@@ -1,7 +1,6 @@
 $("#thread_<%= @thread.id.to_s %>_subscription_span").html("<%= escape_javascript(
   render :partial => 'link',
-         :locals => {:thread => @thread,
-                     :user => @user}) %>");
+         :locals => { :thread => @thread,
+                      :user => @user }) %>");
 
 <%= javascript_proc %>
-

data/app/views/commontator/subscriptions_mailer/comment_created.html.erb

@@ -8,4 +8,3 @@
 <p><%= t 'commontator.email.thread_link_html',
          :commontable_url => @commontable_url,
          :commontable_name => @commontable_name %></p>
-