commontator 2.0.1 → 2.0.2

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

@@ -0,0 +1,62 @@
+<% # Clients of this partial must supply the following variables:
+   # thread
+   # user
+%>
+
+<% can_subscribe = thread.can_subscribe?(user) %>
+<% can_edit = thread.can_be_edited_by?(user) %>
+
+<span id="thread_<%= thread.id.to_s %>_header_span" class="thread_header">
+  <%= thread.config.comment_name.capitalize.pluralize + (thread.is_closed? ? ' (closed)' : '') %>
+</span>
+
+<span id="thread_<%= thread.id.to_s %>_actions_span" class="thread_actions">
+  <% 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} %>
+    </span>
+  <% end %>
+  
+  &nbsp;
+
+  <% if can_edit %>
+    <% is_closed = thread.is_closed? %>
+    <% close_string = is_closed ? "reopen" : "close" %>
+    <%= link_to close_string.capitalize,
+                commontator.polymorphic_path([close_string, thread]),
+                :confirm => (!is_closed ? \
+                              'Are you sure you want to close this thread?' : nil),
+                :method => :put,
+                :id => "thread_#{thread.id.to_s}_#{close_string}_link",
+                :class => "thread_#{close_string}_link",
+                :remote => true %>
+  <% end %>
+</span>
+
+<div id="thread_<%= thread.id.to_s %>_comment_list_div" class="thread_comment_list">
+  <% thread.ordered_comments.each do |comment| %>
+    <% next unless comment.can_be_read_by?(user) %>
+    <%= render :partial => 'commontator/comments/show',
+               :locals => {:comment => comment,
+                           :user => user} %>
+  <% end %>
+</div>
+
+<br/>
+
+<% if thread.is_closed? %>
+
+  <p><%= thread.config.comment_name.capitalize.pluralize %> cannot be <%= thread.config.comment_create_verb_past %> at this time.</p>
+
+<% else %>
+
+  <div id="thread_<%= thread.id %>_new_comment_div" class="thread_new_comment"></div>
+
+  <span id="thread_<%= thread.id %>_new_comment_link_span" class="thread_new_comment_link">
+    <%= link_to thread.config.comment_create_verb_present.capitalize + ' ' + thread.config.comment_name,
+        commontator.new_thread_comment_path(thread), :remote => true %>
+  </span>
+  
+<% end %>

data/config/initializers/commontator.rb~

@@ -62,7 +62,7 @@ Commontator.configure do |config|
   config.comment_create_verb_past = 'posted'
 
   # Verb used when editing comments (present)
-  # Default: 'edit'
+  # Default: 'modify'
   config.comment_edit_verb_present = 'modify'
 
   # Verb used when editing comments (past)

data/config/routes.rb~

@@ -0,0 +1,22 @@
+Commontator::Engine.routes.draw do
+  resources :threads, :only => [:show] do
+    resources :comments, :except => [:index, :destroy], :shallow => true do
+      patch 'delete', :on => :member
+      patch 'undelete', :on => :member
+      
+      patch 'upvote', :on => :member
+      patch 'downvote', :on => :member
+      patch 'unvote', :on => :member
+    end
+    
+    patch 'close', :on => :member
+    patch 'reopen', :on => :member
+    
+    patch 'subscribe', :to => 'subscriptions#subscribe',
+                       :as => 'subscribe',
+                       :on => :member
+    patch 'unsubscribe', :to => 'subscriptions#destroy',
+                       :as => 'unsubscribe',
+                       :on => :member
+  end
+end

data/db/migrate/0_install.rb~

@@ -6,7 +6,7 @@ class Install < ActiveRecord::Migration
       t.string   "editor_type"
       t.integer  "editor_id"
       t.integer  "thread_id", :null => false
-      t.text     "body", :null => false, :default => ''
+      t.text     "body", :null => false
       t.datetime "deleted_at"
       
       t.integer  "cached_votes_total", :default => 0

data/db/migrate/{0_install.rb → 0_install_commontator.rb}

@@ -1,4 +1,4 @@
-class Install < ActiveRecord::Migration
+class InstallCommontator < ActiveRecord::Migration
   def change
     create_table "commontator_comments" do |t|
       t.string   "creator_type"

data/lib/commontator/controller_includes.rb~

@@ -0,0 +1,22 @@
+require 'commontator/shared_helper'
+require 'commontator/security_transgression'
+
+module Commontator
+  module ControllerIncludes
+    def self.included(base)
+      base.helper Commontator::SharedHelper
+    end
+    
+    def commontator_thread_show(commontable)
+      user = send Commontator.current_user_method	
+      raise SecurityTransgression unless (user.nil? || user.is_commontator)
+      
+      thread = commontable.thread
+      raise SecurityTransgression unless thread.can_be_read_by?(user)
+      thread.mark_as_read_for(user)
+      @commontator_thread_show = true
+    end
+  end
+end
+
+ActionController::Base.send :include, Commontator::ControllerIncludes

data/lib/commontator/shared_helper.rb~

@@ -0,0 +1,42 @@
+module Commontator
+  module SharedHelper
+    def commontator_thread(commontable)
+      user = send Commontator.current_user_method
+      
+      render(:partial => 'commontator/shared/thread',
+             :locals => {:thread => commontable.thread,
+                         :user => user}).html_safe
+    end
+    
+    def commontator_name(user)
+      return Commontator.user_missing_name if user.nil?
+      config = user.commontator_config
+      config.user_name_method.blank? ? config.user_missing_name : \
+        user.send(config.user_name_method)
+    end
+    
+    def commontator_email(user)
+      return '' if user.nil?
+      config = user.commontator_config
+      config.user_email_method.blank? ? '' : user.send(config.user_email_method)
+    end
+    
+    def commontator_gravatar_url(user, options = {})
+      options[:secure] ||= request.ssl?
+      options[:size] ||= 50
+    
+      hash = Digest::MD5.hexdigest(commontator_email(user))
+      base = options[:secure] ? "s://secure" : "://www"
+      
+      "http#{base}.gravatar.com/avatar/#{hash}?s=#{options[:size]}"
+    end
+  
+    def commontator_gravatar_image(user, options = {})
+      name = commontator_name(user)
+      image_tag(commontator_gravatar_url(user, options), 
+                { :alt => name, 
+                  :title => name,
+                  :border => 1 })
+    end
+  end
+end

data/lib/commontator/version.rb

@@ -1,3 +1,3 @@
 module Commontator
-  VERSION = "2.0.1"
+  VERSION = "2.0.2"
 end

data/lib/commontator/version.rb~

@@ -1,3 +1,3 @@
 module Commontator
-  VERSION = "2.0.0"
+  VERSION = "2.0.1"
 end

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

@@ -1,4 +1,4 @@
-require 'minitest_helper'
+require 'test_helper'
 require 'acts_as_votable'
 
 module Commontator
@@ -322,7 +322,11 @@ module Commontator
       assert_redirected_to @thread
       assigns(:comment).errors.wont_be_empty
       
-      @comment.delete_by(@user).must_equal true
+      user2 = DummyUser.create
+      user2.can_read = true
+      user2.can_edit = true
+      user2.is_admin = true
+      @comment.delete_by(user2).must_equal true
       put :undelete, :id => @comment.id, :use_route => :commontator
       assert_response 403
       assigns(:comment).is_deleted?.must_equal true
@@ -506,5 +510,54 @@ module Commontator
       assigns(:comment).upvotes.must_be_empty
       assigns(:comment).downvotes.must_be_empty
     end
+
+    it 'wont send mail if recipients empty' do
+      if defined?(CommentsController::SubscriptionsMailer)
+        CommentsController::SubscriptionsMailer.__send__(:initialize)
+      else
+        CommentsController::SubscriptionsMailer = MiniTest::Mock.new
+      end
+
+      user2 = DummyUser.create
+      user2.can_read = true
+
+      email = MiniTest::Mock.new.expect(:deliver, nil)
+      CommentsController::SubscriptionsMailer.expect(:comment_created, email, [Comment, [user2]])
+
+      @user.can_read = true
+      sign_in @user
+
+      attributes = {:body => 'Something else'}
+      post :create, :thread_id => @thread.id, :comment => attributes, :use_route => :commontator
+      assigns(:comment).errors.must_be_empty
+
+      proc { CommentsController::SubscriptionsMailer.verify }.must_raise(MockExpectationError)
+      proc { email.verify }.must_raise(MockExpectationError)
+    end
+    
+    it 'must send mail if recipients not empty' do
+      if defined?(CommentsController::SubscriptionsMailer)
+        CommentsController::SubscriptionsMailer.__send__(:initialize)
+      else
+        CommentsController::SubscriptionsMailer = MiniTest::Mock.new
+      end
+
+      user2 = DummyUser.create
+      user2.can_read = true
+      @thread.subscribe(user2)
+
+      email = MiniTest::Mock.new.expect(:deliver, nil)
+      CommentsController::SubscriptionsMailer.expect(:comment_created, email, [Comment, [user2]])
+
+      @user.can_read = true
+      sign_in @user
+
+      attributes = {:body => 'Something else'}
+      post :create, :thread_id => @thread.id, :comment => attributes, :use_route => :commontator
+      assigns(:comment).errors.must_be_empty
+
+      CommentsController::SubscriptionsMailer.verify
+      email.verify
+    end
   end
 end

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

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'test_helper'
 
 module Commontator
   describe SubscriptionsController do
@@ -6,29 +6,29 @@ module Commontator
       setup_controller_spec
     end
     
-    it 'wont create unless authorized' do
-      post :create, :thread_id => @thread.id, :use_route => :commontator
+    it 'wont subscribe unless authorized' do
+      post :subscribe, :thread_id => @thread.id, :use_route => :commontator
       assert_response 403
       @thread.subscription_for(nil).must_be_nil
       @thread.subscription_for(@user).must_be_nil
       
       sign_in @user
-      post :create, :thread_id => @thread.id, :use_route => :commontator
+      patch :subscribe, :thread_id => @thread.id, :use_route => :commontator
       assert_response 403
       @thread.subscription_for(@user).must_be_nil
       
       @thread.subscribe(@user)
       @user.can_read = true
-      post :create, :thread_id => @thread.id, :use_route => :commontator
+      patch :subscribe, :thread_id => @thread.id, :use_route => :commontator
       assert_redirected_to @thread
       assigns(:thread).errors.wont_be_empty
     end
     
-    it 'must create if authorized' do
+    it 'must subscribe if authorized' do
       sign_in @user
       
       @user.can_read = true
-      post :create, :thread_id => @thread.id, :use_route => :commontator
+      patch :subscribe, :thread_id => @thread.id, :use_route => :commontator
       assert_redirected_to @thread
       assigns(:thread).errors.must_be_empty
       @thread.subscription_for(@user).wont_be_nil
@@ -36,7 +36,7 @@ module Commontator
       @thread.unsubscribe(@user)
       @user.can_read = false
       @user.can_edit = true
-      post :create, :thread_id => @thread.id, :use_route => :commontator
+      patch :subscribe, :thread_id => @thread.id, :use_route => :commontator
       assert_redirected_to @thread
       assigns(:thread).errors.must_be_empty
       @thread.subscription_for(@user).wont_be_nil
@@ -44,27 +44,27 @@ module Commontator
       @thread.unsubscribe(@user)
       @user.can_edit = false
       @user.is_admin = true
-      post :create, :thread_id => @thread.id, :use_route => :commontator
+      patch :subscribe, :thread_id => @thread.id, :use_route => :commontator
       assert_redirected_to @thread
       assigns(:thread).errors.must_be_empty
       @thread.subscription_for(@user).wont_be_nil
     end
     
-    it 'wont destroy unless authorized' do
+    it 'wont unsubscribe unless authorized' do
       @thread.subscribe(@user)
-      delete :destroy, :thread_id => @thread.id, :use_route => :commontator
+      patch :unsubscribe, :thread_id => @thread.id, :use_route => :commontator
       assert_response 403
       @thread.subscription_for(nil).must_be_nil
       @thread.subscription_for(@user).wont_be_nil
       
       sign_in @user
-      delete :destroy, :thread_id => @thread.id, :use_route => :commontator
+      patch :unsubscribe, :thread_id => @thread.id, :use_route => :commontator
       assert_response 403
       @thread.subscription_for(@user).wont_be_nil
       
       @thread.unsubscribe(@user)
       @user.can_read = true
-      delete :destroy, :thread_id => @thread.id, :use_route => :commontator
+      patch :unsubscribe, :thread_id => @thread.id, :use_route => :commontator
       assert_redirected_to @thread
       assigns(:thread).errors.wont_be_empty
     end
@@ -74,7 +74,7 @@ module Commontator
       
       @thread.subscribe(@user)
       @user.can_read = true
-      delete :destroy, :thread_id => @thread.id, :use_route => :commontator
+      patch :unsubscribe, :thread_id => @thread.id, :use_route => :commontator
       assert_redirected_to @thread
       assigns(:thread).errors.must_be_empty
       @thread.subscription_for(@user).must_be_nil
@@ -82,7 +82,7 @@ module Commontator
       @thread.subscribe(@user)
       @user.can_read = false
       @user.can_edit = true
-      delete :destroy, :thread_id => @thread.id, :use_route => :commontator
+      patch :unsubscribe, :thread_id => @thread.id, :use_route => :commontator
       assert_redirected_to @thread
       assigns(:thread).errors.must_be_empty
       @thread.subscription_for(@user).must_be_nil
@@ -90,7 +90,7 @@ module Commontator
       @thread.subscribe(@user)
       @user.can_edit = false
       @user.is_admin = true
-      delete :destroy, :thread_id => @thread.id, :use_route => :commontator
+      patch :unsubscribe, :thread_id => @thread.id, :use_route => :commontator
       assert_redirected_to @thread
       assigns(:thread).errors.must_be_empty
       @thread.subscription_for(@user).must_be_nil

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

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'test_helper'
 
 module Commontator
   describe ThreadsController do

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

@@ -1,3 +1,5 @@
+require 'minitest_helper'
+
 module Commontator
   describe ApplicationHelper do
     it 'must print javascript proc' do

data/spec/app/helpers/commontator/threads_helper_spec.rb~

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'minitest_helper'
 
 module Commontator
   describe ThreadsHelper do

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

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'test_helper'
 
 module Commontator
   describe SubscriptionsMailer do

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

@@ -54,7 +54,7 @@ module Commontator
       @comment.editor = @user
       @comment.save!
       
-      @comment.timestamp.must_equal "#{@thread.config.comment_create_verb_past.capitalize} on #{@comment.created_at.strftime(@thread.config.timestamp_format)}" +
+      @comment.timestamp.must_equal "#{@thread.config.comment_create_verb_past.capitalize} on #{@comment.created_at.strftime(@thread.config.timestamp_format)}" + \
         " | Last #{@thread.config.comment_edit_verb_past} on #{@comment.updated_at.strftime(@thread.config.timestamp_format)}"
     end
   end

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

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'minitest_helper'
 
 module Commontator
   describe Subscription do

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

@@ -9,7 +9,7 @@ module Commontator
     it 'must have a config' do
       @thread.config.must_be_instance_of CommontableConfig
       @thread.commontable = nil
-      @thread.config.must_be_nil
+      @thread.config.must_equal Commontator
     end
     
     it 'must order all comments' do

data/spec/dummy/Rakefile~

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

data/spec/dummy/config.ru~

@@ -0,0 +1,4 @@
+# This file is used by Rack-based servers to start the application.
+
+require ::File.expand_path('../config/environment',  __FILE__)
+run Dummy::Application