Merged in mocheen/cakeside/remove-public-activity (pull request #11)

remove public activity gem.

19 files changed, 43 insertions, 143 deletions

diff --git a/app/views/notifications/index.html.erb b/app/views/notifications/index.html.erb
deleted file mode 100644
index 4ecea9e2..00000000
--- a/app/views/notifications/index.html.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-
-<div class="row">
-  <div class="span12">
-    <% @activities.each do |activity| %>
-      <%= activity.render(self) %>
-    <% end %>
-  </div>
-</div>
diff --git a/app/views/public_activity/avatar/_create.html.erb b/app/views/public_activity/avatar/_create.html.erb
deleted file mode 100644
index 4431b72f..00000000
--- a/app/views/public_activity/avatar/_create.html.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<div class="row">
-  <div class="span12">
-    <%= activity.owner.name if activity.owner %> added a new avatar named <%= activity.trackable.avatar.url if activity.trackable %> at <%= activity.created_at %>
-  </div>
-</div>
diff --git a/app/views/public_activity/avatar/_destroy.html.erb b/app/views/public_activity/avatar/_destroy.html.erb
deleted file mode 100644
index bea6f78a..00000000
--- a/app/views/public_activity/avatar/_destroy.html.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<div class="row">
-  <div class="span12">
-    <%= activity.owner.name if activity.owner %> removed an avatar at <%= activity.created_at %>
-  </div>
-</div>
diff --git a/app/views/public_activity/avatar/_update.html.erb b/app/views/public_activity/avatar/_update.html.erb
deleted file mode 100644
index 471731c8..00000000
--- a/app/views/public_activity/avatar/_update.html.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<div class="row">
-  <div class="span12">
-    <%= activity.owner.name if activity.owner %> updated their avatar <%= activity.trackable.avatar.url if activity.trackable %> at <%= activity.created_at %>
-  </div>
-</div>
diff --git a/app/views/public_activity/comment/_create.html.erb b/app/views/public_activity/comment/_create.html.erb
deleted file mode 100644
index b7a3fb83..00000000
--- a/app/views/public_activity/comment/_create.html.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="row">
-  <div class="span12">
-    <%= activity.owner.name %> commented on <%= activity.trackable.commentable.name %> at <%= activity.created_at %>
-    <blockquote>
-      <%= activity.trackable.body %>
-    </blockquote>
-  </div>
-</div>
diff --git a/app/views/public_activity/creation/_create.html.erb b/app/views/public_activity/creation/_create.html.erb
deleted file mode 100644
index ea9faa5d..00000000
--- a/app/views/public_activity/creation/_create.html.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<div class="row">
-  <div class="span12">
-    a new user named <%= activity.trackable.name if activity.trackable %> signed up at <%= activity.created_at %>
-  </div>
-</div>
diff --git a/app/views/public_activity/creation/_destroy.html.erb b/app/views/public_activity/creation/_destroy.html.erb
deleted file mode 100644
index 64cbcf4d..00000000
--- a/app/views/public_activity/creation/_destroy.html.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<div class="row">
-  <div class="span12">
-     a user cancelled their account at <%= activity.created_at %>
-  </div>
-</div>
diff --git a/app/views/public_activity/creation/_update.html.erb b/app/views/public_activity/creation/_update.html.erb
deleted file mode 100644
index aa0aa8c5..00000000
--- a/app/views/public_activity/creation/_update.html.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<div class="row">
-  <div class="span12">
-    <%= activity.owner.name if activity.owner %> updated their account <%= activity.trackable.name if activity.trackable %> at <%= activity.created_at %>
-  </div>
-</div>
diff --git a/app/views/public_activity/favorite/_create.html.erb b/app/views/public_activity/favorite/_create.html.erb
deleted file mode 100644
index fe7d3117..00000000
--- a/app/views/public_activity/favorite/_create.html.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<div class="row">
-  <div class="span12">
-    <%= activity.owner.name if activity.owner %> added a new creation to their favorites <%= activity.trackable if activity.trackable %> at <%= activity.created_at %>
-  </div>
-</div>
diff --git a/app/views/public_activity/photo/_create.html.erb b/app/views/public_activity/photo/_create.html.erb
deleted file mode 100644
index 17667640..00000000
--- a/app/views/public_activity/photo/_create.html.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<div class="row">
-  <div class="span12">
-    <%= activity.owner.name %> added a new photo <%= activity.trackable.image.url if activity.trackable %> at <%= activity.created_at %>
-  </div>
-</div>
diff --git a/app/views/public_activity/photo/_destroy.html.erb b/app/views/public_activity/photo/_destroy.html.erb
deleted file mode 100644
index 80c2c213..00000000
--- a/app/views/public_activity/photo/_destroy.html.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<div class="row">
-  <div class="span12">
-    <%= activity.owner.name %> removed a photo <%= activity.trackable %> at <%= activity.created_at %>
-  </div>
-</div>
diff --git a/app/views/public_activity/tutorial/_create.html.erb b/app/views/public_activity/tutorial/_create.html.erb
deleted file mode 100644
index b300ba76..00000000
--- a/app/views/public_activity/tutorial/_create.html.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<div class="row">
-  <div class="span12">
-    <%= activity.owner.name if activity.owner %> added a new tutorial named <%= activity.trackable.head if activity.trackable %> at <%= activity.created_at %>
-  </div>
-</div>
diff --git a/app/views/public_activity/tutorial/_destroy.html.erb b/app/views/public_activity/tutorial/_destroy.html.erb
deleted file mode 100644
index 30d3850a..00000000
--- a/app/views/public_activity/tutorial/_destroy.html.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<div class="row">
-  <div class="span12">
-    <%= activity.owner.name if activity.owner %> removed a tutorial at <%= activity.created_at %>
-  </div>
-</div>
diff --git a/app/views/public_activity/tutorial/_update.html.erb b/app/views/public_activity/tutorial/_update.html.erb
deleted file mode 100644
index e76c5140..00000000
--- a/app/views/public_activity/tutorial/_update.html.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<div class="row">
-  <div class="span12">
-    <%= activity.owner.name if activity.owner %> updated a tutorial named <%= activity.trackable.head if activity.trackable %> at <%= activity.created_at %>
-  </div>
-</div>
diff --git a/app/views/public_activity/user/_create.html.erb b/app/views/public_activity/user/_create.html.erb
deleted file mode 100644
index 2cec13e2..00000000
--- a/app/views/public_activity/user/_create.html.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<div class="row">
-  <div class="span12">
-    <%= activity.owner.name if activity.owner %> added a new creation named <%= activity.trackable.name if activity.trackable %> at <%= activity.created_at %>
-  </div>
-</div>
diff --git a/app/views/public_activity/user/_destroy.html.erb b/app/views/public_activity/user/_destroy.html.erb
deleted file mode 100644
index 0db2588e..00000000
--- a/app/views/public_activity/user/_destroy.html.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<div class="row">
-  <div class="span12">
-    <%= activity.owner.name if activity.owner %> removed creation <%= activity.trackable %> at <%= activity.created_at %>
-  </div>
-</div>
diff --git a/app/views/public_activity/user/_update.html.erb b/app/views/public_activity/user/_update.html.erb
deleted file mode 100644
index f4c40e1b..00000000
--- a/app/views/public_activity/user/_update.html.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<div class="row">
-  <div class="span12">
-    <%= activity.owner.name if activity.owner %> updated creation named <%= activity.trackable.name if activity.trackable %> at <%= activity.created_at %>
-  </div>
-</div>
diff --git a/db/migrate/20131229022014_drop_table_activities.rb b/db/migrate/20131229022014_drop_table_activities.rb
new file mode 100644
index 00000000..e0bf13eb
--- /dev/null
+++ b/db/migrate/20131229022014_drop_table_activities.rb
@@ -0,0 +1,5 @@
+class DropTableActivities < ActiveRecord::Migration
+  def change
+    drop_table :activities
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index fcb16763..98c28e86 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,33 +11,19 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20131228172412) do
-
-  create_table "activities", force: true do |t|
-    t.integer  "trackable_id"
-    t.string   "trackable_type"
-    t.integer  "owner_id"
-    t.string   "owner_type"
-    t.string   "key"
-    t.text     "parameters"
-    t.integer  "recipient_id"
-    t.string   "recipient_type"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
+ActiveRecord::Schema.define(version: 20131229022014) do
 
-  add_index "activities", ["owner_id", "owner_type"], name: "index_activities_on_owner_id_and_owner_type"
-  add_index "activities", ["recipient_id", "recipient_type"], name: "index_activities_on_recipient_id_and_recipient_type"
-  add_index "activities", ["trackable_id", "trackable_type"], name: "index_activities_on_trackable_id_and_trackable_type"
+  # These are extensions that must be enabled in order to support this database
+  enable_extension "plpgsql"
 
   create_table "avatars", force: true do |t|
     t.integer  "user_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.string   "avatar"
   end
 
-  add_index "avatars", ["user_id"], name: "index_avatars_on_user_id"
+  add_index "avatars", ["user_id"], name: "index_avatars_on_user_id", using: :btree
 
   create_table "categories", force: true do |t|
     t.string   "name"
@@ -59,16 +45,16 @@ ActiveRecord::Schema.define(version: 20131228172412) do
     t.integer  "favorites_count", default: 0
   end
 
-  add_index "creations", ["created_at"], name: "index_creations_on_created_at"
-  add_index "creations", ["user_id"], name: "index_creations_on_user_id"
+  add_index "creations", ["created_at"], name: "index_creations_on_created_at", using: :btree
+  add_index "creations", ["user_id"], name: "index_creations_on_user_id", using: :btree
 
   create_table "creations_categories", id: false, force: true do |t|
     t.integer "creation_id"
     t.integer "category_id"
   end
 
-  add_index "creations_categories", ["category_id", "creation_id"], name: "index_creations_categories_on_category_id_and_creation_id"
-  add_index "creations_categories", ["creation_id", "category_id"], name: "index_creations_categories_on_creation_id_and_category_id"
+  add_index "creations_categories", ["category_id", "creation_id"], name: "index_creations_categories_on_category_id_and_creation_id", using: :btree
+  add_index "creations_categories", ["creation_id", "category_id"], name: "index_creations_categories_on_creation_id_and_category_id", using: :btree
 
   create_table "delayed_jobs", force: true do |t|
     t.integer  "priority",   default: 0
@@ -80,11 +66,11 @@ ActiveRecord::Schema.define(version: 20131228172412) do
     t.datetime "failed_at"
     t.string   "locked_by"
     t.string   "queue"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",             null: false
+    t.datetime "updated_at",             null: false
   end
 
-  add_index "delayed_jobs", ["priority", "run_at"], name: "delayed_jobs_priority"
+  add_index "delayed_jobs", ["priority", "run_at"], name: "delayed_jobs_priority", using: :btree
 
   create_table "favorites", force: true do |t|
     t.integer  "user_id"
@@ -93,13 +79,13 @@ ActiveRecord::Schema.define(version: 20131228172412) do
     t.datetime "updated_at"
   end
 
-  add_index "favorites", ["creation_id"], name: "index_favorites_on_creation_id"
-  add_index "favorites", ["user_id"], name: "index_favorites_on_user_id"
+  add_index "favorites", ["creation_id"], name: "index_favorites_on_creation_id", using: :btree
+  add_index "favorites", ["user_id"], name: "index_favorites_on_user_id", using: :btree
 
   create_table "interests", force: true do |t|
     t.string   "name"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
   end
 
   create_table "photos", force: true do |t|
@@ -110,7 +96,7 @@ ActiveRecord::Schema.define(version: 20131228172412) do
     t.string   "image_tmp"
   end
 
-  add_index "photos", ["creation_id"], name: "index_photos_on_creation_id"
+  add_index "photos", ["creation_id"], name: "index_photos_on_creation_id", using: :btree
 
   create_table "taggings", force: true do |t|
     t.integer  "tag_id"
@@ -122,11 +108,11 @@ ActiveRecord::Schema.define(version: 20131228172412) do
     t.datetime "created_at"
   end
 
-  add_index "taggings", ["tag_id"], name: "index_taggings_on_tag_id"
-  add_index "taggings", ["taggable_id", "taggable_type", "context"], name: "index_taggings_on_taggable_id_and_taggable_type_and_context"
-  add_index "taggings", ["taggable_type"], name: "index_taggings_on_taggable_type"
-  add_index "taggings", ["tagger_id"], name: "index_taggings_on_tagger_id"
-  add_index "taggings", ["tagger_type"], name: "index_taggings_on_tagger_type"
+  add_index "taggings", ["tag_id"], name: "index_taggings_on_tag_id", using: :btree
+  add_index "taggings", ["taggable_id", "taggable_type", "context"], name: "index_taggings_on_taggable_id_and_taggable_type_and_context", using: :btree
+  add_index "taggings", ["taggable_type"], name: "index_taggings_on_taggable_type", using: :btree
+  add_index "taggings", ["tagger_id"], name: "index_taggings_on_tagger_id", using: :btree
+  add_index "taggings", ["tagger_type"], name: "index_taggings_on_tagger_type", using: :btree
 
   create_table "tags", force: true do |t|
     t.string "name"
@@ -137,22 +123,22 @@ ActiveRecord::Schema.define(version: 20131228172412) do
     t.text     "description"
     t.string   "url"
     t.integer  "user_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",  null: false
+    t.datetime "updated_at",  null: false
     t.string   "image_url"
     t.string   "author"
     t.string   "author_url"
   end
 
-  add_index "tutorials", ["user_id"], name: "index_tutorials_on_user_id"
+  add_index "tutorials", ["user_id"], name: "index_tutorials_on_user_id", using: :btree
 
   create_table "users", force: true do |t|
-    t.string   "email",                  default: "", null: false
-    t.string   "encrypted_password",     default: "", null: false
+    t.string   "email",                              default: "", null: false
+    t.string   "encrypted_password",     limit: 128, default: "", null: false
     t.string   "reset_password_token"
     t.datetime "reset_password_sent_at"
     t.datetime "remember_created_at"
-    t.integer  "sign_in_count",          default: 0
+    t.integer  "sign_in_count",                      default: 0
     t.datetime "current_sign_in_at"
     t.datetime "last_sign_in_at"
     t.string   "current_sign_in_ip"
@@ -171,27 +157,27 @@ ActiveRecord::Schema.define(version: 20131228172412) do
     t.datetime "confirmed_at"
     t.datetime "confirmation_sent_at"
     t.string   "unconfirmed_email"
-    t.integer  "failed_attempts",        default: 0
+    t.integer  "failed_attempts",                    default: 0
     t.string   "unlock_token"
     t.datetime "locked_at"
     t.string   "authentication_token"
     t.string   "invitation_token"
     t.string   "full_address"
-    t.integer  "creations_count",        default: 0
+    t.integer  "creations_count",                    default: 0
   end
 
-  add_index "users", ["authentication_token"], name: "index_users_on_authentication_token", unique: true
-  add_index "users", ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true
-  add_index "users", ["created_at"], name: "index_users_on_created_at"
-  add_index "users", ["email"], name: "index_users_on_email", unique: true
-  add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
-  add_index "users", ["unlock_token"], name: "index_users_on_unlock_token", unique: true
+  add_index "users", ["authentication_token"], name: "index_users_on_authentication_token", unique: true, using: :btree
+  add_index "users", ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true, using: :btree
+  add_index "users", ["created_at"], name: "index_users_on_created_at", using: :btree
+  add_index "users", ["email"], name: "index_users_on_email", unique: true, using: :btree
+  add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true, using: :btree
+  add_index "users", ["unlock_token"], name: "index_users_on_unlock_token", unique: true, using: :btree
 
   create_table "users_interests", id: false, force: true do |t|
     t.integer "user_id"
     t.integer "interest_id"
   end
 
-  add_index "users_interests", ["interest_id", "user_id"], name: "index_users_interests_on_interest_id_and_user_id"
+  add_index "users_interests", ["interest_id", "user_id"], name: "index_users_interests_on_interest_id_and_user_id", using: :btree
 
 end