zena 1.0.0.rc2 → 1.0.0.rc3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (274) hide show
  1. data/History.txt +23 -0
  2. data/README.rdoc +1 -1
  3. data/app/controllers/columns_controller.rb +3 -31
  4. data/app/controllers/comments_controller.rb +8 -3
  5. data/app/controllers/data_entries_controller.rb +1 -1
  6. data/app/controllers/documents_controller.rb +2 -2
  7. data/app/controllers/nodes_controller.rb +29 -12
  8. data/app/controllers/relations_controller.rb +2 -2
  9. data/app/controllers/sites_controller.rb +1 -1
  10. data/app/controllers/user_sessions_controller.rb +6 -3
  11. data/app/controllers/users_controller.rb +18 -16
  12. data/app/controllers/versions_controller.rb +20 -18
  13. data/app/controllers/virtual_classes_controller.rb +103 -17
  14. data/app/helpers/users_helper.rb +1 -1
  15. data/app/models/column.rb +19 -50
  16. data/app/models/comment.rb +2 -1
  17. data/app/models/node.rb +45 -22
  18. data/app/models/relation.rb +13 -0
  19. data/app/models/relation_proxy.rb +3 -2
  20. data/app/models/role.rb +213 -4
  21. data/app/models/site.rb +18 -11
  22. data/app/models/template.rb +37 -35
  23. data/app/models/version.rb +1 -1
  24. data/app/models/virtual_class.rb +154 -86
  25. data/app/views/columns/_li.html.erb +1 -1
  26. data/app/views/columns/index.html.erb +1 -9
  27. data/app/views/comments/index.rhtml +10 -8
  28. data/app/views/documents/_crop.rhtml +5 -6
  29. data/app/views/documents/crop_form.rjs +3 -2
  30. data/app/views/groups/index.rhtml +1 -1
  31. data/app/views/iformats/index.rhtml +1 -1
  32. data/app/views/nodes/_import_results.rhtml +1 -1
  33. data/app/views/nodes/_parent.rhtml +1 -2
  34. data/app/views/nodes/update.rjs +3 -4
  35. data/app/views/relations/index.erb +1 -1
  36. data/app/views/sites/index.erb +1 -1
  37. data/app/views/templates/drive_tabs/_drive.rhtml +0 -2
  38. data/app/views/templates/edit_tabs/_image.rhtml +1 -1
  39. data/app/views/templates/edit_tabs/_title.rhtml +0 -6
  40. data/app/views/users/index.rhtml +1 -1
  41. data/app/views/users/preferences.html.erb +2 -2
  42. data/app/views/versions/backup.rjs +1 -1
  43. data/app/views/versions/custom_tab.rhtml +9 -4
  44. data/app/views/versions/destroy.rjs +2 -2
  45. data/app/views/versions/update.rjs +2 -9
  46. data/app/views/virtual_classes/_form.erb +3 -2
  47. data/app/views/virtual_classes/import_prepare.html.erb +13 -0
  48. data/app/views/virtual_classes/index.erb +28 -8
  49. data/app/views/zafu/default/Node-+adminLayout.zafu +1 -13
  50. data/app/views/zafu/default/Node-+login.zafu +1 -0
  51. data/app/views/zafu/default/Node-+notFound.zafu +1 -1
  52. data/app/views/zafu/default/Node-+popupLayout.zafu +1 -2
  53. data/app/views/zafu/default/Node-+search.zafu +1 -1
  54. data/app/views/zafu/default/Node-admin.zafu +205 -0
  55. data/app/views/zafu/default/Node.zafu +11 -11
  56. data/bricks/captcha/lib/bricks/captcha.rb +3 -2
  57. data/bricks/mongrel/zena/init.rb +2 -1
  58. data/bricks/pdf/README +5 -5
  59. data/bricks/pdf/lib/bricks/pdf/engine/prince.rb +2 -2
  60. data/bricks/pdf/lib/bricks/pdf/engine/xhtml2pdf.rb +2 -2
  61. data/bricks/pdf/lib/bricks/pdf/install.rb +5 -5
  62. data/bricks/pdf/lib/bricks/pdf.rb +11 -11
  63. data/bricks/pdf/test/engines/test_prince.rb +4 -4
  64. data/bricks/pdf/test/engines/test_xhtml2pdf.rb +4 -4
  65. data/bricks/pdf/test/shoulda_macros/shoulda_pdf.rb +2 -2
  66. data/bricks/pdf/zena/init.rb +2 -2
  67. data/bricks/pdf/zena/tasks.rb +2 -2
  68. data/bricks/sphinx/lib/bricks/sphinx.rb +6 -2
  69. data/bricks/sphinx/zena/{sphinx.yml → sphinx.yml.erb} +2 -2
  70. data/bricks/sphinx/zena/tasks.rb +28 -2
  71. data/bricks/tags/lib/bricks/tags.rb +16 -1
  72. data/bricks/tags/zena/test/unit/tags_test.rb +15 -0
  73. data/bricks/tags/zena/test/zafu/tags.yml +5 -1
  74. data/bricks/worker/lib/bricks/worker.rb +39 -0
  75. data/bricks/worker/zena/deploy.rb +0 -2
  76. data/bricks/worker/zena/init.rb +1 -0
  77. data/bricks/worker/zena/test/sites/zena/delayed_jobs.yml +16 -0
  78. data/bricks/worker/zena/test/zafu/worker.yml +8 -0
  79. data/bricks/zena/zena/migrate/01_base.rb +36 -60
  80. data/bricks/zena/zena/migrate/02_zerox1_schema.rb +388 -0
  81. data/bricks/zena/zena/migrate/03_zerox1_data.rb +380 -0
  82. data/bricks/zena/zena/migrate/20110315161158_add_reverse_scope_to_roles.rb +9 -0
  83. data/config/database_example.yml +1 -1
  84. data/config/environment.rb +1 -1
  85. data/config/gems.yml +17 -14
  86. data/db/init/base/skins/default/Node-+index.zafu +8 -1
  87. data/db/init/base/skins/default/Node-+login.zafu +1 -0
  88. data/db/init/base/skins/default/Node-+popupLayout.zafu +1 -2
  89. data/db/init/base/skins/default/Node-+search.zafu +2 -2
  90. data/db/init/base/skins/default/Node.zafu +9 -9
  91. data/db/init/base/skins/default/{favicon.png → img/favicon.png} +0 -0
  92. data/db/init/base/skins/default/{style.css → img/style.css} +0 -0
  93. data/db/init/base/skins/default/img/translations.yml +11 -0
  94. data/db/init/base/skins/default/notes.zafu +7 -9
  95. data/doc/zafu_changes.yml +12 -0
  96. data/lib/bricks/loader.rb +38 -15
  97. data/lib/tasks/zena.rake +74 -24
  98. data/lib/zena/acts/enrollable.rb +4 -1
  99. data/lib/zena/acts/secure.rb +2 -48
  100. data/lib/zena/acts/serializable.rb +13 -1
  101. data/lib/zena/app.rb +9 -0
  102. data/lib/zena/code_syntax.rb +154 -151
  103. data/lib/zena/console.rb +141 -0
  104. data/lib/zena/controller/test_case.rb +1 -1
  105. data/lib/zena/db_helper/abstract_db.rb +17 -5
  106. data/lib/zena/db_helper/mysql.rb +14 -12
  107. data/lib/zena/db_helper/postgresql.rb +1 -2
  108. data/lib/zena/db_helper/sqlite3.rb +6 -6
  109. data/lib/zena/deploy/awstats.conf.rhtml +1 -1
  110. data/lib/zena/deploy/httpd.rhtml +6 -1
  111. data/lib/zena/deploy/vhost.rhtml +9 -1
  112. data/lib/zena/deploy.rb +12 -7
  113. data/lib/zena/foxy_parser.rb +3 -1
  114. data/lib/zena/info.rb +1 -1
  115. data/lib/zena/parser/zafu_tags.rb +1 -0
  116. data/lib/zena/parser/zazen_rules.rb +1 -1
  117. data/lib/zena/remote/node.rb +15 -3
  118. data/lib/zena/remote/serializable_array.rb +19 -0
  119. data/lib/zena/remote.rb +1 -0
  120. data/lib/zena/routes.rb +7 -2
  121. data/lib/zena/site_worker.rb +11 -1
  122. data/lib/zena/unit/test_case.rb +68 -0
  123. data/lib/zena/use/action.rb +6 -2
  124. data/lib/zena/use/ajax.rb +127 -53
  125. data/lib/zena/use/ancestry.rb +11 -8
  126. data/lib/zena/use/calendar.rb +265 -129
  127. data/lib/zena/use/conditional.rb +1 -1
  128. data/lib/zena/use/context.rb +5 -5
  129. data/lib/zena/use/dates.rb +172 -60
  130. data/lib/zena/use/display.rb +70 -39
  131. data/lib/zena/use/error_rendering.rb +1 -3
  132. data/lib/zena/use/field_index.rb +4 -1
  133. data/lib/zena/use/forms.rb +94 -72
  134. data/lib/zena/use/fulltext.rb +16 -24
  135. data/lib/zena/use/html_tags.rb +20 -12
  136. data/lib/zena/use/i18n.rb +37 -37
  137. data/lib/zena/use/image_builder.rb +8 -1
  138. data/lib/zena/use/ml_index.rb +16 -16
  139. data/lib/zena/use/prop_eval.rb +10 -5
  140. data/lib/zena/use/query_builder.rb +55 -23
  141. data/lib/zena/use/query_node.rb +51 -25
  142. data/lib/zena/use/refactor.rb +2 -28
  143. data/lib/zena/use/relations.rb +1 -1
  144. data/lib/zena/use/rendering.rb +29 -0
  145. data/lib/zena/use/scope_index.rb +75 -14
  146. data/lib/zena/use/search.rb +5 -10
  147. data/lib/zena/use/test_helper.rb +2 -2
  148. data/lib/zena/use/urls.rb +125 -104
  149. data/lib/zena/use/workflow.rb +2 -1
  150. data/lib/zena/use/zafu_attributes.rb +2 -2
  151. data/lib/zena/use/zafu_safe_definitions.rb +20 -0
  152. data/lib/zena/use/zafu_templates.rb +20 -6
  153. data/lib/zena/use/zazen.rb +31 -20
  154. data/lib/zena/view/test_case.rb +5 -0
  155. data/lib/zena/zafu_compiler.rb +24 -2
  156. data/lib/zena.rb +12 -6
  157. data/locale/de/LC_MESSAGES/zena.mo +0 -0
  158. data/locale/de/zena.po +1345 -1164
  159. data/locale/en/LC_MESSAGES/zena.mo +0 -0
  160. data/locale/en/zena.po +1275 -1129
  161. data/locale/fr/LC_MESSAGES/zena.mo +0 -0
  162. data/locale/fr/zena.mo +0 -0
  163. data/locale/fr/zena.po +1617 -1441
  164. data/locale/log.txt +9 -0
  165. data/locale/zena.pot +957 -748
  166. data/public/javascripts/prototype.js +1 -1
  167. data/public/javascripts/zena.js +99 -44
  168. data/public/stylesheets/admin.css +6 -4
  169. data/public/stylesheets/backend.css +71 -0
  170. data/public/stylesheets/calendar.css +24 -25
  171. data/public/stylesheets/code.css +11 -6
  172. data/public/stylesheets/comment.css +2 -1
  173. data/public/stylesheets/popup.css +7 -8
  174. data/test/custom_queries/complex.host.yml +15 -1
  175. data/test/fixtures/files/Node-test.zafu +29 -28
  176. data/test/fixtures/files/translations_de.yml +12 -1
  177. data/test/fixtures/files/translations_fr.yml +12 -1
  178. data/test/functional/comments_controller_test.rb +9 -0
  179. data/test/functional/iformats_controller_test.rb +1 -1
  180. data/test/functional/nodes_controller_test.rb +124 -35
  181. data/test/functional/users_controller_test.rb +132 -3
  182. data/test/functional/virtual_classes_controller_test.rb +75 -4
  183. data/test/integration/navigation_test.rb +51 -9
  184. data/test/integration/query_node/basic.yml +19 -7
  185. data/test/integration/query_node/complex.yml +1 -1
  186. data/test/integration/query_node/dates.yml +27 -1
  187. data/test/integration/query_node/filters.yml +1 -1
  188. data/test/integration/query_node/relations.yml +13 -4
  189. data/test/integration/query_node_test.rb +4 -0
  190. data/test/integration/xml_api_test.rb +6 -1
  191. data/test/integration/zafu_compiler/action.yml +3 -3
  192. data/test/integration/zafu_compiler/ajax.yml +103 -22
  193. data/test/integration/zafu_compiler/basic.yml +0 -52
  194. data/test/integration/zafu_compiler/calendar.yml +44 -20
  195. data/test/integration/zafu_compiler/comments.yml +53 -0
  196. data/test/integration/zafu_compiler/complex.yml +11 -11
  197. data/test/integration/zafu_compiler/complex_ok.yml +16 -3
  198. data/test/integration/zafu_compiler/conditional.yml +15 -5
  199. data/test/integration/zafu_compiler/context.yml +9 -0
  200. data/test/integration/zafu_compiler/dates.yml +43 -15
  201. data/test/integration/zafu_compiler/display.yml +60 -6
  202. data/test/integration/zafu_compiler/errors.yml +6 -2
  203. data/test/integration/zafu_compiler/forms.yml +45 -6
  204. data/test/integration/zafu_compiler/i18n.yml +8 -1
  205. data/test/integration/zafu_compiler/meta.yml +38 -0
  206. data/test/integration/zafu_compiler/query.yml +43 -4
  207. data/test/integration/zafu_compiler/relations.yml +26 -33
  208. data/test/integration/zafu_compiler/rubyless.yml +10 -0
  209. data/test/integration/zafu_compiler/safe_definitions.yml +21 -1
  210. data/test/integration/zafu_compiler/urls.yml +75 -5
  211. data/test/integration/zafu_compiler/version.yml +2 -2
  212. data/test/integration/zafu_compiler/zafu_attributes.yml +5 -1
  213. data/test/integration/zafu_compiler/zazen.yml +14 -6
  214. data/test/integration/zafu_compiler_test.rb +5 -1
  215. data/test/sites/complex/columns.yml +5 -0
  216. data/test/sites/complex/roles.yml +4 -0
  217. data/test/sites/zena/nodes.yml +13 -2
  218. data/test/sites/zena/roles.yml +13 -5
  219. data/test/sites/zena/versions.yml +27 -9
  220. data/test/unit/column_test.rb +51 -5
  221. data/test/unit/iformat_test.rb +2 -2
  222. data/test/unit/node_test.rb +29 -17
  223. data/test/unit/note_test.rb +1 -1
  224. data/test/unit/relation_proxy_test.rb +4 -5
  225. data/test/unit/relation_test.rb +16 -0
  226. data/test/unit/remote_test.rb +2 -2
  227. data/test/unit/role_test.rb +292 -4
  228. data/test/unit/site_test.rb +12 -0
  229. data/test/unit/template_test.rb +1 -1
  230. data/test/unit/text_document_test.rb +1 -1
  231. data/test/unit/virtual_class_test.rb +200 -83
  232. data/test/unit/zena/acts/enrollable_test.rb +26 -31
  233. data/test/unit/zena/use/calendar_test.rb +90 -37
  234. data/test/unit/zena/use/field_index_test.rb +28 -0
  235. data/test/unit/zena/use/html_tags_test.rb +7 -3
  236. data/test/unit/zena/use/ml_index_test.rb +2 -16
  237. data/test/unit/zena/use/nested_attributes_alias_view_test.rb +2 -2
  238. data/test/unit/zena/use/prop_eval_test.rb +50 -8
  239. data/test/unit/zena/use/query_node_test.rb +11 -0
  240. data/test/unit/zena/use/rendering_test.rb +72 -0
  241. data/test/unit/zena/use/scope_index_test.rb +37 -2
  242. data/test/unit/zena/use/urls_test.rb +10 -0
  243. data/test/unit/zena/use/zazen_test.rb +3 -3
  244. data/vendor/plugins/gettext_i18n_rails/Gemfile +11 -0
  245. data/vendor/plugins/gettext_i18n_rails/Gemfile.lock +92 -0
  246. data/vendor/plugins/gettext_i18n_rails/Rakefile +12 -17
  247. data/vendor/plugins/gettext_i18n_rails/Readme.md +215 -0
  248. data/vendor/plugins/gettext_i18n_rails/VERSION +1 -1
  249. data/vendor/plugins/gettext_i18n_rails/gettext_i18n_rails.gemspec +38 -34
  250. data/vendor/plugins/gettext_i18n_rails/lib/gettext_i18n_rails/active_record.rb +1 -1
  251. data/vendor/plugins/gettext_i18n_rails/lib/gettext_i18n_rails/backend.rb +30 -14
  252. data/vendor/plugins/gettext_i18n_rails/lib/gettext_i18n_rails/haml_parser.rb +1 -1
  253. data/vendor/plugins/gettext_i18n_rails/lib/gettext_i18n_rails/html_safe_translations.rb +29 -0
  254. data/vendor/plugins/gettext_i18n_rails/lib/gettext_i18n_rails/i18n_hacks.rb +29 -1
  255. data/vendor/plugins/gettext_i18n_rails/lib/gettext_i18n_rails/model_attributes_finder.rb +7 -1
  256. data/vendor/plugins/gettext_i18n_rails/lib/gettext_i18n_rails/railtie.rb +10 -0
  257. data/vendor/plugins/gettext_i18n_rails/lib/gettext_i18n_rails/ruby_gettext_extractor.rb +6 -2
  258. data/vendor/plugins/gettext_i18n_rails/lib/gettext_i18n_rails/string_interpolate_fix.rb +20 -0
  259. data/vendor/plugins/gettext_i18n_rails/lib/gettext_i18n_rails/tasks.rb +120 -0
  260. data/vendor/plugins/gettext_i18n_rails/lib/gettext_i18n_rails.rb +10 -3
  261. data/vendor/plugins/gettext_i18n_rails/lib/tasks/gettext_rails_i18n.rake +1 -74
  262. data/vendor/plugins/gettext_i18n_rails/spec/gettext_i18n_rails/active_record_spec.rb +51 -20
  263. data/vendor/plugins/gettext_i18n_rails/spec/gettext_i18n_rails/backend_spec.rb +12 -7
  264. data/vendor/plugins/gettext_i18n_rails/spec/gettext_i18n_rails/string_interpolate_fix_spec.rb +32 -0
  265. data/vendor/plugins/gettext_i18n_rails/spec/gettext_i18n_rails_spec.rb +38 -1
  266. data/vendor/plugins/gettext_i18n_rails/spec/rails2/Gemfile +11 -0
  267. data/vendor/plugins/gettext_i18n_rails/spec/spec_helper.rb +1 -8
  268. data/zena.gemspec +2241 -2217
  269. metadata +123 -83
  270. data/.gitignore +0 -36
  271. data/app/views/nodes/_dates.rhtml +0 -13
  272. data/db/init/base/skins/default/Node-+adminLayout.zafu +0 -46
  273. data/db/init/base/skins/default/Node-tree.zafu +0 -19
  274. data/vendor/plugins/gettext_i18n_rails/README.markdown +0 -143
@@ -1,6 +1,13 @@
1
1
  class Base < ActiveRecord::Migration
2
2
  def self.up
3
- create_table "attachments", :force => true do |t|
3
+ if connection.tables.include?('nodes')
4
+ # Legacy: do nothing
5
+ puts "=> Detected existing 'nodes' table: not running base migration."
6
+ return
7
+ end
8
+ table_options = Zena::Db.table_options
9
+
10
+ create_table "attachments", :options => table_options, :force => true do |t|
4
11
  t.string "filename"
5
12
  t.integer "site_id"
6
13
  t.integer "user_id"
@@ -8,7 +15,7 @@ class Base < ActiveRecord::Migration
8
15
  t.datetime "updated_at"
9
16
  end
10
17
 
11
- create_table "cached_pages", :force => true do |t|
18
+ create_table "cached_pages", :options => table_options, :force => true do |t|
12
19
  t.text "path"
13
20
  t.datetime "expire_after"
14
21
  t.datetime "created_at"
@@ -18,7 +25,7 @@ class Base < ActiveRecord::Migration
18
25
 
19
26
  add_index "cached_pages", ["node_id"], :name => "index_cached_pages_on_node_id"
20
27
 
21
- create_table "cached_pages_nodes", :id => false, :force => true do |t|
28
+ create_table "cached_pages_nodes", :id => false, :options => table_options, :force => true do |t|
22
29
  t.integer "cached_page_id"
23
30
  t.integer "node_id"
24
31
  end
@@ -26,7 +33,7 @@ class Base < ActiveRecord::Migration
26
33
  add_index "cached_pages_nodes", ["node_id"], :name => "index_cached_pages_nodes_on_node_id"
27
34
  add_index "cached_pages_nodes", ["cached_page_id"], :name => "index_cached_pages_nodes_on_cached_page_id"
28
35
 
29
- create_table "caches", :force => true do |t|
36
+ create_table "caches", :options => table_options, :force => true do |t|
30
37
  t.datetime "updated_at"
31
38
  t.integer "visitor_id"
32
39
  t.string "visitor_groups", :limit => 200
@@ -36,7 +43,7 @@ class Base < ActiveRecord::Migration
36
43
  t.integer "context"
37
44
  end
38
45
 
39
- create_table "columns", :force => true do |t|
46
+ create_table "columns", :options => table_options, :force => true do |t|
40
47
  t.integer "role_id"
41
48
  t.string "name"
42
49
  t.string "ptype"
@@ -49,7 +56,7 @@ class Base < ActiveRecord::Migration
49
56
  add_index "columns", ["role_id"], :name => "index_columns_on_role_id"
50
57
  add_index "columns", ["name"], :name => "index_columns_on_name"
51
58
 
52
- create_table "comments", :force => true do |t|
59
+ create_table "comments", :options => table_options, :force => true do |t|
53
60
  t.datetime "created_at"
54
61
  t.datetime "updated_at"
55
62
  t.integer "status", :default => 70, :null => false
@@ -67,24 +74,7 @@ class Base < ActiveRecord::Migration
67
74
  add_index "comments", ["reply_to"], :name => "index_comments_on_reply_to"
68
75
  add_index "comments", ["user_id"], :name => "index_comments_on_user_id"
69
76
 
70
- create_table "contact_contents", :force => true do |t|
71
- t.datetime "created_at"
72
- t.datetime "updated_at"
73
- t.integer "version_id"
74
- t.string "first_name", :limit => 60, :default => "", :null => false
75
- t.string "name", :limit => 60, :default => "", :null => false
76
- t.text "address"
77
- t.string "zip", :limit => 20, :default => "", :null => false
78
- t.string "city", :limit => 60, :default => "", :null => false
79
- t.string "telephone", :limit => 60, :default => "", :null => false
80
- t.string "mobile", :limit => 60, :default => "", :null => false
81
- t.string "email", :limit => 60, :default => "", :null => false
82
- t.date "birthday"
83
- t.integer "site_id"
84
- t.string "country", :limit => 100
85
- end
86
-
87
- create_table "data_entries", :force => true do |t|
77
+ create_table "data_entries", :options => table_options, :force => true do |t|
88
78
  t.integer "site_id"
89
79
  t.datetime "created_at"
90
80
  t.datetime "updated_at"
@@ -104,7 +94,7 @@ class Base < ActiveRecord::Migration
104
94
  add_index "data_entries", ["node_c_id"], :name => "index_data_entries_on_node_c_id"
105
95
  add_index "data_entries", ["node_d_id"], :name => "index_data_entries_on_node_d_id"
106
96
 
107
- create_table "discussions", :force => true do |t|
97
+ create_table "discussions", :options => table_options, :force => true do |t|
108
98
  t.datetime "created_at"
109
99
  t.datetime "updated_at"
110
100
  t.integer "node_id"
@@ -116,27 +106,14 @@ class Base < ActiveRecord::Migration
116
106
 
117
107
  add_index "discussions", ["node_id"], :name => "index_discussions_on_node_id"
118
108
 
119
- create_table "document_contents", :force => true do |t|
120
- t.string "type", :limit => 32
121
- t.integer "version_id"
122
- t.string "name", :limit => 200, :default => "", :null => false
123
- t.string "content_type", :limit => 40
124
- t.string "ext", :limit => 20
125
- t.integer "size"
126
- t.integer "width"
127
- t.integer "height"
128
- t.integer "site_id"
129
- t.text "exif_json"
130
- end
131
-
132
- create_table "groups", :force => true do |t|
109
+ create_table "groups", :options => table_options, :force => true do |t|
133
110
  t.datetime "created_at"
134
111
  t.datetime "updated_at"
135
112
  t.string "name", :limit => 20, :default => "", :null => false
136
113
  t.integer "site_id"
137
114
  end
138
115
 
139
- create_table "groups_users", :id => false, :force => true do |t|
116
+ create_table "groups_users", :id => false, :options => table_options, :force => true do |t|
140
117
  t.integer "group_id", :null => false
141
118
  t.integer "user_id", :null => false
142
119
  end
@@ -144,7 +121,7 @@ class Base < ActiveRecord::Migration
144
121
  add_index "groups_users", ["group_id"], :name => "index_groups_users_on_group_id"
145
122
  add_index "groups_users", ["user_id"], :name => "index_groups_users_on_user_id"
146
123
 
147
- create_table "idx_nodes_datetimes", :force => true do |t|
124
+ create_table "idx_nodes_datetimes", :options => table_options, :force => true do |t|
148
125
  t.integer "node_id", :null => false
149
126
  t.string "key"
150
127
  t.datetime "value"
@@ -154,7 +131,7 @@ class Base < ActiveRecord::Migration
154
131
  add_index "idx_nodes_datetimes", ["value"], :name => "index_idx_nodes_datetimes_on_value"
155
132
  add_index "idx_nodes_datetimes", ["node_id"], :name => "index_idx_nodes_datetimes_on_node_id"
156
133
 
157
- create_table "idx_nodes_floats", :force => true do |t|
134
+ create_table "idx_nodes_floats", :options => table_options, :force => true do |t|
158
135
  t.integer "node_id", :null => false
159
136
  t.string "key"
160
137
  t.float "value"
@@ -164,7 +141,7 @@ class Base < ActiveRecord::Migration
164
141
  add_index "idx_nodes_floats", ["value"], :name => "index_idx_nodes_floats_on_value"
165
142
  add_index "idx_nodes_floats", ["node_id"], :name => "index_idx_nodes_floats_on_node_id"
166
143
 
167
- create_table "idx_nodes_integers", :force => true do |t|
144
+ create_table "idx_nodes_integers", :options => table_options, :force => true do |t|
168
145
  t.integer "node_id", :null => false
169
146
  t.string "key"
170
147
  t.integer "value"
@@ -174,7 +151,7 @@ class Base < ActiveRecord::Migration
174
151
  add_index "idx_nodes_integers", ["value"], :name => "index_idx_nodes_integers_on_value"
175
152
  add_index "idx_nodes_integers", ["node_id"], :name => "index_idx_nodes_integers_on_node_id"
176
153
 
177
- create_table "idx_nodes_ml_strings", :force => true do |t|
154
+ create_table "idx_nodes_ml_strings", :options => table_options, :force => true do |t|
178
155
  t.integer "node_id", :null => false
179
156
  t.string "key"
180
157
  t.string "lang", :limit => 10
@@ -185,7 +162,7 @@ class Base < ActiveRecord::Migration
185
162
  add_index "idx_nodes_ml_strings", ["value"], :name => "index_idx_nodes_ml_strings_on_value"
186
163
  add_index "idx_nodes_ml_strings", ["node_id"], :name => "index_idx_nodes_ml_strings_on_node_id"
187
164
 
188
- create_table "idx_nodes_strings", :force => true do |t|
165
+ create_table "idx_nodes_strings", :options => table_options, :force => true do |t|
189
166
  t.integer "node_id", :null => false
190
167
  t.string "key"
191
168
  t.string "value"
@@ -195,7 +172,7 @@ class Base < ActiveRecord::Migration
195
172
  add_index "idx_nodes_strings", ["value"], :name => "index_idx_nodes_strings_on_value"
196
173
  add_index "idx_nodes_strings", ["node_id"], :name => "index_idx_nodes_strings_on_node_id"
197
174
 
198
- create_table "idx_projects", :force => true do |t|
175
+ create_table "idx_projects", :options => table_options, :force => true do |t|
199
176
  t.integer "site_id"
200
177
  t.integer "node_id"
201
178
  t.integer "blog_id"
@@ -211,7 +188,7 @@ class Base < ActiveRecord::Migration
211
188
  t.string "tag_title"
212
189
  end
213
190
 
214
- create_table "idx_templates", :force => true do |t|
191
+ create_table "idx_templates", :options => table_options, :force => true do |t|
215
192
  t.integer "site_id"
216
193
  t.integer "node_id"
217
194
  t.string "format"
@@ -228,7 +205,7 @@ class Base < ActiveRecord::Migration
228
205
  add_index "idx_templates", ["node_id"], :name => "index_idx_templates_on_node_id"
229
206
  add_index "idx_templates", ["version_id"], :name => "index_idx_templates_on_version_id"
230
207
 
231
- create_table "iformats", :force => true do |t|
208
+ create_table "iformats", :options => table_options, :force => true do |t|
232
209
  t.string "name", :limit => 40
233
210
  t.integer "site_id"
234
211
  t.datetime "created_at"
@@ -240,7 +217,7 @@ class Base < ActiveRecord::Migration
240
217
  t.string "popup", :limit => 120
241
218
  end
242
219
 
243
- create_table "links", :force => true do |t|
220
+ create_table "links", :options => table_options, :force => true do |t|
244
221
  t.integer "source_id"
245
222
  t.integer "target_id"
246
223
  t.integer "relation_id"
@@ -255,7 +232,7 @@ class Base < ActiveRecord::Migration
255
232
  add_index "links", ["status"], :name => "index_links_on_status"
256
233
  add_index "links", ["date"], :name => "index_links_on_date"
257
234
 
258
- create_table "nodes", :force => true do |t|
235
+ create_table "nodes", :options => table_options, :force => true do |t|
259
236
  t.string "type", :limit => 32
260
237
  t.datetime "event_at"
261
238
  t.string "kpath", :limit => 16
@@ -313,7 +290,7 @@ class Base < ActiveRecord::Migration
313
290
  add_index "nodes", ["idx_integer1"], :name => "index_nodes_on_idx_integer1"
314
291
  add_index "nodes", ["idx_integer2"], :name => "index_nodes_on_idx_integer2"
315
292
 
316
- create_table "nodes_roles", :id => false, :force => true do |t|
293
+ create_table "nodes_roles", :id => false, :options => table_options, :force => true do |t|
317
294
  t.integer "node_id", :default => 0, :null => false
318
295
  t.integer "role_id", :default => 0, :null => false
319
296
  end
@@ -321,7 +298,7 @@ class Base < ActiveRecord::Migration
321
298
  add_index "nodes_roles", ["node_id"], :name => "index_nodes_roles_on_node_id"
322
299
  add_index "nodes_roles", ["role_id"], :name => "index_nodes_roles_on_role_id"
323
300
 
324
- create_table "relations", :force => true do |t|
301
+ create_table "relations", :options => table_options, :force => true do |t|
325
302
  t.string "source_role", :limit => 32
326
303
  t.string "source_kpath", :limit => 16
327
304
  t.boolean "source_unique"
@@ -338,7 +315,7 @@ class Base < ActiveRecord::Migration
338
315
  add_index "relations", ["target_role"], :name => "index_relations_on_target_role"
339
316
  add_index "relations", ["site_id"], :name => "index_relations_on_site_id"
340
317
 
341
- create_table "roles", :force => true do |t|
318
+ create_table "roles", :options => table_options, :force => true do |t|
342
319
  t.string "name"
343
320
  t.string "kpath", :limit => 16
344
321
  t.string "real_class", :limit => 16
@@ -358,7 +335,7 @@ class Base < ActiveRecord::Migration
358
335
  add_index "roles", ["kpath"], :name => "index_roles_on_kpath"
359
336
  add_index "roles", ["site_id"], :name => "index_roles_on_site_id"
360
337
 
361
- create_table "sessions", :force => true do |t|
338
+ create_table "sessions", :options => table_options, :force => true do |t|
362
339
  t.string "session_id", :null => false
363
340
  t.text "data"
364
341
  t.datetime "created_at"
@@ -368,7 +345,7 @@ class Base < ActiveRecord::Migration
368
345
  add_index "sessions", ["session_id"], :name => "index_sessions_on_session_id"
369
346
  add_index "sessions", ["updated_at"], :name => "index_sessions_on_updated_at"
370
347
 
371
- create_table "sites", :force => true do |t|
348
+ create_table "sites", :options => table_options, :force => true do |t|
372
349
  t.string "host"
373
350
  t.integer "root_id"
374
351
  t.integer "anon_id"
@@ -389,13 +366,13 @@ class Base < ActiveRecord::Migration
389
366
 
390
367
  add_index "sites", ["host"], :name => "index_sites_on_host"
391
368
 
392
- create_table "stored_columns", :force => true do |t|
369
+ create_table "stored_columns", :options => table_options, :force => true do |t|
393
370
  t.integer "stored_role_id"
394
371
  t.string "name"
395
372
  t.string "ptype"
396
373
  end
397
374
 
398
- create_table "users", :force => true do |t|
375
+ create_table "users", :options => table_options, :force => true do |t|
399
376
  t.datetime "created_at"
400
377
  t.datetime "updated_at"
401
378
  t.string "login", :limit => 20
@@ -411,8 +388,7 @@ class Base < ActiveRecord::Migration
411
388
  t.text "properties"
412
389
  end
413
390
 
414
- create_table "versions", :force => true do |t|
415
- t.string "type", :limit => 32
391
+ create_table "versions", :options => table_options, :force => true do |t|
416
392
  t.datetime "created_at"
417
393
  t.datetime "updated_at"
418
394
  t.integer "node_id", :null => false
@@ -438,7 +414,7 @@ class Base < ActiveRecord::Migration
438
414
  execute "CREATE FULLTEXT INDEX index_versions_on_title_and_text_and_summary ON versions (idx_text_high,idx_text_low,idx_text_medium)"
439
415
  end
440
416
 
441
- create_table "zips", :id => false, :force => true do |t|
417
+ create_table "zips", :id => false, :options => table_options, :force => true do |t|
442
418
  t.integer "site_id"
443
419
  t.integer "zip"
444
420
  end