commontator 0.2.0 → 0.2.4

data/README.md

@@ -81,10 +81,18 @@ Follow the steps below to add commontator to your models and views:
   ```ruby
   acts_as_commontable
   ```
+
+2. Controllers
+
+  Add the following line to the controller(s) that handle the views where you want to display comments:
+
+  ```ruby
+  helper Commontator::CommontatorHelper
+  ```
     
-2. Views
+3. Views
 
-  Add the following line to any view where you want to display comments:
+  Add the following line to any view where you would like to display comments:
 
   ```erb
   <%= commontator_thread_link(commontable) %>

data/app/models/commontator/comment.rb~

@@ -1,6 +1,5 @@
 module Commontator
   class Comment < ActiveRecord::Base
-
     belongs_to :commontator, :polymorphic => true
     belongs_to :deleter, :polymorphic => true
     belongs_to :thread
@@ -79,6 +78,5 @@ module Commontator
       can_be_voted_on? && !thread.is_closed? &&\
         thread.can_be_read_by?(user) && user != commontator
     end
-    
   end
 end

data/app/models/commontator/thread.rb

@@ -14,9 +14,9 @@ module Commontator
       commontable.try(:commontable_config)
     end
     
-    def comments
+    def ordered_comments
       (!commontable.blank? && config.comments_can_be_voted_on && config.comments_ordered_by_votes) ? \
-        super.order("cached_votes_down - cached_votes_up") : super
+        comments.order("cached_votes_down - cached_votes_up") : comments
     end
     
     def subscribers

data/app/models/commontator/thread.rb~

@@ -10,13 +10,15 @@ module Commontator
     
     attr_accessible :is_closed
     
+    alias_method :default_comments, :comments
+    
     def config
       commontable.try(:commontable_config)
     end
     
-    def comments
+    def ordered_comments
       (!commontable.blank? && config.comments_can_be_voted_on && config.comments_ordered_by_votes) ? \
-        super.order("cached_votes_down - cached_votes_up") : super
+        default_comments.order("cached_votes_down - cached_votes_up") : default_comments
     end
     
     def subscribers

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

@@ -7,7 +7,7 @@
 </span>
 
 <div id="thread_<%= thread.id %>_comment_list_div" class="thread_comment_list">
-  <% thread.comments.each do |comment| %>
+  <% thread.ordered_comments.each do |comment| %>
     <% next unless comment.can_be_read_by?(@commontator) %>
     <%= render :partial => 'commontator/comments/show',
                :locals => {:comment => comment} %>

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

@@ -8,7 +8,7 @@
 
 <div id="thread_<%= thread.id %>_comment_list_div" class="thread_comment_list">
   <% thread.comments.each do |comment| %>
-    <% next unless comment.can_be_read_by?(@commontator)is_deleted? && !thread.config.deleted_comments_are_visible %>
+    <% next unless comment.can_be_read_by?(@commontator) %>
     <%= render :partial => 'commontator/comments/show',
                :locals => {:comment => comment} %>
   <% end %>

data/config/initializers/commontator.rb

@@ -9,11 +9,11 @@ Commontator.configure do |config|
   config.current_user_method = 'current_user'
 
   # Proc that is called when a view wants to set the page heading.
-  # Default: Proc.new {}
+  # Default: nil
   config.heading_proc = nil
 
   # Proc that is called after any javascript runs (e.g. to clear flash notices)
-  # Default: Proc.new {}
+  # Default: nil
   config.javascript_proc = nil
 
 
@@ -59,10 +59,15 @@ Commontator.configure do |config|
   config.commontable_name = 'commontable'
 
   # Proc that returns the subscription email subject
-  # Default: Proc.new {}
-  config.subscription_email_subject_proc = Proc.new {|params| \
+  # Default:
+  # Proc.new do |params|
+  #   "#{params[:commontator_name]} #{params[:config].comment_create_verb_past} a " + \
+  #   "#{params[:config].comment_name} on #{params[:commontable_name]} ##{params[:commontable_id]}"
+  # end
+  config.subscription_email_subject_proc = Proc.new do |params|
     "#{params[:commontator_name]} #{params[:config].comment_create_verb_past} a " + \
-    "#{params[:config].comment_name} on #{params[:commontable_name]} ##{params[:commontable_id]}"}
+    "#{params[:config].comment_name} on #{params[:commontable_name]} ##{params[:commontable_id]}"
+  end
 
   # The format of the timestamps used by Commontator
   # Default: '%b %d %Y, %I:%M %p'

data/config/initializers/commontator.rb~

@@ -9,12 +9,12 @@ Commontator.configure do |config|
   config.current_user_method = 'current_user'
 
   # Proc that is called when a view wants to set the page heading.
-  # Default: Proc.new {}
-  config.heading_proc = nil
+  # Default: nil
+  config.heading_proc = Proc.new{|string| }
 
   # Proc that is called after any javascript runs (e.g. to clear flash notices)
-  # Default: Proc.new {}
-  config.javascript_proc = nil
+  # Default: nil
+  config.javascript_proc = Proc.new{}
 
 
   # Commontator (User model) Configuration
@@ -59,10 +59,15 @@ Commontator.configure do |config|
   config.commontable_name = 'commontable'
 
   # Proc that returns the subscription email subject
-  # Default: Proc.new {}
-  config.subscription_email_subject_proc = Proc.new {|params| \
+  # Default:
+  # Proc.new do |params|
+  #   "#{params[:commontator_name]} #{params[:config].comment_create_verb_past} a " + \
+  #   "#{params[:config].comment_name} on #{params[:commontable_name]} ##{params[:commontable_id]}"
+  # end
+  config.subscription_email_subject_proc = Proc.new do |params|
     "#{params[:commontator_name]} #{params[:config].comment_create_verb_past} a " + \
-    "#{params[:config].comment_name} on #{params[:commontable_name]} ##{params[:commontable_id]}"}
+    "#{params[:config].comment_name} on #{params[:commontable_name]} ##{params[:commontable_id]}"
+  end
 
   # The format of the timestamps used by Commontator
   # Default: '%b %d %Y, %I:%M %p'
@@ -107,7 +112,7 @@ Commontator.configure do |config|
   # Whether comments should be ordered by vote score
   # instead of by order posted
   # Default: false
-  config.comments_order_by_votes = false
+  config.comments_ordered_by_votes = false
 
   # Whether users can read threads closed by admins
   # Default: true

data/lib/commontator/version.rb

@@ -1,3 +1,3 @@
 module Commontator
-  VERSION = "0.2.0"
+  VERSION = "0.2.4"
 end

data/lib/commontator/version.rb~

@@ -1,3 +1,3 @@
 module Commontator
-  VERSION = "0.1.46"
+  VERSION = "0.3.0"
 end

data/lib/tasks/commontator_tasks.rake

@@ -5,9 +5,12 @@ namespace :commontator do
     desc "Copy initializers from commontator to application"
     task :initializers do
       Dir.glob(File.expand_path('../../../config/initializers/*.rb', __FILE__)) do |file|
-        next if File.exists?(File.expand_path(File.basename(file), 'config/initializers'))
-        cp file, 'config/initializers', :verbose => false
-        print "Copied initializer #{File.basename(file)} from commontator\n"
+        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

data/lib/tasks/commontator_tasks.rake~

@@ -5,9 +5,12 @@ namespace :commontator do
     desc "Copy initializers from commontator to application"
     task :initializers do
       Dir.glob(File.expand_path('../../../config/initializers/*.rb', __FILE__)) do |file|
-        next if File.exists?(File.expand_path(File.basename(file), 'config/initializers'))
-        cp file, 'config/initializers', :verbose => false
-        print "Copied initializer #{File.basename(file)} from commontator\n"
+        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."
+        else
+          cp file, 'config/initializers', :verbose => false
+          print "Copied initializer #{File.basename(file)} from commontator\n"
+        end
       end
     end
   end
@@ -32,7 +35,6 @@ namespace :commontator do
   desc "Copy assets, views, mailers, helpers, controllers and models from commontator to application"
   task :copy do
     COPY_TASKS.each do |path|
-      name = path
       Rake::Task["commontator:copy:#{File.basename(path)}"].invoke
     end
   end

data/test/dummy/config/routes.rb~

@@ -0,0 +1,3 @@
+Rails.application.routes.draw do
+  mount Commontator::Engine => "/commontator"
+end

data/test/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20120710213148) do
+ActiveRecord::Schema.define(:version => 1) do
 
   create_table "commontator_comments", :force => true do |t|
     t.text     "body"

data/test/dummy/log/development.log

@@ -274,3 +274,71 @@ Connecting to database specified by database.yml
 Connecting to database specified by database.yml
 Connecting to database specified by database.yml
 Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+   (0.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
+Migrating to InstallCommontator (1)
+   (0.0ms)  select sqlite_version(*)
+   (0.0ms)  begin transaction
+   (0.2ms)  CREATE TABLE "commontator_comments" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "body" text, "commontator_id" integer, "commontator_type" varchar(255), "deleted_at" datetime, "deleter_id" integer, "deleter_type" varchar(255), "thread_id" integer, "cached_votes_total" integer DEFAULT 0, "cached_votes_up" integer DEFAULT 0, "cached_votes_down" integer DEFAULT 0, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+SQLite3::SQLException: table "commontator_comments" already exists: CREATE TABLE "commontator_comments" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "body" text, "commontator_id" integer, "commontator_type" varchar(255), "deleted_at" datetime, "deleter_id" integer, "deleter_type" varchar(255), "thread_id" integer, "cached_votes_total" integer DEFAULT 0, "cached_votes_up" integer DEFAULT 0, "cached_votes_down" integer DEFAULT 0, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+   (0.1ms)  rollback transaction
+Connecting to database specified by database.yml
+   (0.1ms)  select sqlite_version(*)
+   (288.1ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (0.1ms)  PRAGMA index_list("schema_migrations")
+   (237.9ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
+Migrating to InstallCommontator (1)
+   (0.0ms)  begin transaction
+   (0.5ms)  CREATE TABLE "commontator_comments" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "body" text, "commontator_id" integer, "commontator_type" varchar(255), "deleted_at" datetime, "deleter_id" integer, "deleter_type" varchar(255), "thread_id" integer, "cached_votes_total" integer DEFAULT 0, "cached_votes_up" integer DEFAULT 0, "cached_votes_down" integer DEFAULT 0, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+   (0.2ms)  CREATE TABLE "commontator_subscriptions" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "subscriber_id" integer, "subscriber_type" varchar(255), "thread_id" integer, "is_unread" boolean, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+   (0.2ms)  CREATE TABLE "commontator_threads" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "commontable_id" integer, "commontable_type" varchar(255), "closed_at" datetime, "closer_id" integer, "closer_type" varchar(255), "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+   (0.0ms)  PRAGMA index_list("commontator_comments")
+   (0.1ms)  CREATE INDEX "index_c_c_on_c_id_and_c_type_and_t_id" ON "commontator_comments" ("commontator_id", "commontator_type", "thread_id")
+   (0.0ms)  PRAGMA index_list("commontator_comments")
+   (0.0ms)  PRAGMA index_info('index_c_c_on_c_id_and_c_type_and_t_id')
+   (0.2ms)  CREATE INDEX "index_commontator_comments_on_thread_id" ON "commontator_comments" ("thread_id")
+   (0.0ms)  PRAGMA index_list("commontator_subscriptions")
+   (0.2ms)  CREATE UNIQUE INDEX "index_c_s_on_s_id_and_s_type_and_t_id" ON "commontator_subscriptions" ("subscriber_id", "subscriber_type", "thread_id")
+   (0.0ms)  PRAGMA index_list("commontator_subscriptions")
+   (0.0ms)  PRAGMA index_info('index_c_s_on_s_id_and_s_type_and_t_id')
+   (0.1ms)  CREATE INDEX "index_commontator_subscriptions_on_thread_id" ON "commontator_subscriptions" ("thread_id")
+   (0.0ms)  PRAGMA index_list("commontator_threads")
+   (0.1ms)  CREATE INDEX "index_commontator_threads_on_commontable_id_and_commontable_type" ON "commontator_threads" ("commontable_id", "commontable_type")
+   (0.0ms)  PRAGMA index_list("commontator_comments")
+   (0.0ms)  PRAGMA index_info('index_commontator_comments_on_thread_id')
+   (0.0ms)  PRAGMA index_info('index_c_c_on_c_id_and_c_type_and_t_id')
+   (0.2ms)  CREATE INDEX "index_commontator_comments_on_cached_votes_total" ON "commontator_comments" ("cached_votes_total")
+   (0.0ms)  PRAGMA index_list("commontator_comments")
+   (0.0ms)  PRAGMA index_info('index_commontator_comments_on_cached_votes_total')
+   (0.0ms)  PRAGMA index_info('index_commontator_comments_on_thread_id')
+   (0.0ms)  PRAGMA index_info('index_c_c_on_c_id_and_c_type_and_t_id')
+   (0.2ms)  CREATE INDEX "index_commontator_comments_on_cached_votes_up" ON "commontator_comments" ("cached_votes_up")
+   (0.1ms)  PRAGMA index_list("commontator_comments")
+   (0.0ms)  PRAGMA index_info('index_commontator_comments_on_cached_votes_up')
+   (0.0ms)  PRAGMA index_info('index_commontator_comments_on_cached_votes_total')
+   (0.0ms)  PRAGMA index_info('index_commontator_comments_on_thread_id')
+   (0.0ms)  PRAGMA index_info('index_c_c_on_c_id_and_c_type_and_t_id')
+   (0.2ms)  CREATE INDEX "index_commontator_comments_on_cached_votes_down" ON "commontator_comments" ("cached_votes_down")
+   (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES ('1')
+   (362.6ms)  commit transaction
+   (0.4ms)  select sqlite_version(*)
+   (0.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
+   (0.0ms)  PRAGMA index_list("commontator_comments")
+   (0.0ms)  PRAGMA index_info('index_commontator_comments_on_cached_votes_down')
+   (0.0ms)  PRAGMA index_info('index_commontator_comments_on_cached_votes_up')
+   (0.0ms)  PRAGMA index_info('index_commontator_comments_on_cached_votes_total')
+   (0.0ms)  PRAGMA index_info('index_commontator_comments_on_thread_id')
+   (0.0ms)  PRAGMA index_info('index_c_c_on_c_id_and_c_type_and_t_id')
+   (0.0ms)  PRAGMA index_list("commontator_subscriptions")
+   (0.0ms)  PRAGMA index_info('index_commontator_subscriptions_on_thread_id')
+   (0.0ms)  PRAGMA index_info('index_c_s_on_s_id_and_s_type_and_t_id')
+   (0.0ms)  PRAGMA index_list("commontator_threads")
+   (0.0ms)  PRAGMA index_info('index_commontator_threads_on_commontable_id_and_commontable_type')
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+SQLite3::SQLException: no such column: a: SELECT "commontator_comments".* FROM "commontator_comments"  WHERE "commontator_comments"."thread_id" = 1 ORDER BY a
+Connecting to database specified by database.yml

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: commontator
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-10 00:00:00.000000000 Z
+date: 2012-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -152,7 +152,7 @@ files:
 - config/routes.rb~
 - config/routes.rb
 - db/migrate/0_install_commontator.rb~
-- db/migrate/0_install.rb
+- db/migrate/0_install_commontator.rb
 - lib/commontator.rb
 - lib/commontator.rb~
 - lib/tasks/commontator_tasks.rake~
@@ -195,9 +195,8 @@ files:
 - test/dummy/README.rdoc
 - test/dummy/log/development.log
 - test/dummy/db/development.sqlite3
-- test/dummy/db/test.sqlite3
 - test/dummy/db/schema.rb
-- test/dummy/db/migrate/1_install.commontator.rb
+- test/dummy/db/migrate/1_install_commontator.commontator.rb
 - test/dummy/Rakefile
 - test/dummy/script/rails
 - test/dummy/app/assets/stylesheets/application.css
@@ -222,6 +221,7 @@ files:
 - test/dummy/config/boot.rb
 - test/dummy/config/application.rb
 - test/dummy/config/environment.rb
+- test/dummy/config/routes.rb~
 - test/dummy/config/environments/test.rb
 - test/dummy/config/environments/production.rb
 - test/dummy/config/environments/development.rb
@@ -275,9 +275,8 @@ test_files:
 - test/dummy/README.rdoc
 - test/dummy/log/development.log
 - test/dummy/db/development.sqlite3
-- test/dummy/db/test.sqlite3
 - test/dummy/db/schema.rb
-- test/dummy/db/migrate/1_install.commontator.rb
+- test/dummy/db/migrate/1_install_commontator.commontator.rb
 - test/dummy/Rakefile
 - test/dummy/script/rails
 - test/dummy/app/assets/stylesheets/application.css
@@ -302,6 +301,7 @@ test_files:
 - test/dummy/config/boot.rb
 - test/dummy/config/application.rb
 - test/dummy/config/environment.rb
+- test/dummy/config/routes.rb~
 - test/dummy/config/environments/test.rb
 - test/dummy/config/environments/production.rb
 - test/dummy/config/environments/development.rb