has_moderated 0.0.24 → 0.0.25

data/lib/has_moderated/moderation_model.rb

@@ -32,7 +32,12 @@ module HasModerated
       if assoc.macro == :has_and_belongs_to_many || !assoc.options[:through].blank? 
         arec.send(rec.class.to_s.underscore.pluralize) << rec
       elsif assoc.macro == :has_many || assoc.macro == :has_one
-        arec.send(rec.class.to_s.underscore + "=", rec)
+        field = if assoc.options[:as]
+          assoc.options[:as].to_s
+        else
+          rec.class.to_s.underscore
+        end
+        arec.send(field + "=", rec)
         #fk = if assoc.respond_to?(:foreign_key)
         #  assoc.foreign_key
         #else # Rails < v3.1

data/lib/has_moderated/version.rb

@@ -1,3 +1,3 @@
 module HasModerated
-  VERSION = "0.0.24"
+  VERSION = "0.0.25"
 end

data/test/dummy/app/models/hone_as_test.rb

@@ -0,0 +1,3 @@
+class HoneAsTest < ActiveRecord::Base
+  belongs_to :testable, :polymorphic => true
+end

data/test/dummy/app/models/task.rb

@@ -4,10 +4,11 @@ class Task < ActiveRecord::Base
   has_many :task_photos
   has_and_belongs_to_many :hjoin_tests
   has_one :hone_test
+  has_one :hone_as_test, :as => :testable
   has_many :hmanythrough_join
   has_many :hmanythrough_test, :through => :hmanythrough_join
   has_moderated :title, :desc
-  has_moderated_create :with_associations => [:subtasks, :task_photos, :hjoin_tests, :hone_test, :hmanythrough_test, :hmanythrough_join]
+  has_moderated_create :with_associations => [:subtasks, :task_photos, :hjoin_tests, :hone_test, :hmanythrough_test, :hmanythrough_join, :hone_as_test]
   has_moderated_association :all
   has_moderated_destroy
 end

data/test/dummy/db/migrate/20111018172409_create_hone_as_tests.rb

@@ -0,0 +1,11 @@
+class CreateHoneAsTests < ActiveRecord::Migration
+  def change
+    create_table :hone_as_tests do |t|
+      t.integer :testable_id
+      t.string :testable_type
+      t.string :title
+
+      t.timestamps
+    end
+  end
+end

data/test/dummy/db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20111009205545) do
+ActiveRecord::Schema.define(:version => 20111018172409) do
 
   create_table "hjoin_tests", :force => true do |t|
     t.string   "title"
@@ -37,6 +37,14 @@ ActiveRecord::Schema.define(:version => 20111009205545) do
     t.datetime "updated_at"
   end
 
+  create_table "hone_as_tests", :force => true do |t|
+    t.integer  "testable_id"
+    t.string   "testable_type"
+    t.string   "title"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
   create_table "hone_tests", :force => true do |t|
     t.integer  "task_id"
     t.datetime "created_at"

data/test/dummy/log/development.log

@@ -6049,3 +6049,145 @@ Migrating to CreateHmanythroughJoins (20111009205545)
    (1.6ms)  INSERT INTO "schema_migrations" (version) VALUES ('20111009193145')
    (1.3ms)  INSERT INTO "schema_migrations" (version) VALUES ('20111009201729')
    (2.7ms)  INSERT INTO "schema_migrations" (version) VALUES ('20111009205517')
+   (0.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
+   (0.1ms)  select sqlite_version(*)
+   (1.8ms)  CREATE TABLE "hjoin_tests" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "created_at" datetime, "updated_at" datetime) 
+   (1.4ms)  CREATE TABLE "hjoin_tests_tasks" ("task_id" integer, "hjoin_test_id" integer) 
+   (1.6ms)  CREATE TABLE "hmanythrough_joins" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "hmanythrough_test_id" integer, "task_id" integer, "exdata" varchar(255), "created_at" datetime, "updated_at" datetime) 
+   (1.5ms)  CREATE TABLE "hmanythrough_tests" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "created_at" datetime, "updated_at" datetime) 
+   (1.7ms)  CREATE TABLE "hone_tests" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "task_id" integer, "created_at" datetime, "updated_at" datetime, "title" varchar(255)) 
+   (1.6ms)  CREATE TABLE "hook_tests" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "foo" varchar(255), "created_at" datetime, "updated_at" datetime) 
+   (1.7ms)  CREATE TABLE "moderations" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "moderatable_id" integer, "moderatable_type" varchar(255) NOT NULL, "attr_name" varchar(60) NOT NULL, "attr_value" text NOT NULL, "created_at" datetime, "updated_at" datetime) 
+   (1.5ms)  CREATE TABLE "photo_holders" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "created_at" datetime, "updated_at" datetime) 
+   (1.9ms)  CREATE TABLE "photos" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "photo" varchar(255), "created_at" datetime, "updated_at" datetime, "photo_holder_id" integer) 
+   (1.6ms)  CREATE TABLE "subtasks" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "task_id" integer, "title" varchar(255), "desc" varchar(255), "created_at" datetime, "updated_at" datetime, "task_all_id" integer) 
+   (1.6ms)  CREATE TABLE "task_alls" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "value" varchar(255), "created_at" datetime, "updated_at" datetime) 
+   (2.5ms)  CREATE TABLE "task_photos" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "photo" varchar(255), "task_id" integer, "created_at" datetime, "updated_at" datetime) 
+   (1.6ms)  CREATE TABLE "tasks" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "desc" varchar(255), "created_at" datetime, "updated_at" datetime) 
+   (1.8ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (0.0ms)  PRAGMA index_list("schema_migrations")
+   (1.5ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.1ms)  SELECT version FROM "schema_migrations"
+   (2.2ms)  INSERT INTO "schema_migrations" (version) VALUES ('20111009205545')
+   (1.7ms)  INSERT INTO "schema_migrations" (version) VALUES ('20110901013205')
+   (1.9ms)  INSERT INTO "schema_migrations" (version) VALUES ('20110901013228')
+   (2.1ms)  INSERT INTO "schema_migrations" (version) VALUES ('20110901013618')
+   (1.7ms)  INSERT INTO "schema_migrations" (version) VALUES ('20110908025410')
+   (2.5ms)  INSERT INTO "schema_migrations" (version) VALUES ('20110908025606')
+   (1.8ms)  INSERT INTO "schema_migrations" (version) VALUES ('20111003205633')
+   (1.7ms)  INSERT INTO "schema_migrations" (version) VALUES ('20111003234101')
+   (1.5ms)  INSERT INTO "schema_migrations" (version) VALUES ('20111004153147')
+   (1.4ms)  INSERT INTO "schema_migrations" (version) VALUES ('20111004164509')
+   (1.6ms)  INSERT INTO "schema_migrations" (version) VALUES ('20111008195728')
+   (2.2ms)  INSERT INTO "schema_migrations" (version) VALUES ('20111008195809')
+   (1.1ms)  INSERT INTO "schema_migrations" (version) VALUES ('20111009193145')
+   (1.7ms)  INSERT INTO "schema_migrations" (version) VALUES ('20111009201729')
+   (1.5ms)  INSERT INTO "schema_migrations" (version) VALUES ('20111009205517')
+   (0.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
+Migrating to CreateTasks (20110901013205)
+Migrating to CreateSubtasks (20110901013228)
+Migrating to CreateModerations (20110901013618)
+Migrating to CreateTaskAlls (20110908025410)
+Migrating to AddTaskAllIdToSubtasks (20110908025606)
+Migrating to CreatePhotos (20111003205633)
+Migrating to CreateTaskPhotos (20111003234101)
+Migrating to CreateHookTests (20111004153147)
+Migrating to CreatePhotoHolders (20111004164509)
+Migrating to CreateHoneTests (20111008195728)
+Migrating to CreateHjoinTests (20111008195809)
+Migrating to FixJoinTable (20111009193145)
+Migrating to AddTitleToHoneTests (20111009201729)
+Migrating to CreateHmanythroughTests (20111009205517)
+Migrating to CreateHmanythroughJoins (20111009205545)
+Migrating to CreateHoneAsTests (20111018172409)
+   (0.0ms)  select sqlite_version(*)
+   (0.6ms)  CREATE TABLE "hone_as_tests" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "testable_id" integer, "testable_type" varchar(255), "title" varchar(255), "created_at" datetime, "updated_at" datetime) 
+   (16.5ms)  INSERT INTO "schema_migrations" ("version") VALUES ('20111018172409')
+   (0.1ms)  select sqlite_version(*)
+   (0.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
+   (0.0ms)  PRAGMA index_list("hjoin_tests")
+   (0.0ms)  PRAGMA index_list("hjoin_tests_tasks")
+   (0.0ms)  PRAGMA index_list("hmanythrough_joins")
+   (0.0ms)  PRAGMA index_list("hmanythrough_tests")
+   (0.0ms)  PRAGMA index_list("hone_as_tests")
+   (0.0ms)  PRAGMA index_list("hone_tests")
+   (0.0ms)  PRAGMA index_list("hook_tests")
+   (0.0ms)  PRAGMA index_list("moderations")
+   (0.0ms)  PRAGMA index_list("photo_holders")
+   (0.0ms)  PRAGMA index_list("photos")
+   (0.0ms)  PRAGMA index_list("subtasks")
+   (0.0ms)  PRAGMA index_list("task_alls")
+   (0.0ms)  PRAGMA index_list("task_photos")
+   (0.0ms)  PRAGMA index_list("tasks")
+   (0.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
+   (0.1ms)  select sqlite_version(*)
+   (2.8ms)  CREATE TABLE "hjoin_tests" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "created_at" datetime, "updated_at" datetime) 
+   (1.6ms)  CREATE TABLE "hjoin_tests_tasks" ("task_id" integer, "hjoin_test_id" integer) 
+   (1.7ms)  CREATE TABLE "hmanythrough_joins" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "hmanythrough_test_id" integer, "task_id" integer, "exdata" varchar(255), "created_at" datetime, "updated_at" datetime) 
+   (1.2ms)  CREATE TABLE "hmanythrough_tests" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "created_at" datetime, "updated_at" datetime) 
+   (1.4ms)  CREATE TABLE "hone_as_tests" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "testable_id" integer, "testable_type" varchar(255), "title" varchar(255), "created_at" datetime, "updated_at" datetime) 
+   (1.9ms)  CREATE TABLE "hone_tests" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "task_id" integer, "created_at" datetime, "updated_at" datetime, "title" varchar(255)) 
+   (1.6ms)  CREATE TABLE "hook_tests" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "foo" varchar(255), "created_at" datetime, "updated_at" datetime) 
+   (1.5ms)  CREATE TABLE "moderations" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "moderatable_id" integer, "moderatable_type" varchar(255) NOT NULL, "attr_name" varchar(60) NOT NULL, "attr_value" text NOT NULL, "created_at" datetime, "updated_at" datetime) 
+   (2.1ms)  CREATE TABLE "photo_holders" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "created_at" datetime, "updated_at" datetime) 
+   (1.5ms)  CREATE TABLE "photos" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "photo" varchar(255), "created_at" datetime, "updated_at" datetime, "photo_holder_id" integer) 
+   (1.7ms)  CREATE TABLE "subtasks" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "task_id" integer, "title" varchar(255), "desc" varchar(255), "created_at" datetime, "updated_at" datetime, "task_all_id" integer) 
+   (1.7ms)  CREATE TABLE "task_alls" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "value" varchar(255), "created_at" datetime, "updated_at" datetime) 
+   (2.3ms)  CREATE TABLE "task_photos" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "photo" varchar(255), "task_id" integer, "created_at" datetime, "updated_at" datetime) 
+   (1.8ms)  CREATE TABLE "tasks" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "desc" varchar(255), "created_at" datetime, "updated_at" datetime) 
+   (1.7ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (0.0ms)  PRAGMA index_list("schema_migrations")
+   (2.0ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.1ms)  SELECT version FROM "schema_migrations"
+   (1.8ms)  INSERT INTO "schema_migrations" (version) VALUES ('20111018172409')
+   (1.6ms)  INSERT INTO "schema_migrations" (version) VALUES ('20110901013205')
+   (1.5ms)  INSERT INTO "schema_migrations" (version) VALUES ('20110901013228')
+   (1.5ms)  INSERT INTO "schema_migrations" (version) VALUES ('20110901013618')
+   (1.8ms)  INSERT INTO "schema_migrations" (version) VALUES ('20110908025410')
+   (1.3ms)  INSERT INTO "schema_migrations" (version) VALUES ('20110908025606')
+   (2.2ms)  INSERT INTO "schema_migrations" (version) VALUES ('20111003205633')
+   (1.6ms)  INSERT INTO "schema_migrations" (version) VALUES ('20111003234101')
+   (1.3ms)  INSERT INTO "schema_migrations" (version) VALUES ('20111004153147')
+   (1.4ms)  INSERT INTO "schema_migrations" (version) VALUES ('20111004164509')
+   (1.4ms)  INSERT INTO "schema_migrations" (version) VALUES ('20111008195728')
+   (1.2ms)  INSERT INTO "schema_migrations" (version) VALUES ('20111008195809')
+   (1.3ms)  INSERT INTO "schema_migrations" (version) VALUES ('20111009193145')
+   (2.0ms)  INSERT INTO "schema_migrations" (version) VALUES ('20111009201729')
+   (1.3ms)  INSERT INTO "schema_migrations" (version) VALUES ('20111009205517')
+   (1.4ms)  INSERT INTO "schema_migrations" (version) VALUES ('20111009205545')
+   (0.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
+   (0.1ms)  select sqlite_version(*)
+   (2.7ms)  CREATE TABLE "hjoin_tests" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "created_at" datetime, "updated_at" datetime) 
+   (1.9ms)  CREATE TABLE "hjoin_tests_tasks" ("task_id" integer, "hjoin_test_id" integer) 
+   (1.5ms)  CREATE TABLE "hmanythrough_joins" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "hmanythrough_test_id" integer, "task_id" integer, "exdata" varchar(255), "created_at" datetime, "updated_at" datetime) 
+   (1.4ms)  CREATE TABLE "hmanythrough_tests" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "created_at" datetime, "updated_at" datetime) 
+   (1.7ms)  CREATE TABLE "hone_as_tests" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "testable_id" integer, "testable_type" varchar(255), "title" varchar(255), "created_at" datetime, "updated_at" datetime) 
+   (1.3ms)  CREATE TABLE "hone_tests" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "task_id" integer, "created_at" datetime, "updated_at" datetime, "title" varchar(255)) 
+   (1.8ms)  CREATE TABLE "hook_tests" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "foo" varchar(255), "created_at" datetime, "updated_at" datetime) 
+   (1.4ms)  CREATE TABLE "moderations" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "moderatable_id" integer, "moderatable_type" varchar(255) NOT NULL, "attr_name" varchar(60) NOT NULL, "attr_value" text NOT NULL, "created_at" datetime, "updated_at" datetime) 
+   (1.7ms)  CREATE TABLE "photo_holders" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "created_at" datetime, "updated_at" datetime) 
+   (1.6ms)  CREATE TABLE "photos" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "photo" varchar(255), "created_at" datetime, "updated_at" datetime, "photo_holder_id" integer) 
+   (1.5ms)  CREATE TABLE "subtasks" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "task_id" integer, "title" varchar(255), "desc" varchar(255), "created_at" datetime, "updated_at" datetime, "task_all_id" integer) 
+   (1.6ms)  CREATE TABLE "task_alls" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "value" varchar(255), "created_at" datetime, "updated_at" datetime) 
+   (1.8ms)  CREATE TABLE "task_photos" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "photo" varchar(255), "task_id" integer, "created_at" datetime, "updated_at" datetime) 
+   (1.6ms)  CREATE TABLE "tasks" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "desc" varchar(255), "created_at" datetime, "updated_at" datetime) 
+   (1.9ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (0.0ms)  PRAGMA index_list("schema_migrations")
+   (2.5ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.1ms)  SELECT version FROM "schema_migrations"
+   (1.7ms)  INSERT INTO "schema_migrations" (version) VALUES ('20111018172409')
+   (2.3ms)  INSERT INTO "schema_migrations" (version) VALUES ('20110901013205')
+   (1.7ms)  INSERT INTO "schema_migrations" (version) VALUES ('20110901013228')
+   (2.6ms)  INSERT INTO "schema_migrations" (version) VALUES ('20110901013618')
+   (1.9ms)  INSERT INTO "schema_migrations" (version) VALUES ('20110908025410')
+   (1.9ms)  INSERT INTO "schema_migrations" (version) VALUES ('20110908025606')
+   (1.7ms)  INSERT INTO "schema_migrations" (version) VALUES ('20111003205633')
+   (1.5ms)  INSERT INTO "schema_migrations" (version) VALUES ('20111003234101')
+   (1.5ms)  INSERT INTO "schema_migrations" (version) VALUES ('20111004153147')
+   (2.2ms)  INSERT INTO "schema_migrations" (version) VALUES ('20111004164509')
+   (1.6ms)  INSERT INTO "schema_migrations" (version) VALUES ('20111008195728')
+   (1.2ms)  INSERT INTO "schema_migrations" (version) VALUES ('20111008195809')
+   (1.4ms)  INSERT INTO "schema_migrations" (version) VALUES ('20111009193145')
+   (1.4ms)  INSERT INTO "schema_migrations" (version) VALUES ('20111009201729')
+   (1.6ms)  INSERT INTO "schema_migrations" (version) VALUES ('20111009205517')
+   (2.3ms)  INSERT INTO "schema_migrations" (version) VALUES ('20111009205545')