commontator 1.1.1 → 1.1.2

data/README.md

@@ -13,7 +13,7 @@ There are 4 steps you must follow to install commontator:
   Add this line to your application's Gemfile:
 
   ```ruby
-  gem 'commontator', '~> 1.0.0'
+  gem 'commontator', '~> 1.1.0'
   ```
 
   And then execute:

data/Rakefile

@@ -4,38 +4,20 @@ begin
 rescue LoadError
   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
-begin
-  require 'rdoc/task'
-rescue LoadError
-  require 'rdoc/rdoc'
-  require 'rake/rdoctask'
-  RDoc::Task = Rake::RDocTask
-end
-
-RDoc::Task.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'Commontator'
-  rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README.rdoc')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
 
 APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
 load 'rails/tasks/engine.rake'
 
-
-
 Bundler::GemHelper.install_tasks
 
 require 'rake/testtask'
 
-Rake::TestTask.new(:spec) do |t|
-  Rake::Task['app:db:test:prepare'].invoke
+Rake::TestTask.new(:test => 'app:db:test:prepare') do |t|
   t.libs << 'lib'
   t.libs << 'spec'
   t.pattern = 'spec/**/*_spec.rb'
   t.verbose = false
 end
 
+task :default => :test
 
-task :default => :spec

data/lib/commontator.rb

@@ -1,3 +1,6 @@
+require 'commontator/engine'
+require 'commontator/controller_includes'
+
 module Commontator
   # Attributes
 
@@ -53,7 +56,6 @@ module Commontator
   end
 end
 
-require 'commontator/engine'
 require 'commontator/acts_as_commontator'
 require 'commontator/acts_as_commontable'
-require 'commontator/controller_includes'
+

data/lib/commontator.rb~

@@ -1,3 +1,8 @@
+require 'commontator/engine'
+require 'commontator/controller_includes'
+require 'commontator/acts_as_commontator'
+require 'commontator/acts_as_commontable'
+
 module Commontator
   # Attributes
 
@@ -11,7 +16,6 @@ module Commontator
   COMMONTATOR_ATTRIBUTES = [
     :user_missing_name,
     :user_name_clickable,
-    :subscription_emails,
     :user_email_method,
     :user_name_method,
     :user_admin_proc,
@@ -54,7 +58,5 @@ module Commontator
   end
 end
 
-require 'commontator/engine'
-require 'commontator/acts_as_commontator'
-require 'commontator/acts_as_commontable'
-require 'commontator/controller_includes'
+
+

data/lib/commontator/acts_as_commontable.rb

@@ -18,7 +18,7 @@ module Commontator
           validates_presence_of :thread
           
           cattr_accessor :commontable_config
-          self.commontable_config = Commontator::CommontableConfig.new
+          self.commontable_config = Commontator::CommontableConfig.new(options)
           self.is_commontable = true
           
           alias_method :thread_raw, :thread

data/lib/commontator/acts_as_commontable.rb~

@@ -24,8 +24,8 @@ module Commontator
           alias_method :thread_raw, :thread
           
           def thread
-            t = thread_raw
-            return t unless t.nil?
+            raw = thread_raw
+            return raw unless raw.nil?
             return Commontator::Thread.find_or_create_by_commontable_id_and_commontable_type(self.id, self.class.name) \
               unless self.id.nil?
             self.thread = Commontator::Thread.new

data/lib/commontator/security_transgression.rb

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

data/lib/commontator/security_transgression.rb~

@@ -0,0 +1,3 @@
+module Commontator
+  class SecurityTransgression < StandardError; end
+end

data/lib/commontator/version.rb

@@ -1,3 +1,3 @@
 module Commontator
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

data/lib/commontator/version.rb~

@@ -1,3 +1,3 @@
 module Commontator
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/lib/tasks/commontator_tasks.rake

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

data/lib/tasks/commontator_tasks.rake~

@@ -0,0 +1,41 @@
+COPY_TASKS = ['assets/images', 'assets/stylesheets', 'views', 'mailers', 'helpers', 'controllers', 'models']
+
+namespace :commontator do
+  namespace :install do
+    desc "Copy initializers from commontator to application"
+    task :initializers do
+      Dir.glob(File.expand_path('../../../config/initializers/*.rb', __FILE__)) do |file|
+        if File.exists?(File.expand_path(File.basename(file), 'config/initializers'))
+          print "NOTE: Initializer #{File.basename(file)} from commontator has been skipped. Initializer with the same name already exists.\n"
+        else
+          cp file, 'config/initializers', :verbose => false
+          print "Copied initializer #{File.basename(file)} from commontator\n"
+        end
+      end
+    end
+  end
+  
+  namespace :copy do
+    COPY_TASKS.each do |path|
+      name = File.basename(path)
+      desc "Copy #{name} from commontator to application"
+      task name.to_sym do
+        cp_r File.expand_path("../../../app/#{path}/commontator", __FILE__), "app/#{path}", :verbose => false
+        print "Copied #{name} from commontator\n"
+      end
+    end
+  end
+  
+  desc "Copy initializers and migrations from commontator to application"
+  task :install do
+    Rake::Task["commontator:install:initializers"].invoke
+    Rake::Task["commontator:install:migrations"].invoke
+  end
+  
+  desc "Copy assets, views, mailers, helpers, controllers and models from commontator to application"
+  task :copy do
+    COPY_TASKS.each do |path|
+      Rake::Task["commontator:copy:#{File.basename(path)}"].invoke
+    end
+  end
+end

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

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'minitest_helper'
 require 'acts_as_votable'
 
 module Commontator

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

@@ -2,10 +2,10 @@ require 'spec_helper'
 require 'acts_as_votable'
 
 module Commontator
-  describe Commontator::CommentsController do
+  describe CommentsController do
     before do
       setup_controller_spec
-      @comment = Commontator::Comment.new
+      @comment = Comment.new
       @comment.thread = @thread
       @comment.creator = @user
       @comment.body = 'Something'
@@ -114,7 +114,7 @@ module Commontator
       @user.can_edit = true
       @user.is_admin = true
       sign_in @user
-      comment2 = Commontator::Comment.new
+      comment2 = Comment.new
       comment2.thread = @thread
       comment2.creator = @user
       comment2.body = 'Something else'
@@ -170,7 +170,7 @@ module Commontator
       @user.can_edit = true
       @user.is_admin = true
       sign_in @user
-      comment2 = Commontator::Comment.new
+      comment2 = Comment.new
       comment2.thread = @thread
       comment2.creator = @user
       comment2.body = 'Something else'
@@ -220,7 +220,7 @@ module Commontator
       assert_redirected_to @thread
       assigns(:comment).errors.wont_be_empty
       
-      comment2 = Commontator::Comment.new
+      comment2 = Comment.new
       comment2.thread = @thread
       comment2.creator = @user
       comment2.body = 'Something else'
@@ -243,7 +243,7 @@ module Commontator
       
       user2 = DummyUser.create
       sign_in user2
-      comment2 = Commontator::Comment.new
+      comment2 = Comment.new
       comment2.thread = @thread
       comment2.creator = @user
       comment2.body = 'Something else'
@@ -290,7 +290,7 @@ module Commontator
       assert_response 403
       assigns(:comment).is_deleted?.must_equal true
       
-      comment2 = Commontator::Comment.new
+      comment2 = Comment.new
       comment2.thread = @thread
       comment2.creator = @user
       comment2.body = 'Something else'
@@ -314,7 +314,7 @@ module Commontator
       
       user2 = DummyUser.create
       sign_in user2
-      comment2 = Commontator::Comment.new
+      comment2 = Comment.new
       comment2.thread = @thread
       comment2.creator = @user
       comment2.body = 'Something else'

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

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

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

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 module Commontator
-  describe Commontator::SubscriptionsController do
+  describe SubscriptionsController do
     before do
       setup_controller_spec
     end

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

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

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

@@ -1,121 +1,121 @@
 require 'spec_helper'
 
 module Commontator
-describe ThreadsController do
-  before do
-    setup_controller_spec
-  end
-  
-  it 'wont show unless authorized' do
-    get :show, :id => @thread.id, :use_route => :commontator
-    assert_response 403
-    
-    sign_in @user
-    get :show, :id => @thread.id, :use_route => :commontator
-    assert_response 403
-  end
-  
-  it 'must show if authorized' do
-    commontable_path = Rails.application.routes.url_helpers.dummy_model_path(@commontable)
-    sign_in @user
-    
-    @user.can_read = true
-    get :show, :id => @thread.id, :use_route => :commontator
-    assert_redirected_to commontable_path
+  describe ThreadsController do
+    before do
+      setup_controller_spec
+    end
     
-    @user.can_read = false
-    @user.can_edit = true
-    get :show, :id => @thread.id, :use_route => :commontator
-    assert_redirected_to commontable_path
+    it 'wont show unless authorized' do
+      get :show, :id => @thread.id, :use_route => :commontator
+      assert_response 403
+      
+      sign_in @user
+      get :show, :id => @thread.id, :use_route => :commontator
+      assert_response 403
+    end
     
-    @user.can_edit = false
-    @user.is_admin = true
-    get :show, :id => @thread.id, :use_route => :commontator
-    assert_redirected_to commontable_path
-  end
-  
-  it 'wont close unless authorized and open' do
-    put :close, :id => @thread.id, :use_route => :commontator
-    assert_response 403
-    assigns(:thread).is_closed?.must_equal false
-    
-    sign_in @user
-    put :close, :id => @thread.id, :use_route => :commontator
-    assert_response 403
-    assigns(:thread).is_closed?.must_equal false
+    it 'must show if authorized' do
+      commontable_path = Rails.application.routes.url_helpers.dummy_model_path(@commontable)
+      sign_in @user
+      
+      @user.can_read = true
+      get :show, :id => @thread.id, :use_route => :commontator
+      assert_redirected_to commontable_path
+      
+      @user.can_read = false
+      @user.can_edit = true
+      get :show, :id => @thread.id, :use_route => :commontator
+      assert_redirected_to commontable_path
+      
+      @user.can_edit = false
+      @user.is_admin = true
+      get :show, :id => @thread.id, :use_route => :commontator
+      assert_redirected_to commontable_path
+    end
     
-    @user.can_read = true
-    put :close, :id => @thread.id, :use_route => :commontator
-    assert_response 403
-    assigns(:thread).is_closed?.must_equal false
+    it 'wont close unless authorized and open' do
+      put :close, :id => @thread.id, :use_route => :commontator
+      assert_response 403
+      assigns(:thread).is_closed?.must_equal false
+      
+      sign_in @user
+      put :close, :id => @thread.id, :use_route => :commontator
+      assert_response 403
+      assigns(:thread).is_closed?.must_equal false
+      
+      @user.can_read = true
+      put :close, :id => @thread.id, :use_route => :commontator
+      assert_response 403
+      assigns(:thread).is_closed?.must_equal false
+      
+      @user.can_edit = true
+      @thread.close.must_equal true
+      put :close, :id => @thread.id, :use_route => :commontator
+      assert_redirected_to @thread
+      assigns(:thread).errors.wont_be_empty
+    end
     
-    @user.can_edit = true
-    @thread.close.must_equal true
-    put :close, :id => @thread.id, :use_route => :commontator
-    assert_redirected_to @thread
-    assigns(:thread).errors.wont_be_empty
-  end
-  
-  it 'must close if authorized and open' do
-    sign_in @user
+    it 'must close if authorized and open' do
+      sign_in @user
+      
+      @user.can_edit = true
+      put :close, :id => @thread.id, :use_route => :commontator
+      assert_redirected_to @thread
+      assigns(:thread).errors.must_be_empty
+      assigns(:thread).is_closed?.must_equal true
+      assigns(:thread).closer.must_equal @user
+      
+      assigns(:thread).reopen.must_equal true
+      @user.can_edit = false
+      @user.is_admin = true
+      put :close, :id => @thread.id, :use_route => :commontator
+      assert_redirected_to @thread
+      assigns(:thread).errors.must_be_empty
+      assigns(:thread).is_closed?.must_equal true
+      assigns(:thread).closer.must_equal @user
+    end
     
-    @user.can_edit = true
-    put :close, :id => @thread.id, :use_route => :commontator
-    assert_redirected_to @thread
-    assigns(:thread).errors.must_be_empty
-    assigns(:thread).is_closed?.must_equal true
-    assigns(:thread).closer.must_equal @user
+    it 'wont reopen unless authorized and closed' do
+      @thread.close.must_equal true
+      put :reopen, :id => @thread.id, :use_route => :commontator
+      assert_response 403
+      assigns(:thread).is_closed?.must_equal true
+      
+      sign_in @user
+      put :reopen, :id => @thread.id, :use_route => :commontator
+      assert_response 403
+      assigns(:thread).is_closed?.must_equal true
+      
+      @user.can_read = true
+      put :reopen, :id => @thread.id, :use_route => :commontator
+      assert_response 403
+      assigns(:thread).is_closed?.must_equal true
+      
+      @thread.reopen.must_equal true
+      @user.can_edit = true
+      put :reopen, :id => @thread.id, :use_route => :commontator
+      assert_redirected_to @thread
+      assigns(:thread).errors.wont_be_empty
+    end
     
-    assigns(:thread).reopen.must_equal true
-    @user.can_edit = false
-    @user.is_admin = true
-    put :close, :id => @thread.id, :use_route => :commontator
-    assert_redirected_to @thread
-    assigns(:thread).errors.must_be_empty
-    assigns(:thread).is_closed?.must_equal true
-    assigns(:thread).closer.must_equal @user
+    it 'must reopen if authorized and closed' do
+      sign_in @user
+      
+      @thread.close.must_equal true
+      @user.can_edit = true
+      put :reopen, :id => @thread.id, :use_route => :commontator
+      assert_redirected_to @thread
+      assigns(:thread).errors.must_be_empty
+      assigns(:thread).is_closed?.must_equal false
+      
+      assigns(:thread).close.must_equal true
+      @user.can_edit = false
+      @user.is_admin = true
+      put :reopen, :id => @thread.id, :use_route => :commontator
+      assert_redirected_to @thread
+      assigns(:thread).errors.must_be_empty
+      assigns(:thread).is_closed?.must_equal false
+    end
   end
-  
-  it 'wont reopen unless authorized and closed' do
-    @thread.close.must_equal true
-    put :reopen, :id => @thread.id, :use_route => :commontator
-    assert_response 403
-    assigns(:thread).is_closed?.must_equal true
-    
-    sign_in @user
-    put :reopen, :id => @thread.id, :use_route => :commontator
-    assert_response 403
-    assigns(:thread).is_closed?.must_equal true
-    
-    @user.can_read = true
-    put :reopen, :id => @thread.id, :use_route => :commontator
-    assert_response 403
-    assigns(:thread).is_closed?.must_equal true
-    
-    @thread.reopen.must_equal true
-    @user.can_edit = true
-    put :reopen, :id => @thread.id, :use_route => :commontator
-    assert_redirected_to @thread
-    assigns(:thread).errors.wont_be_empty
-  end
-  
-  it 'must reopen if authorized and closed' do
-    sign_in @user
-    
-    @thread.close.must_equal true
-    @user.can_edit = true
-    put :reopen, :id => @thread.id, :use_route => :commontator
-    assert_redirected_to @thread
-    assigns(:thread).errors.must_be_empty
-    assigns(:thread).is_closed?.must_equal false
-    
-    assigns(:thread).close.must_equal true
-    @user.can_edit = false
-    @user.is_admin = true
-    put :reopen, :id => @thread.id, :use_route => :commontator
-    assert_redirected_to @thread
-    assigns(:thread).errors.must_be_empty
-    assigns(:thread).is_closed?.must_equal false
-  end
-end
 end