has_moderated 0.0.34 → 1.0.alpha

Sign up to get free protection for your applications and to get access to all the features.
Files changed (55) hide show
  1. data/README.rdoc +17 -0
  2. data/lib/generators/has_moderated/install/templates/migration.rb +4 -3
  3. data/lib/has_moderated/adapters/active_record.rb +109 -0
  4. data/lib/has_moderated/adapters/proxy.rb +23 -0
  5. data/lib/has_moderated/associations/base.rb +157 -0
  6. data/lib/has_moderated/associations/collection.rb +123 -0
  7. data/lib/has_moderated/associations/has_many.rb +15 -0
  8. data/lib/has_moderated/associations/has_one.rb +58 -0
  9. data/lib/has_moderated/carrier_wave.rb +3 -3
  10. data/lib/has_moderated/common.rb +62 -113
  11. data/lib/has_moderated/moderated_attributes.rb +24 -11
  12. data/lib/has_moderated/moderated_create.rb +22 -14
  13. data/lib/has_moderated/moderated_destroy.rb +11 -10
  14. data/lib/has_moderated/moderation_model.rb +6 -200
  15. data/lib/has_moderated/user_hooks.rb +3 -2
  16. data/lib/has_moderated/version.rb +1 -1
  17. data/lib/has_moderated.rb +15 -7
  18. data/test/dummy/app/models/moderation.rb +0 -0
  19. data/test/dummy/app/models/subtask.rb +0 -1
  20. data/test/dummy/app/models/task.rb +0 -13
  21. data/test/dummy/app/models/task_connection.rb +4 -0
  22. data/test/dummy/db/migrate/20120515155730_create_moderations2.rb +20 -0
  23. data/test/dummy/db/migrate/20120515174306_prepare_for_new_tests.rb +36 -0
  24. data/test/dummy/db/migrate/20120515175621_remove_photo_relateds.rb +8 -0
  25. data/test/dummy/db/schema.rb +17 -96
  26. data/test/dummy/db/test.sqlite3 +0 -0
  27. data/test/dummy/log/development.log +35 -0
  28. data/test/dummy/log/test.log +81290 -0
  29. data/test/dummy/spec/models/task_spec.rb +414 -247
  30. data/test/dummy/spec/spec_helper.rb +4 -0
  31. metadata +26 -57
  32. data/lib/has_moderated/moderated_associations.rb +0 -69
  33. data/test/dummy/app/models/habtm_name_test.rb +0 -3
  34. data/test/dummy/app/models/hjoin_test.rb +0 -3
  35. data/test/dummy/app/models/hmany_fk_test.rb +0 -3
  36. data/test/dummy/app/models/hmanythrough_join.rb +0 -4
  37. data/test/dummy/app/models/hmanythrough_test.rb +0 -4
  38. data/test/dummy/app/models/hone_as_test.rb +0 -3
  39. data/test/dummy/app/models/hone_test.rb +0 -3
  40. data/test/dummy/app/models/hook_test.rb +0 -9
  41. data/test/dummy/app/models/photo.rb +0 -8
  42. data/test/dummy/app/models/photo_holder.rb +0 -4
  43. data/test/dummy/app/models/photo_related.rb +0 -3
  44. data/test/dummy/app/models/task_all.rb +0 -4
  45. data/test/dummy/app/models/task_photo.rb +0 -5
  46. data/test/dummy/spec/models/habtm_name_test_spec.rb +0 -22
  47. data/test/dummy/spec/models/hjoin_test_spec.rb +0 -54
  48. data/test/dummy/spec/models/hmany_fk_test_spec.rb +0 -36
  49. data/test/dummy/spec/models/hmanythrough_test_spec.rb +0 -99
  50. data/test/dummy/spec/models/hone_as_test_spec.rb +0 -36
  51. data/test/dummy/spec/models/hone_test_spec.rb +0 -36
  52. data/test/dummy/spec/models/hooks_spec.rb +0 -30
  53. data/test/dummy/spec/models/photo_holder_spec.rb +0 -21
  54. data/test/dummy/spec/models/photo_spec.rb +0 -69
  55. data/test/dummy/spec/models/task_photo_spec.rb +0 -25
@@ -0,0 +1,4 @@
1
+ class TaskConnection < ActiveRecord::Base
2
+ belongs_to :renamed_task, :class_name => "Task", :foreign_key => "m1_id"
3
+ belongs_to :renamed_subtask, :class_name => "Subtask", :foreign_key => "m2_id"
4
+ end
@@ -0,0 +1,20 @@
1
+ class CreateModerations2 < ActiveRecord::Migration
2
+ def self.up
3
+ if table_exists? :moderations # for upgrading
4
+ if Moderation.count > 0
5
+ raise "Moderations table must be empty before upgrading has_moderated!"
6
+ end
7
+ drop_table :moderations
8
+ end
9
+ create_table "moderations" do |t|
10
+ t.integer "moderatable_id", :null => true
11
+ t.string "moderatable_type", :null => true
12
+ t.text "data", :null => false
13
+ t.timestamps
14
+ end
15
+ end
16
+
17
+ def self.down
18
+ drop_table :moderations
19
+ end
20
+ end
@@ -0,0 +1,36 @@
1
+ class PrepareForNewTests < ActiveRecord::Migration
2
+ def up
3
+ drop_table :task_alls
4
+ drop_table :photos
5
+ drop_table :photo_holders
6
+ drop_table :hook_tests
7
+ drop_table :hone_tests
8
+ drop_table :hone_as_tests
9
+ drop_table :hmanythrough_tests
10
+ drop_table :hmanythrough_joins
11
+ drop_table :hmany_fk_tests
12
+ drop_table :hjoin_tests_tasks
13
+ drop_table :hjoin_tests
14
+ drop_table :habtm_name_tests_tasks
15
+ drop_table :habtm_name_tests
16
+
17
+ remove_column :subtasks, :task_all_id
18
+ add_column :subtasks, :parentable_id, :integer
19
+ add_column :subtasks, :parentable_type, :string
20
+
21
+ create_table "tasks_jointable", :id => false do |t|
22
+ t.integer :m1_id
23
+ t.integer :m2_id
24
+ end
25
+
26
+ create_table "task_connections" do |t|
27
+ t.string :title
28
+ t.integer :m1_id
29
+ t.integer :m2_id
30
+ t.timestamps
31
+ end
32
+ end
33
+
34
+ def down
35
+ end
36
+ end
@@ -0,0 +1,8 @@
1
+ class RemovePhotoRelateds < ActiveRecord::Migration
2
+ def up
3
+ drop_table :photo_relateds
4
+ end
5
+
6
+ def down
7
+ end
8
+ end
@@ -10,100 +10,14 @@
10
10
  #
11
11
  # It's strongly recommended to check this file into your version control system.
12
12
 
13
- ActiveRecord::Schema.define(:version => 20120209045206) do
14
-
15
- create_table "habtm_name_tests", :force => true do |t|
16
- t.string "title"
17
- t.datetime "created_at"
18
- t.datetime "updated_at"
19
- end
20
-
21
- create_table "habtm_name_tests_tasks", :id => false, :force => true do |t|
22
- t.integer "task_id"
23
- t.integer "habtm_name_test_id"
24
- end
25
-
26
- create_table "hjoin_tests", :force => true do |t|
27
- t.string "title"
28
- t.datetime "created_at"
29
- t.datetime "updated_at"
30
- end
31
-
32
- create_table "hjoin_tests_tasks", :id => false, :force => true do |t|
33
- t.integer "task_id"
34
- t.integer "hjoin_test_id"
35
- end
36
-
37
- create_table "hmany_fk_tests", :force => true do |t|
38
- t.integer "something_id"
39
- t.string "title"
40
- t.datetime "created_at"
41
- t.datetime "updated_at"
42
- end
43
-
44
- create_table "hmanythrough_joins", :force => true do |t|
45
- t.integer "hmanythrough_test_id"
46
- t.integer "task_id"
47
- t.string "exdata"
48
- t.datetime "created_at"
49
- t.datetime "updated_at"
50
- end
51
-
52
- create_table "hmanythrough_tests", :force => true do |t|
53
- t.string "title"
54
- t.datetime "created_at"
55
- t.datetime "updated_at"
56
- end
57
-
58
- create_table "hone_as_tests", :force => true do |t|
59
- t.integer "testable_id"
60
- t.string "testable_type"
61
- t.string "title"
62
- t.datetime "created_at"
63
- t.datetime "updated_at"
64
- end
65
-
66
- create_table "hone_tests", :force => true do |t|
67
- t.integer "task_id"
68
- t.datetime "created_at"
69
- t.datetime "updated_at"
70
- t.string "title"
71
- end
72
-
73
- create_table "hook_tests", :force => true do |t|
74
- t.string "title"
75
- t.string "foo"
76
- t.datetime "created_at"
77
- t.datetime "updated_at"
78
- end
13
+ ActiveRecord::Schema.define(:version => 20120515175621) do
79
14
 
80
15
  create_table "moderations", :force => true do |t|
81
16
  t.integer "moderatable_id"
82
- t.string "moderatable_type", :null => false
83
- t.string "attr_name", :limit => 60, :null => false
84
- t.text "attr_value", :null => false
85
- t.datetime "created_at"
86
- t.datetime "updated_at"
87
- end
88
-
89
- create_table "photo_holders", :force => true do |t|
90
- t.string "title"
91
- t.datetime "created_at"
92
- t.datetime "updated_at"
93
- end
94
-
95
- create_table "photo_relateds", :force => true do |t|
96
- t.integer "photo_id"
97
- t.string "data"
98
- t.datetime "created_at"
99
- t.datetime "updated_at"
100
- end
101
-
102
- create_table "photos", :force => true do |t|
103
- t.string "photo"
104
- t.datetime "created_at"
105
- t.datetime "updated_at"
106
- t.integer "photo_holder_id"
17
+ t.string "moderatable_type"
18
+ t.text "data", :null => false
19
+ t.datetime "created_at", :null => false
20
+ t.datetime "updated_at", :null => false
107
21
  end
108
22
 
109
23
  create_table "subtasks", :force => true do |t|
@@ -112,14 +26,16 @@ ActiveRecord::Schema.define(:version => 20120209045206) do
112
26
  t.string "desc"
113
27
  t.datetime "created_at"
114
28
  t.datetime "updated_at"
115
- t.integer "task_all_id"
29
+ t.integer "parentable_id"
30
+ t.string "parentable_type"
116
31
  end
117
32
 
118
- create_table "task_alls", :force => true do |t|
33
+ create_table "task_connections", :force => true do |t|
119
34
  t.string "title"
120
- t.string "value"
121
- t.datetime "created_at"
122
- t.datetime "updated_at"
35
+ t.integer "m1_id"
36
+ t.integer "m2_id"
37
+ t.datetime "created_at", :null => false
38
+ t.datetime "updated_at", :null => false
123
39
  end
124
40
 
125
41
  create_table "task_photos", :force => true do |t|
@@ -136,4 +52,9 @@ ActiveRecord::Schema.define(:version => 20120209045206) do
136
52
  t.datetime "updated_at"
137
53
  end
138
54
 
55
+ create_table "tasks_jointable", :id => false, :force => true do |t|
56
+ t.integer "m1_id"
57
+ t.integer "m2_id"
58
+ end
59
+
139
60
  end
Binary file
@@ -7437,3 +7437,38 @@ DEPRECATION WARNING: ActiveSupport::Memoizable is deprecated and will be removed
7437
7437
   (1.9ms) INSERT INTO "schema_migrations" (version) VALUES ('20111018172409')
7438
7438
   (1.5ms) INSERT INTO "schema_migrations" (version) VALUES ('20111018174319')
7439
7439
   (1.2ms) INSERT INTO "schema_migrations" (version) VALUES ('20111018180207')
7440
+ DEPRECATION WARNING: ActiveSupport::Memoizable is deprecated and will be removed in future releases,simply use Ruby memoization pattern instead. (called from /Users/apple/rails/has_moderated/test/dummy/config/environment.rb:5)
7441
+ DEPRECATION WARNING: ActiveSupport::Memoizable is deprecated and will be removed in future releases,simply use Ruby memoization pattern instead. (called from /Users/apple/rails/has_moderated/test/dummy/config/environment.rb:5)
7442
+ DEPRECATION WARNING: ActiveSupport::Memoizable is deprecated and will be removed in future releases,simply use Ruby memoization pattern instead. (called from /Users/apple/rails/has_moderated/test/dummy/config/environment.rb:5)
7443
+ DEPRECATION WARNING: ActiveSupport::Memoizable is deprecated and will be removed in future releases,simply use Ruby memoization pattern instead. (called from /Users/apple/rails/has_moderated/test/dummy/config/environment.rb:5)
7444
+ DEPRECATION WARNING: ActiveSupport::Memoizable is deprecated and will be removed in future releases,simply use Ruby memoization pattern instead. (called from /Users/apple/rails/has_moderated/test/dummy/config/environment.rb:5)
7445
+ DEPRECATION WARNING: ActiveSupport::Memoizable is deprecated and will be removed in future releases,simply use Ruby memoization pattern instead. (called from /Users/apple/rails/has_moderated/test/dummy/config/environment.rb:5)
7446
+ DEPRECATION WARNING: ActiveSupport::Memoizable is deprecated and will be removed in future releases,simply use Ruby memoization pattern instead. (called from /Users/apple/rails/has_moderated/test/dummy/config/environment.rb:5)
7447
+  (0.1ms) SELECT "schema_migrations"."version" FROM "schema_migrations" 
7448
+ Migrating to CreateTasks (20110901013205)
7449
+ Migrating to CreateSubtasks (20110901013228)
7450
+ Migrating to CreateModerations (20110901013618)
7451
+ Migrating to CreateTaskAlls (20110908025410)
7452
+ Migrating to AddTaskAllIdToSubtasks (20110908025606)
7453
+ Migrating to CreatePhotos (20111003205633)
7454
+ Migrating to CreateTaskPhotos (20111003234101)
7455
+ Migrating to CreateHookTests (20111004153147)
7456
+ Migrating to CreatePhotoHolders (20111004164509)
7457
+ Migrating to CreateHoneTests (20111008195728)
7458
+ Migrating to CreateHjoinTests (20111008195809)
7459
+ Migrating to FixJoinTable (20111009193145)
7460
+ Migrating to AddTitleToHoneTests (20111009201729)
7461
+ Migrating to CreateHmanythroughTests (20111009205517)
7462
+ Migrating to CreateHmanythroughJoins (20111009205545)
7463
+ Migrating to CreateHoneAsTests (20111018172409)
7464
+ Migrating to CreateHmanyFkTests (20111018174319)
7465
+ Migrating to CreateHabtmNameTests (20111018180207)
7466
+ Migrating to CreatePhotoRelateds (20120209045206)
7467
+ Migrating to CreateModerations2 (20120515155730)
7468
+  (0.0ms) select sqlite_version(*)
7469
+  (0.0ms) begin transaction
7470
+  (17.0ms) SELECT COUNT(*) FROM "moderations"
7471
+  (0.1ms) rollback transaction
7472
+ DEPRECATION WARNING: ActiveSupport::Memoizable is deprecated and will be removed in future releases,simply use Ruby memoization pattern instead. (called from /Users/apple/rails/has_moderated/test/dummy/config/environment.rb:5)
7473
+ DEPRECATION WARNING: ActiveSupport::Memoizable is deprecated and will be removed in future releases,simply use Ruby memoization pattern instead. (called from /Users/apple/rails/has_moderated/test/dummy/config/environment.rb:5)
7474
+ DEPRECATION WARNING: ActiveSupport::Memoizable is deprecated and will be removed in future releases,simply use Ruby memoization pattern instead. (called from /Users/apple/rails/has_moderated/test/dummy/config/environment.rb:5)