commontator 0.4.1 → 0.5.12

data/test/dummy/db/migrate/1_install_commontator.commontator.rb

@@ -3,8 +3,8 @@ class InstallCommontator < ActiveRecord::Migration
   def change
     create_table "commontator_comments" do |t|
       t.text     "body"
-      t.integer  "commontator_id"
-      t.string   "commontator_type"
+      t.integer  "creator_id"
+      t.string   "creator_type"
       t.datetime "deleted_at"
       t.integer  "deleter_id"
       t.string   "deleter_type"
@@ -36,7 +36,7 @@ class InstallCommontator < ActiveRecord::Migration
       t.timestamps
     end
     
-    add_index :commontator_comments, [:commontator_id, :commontator_type, :thread_id], :name => "index_c_c_on_c_id_and_c_type_and_t_id"
+    add_index :commontator_comments, [:creator_id, :creator_type, :thread_id], :name => "index_c_c_on_c_id_and_c_type_and_t_id"
     add_index :commontator_comments, :thread_id
     add_index :commontator_subscriptions, [:subscriber_id, :subscriber_type, :thread_id], :unique => true, :name => "index_c_s_on_s_id_and_s_type_and_t_id"
     add_index :commontator_subscriptions, :thread_id

data/test/dummy/db/schema.rb

@@ -15,8 +15,8 @@ ActiveRecord::Schema.define(:version => 1) do
 
   create_table "commontator_comments", :force => true do |t|
     t.text     "body"
-    t.integer  "commontator_id"
-    t.string   "commontator_type"
+    t.integer  "creator_id"
+    t.string   "creator_type"
     t.datetime "deleted_at"
     t.integer  "deleter_id"
     t.string   "deleter_type"
@@ -31,7 +31,7 @@ ActiveRecord::Schema.define(:version => 1) do
   add_index "commontator_comments", ["cached_votes_down"], :name => "index_commontator_comments_on_cached_votes_down"
   add_index "commontator_comments", ["cached_votes_total"], :name => "index_commontator_comments_on_cached_votes_total"
   add_index "commontator_comments", ["cached_votes_up"], :name => "index_commontator_comments_on_cached_votes_up"
-  add_index "commontator_comments", ["commontator_id", "commontator_type", "thread_id"], :name => "index_c_c_on_c_id_and_c_type_and_t_id"
+  add_index "commontator_comments", ["creator_id", "creator_type", "thread_id"], :name => "index_c_c_on_c_id_and_c_type_and_t_id"
   add_index "commontator_comments", ["thread_id"], :name => "index_commontator_comments_on_thread_id"
 
   create_table "commontator_subscriptions", :force => true do |t|

data/test/dummy/log/development.log

@@ -348,3 +348,67 @@ 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
+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
+Connecting to database specified by database.yml
+   (0.1ms)  select sqlite_version(*)
+   (289.0ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (0.1ms)  PRAGMA index_list("schema_migrations")
+   (265.1ms)  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.6ms)  CREATE TABLE "commontator_comments" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "body" text, "creator_id" integer, "creator_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.2ms)  CREATE INDEX "index_c_c_on_c_id_and_c_type_and_t_id" ON "commontator_comments" ("creator_id", "creator_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")
+   (8.3ms)  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.2ms)  CREATE INDEX "index_commontator_subscriptions_on_thread_id" ON "commontator_subscriptions" ("thread_id")
+   (0.0ms)  PRAGMA index_list("commontator_threads")
+   (0.2ms)  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.0ms)  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.1ms)  CREATE INDEX "index_commontator_comments_on_cached_votes_down" ON "commontator_comments" ("cached_votes_down")
+   (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES ('1')
+   (317.7ms)  commit transaction
+   (0.4ms)  select sqlite_version(*)
+   (0.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
+   (0.1ms)  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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: commontator
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-12 00:00:00.000000000 Z
+date: 2012-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -68,10 +68,8 @@ extra_rdoc_files: []
 files:
 - app/assets/stylesheets/commontator/application.css
 - app/assets/stylesheets/commontator/comments.css
-- app/assets/stylesheets/commontator/application.css~
 - app/assets/stylesheets/commontator/comments.css~
 - app/assets/stylesheets/commontator/threads.css
-- app/assets/stylesheets/commontator/threads.css~
 - app/assets/images/commontator/upvote.png
 - app/assets/images/commontator/downvote_hover.png
 - app/assets/images/commontator/upvote_hover.png
@@ -85,22 +83,15 @@ files:
 - app/controllers/commontator/comments_controller.rb
 - app/controllers/commontator/subscriptions_controller.rb~
 - app/mailers/commontator/subscriptions_mailer.rb~
-- app/mailers/commontator/subscription_mailer.rb~
 - app/mailers/commontator/subscriptions_mailer.rb
 - app/views/commontator/comments/_body.html.erb
 - app/views/commontator/comments/_show.html.erb~
-- app/views/commontator/comments/_votes.html.erb~
-- app/views/commontator/comments/vote.js.erb~
-- app/views/commontator/comments/edit.js.erb~
 - app/views/commontator/comments/_form.html.erb
 - app/views/commontator/comments/delete.js.erb
-- app/views/commontator/comments/destroy.js.erb~
 - app/views/commontator/comments/vote.js.erb
-- app/views/commontator/comments/new.html.erb~
 - app/views/commontator/comments/update.js.erb
 - app/views/commontator/comments/_actions.html.erb~
 - app/views/commontator/comments/update.js.erb~
-- app/views/commontator/comments/new.js.erb~
 - app/views/commontator/comments/_show.html.erb
 - app/views/commontator/comments/_form.html.erb~
 - app/views/commontator/comments/delete.js.erb~
@@ -110,90 +101,54 @@ files:
 - app/views/commontator/comments/_votes.html.erb
 - app/views/commontator/comments/create.js.erb
 - app/views/commontator/comments/new.js.erb
-- app/views/commontator/comments/edit.html.erb~
-- app/views/commontator/comments/create.js.erb~
 - app/views/commontator/subscriptions_mailer/comment_created_email.html.erb
-- app/views/commontator/subscriptions_mailer/comment_created_email.html.erb~
 - app/views/commontator/subscriptions/subscribe.js.erb
-- app/views/commontator/subscriptions/_subscription_link.html.erb~
-- app/views/commontator/subscriptions/_link.html.erb~
-- app/views/commontator/subscriptions/destroy.js.erb~
 - app/views/commontator/subscriptions/_link.html.erb
-- app/views/commontator/subscriptions/index.html.erb~
-- app/views/commontator/subscriptions/_index.html.erb~
-- app/views/commontator/subscriptions/create.js.erb~
-- app/views/commontator/subscriptions/subscribe.js.erb~
-- app/views/commontator/shared/_thread_link.html.erb
-- app/views/commontator/threads/show.js.erb~
+- app/views/commontator/shared/_thread.html.erb~
+- app/views/commontator/shared/_thread.html.erb
+- app/views/commontator/shared/_thread_link.html.erb~
 - app/views/commontator/threads/_show.html.erb~
-- app/views/commontator/threads/_link.html.erb~
 - app/views/commontator/threads/show.js.erb
-- app/views/commontator/threads/close.js.erb~
-- app/views/commontator/threads/_actions.html.erb~
 - app/views/commontator/threads/_show.html.erb
-- app/views/commontator/threads/show.html.erb~
 - app/models/commontator/comment.rb
 - app/models/commontator/subscription.rb
 - app/models/commontator/comment.rb~
-- app/models/commontator/subscription.rb~
-- app/models/commontator/thread.rb~
 - app/models/commontator/thread.rb
-- app/helpers/commontator/commontable_helper.rb~
-- app/helpers/commontator/comments_helper.rb
 - app/helpers/commontator/comments_helper.rb~
-- app/helpers/commontator/application_helper.rb~
 - app/helpers/commontator/threads_helper.rb
-- app/helpers/commontator/subscriptions_helper.rb
 - app/helpers/commontator/subscriptions_helper.rb~
 - app/helpers/commontator/threads_helper.rb~
-- app/helpers/commontator/commontator_helper.rb~
-- app/helpers/commontator/commontator_helper.rb
 - app/helpers/commontator/application_helper.rb
 - config/initializers/commontator.rb
-- config/initializers/commontator.rb~
-- config/routes.rb~
 - config/routes.rb
-- db/migrate/0_install_commontator.rb~
 - db/migrate/0_install_commontator.rb
 - lib/commontator.rb
 - lib/commontator.rb~
-- lib/tasks/commontator_tasks.rake~
 - lib/tasks/commontator_tasks.rake
 - lib/commontator/acts_as_commontable.rb
-- lib/commontator/commontator_config.rb~
+- lib/commontator/controller_includes.rb
 - lib/commontator/version.rb
 - lib/commontator/engine.rb
-- lib/commontator/acts_as_commontator.rb~
-- lib/commontator/acts_as_commontable.rb~
+- lib/commontator/shared_methods.rb~
+- lib/commontator/shared_helper.rb~
 - lib/commontator/commontable_config.rb
 - lib/commontator/version.rb~
-- lib/commontator/routes.rb~
+- lib/commontator/shared_helper.rb
 - lib/commontator/acts_as_commontator.rb
-- lib/commontator/commontable_config.rb~
 - lib/commontator/commontator_config.rb
+- lib/commontator/controller_includes.rb~
 - MIT-LICENSE
 - Rakefile
 - README.md
 - test/test_helper.rb
 - test/integration/navigation_test.rb
 - test/unit/subscription_test.rb
-- test/unit/subscription_test.rb~
-- test/unit/thread_test.rb~
-- test/unit/comment_thread_test.rb~
 - test/unit/comment_test.rb
-- test/unit/comment_test.rb~
-- test/unit/comment_thread_subscription_test.rb~
 - test/unit/thread_test.rb
 - test/unit/helpers/subscriptions_helper_test.rb
 - test/unit/helpers/comments_helper_test.rb
-- test/unit/helpers/comment_thread_subscriptions_helper_test.rb~
-- test/unit/helpers/subscriptions_helper_test.rb~
-- test/unit/helpers/comments_helper_test.rb~
-- test/functional/comments_controller_test.rb~
 - test/functional/comments_controller_test.rb
-- test/functional/comment_thread_subscriptions_controller_test.rb~
 - test/functional/subscriptions_controller_test.rb
-- test/functional/subscriptions_controller_test.rb~
 - test/dummy/README.rdoc
 - test/dummy/log/development.log
 - test/dummy/db/development.sqlite3
@@ -217,14 +172,12 @@ files:
 - test/dummy/config/initializers/wrap_parameters.rb
 - test/dummy/config/initializers/commontator.rb
 - test/dummy/config/initializers/secret_token.rb
-- test/dummy/config/initializers/commontator.rb~
 - test/dummy/config/initializers/session_store.rb
 - test/dummy/config/initializers/inflections.rb
 - test/dummy/config/locales/en.yml
 - 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
@@ -258,23 +211,12 @@ test_files:
 - test/test_helper.rb
 - test/integration/navigation_test.rb
 - test/unit/subscription_test.rb
-- test/unit/subscription_test.rb~
-- test/unit/thread_test.rb~
-- test/unit/comment_thread_test.rb~
 - test/unit/comment_test.rb
-- test/unit/comment_test.rb~
-- test/unit/comment_thread_subscription_test.rb~
 - test/unit/thread_test.rb
 - test/unit/helpers/subscriptions_helper_test.rb
 - test/unit/helpers/comments_helper_test.rb
-- test/unit/helpers/comment_thread_subscriptions_helper_test.rb~
-- test/unit/helpers/subscriptions_helper_test.rb~
-- test/unit/helpers/comments_helper_test.rb~
-- test/functional/comments_controller_test.rb~
 - test/functional/comments_controller_test.rb
-- test/functional/comment_thread_subscriptions_controller_test.rb~
 - test/functional/subscriptions_controller_test.rb
-- test/functional/subscriptions_controller_test.rb~
 - test/dummy/README.rdoc
 - test/dummy/log/development.log
 - test/dummy/db/development.sqlite3
@@ -298,14 +240,12 @@ test_files:
 - test/dummy/config/initializers/wrap_parameters.rb
 - test/dummy/config/initializers/commontator.rb
 - test/dummy/config/initializers/secret_token.rb
-- test/dummy/config/initializers/commontator.rb~
 - test/dummy/config/initializers/session_store.rb
 - test/dummy/config/initializers/inflections.rb
 - test/dummy/config/locales/en.yml
 - 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

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

@@ -1,88 +0,0 @@
-/*
- * This is a manifest file that'll be compiled into application.css, which will include all the files
- * listed below.
- *
- * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
- * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
- *
- * You're free to add application-wide styles to this file and they'll appear at the top of the
- * compiled file, but it's generally better to create a new file per style scope.
- *
- *= require_self
- *= require_tree .
- */
- 
-.comment {
-  font-size: 12px;
-  font-weight: normal;
-  font-style: normal;
-  margin-top: 15px;
-  margin-bottom: 15px;
-  border-left: 1px solid;
-  border-top: 1px solid;
-  padding: 8px;
-  padding-left: 15px;
-  border-color: #ddd;
-  color: #000;
-  background-color: #fff;
-  clear:both;
-}
-
-.comment_actions {
-  float:right;
-}
-
-.comment_actions a {
-  display:inline;
-}
-
-.comment_body_div {
-   float: left;
-}
-
-.comment_body {
-	clear:both; 
-	margin:3px; 
-	padding-left:8px;
-	padding-bottom:6px;
-	padding-top: 8px;
-	float: left;
-}
-
-.comment_body pre { /* When showing comments, allow <pre> to wrap */
-   white-space: pre-wrap; /* css-3 */
-   white-space: -moz-pre-wrap !important; /* Mozilla, since 1999 */
-   white-space: -pre-wrap; /* Opera 4-6 */
-   white-space: -o-pre-wrap; /* Opera 7 */
-   word-wrap: break-word; /* Internet Explorer 5.5+ */
-}
-
-.comment_profile_picture {
-  float:left;
-  padding-top: 8px;
-  height:auto;
-}
-
-.comment_timestamp {
-	color: #777;
-}
-
-.comment_votes {
-  float:right;
-}
-
-.new_comment_div textarea {
-	width: 100%;
-}
-
-.thread_new_comment {
-  display:none;
-}
-
-.thread_new_comment_body {
-  width: 100%;
-}
-
-.thread_new_comment_link {
-  float:left;
-}

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

@@ -1,13 +0,0 @@
-.thread_header {
-  font-size: 16px;
-  font-weight: bold;
-  font-style: normal;
-}
-
-.thread_new_comment {
-  display: none;
-}
-
-.thread_new_comment textarea {
-	width: 100%;
-}

data/app/helpers/commontator/application_helper.rb~

@@ -1,11 +0,0 @@
-module Commontator
-  module ApplicationHelper
-    def commontable_url(thread)
-      thread.config.commontable_url_proc.call(main_app, thread.commontable)
-    end
-    
-    def javascript_proc
-      Commontator.javascript_proc.call(self).html_safe
-    end
-  end
-end

data/app/helpers/commontator/comments_helper.rb

@@ -1,51 +0,0 @@
-module Commontator
-  module CommentsHelper
-    def commontator_name(comment)
-      commontator = comment.commontator
-      return Commontator.commontator_missing_name if commontator.nil?
-      config = commontator.commontator_config
-      config.commontator_name_method.blank? ? config.commontator_missing_name : \
-        commontator.send(config.commontator_name_method)
-    end
-    
-    def deleter_name(comment)
-      deleter = comment.deleter
-      return Commontator.commontator_missing_name if deleter.nil?
-      config = deleter.commontator_config
-      config.commontator_name_method.blank? ? config.commontator_missing_name : \
-        deleter.send(config.commontator_name_method)
-    end
-    
-    def comment_timestamp(comment)
-      config = comment.thread.config
-      (comment.is_modified? ? 'Last modified on ' : \
-        config.comment_create_verb_past.capitalize + \
-        ' on ') + comment.updated_at.strftime(config.timestamp_format)
-    end
-    
-    def gravatar_url(comment, options = {})
-      commontator = comment.commontator
-      return '' if commontator.nil?
-      config = commontator.commontator_config
-      
-      options[:secure] ||= request.ssl?
-      options[:size] ||= 50
-    
-      hash = Digest::MD5.hexdigest(commontator.send(config.commontator_email_method))
-      base = options[:secure] ? "s://secure" : "://www"
-      
-      "http#{base}.gravatar.com/avatar/#{hash}?s=#{options[:size]}"
-    end
-  
-    def gravatar_image(comment, options = {})
-      commontator = comment.commontator
-      return '' if commontator.nil?
-      config = commontator.commontator_config
-      name = commontator.send(config.commontator_name_method)
-      image_tag(gravatar_url(comment, options), 
-                { :alt => name, 
-                  :title => name,
-                  :border => 1 })
-    end
-  end
-end