zena 0.16.9 → 1.0.0.beta1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (572) hide show
  1. data/.gitignore +16 -3
  2. data/CREDITS +8 -4
  3. data/History.txt +12 -15
  4. data/app/controllers/application_controller.rb +1 -0
  5. data/app/controllers/columns_controller.rb +130 -0
  6. data/app/controllers/documents_controller.rb +16 -4
  7. data/app/controllers/groups_controller.rb +1 -5
  8. data/app/controllers/iformats_controller.rb +1 -5
  9. data/app/controllers/nodes_controller.rb +116 -41
  10. data/app/controllers/preferences_controller.rb +2 -0
  11. data/app/controllers/relations_controller.rb +1 -5
  12. data/app/controllers/sites_controller.rb +1 -5
  13. data/app/controllers/user_sessions_controller.rb +8 -3
  14. data/app/controllers/users_controller.rb +23 -11
  15. data/app/controllers/versions_controller.rb +29 -46
  16. data/app/controllers/virtual_classes_controller.rb +20 -12
  17. data/app/helpers/documents_helper.rb +5 -1
  18. data/app/models/attachment.rb +41 -0
  19. data/app/models/base_contact.rb +79 -0
  20. data/app/models/cache.rb +2 -2
  21. data/app/models/cached_page.rb +5 -4
  22. data/app/models/column.rb +90 -0
  23. data/app/models/comment.rb +3 -1
  24. data/app/models/contact_content.rb +5 -5
  25. data/app/models/contact_version.rb +2 -2
  26. data/app/models/data_entry.rb +9 -8
  27. data/app/models/discussion.rb +4 -0
  28. data/app/models/document.rb +170 -42
  29. data/app/models/document_content.rb +5 -9
  30. data/app/models/group.rb +4 -3
  31. data/app/models/idx_nodes_ml_string.rb +5 -0
  32. data/app/models/idx_nodes_string.rb +5 -0
  33. data/app/models/idx_template.rb +35 -0
  34. data/app/models/iformat.rb +4 -4
  35. data/app/models/image.rb +193 -26
  36. data/app/models/link.rb +1 -1
  37. data/app/models/node.rb +358 -338
  38. data/app/models/note.rb +2 -4
  39. data/app/models/page.rb +10 -8
  40. data/app/models/reference.rb +1 -1
  41. data/app/models/relation.rb +40 -1
  42. data/app/models/relation_proxy.rb +37 -40
  43. data/app/models/role.rb +19 -0
  44. data/app/models/site.rb +54 -24
  45. data/app/models/skin.rb +1 -16
  46. data/app/models/template.rb +92 -62
  47. data/app/models/template_content.rb +12 -6
  48. data/app/models/text_document.rb +69 -36
  49. data/app/models/text_document_content.rb +3 -3
  50. data/app/models/user.rb +34 -13
  51. data/app/models/version.rb +47 -291
  52. data/app/models/virtual_class.rb +26 -29
  53. data/app/views/columns/_add.html.erb +6 -0
  54. data/app/views/columns/_form.html.erb +36 -0
  55. data/app/views/columns/_li.html.erb +11 -0
  56. data/app/views/columns/create.rjs +8 -0
  57. data/app/views/columns/destroy.rjs +6 -0
  58. data/app/views/columns/edit.html.erb +5 -0
  59. data/app/views/columns/index.html.erb +15 -0
  60. data/app/views/columns/new.html.erb +2 -0
  61. data/app/views/columns/show.rjs +1 -0
  62. data/app/views/columns/update.rjs +5 -0
  63. data/app/views/comments/_li.rhtml +1 -1
  64. data/app/views/comments/create.rjs +1 -1
  65. data/app/views/comments/index.rhtml +1 -1
  66. data/app/views/comments/publish.rjs +1 -1
  67. data/app/views/comments/remove.rjs +1 -1
  68. data/app/views/data_entries/_li.html.erb +1 -1
  69. data/app/views/discussions/create.rjs +1 -1
  70. data/app/views/documents/_crop.rhtml +4 -4
  71. data/app/views/documents/crop_form.rjs +1 -1
  72. data/app/views/documents/new.rhtml +1 -1
  73. data/app/views/documents/show.rhtml +4 -4
  74. data/app/views/groups/_form.rhtml +1 -1
  75. data/app/views/groups/index.rhtml +1 -1
  76. data/app/views/iformats/_form.rhtml +1 -1
  77. data/app/views/iformats/create.rjs +1 -1
  78. data/app/views/iformats/index.rhtml +1 -1
  79. data/app/views/links/create.rjs +1 -1
  80. data/app/views/links/destroy.rjs +1 -1
  81. data/app/views/links/show.rjs +1 -1
  82. data/app/views/nodes/_dates.rhtml +2 -2
  83. data/app/views/nodes/_gallery.rhtml +2 -2
  84. data/app/views/nodes/_list_nodes.rhtml +2 -2
  85. data/app/views/nodes/_parent.rhtml +1 -1
  86. data/app/views/nodes/_position.rhtml +2 -2
  87. data/app/views/nodes/_results.rhtml +1 -1
  88. data/app/views/nodes/create.rjs +1 -4
  89. data/app/views/nodes/destroy.erb +0 -0
  90. data/app/views/nodes/import.rhtml +1 -1
  91. data/app/views/nodes/save_text.rjs +3 -3
  92. data/app/views/nodes/table_update.rjs +1 -2
  93. data/app/views/nodes/update.rjs +1 -1
  94. data/app/views/relations/_form.erb +15 -15
  95. data/app/views/relations/_li.erb +5 -11
  96. data/app/views/relations/create.rjs +1 -1
  97. data/app/views/relations/index.erb +1 -1
  98. data/app/views/sites/_form.erb +3 -3
  99. data/app/views/sites/_li.erb +1 -1
  100. data/app/views/sites/index.erb +1 -1
  101. data/app/views/templates/document_create_tabs/_file.rhtml +3 -3
  102. data/app/views/templates/document_create_tabs/_template.rhtml +9 -9
  103. data/app/views/templates/document_create_tabs/{_text_doc.rhtml → _text_document.rhtml} +4 -4
  104. data/app/views/templates/edit_tabs/{_contact.rhtml → _basecontact.rhtml} +2 -2
  105. data/app/views/templates/edit_tabs/_document.rhtml +3 -3
  106. data/app/views/templates/edit_tabs/_help.rhtml +2 -2
  107. data/app/views/templates/edit_tabs/_image.rhtml +4 -4
  108. data/app/views/templates/edit_tabs/_template.rhtml +6 -6
  109. data/app/views/templates/edit_tabs/_text.rhtml +1 -1
  110. data/app/views/templates/edit_tabs/_textdocument.rhtml +4 -4
  111. data/app/views/templates/edit_tabs/_title.rhtml +9 -14
  112. data/app/views/users/_form.rhtml +1 -1
  113. data/app/views/users/change_info.rjs +1 -1
  114. data/app/views/users/change_password.rjs +1 -1
  115. data/app/views/users/index.rhtml +1 -1
  116. data/app/views/users/preferences.html.erb +10 -4
  117. data/app/views/users/update.rjs +1 -1
  118. data/app/views/versions/_list.rhtml +1 -1
  119. data/app/views/versions/_tr.rhtml +1 -1
  120. data/app/views/versions/backup.rjs +1 -1
  121. data/app/views/versions/destroy.rjs +6 -2
  122. data/app/views/versions/diff.rjs +1 -1
  123. data/app/views/versions/edit.rhtml +14 -6
  124. data/app/views/versions/preview.rjs +1 -1
  125. data/app/views/versions/show.rjs +1 -1
  126. data/app/views/virtual_classes/_add.erb +1 -1
  127. data/app/views/virtual_classes/_form.erb +15 -10
  128. data/app/views/virtual_classes/_li.erb +13 -7
  129. data/app/views/virtual_classes/create.rjs +2 -2
  130. data/app/views/virtual_classes/edit.html.erb +7 -0
  131. data/app/views/virtual_classes/index.erb +2 -2
  132. data/app/views/zafu/default/Node-+adminLayout.zafu +47 -0
  133. data/app/views/zafu/default/Node-+index.zafu +1 -0
  134. data/app/views/{templates/defaults/+login.zafu → zafu/default/Node-+login.zafu} +9 -7
  135. data/app/views/zafu/default/Node-+notFound.zafu +14 -0
  136. data/app/views/zafu/default/Node-+popupLayout.zafu +24 -0
  137. data/app/views/zafu/default/Node-+search.zafu +23 -0
  138. data/app/views/zafu/default/Node.zafu +95 -0
  139. data/bin/zena +0 -2
  140. data/bricks/captcha/lib/bricks/captcha.rb +62 -0
  141. data/bricks/captcha/zena/init.rb +11 -0
  142. data/bricks/data2pdf/.document +5 -0
  143. data/bricks/data2pdf/README +19 -0
  144. data/bricks/data2pdf/Rakefile +36 -0
  145. data/bricks/data2pdf/VERSION +1 -0
  146. data/bricks/data2pdf/lib/data2pdf.rb +60 -0
  147. data/bricks/data2pdf/lib/engines/prince.rb +39 -0
  148. data/bricks/data2pdf/lib/engines/xhtml2pdf.rb +41 -0
  149. data/bricks/data2pdf/lib/install.rb +111 -0
  150. data/bricks/data2pdf/test/engines/test_prince.rb +14 -0
  151. data/bricks/data2pdf/test/engines/test_xhtml2pdf.rb +14 -0
  152. data/bricks/data2pdf/test/fixtures/application.css +241 -0
  153. data/bricks/data2pdf/test/fixtures/contact.html +153 -0
  154. data/bricks/data2pdf/test/fixtures/pisa-default.css +207 -0
  155. data/bricks/data2pdf/test/fixtures/sheet1.css +207 -0
  156. data/bricks/data2pdf/test/fixtures/sheet2.css +207 -0
  157. data/bricks/data2pdf/test/fixtures/simple-html.html +337 -0
  158. data/bricks/data2pdf/test/fixtures/simple-text.txt +1 -0
  159. data/bricks/data2pdf/test/helper.rb +23 -0
  160. data/bricks/data2pdf/test/shoulda_macros/shoulda_data2pdf.rb +91 -0
  161. data/bricks/data2pdf/test/unit/test_rendering.rb +37 -0
  162. data/bricks/math/{patch/application_helper.rb → lib/bricks/math.rb} +0 -4
  163. data/bricks/math/zena/init.rb +4 -0
  164. data/bricks/sphinx/README +2 -2
  165. data/bricks/sphinx/lib/use_sphinx.rb +7 -11
  166. data/bricks/sphinx/{misc → zena}/deploy.rb +0 -0
  167. data/bricks/sphinx/{patch/node.rb → zena/init.rb} +1 -3
  168. data/bricks/sphinx/{migrate → zena/migrate}/20091102171258_add_delta_for_sphinx.rb +0 -0
  169. data/bricks/sphinx/{misc → zena}/sphinx.yml +0 -0
  170. data/bricks/sphinx/{misc → zena}/tasks.rb +0 -0
  171. data/bricks/tags/lib/{has_tags.rb → bricks/tags.rb} +12 -24
  172. data/bricks/tags/zena/init.rb +21 -0
  173. data/bricks/tags/{test → zena/test}/sites/zena/links.yml +0 -0
  174. data/bricks/tags/{test → zena/test}/unit/tags_test.rb +1 -1
  175. data/bricks/tags/zena/test/zafu/tags.yml +41 -0
  176. data/bricks/worker/README +2 -2
  177. data/bricks/worker/{misc → zena}/deploy.rb +0 -0
  178. data/bricks/worker/{misc → zena}/init.rb +2 -1
  179. data/bricks/worker/{migrate → zena/migrate}/20091104191643_create_delayed_jobs_table.rb +0 -0
  180. data/bricks/worker/{misc → zena}/tasks.rb +0 -0
  181. data/bricks/worker/{misc → zena}/worker +0 -0
  182. data/config/bricks.yml +2 -0
  183. data/config/deploy.rb +2 -7
  184. data/config/environment.rb +3 -5
  185. data/config/gems.yml +9 -4
  186. data/db/20100628074512_zena0x_to1x.rb +223 -0
  187. data/db/init/base/help.en.zml +3 -3
  188. data/db/init/base/help.fr.zml +3 -3
  189. data/db/init/base/skins.zml +2 -2
  190. data/db/init/base/skins/default.zml +4 -4
  191. data/db/init/base/skins/default/Node-+adminLayout.zafu +8 -7
  192. data/db/init/base/skins/default/Node-+login.zafu +9 -7
  193. data/db/init/base/skins/default/Node-+search.zafu +4 -1
  194. data/db/init/base/skins/default/Node-tree.zafu +3 -3
  195. data/db/init/base/skins/default/Node.zafu +20 -20
  196. data/db/init/base/skins/default/Project.zafu +1 -1
  197. data/db/init/base/skins/default/notes.zafu +5 -5
  198. data/db/init/base/skins/default/style.css +17 -12
  199. data/db/migrate/001_create_base.rb +1 -1
  200. data/db/migrate/008_user_status.rb +1 -1
  201. data/db/migrate/020_create_participation.rb +3 -3
  202. data/db/migrate/024_correct_vclass_kpath.rb +5 -3
  203. data/db/migrate/025_move_tag_into_vclass.rb +7 -5
  204. data/db/migrate/030_redit_auto_publish_site_settings.rb +2 -2
  205. data/db/migrate/032_caches_context_as_hash.rb +4 -2
  206. data/db/migrate/046_fix_zazen_image_tag.rb +2 -2
  207. data/db/migrate/047_change_default_link_id_to_zero.rb +4 -2
  208. data/db/migrate/20090825201159_insert_zero_link.rb +1 -1
  209. data/db/migrate/20090924141459_zafu_fix_sept09.rb +2 -2
  210. data/db/migrate/20100125062254_add_dynamo_to_version.rb +9 -0
  211. data/db/migrate/20100201133242_remove_default_status_on_version.rb +9 -0
  212. data/db/migrate/20100208194210_create_attachments.rb +17 -0
  213. data/db/migrate/20100210112319_change_dynamo_to_property.rb +9 -0
  214. data/db/migrate/20100320145726_transform_template_contents_into_index.rb +13 -0
  215. data/db/migrate/20100328125634_change_skin_name_to_id.rb +31 -0
  216. data/db/migrate/20100417061257_add_properties_to_sites.rb +9 -0
  217. data/db/migrate/20100419163149_rename_name_to_node_name.rb +9 -0
  218. data/db/migrate/20100422091606_change_v_class_table_into_roles.rb +27 -0
  219. data/db/migrate/20100422094048_node_habtm_roles.rb +13 -0
  220. data/db/migrate/20100422115935_create_columns.rb +15 -0
  221. data/db/migrate/20100513181529_add_site_id_to_columns.rb +9 -0
  222. data/db/migrate/20100519091711_add_index_definition_to_columns.rb +9 -0
  223. data/db/migrate/20100519091940_create_idx_nodes_string.rb +14 -0
  224. data/db/migrate/20100519232432_create_idx_nodes_ml_string.rb +15 -0
  225. data/db/migrate/20100525113858_add_porperties_to_users.rb +9 -0
  226. data/db/migrate/20100526090140_renamed_contact_model_to_base_contact.rb +13 -0
  227. data/db/migrate/20100527130937_change_column_index_to_string.rb +9 -0
  228. data/db/migrate/20100531135128_add_fulltext_builder_fields.rb +28 -0
  229. data/doc/zafu_changes.yml +2 -2
  230. data/lib/bricks/loader.rb +48 -26
  231. data/lib/exif_data.rb +21 -1
  232. data/lib/gettext_strings.rb +8 -1
  233. data/lib/tasks/zena.rake +55 -20
  234. data/lib/version_off.rb +323 -0
  235. data/lib/zazen_parser.rb +9 -0
  236. data/lib/zena.rb +13 -14
  237. data/lib/zena/acts/enrollable.rb +232 -0
  238. data/lib/zena/acts/secure.rb +86 -506
  239. data/lib/zena/acts/secure_node.rb +483 -0
  240. data/lib/zena/acts/serializable.rb +149 -0
  241. data/lib/zena/app.rb +36 -23
  242. data/lib/zena/code_syntax.rb +26 -2
  243. data/lib/zena/controller/test_case.rb +23 -2
  244. data/lib/zena/core_ext/file_utils.rb +3 -3
  245. data/lib/zena/core_ext/string.rb +2 -2
  246. data/lib/zena/db.rb +180 -24
  247. data/lib/zena/deploy.rb +140 -183
  248. data/lib/zena/deploy/awstats.conf.rhtml +4 -4
  249. data/lib/zena/deploy/httpd.rhtml +1 -2
  250. data/lib/zena/deploy/stats.vhost.rhtml +7 -7
  251. data/lib/zena/deploy/vhost.rhtml +1 -1
  252. data/lib/zena/deploy/vhost_www.rhtml +4 -4
  253. data/lib/zena/foxy_parser.rb +345 -295
  254. data/lib/zena/info.rb +1 -2
  255. data/lib/zena/integration/test_case.rb +70 -0
  256. data/lib/zena/loader/yaml_loader.rb +80 -0
  257. data/lib/zena/migrator.rb +2 -2
  258. data/lib/zena/parser.rb +19 -17
  259. data/lib/zena/parser/zafu_rules.rb +7 -0
  260. data/lib/zena/parser/zafu_tags.rb +2 -2
  261. data/lib/zena/parser/zazen_rules.rb +9 -29
  262. data/lib/zena/parser/zena_rules.rb +2 -2
  263. data/lib/zena/refactor/act_as_content.rb +6 -0
  264. data/lib/zena/routes.rb +9 -3
  265. data/lib/zena/site_worker.rb +48 -0
  266. data/lib/zena/test_controller.rb +49 -12
  267. data/lib/zena/use.rb +47 -0
  268. data/lib/zena/use/action.rb +230 -0
  269. data/lib/zena/use/ajax.rb +287 -13
  270. data/lib/zena/use/authlogic.rb +28 -12
  271. data/lib/zena/use/calendar.rb +2 -2
  272. data/lib/zena/use/conditional.rb +41 -0
  273. data/lib/zena/use/context.rb +187 -0
  274. data/lib/zena/use/dates.rb +87 -30
  275. data/lib/zena/use/display.rb +598 -0
  276. data/lib/zena/use/dyn_attributes.rb +4 -4
  277. data/lib/zena/use/error_rendering.rb +3 -1
  278. data/lib/zena/use/fixtures.rb +56 -22
  279. data/lib/zena/use/forms.rb +584 -0
  280. data/lib/zena/use/fulltext.rb +90 -0
  281. data/lib/zena/use/grid.rb +12 -7
  282. data/lib/zena/use/html_tags.rb +8 -459
  283. data/lib/zena/use/i18n.rb +172 -109
  284. data/lib/zena/use/image_builder.rb +1 -2
  285. data/lib/zena/use/ml_index.rb +56 -0
  286. data/lib/zena/use/nested_attributes_alias.rb +2 -2
  287. data/lib/zena/use/node_name.rb +94 -0
  288. data/lib/zena/use/query_builder.rb +355 -0
  289. data/lib/zena/use/query_comment.rb +63 -73
  290. data/lib/zena/use/query_node.rb +404 -317
  291. data/lib/zena/use/recursion.rb +71 -0
  292. data/lib/zena/use/refactor.rb +27 -40
  293. data/lib/zena/use/relations.rb +9 -3
  294. data/lib/zena/use/rendering.rb +143 -116
  295. data/lib/zena/use/search.rb +79 -21
  296. data/lib/zena/use/test_helper.rb +17 -9
  297. data/lib/zena/use/upload.rb +1 -1
  298. data/lib/zena/use/urls.rb +534 -28
  299. data/lib/zena/use/version_hash.rb +154 -0
  300. data/lib/zena/use/workflow.rb +635 -0
  301. data/lib/zena/use/zafu_attributes.rb +205 -0
  302. data/lib/zena/use/zafu_eval.rb +21 -0
  303. data/lib/zena/use/zafu_safe_definitions.rb +36 -0
  304. data/lib/zena/use/zafu_templates.rb +459 -0
  305. data/lib/zena/use/zazen.rb +53 -23
  306. data/lib/zena/view/test_case.rb +56 -7
  307. data/lib/zena/webdav_adapter.rb +8 -8
  308. data/lib/zena/zafu_compiler.rb +25 -0
  309. data/locale/de/LC_MESSAGES/zena.mo +0 -0
  310. data/locale/de/zena.mo +0 -0
  311. data/locale/de/zena.po +920 -781
  312. data/locale/en/LC_MESSAGES/zena.mo +0 -0
  313. data/locale/en/zena.mo +0 -0
  314. data/locale/en/zena.po +530 -405
  315. data/locale/fr/LC_MESSAGES/zena.mo +0 -0
  316. data/locale/fr/zena.mo +0 -0
  317. data/locale/fr/zena.po +588 -432
  318. data/locale/zena.pot +391 -353
  319. data/old_zafu/action.rb +129 -0
  320. data/{lib/zafu → old_zafu}/ajax.rb +0 -24
  321. data/{lib/zafu → old_zafu}/attributes.rb +2 -2
  322. data/{lib/zafu → old_zafu}/calendar.rb +1 -1
  323. data/{lib/zafu → old_zafu}/context.rb +4 -8
  324. data/{lib/zafu → old_zafu}/core/html.rb +1 -1
  325. data/old_zafu/core/move_to_parser.rb +74 -0
  326. data/old_zafu/dates.rb +20 -0
  327. data/{lib/zafu → old_zafu}/display.rb +33 -146
  328. data/{lib/zafu → old_zafu}/eval.rb +0 -0
  329. data/{lib/zafu → old_zafu}/experimental.rb +1 -1
  330. data/{lib/zafu → old_zafu}/i18n.rb +1 -1
  331. data/{lib/zafu → old_zafu}/meta.rb +0 -0
  332. data/old_zafu/query_node.rb +278 -0
  333. data/{lib/zafu → old_zafu}/refactor.rb +2 -12
  334. data/old_zafu/support/context.rb +146 -0
  335. data/{lib/zafu → old_zafu}/support/dom.rb +1 -43
  336. data/{lib/zafu → old_zafu}/support/erb.rb +0 -0
  337. data/{lib/zafu → old_zafu}/support/flow.rb +1 -13
  338. data/old_zafu/support/forms.rb +7 -0
  339. data/old_zafu/support/links.rb +75 -0
  340. data/{lib → old_zafu}/zafu_parser.rb +2 -2
  341. data/public/images/attach_window.png +0 -0
  342. data/public/images/dettach_window.png +0 -0
  343. data/public/images/ext/{contact.png → basecontact.png} +0 -0
  344. data/public/images/toggle_off.png +0 -0
  345. data/public/images/toggle_on.png +0 -0
  346. data/public/images/window/bottom_left.png +0 -0
  347. data/public/images/window/bottom_mid.png +0 -0
  348. data/public/images/window/bottom_right.png +0 -0
  349. data/public/images/window/center_left.png +0 -0
  350. data/public/images/window/center_right.png +0 -0
  351. data/public/images/window/close.png +0 -0
  352. data/public/images/window/maximize.png +0 -0
  353. data/public/images/window/minimize.png +0 -0
  354. data/public/images/window/overlay.png +0 -0
  355. data/public/images/window/sizer.png +0 -0
  356. data/public/images/window/top_left.png +0 -0
  357. data/public/images/window/top_mid.png +0 -0
  358. data/public/images/window/top_right.png +0 -0
  359. data/public/javascripts/builder.js +1 -3
  360. data/public/javascripts/controls.js +3 -5
  361. data/public/javascripts/dragdrop.js +5 -8
  362. data/public/javascripts/effects.js +6 -15
  363. data/public/javascripts/prototype.js +1574 -1020
  364. data/public/javascripts/scriptaculous.js +13 -7
  365. data/public/javascripts/slider.js +5 -7
  366. data/public/javascripts/sound.js +6 -4
  367. data/public/javascripts/unittest.js +69 -71
  368. data/public/javascripts/window.js +1843 -0
  369. data/public/javascripts/zena.js +216 -16
  370. data/public/stylesheets/admin.css +18 -13
  371. data/public/stylesheets/default.css +18 -17
  372. data/public/stylesheets/popup.css +4 -4
  373. data/public/stylesheets/window.css +155 -0
  374. data/public/stylesheets/zena.css +9 -8
  375. data/test/custom_queries/complex.host.yml +8 -8
  376. data/test/fixtures/files/Node-test.zafu +11 -11
  377. data/test/fixtures/files/import.tgz +0 -0
  378. data/test/fixtures/files/simple.zml.gz +0 -0
  379. data/test/fixtures/import/photos.en.zml +3 -3
  380. data/test/fixtures/import/photos/bird.jpg.en.zml +1 -1
  381. data/test/fixtures/import/photos/bird.jpg.fr.zml +1 -1
  382. data/test/fixtures/import/simple.zml +2 -2
  383. data/test/functional/application_controller_test.rb +2 -41
  384. data/test/functional/columns_controller_test.rb +140 -0
  385. data/test/functional/data_entries_controller_test.rb +1 -1
  386. data/test/functional/documents_controller_test.rb +88 -5
  387. data/test/functional/nodes_controller_commit_test.rb +71 -0
  388. data/test/functional/nodes_controller_test.rb +393 -93
  389. data/test/functional/note_controller_test.rb +5 -5
  390. data/test/functional/relations_controller_test.rb +1 -1
  391. data/test/functional/users_controller_test.rb +72 -14
  392. data/test/functional/versions_controller_test.rb +9 -8
  393. data/test/functional/virtual_classes_controller_test.rb +142 -65
  394. data/test/integration/multiple_hosts_test.rb +28 -20
  395. data/test/integration/navigation_test.rb +121 -83
  396. data/test/integration/query_node/basic.yml +128 -0
  397. data/test/integration/query_node/comments.yml +23 -0
  398. data/test/integration/query_node/complex.yml +111 -0
  399. data/test/integration/query_node/dates.yml +22 -0
  400. data/test/integration/query_node/errors.yml +12 -0
  401. data/test/integration/query_node/filters.yml +123 -0
  402. data/test/integration/query_node/properties.yml +41 -0
  403. data/test/integration/query_node/relations.yml +75 -0
  404. data/test/integration/query_node_test.rb +189 -0
  405. data/test/integration/xml_api_test.rb +166 -0
  406. data/test/integration/zafu_compiler/action.yml +67 -0
  407. data/test/integration/zafu_compiler/ajax.yml +263 -0
  408. data/test/{unit/zena/zena_tags → integration/zafu_compiler}/apphelper.yml +0 -0
  409. data/test/integration/zafu_compiler/asset.yml +13 -0
  410. data/test/integration/zafu_compiler/basic.yml +518 -0
  411. data/test/integration/zafu_compiler/calendar.yml +35 -0
  412. data/test/{unit/zena/zena_tags → integration/zafu_compiler}/complex.yml +16 -16
  413. data/test/integration/zafu_compiler/conditional.yml +173 -0
  414. data/test/{unit/zena/zena_tags → integration/zafu_compiler}/data.yml +3 -3
  415. data/test/integration/zafu_compiler/dates.yml +58 -0
  416. data/test/integration/zafu_compiler/display.yml +273 -0
  417. data/test/integration/zafu_compiler/errors.yml +79 -0
  418. data/test/{unit/zena/zena_tags → integration/zafu_compiler}/eval.yml +6 -2
  419. data/test/integration/zafu_compiler/forms.yml +130 -0
  420. data/test/integration/zafu_compiler/i18n.yml +107 -0
  421. data/test/integration/zafu_compiler/later.yml +31 -0
  422. data/test/integration/zafu_compiler/off/off.yml +15 -0
  423. data/test/integration/zafu_compiler/recursion.yml +28 -0
  424. data/test/integration/zafu_compiler/relations.yml +487 -0
  425. data/test/integration/zafu_compiler/roles.yml +28 -0
  426. data/test/{unit/zena/zena_tags → integration/zafu_compiler}/rubyless.yml +10 -9
  427. data/test/integration/zafu_compiler/safe_definitions.yml +65 -0
  428. data/test/integration/zafu_compiler/search.yml +13 -0
  429. data/test/integration/zafu_compiler/security.yml +30 -0
  430. data/test/integration/zafu_compiler/site.yml +14 -0
  431. data/test/integration/zafu_compiler/urls.yml +189 -0
  432. data/test/integration/zafu_compiler/user.yml +32 -0
  433. data/test/integration/zafu_compiler/version.yml +47 -0
  434. data/test/integration/zafu_compiler/workflow.yml +36 -0
  435. data/test/integration/zafu_compiler/zafu_attributes.yml +169 -0
  436. data/test/{unit/zena/zena_tags → integration/zafu_compiler}/zazen.yml +7 -3
  437. data/test/{unit/zena/zena_tags_test.rb → integration/zafu_compiler_test.rb} +137 -57
  438. data/test/sites/complex/nodes.yml +48 -47
  439. data/test/sites/complex/{virtual_classes.yml → roles.yml} +2 -1
  440. data/test/sites/ocean/nodes.yml +7 -7
  441. data/test/sites/ocean/versions.yml +30 -21
  442. data/test/sites/zena/columns.yml +12 -0
  443. data/test/sites/zena/nodes.yml +33 -32
  444. data/test/sites/zena/{virtual_classes.yml → roles.yml} +11 -1
  445. data/test/sites/zena/sites.yml +4 -1
  446. data/test/sites/zena/users.yml +5 -4
  447. data/test/sites/zena/versions.yml +398 -279
  448. data/test/test_helper.rb +2 -1
  449. data/test/test_zena.rb +3 -8
  450. data/test/unit/after_commit_test.rb +103 -0
  451. data/test/unit/attachment_test.rb +266 -0
  452. data/test/unit/base_contact_test.rb +242 -0
  453. data/test/unit/cached_page_test.rb +6 -6
  454. data/test/unit/column_test.rb +77 -0
  455. data/test/unit/comment_test.rb +1 -1
  456. data/test/unit/data_entry_test.rb +8 -2
  457. data/test/unit/document_test.rb +393 -211
  458. data/test/unit/exif_data_test.rb +1 -1
  459. data/test/unit/iformat_test.rb +9 -9
  460. data/test/unit/image_test.rb +358 -284
  461. data/test/unit/multi_version_test.rb +4 -0
  462. data/test/unit/multiversion_test.rb +2 -1013
  463. data/test/unit/node_name_test.rb +137 -0
  464. data/test/unit/node_test.rb +374 -461
  465. data/test/unit/note_test.rb +23 -23
  466. data/test/unit/page_test.rb +23 -23
  467. data/test/unit/project_test.rb +2 -2
  468. data/test/unit/relation_proxy_test.rb +25 -6
  469. data/test/unit/relation_test.rb +156 -24
  470. data/test/unit/role_test.rb +122 -0
  471. data/test/unit/section_test.rb +2 -2
  472. data/test/unit/site_test.rb +48 -12
  473. data/test/unit/skin_test.rb +0 -13
  474. data/test/unit/template_test.rb +361 -314
  475. data/test/unit/text_document_test.rb +105 -33
  476. data/test/unit/transparent_version_test.rb +4 -0
  477. data/test/unit/user_test.rb +10 -10
  478. data/test/unit/version_test.rb +209 -301
  479. data/test/unit/virtual_class_test.rb +21 -29
  480. data/test/unit/workflow_test.rb +1075 -0
  481. data/test/unit/zena/acts/enrollable_test.rb +211 -0
  482. data/test/unit/{secure_test.rb → zena/acts/secure_test.rb} +190 -105
  483. data/test/unit/zena/acts/serializable_test.rb +85 -0
  484. data/test/unit/zena/db_test.rb +27 -14
  485. data/test/unit/zena/parser/zazen.yml +1 -1
  486. data/test/unit/zena/use/action_test.rb +109 -0
  487. data/test/unit/zena/use/calendar_test.rb +8 -8
  488. data/test/unit/zena/use/dates_test.rb +10 -0
  489. data/test/unit/zena/use/dates_view_methods_test.rb +8 -12
  490. data/test/unit/zena/use/fulltext_test.rb +82 -0
  491. data/test/unit/zena/use/html_tags_test.rb +225 -201
  492. data/test/unit/zena/use/i18n_test.rb +56 -26
  493. data/test/unit/zena/use/ml_index_test.rb +129 -0
  494. data/test/unit/zena/use/nested_attributes_alias_view_test.rb +10 -10
  495. data/test/unit/zena/use/query_node_test.rb +104 -0
  496. data/test/unit/zena/use/refactor_test.rb +4 -15
  497. data/test/unit/zena/use/rendering_test.rb +23 -16
  498. data/test/unit/zena/use/upload_test.rb +2 -2
  499. data/test/unit/zena/use/urls_test.rb +2 -0
  500. data/test/unit/zena/use/version_hash_test.rb +126 -0
  501. data/test/unit/zena/use/zafu_template_test.rb +135 -0
  502. data/test/unit/zena/use/zazen_test.rb +85 -61
  503. data/vendor/plugins/gettext_i18n_rails/README.markdown +26 -22
  504. data/vendor/plugins/gettext_i18n_rails/Rakefile +31 -5
  505. data/vendor/plugins/gettext_i18n_rails/VERSION +1 -0
  506. data/vendor/plugins/gettext_i18n_rails/gettext_i18n_rails.gemspec +64 -0
  507. data/vendor/plugins/gettext_i18n_rails/init.rb +7 -3
  508. data/vendor/plugins/gettext_i18n_rails/lib/gettext_i18n_rails.rb +5 -6
  509. data/vendor/plugins/gettext_i18n_rails/lib/gettext_i18n_rails/active_record.rb +6 -2
  510. data/vendor/plugins/gettext_i18n_rails/lib/gettext_i18n_rails/backend.rb +1 -1
  511. data/vendor/plugins/gettext_i18n_rails/lib/gettext_i18n_rails/model_attributes_finder.rb +2 -2
  512. data/vendor/plugins/gettext_i18n_rails/{tasks → lib/tasks}/gettext_rails_i18n.rake +10 -9
  513. data/vendor/plugins/gettext_i18n_rails/spec/gettext_i18n_rails/action_controller_spec.rb +7 -3
  514. data/vendor/plugins/gettext_i18n_rails/spec/gettext_i18n_rails/active_record_spec.rb +7 -5
  515. data/vendor/plugins/gettext_i18n_rails/spec/gettext_i18n_rails/backend_spec.rb +7 -7
  516. data/vendor/plugins/gettext_i18n_rails/spec/gettext_i18n_rails_spec.rb +4 -0
  517. data/vendor/plugins/gettext_i18n_rails/spec/spec_helper.rb +11 -9
  518. data/vendor/plugins/mysql_timezone_utc/init.rb +1 -0
  519. data/vendor/plugins/mysql_timezone_utc/lib/mysql_timezone_utc.rb +14 -0
  520. data/vendor/plugins/postgresql_timezone_utc/init.rb +1 -0
  521. data/vendor/plugins/postgresql_timezone_utc/lib/postgresql_timezone_utc.rb +14 -0
  522. data/zena.gemspec +281 -123
  523. metadata +354 -160
  524. data/app/models/contact.rb +0 -32
  525. data/app/models/document_version.rb +0 -13
  526. data/app/models/image_version.rb +0 -21
  527. data/app/models/text_document_version.rb +0 -29
  528. data/app/views/templates/defaults/+adminLayout.zafu +0 -69
  529. data/bricks/captcha/patch/application_controller.rb +0 -10
  530. data/bricks/captcha/patch/application_helper.rb +0 -32
  531. data/bricks/captcha/patch/site.rb +0 -2
  532. data/bricks/captcha/zafu/captcha.rb +0 -29
  533. data/bricks/tags/patch/node.rb +0 -15
  534. data/bricks/tags/test/zafu/tags.yml +0 -40
  535. data/db/schema.rb +0 -295
  536. data/lib/zafu/action.rb +0 -285
  537. data/lib/zafu/core/move_to_parser.rb +0 -167
  538. data/lib/zafu/dates.rb +0 -58
  539. data/lib/zafu/support/context.rb +0 -265
  540. data/lib/zafu/support/forms.rb +0 -461
  541. data/lib/zafu/support/links.rb +0 -306
  542. data/lib/zena/acts/multiversion.rb +0 -755
  543. data/lib/zena/fix/mysql_connection.rb +0 -17
  544. data/lib/zena/use/query_node_finders.rb +0 -91
  545. data/lib/zena/use/zafu.rb +0 -514
  546. data/test/helpers/query_node/basic.yml +0 -149
  547. data/test/helpers/query_node/comments.yml +0 -18
  548. data/test/helpers/query_node/complex.yml +0 -98
  549. data/test/helpers/query_node/filters.yml +0 -110
  550. data/test/helpers/query_node/relations.yml +0 -43
  551. data/test/helpers/query_node_test.rb +0 -116
  552. data/test/sites/ocean/contact_contents.yml +0 -19
  553. data/test/sites/ocean/template_contents.yml +0 -8
  554. data/test/sites/zena/contact_contents.yml +0 -55
  555. data/test/sites/zena/document_contents.yml +0 -76
  556. data/test/sites/zena/dyn_attributes.yml +0 -43
  557. data/test/sites/zena/template_contents.yml +0 -103
  558. data/test/unit/contact_content_test.rb +0 -33
  559. data/test/unit/contact_test.rb +0 -39
  560. data/test/unit/contact_version_test.rb +0 -48
  561. data/test/unit/document_content_test.rb +0 -110
  562. data/test/unit/document_version_test.rb +0 -11
  563. data/test/unit/dyn_attributes_test.rb +0 -229
  564. data/test/unit/image_content_test.rb +0 -154
  565. data/test/unit/image_version_test.rb +0 -18
  566. data/test/unit/template_content_test.rb +0 -9
  567. data/test/unit/text_document_version_test.rb +0 -37
  568. data/test/unit/zena/use/zafu_test.rb +0 -41
  569. data/test/unit/zena/zena_tags/ajax.yml +0 -233
  570. data/test/unit/zena/zena_tags/basic.yml +0 -1306
  571. data/test/unit/zena/zena_tags/errors.yml +0 -71
  572. data/test/unit/zena/zena_tags/relations.yml +0 -405
@@ -0,0 +1,9 @@
1
+ class AddIndexDefinitionToColumns < ActiveRecord::Migration
2
+ def self.up
3
+ add_column :columns, :index, :integer
4
+ end
5
+
6
+ def self.down
7
+ remove_column :columns, :index
8
+ end
9
+ end
@@ -0,0 +1,14 @@
1
+ class CreateIdxNodesString < ActiveRecord::Migration
2
+ def self.up
3
+ # index strings for nodes
4
+ create_table :idx_nodes_strings, :options => Zena::Db.table_options do |t|
5
+ t.integer 'node_id', :null => false
6
+ t.string 'key'
7
+ t.string 'value'
8
+ end
9
+ end
10
+
11
+ def self.down
12
+ drop_table 'idx_nodes_strings'
13
+ end
14
+ end
@@ -0,0 +1,15 @@
1
+ class CreateIdxNodesMlString < ActiveRecord::Migration
2
+ def self.up
3
+ # index strings for nodes
4
+ create_table :idx_nodes_ml_strings, :options => Zena::Db.table_options do |t|
5
+ t.integer 'node_id', :null => false
6
+ t.string 'key'
7
+ t.string 'lang', :limit => 10
8
+ t.string 'value'
9
+ end
10
+ end
11
+
12
+ def self.down
13
+ drop_table 'idx_nodes_ml_strings'
14
+ end
15
+ end
@@ -0,0 +1,9 @@
1
+ class AddPorpertiesToUsers < ActiveRecord::Migration
2
+ def self.up
3
+ add_column :users, :properties, :text
4
+ end
5
+
6
+ def self.down
7
+ remove_column :users, :properties
8
+ end
9
+ end
@@ -0,0 +1,13 @@
1
+ class RenamedContactModelToBaseContact < ActiveRecord::Migration
2
+ def self.up
3
+ unless $migrating_new_site
4
+ execute "UPDATE nodes SET type = 'BaseContact' WHERE type = 'Contact'"
5
+ execute "UPDATE roles SET real_class = 'BaseContact' WHERE real_class = 'Contact'"
6
+ end
7
+ end
8
+
9
+ def self.down
10
+ execute "UPDATE nodes SET type = 'Contact' WHERE type = 'BaseContact'"
11
+ execute "UPDATE roles SET real_class = 'Contact' WHERE real_class = 'BaseContact'"
12
+ end
13
+ end
@@ -0,0 +1,9 @@
1
+ class ChangeColumnIndexToString < ActiveRecord::Migration
2
+ def self.up
3
+ change_column :columns, :index, :string, :limit => 30
4
+ end
5
+
6
+ def self.down
7
+ change_column :columns, :index, :boolean
8
+ end
9
+ end
@@ -0,0 +1,28 @@
1
+ class AddFulltextBuilderFields < ActiveRecord::Migration
2
+ def self.up
3
+ rename_column 'versions', :title, :idx_text_high
4
+ rename_column 'versions', :summary, :idx_text_medium
5
+ rename_column 'versions', :text, :idx_text_low
6
+
7
+ add_column 'roles', :idx_text_low, :text
8
+ add_column 'roles', :idx_text_medium, :text
9
+ add_column 'roles', :idx_text_high, :text
10
+
11
+ #add_index 'versions', Zena::Use::Fulltext::FULLTEXT_FIELDS, :index_type => "FULLTEXT"
12
+ #remove_index 'versions', %w{title text summary}
13
+ end
14
+
15
+ def self.down
16
+ #remove_index 'versions', Zena::Use::Fulltext::FULLTEXT_FIELDS
17
+
18
+ rename_column 'versions', :idx_text_high, :title
19
+ rename_column 'versions', :idx_text_medium, :summary
20
+ rename_column 'versions', :idx_text_low, :text
21
+
22
+ remove_column 'roles', :idx_text_low
23
+ remove_column 'roles', :idx_text_medium
24
+ remove_column 'roles', :idx_text_high
25
+
26
+ #add_index 'versions', %w{title text summary}, :index_type => "FULLTEXT"
27
+ end
28
+ end
data/doc/zafu_changes.yml CHANGED
@@ -4,8 +4,8 @@ CHANGESET1:
4
4
 
5
5
  CHANGES:
6
6
  if_or:
7
- old: "<r:if can='write' or_test='[d_foo]'>hello</r:if>"
8
- new: "<r:if can='write' or_test='d_foo'>hello</r:if>"
7
+ old: "<r:if eval='can_write?' or_test='[d_foo]'>hello</r:if>"
8
+ new: "<r:if eval='can_write?' or_test='d_foo'>hello</r:if>"
9
9
 
10
10
  SHOULD_CHANGE:
11
11
  basic:
data/lib/bricks/loader.rb CHANGED
@@ -26,19 +26,41 @@ module Bricks
26
26
  bricks.map {|f| Dir["#{f}/models"] }.flatten
27
27
  end
28
28
 
29
- def libs_paths
30
- bricks.map {|f| Dir["#{f}/lib"] }.flatten
29
+ def init_paths
30
+ bricks.map {|f| Dir["#{f}/zena/init.rb"] }.flatten
31
31
  end
32
32
 
33
- def foreach_brick(&block)
33
+ def migrations_for(brick)
34
+ File.join(Zena::ROOT, 'bricks', brick, 'zena', 'migrate')
35
+ end
36
+
37
+ def fixtures_path_for(brick)
38
+ File.join(Zena::ROOT, 'bricks', brick, 'zena', 'test', 'sites')
39
+ end
40
+
41
+ def zafu_tests
42
+ ["#{Zena::ROOT}/bricks/*/zena/test/zafu", "#{RAILS_ROOT}/bricks/*/zena/test/zafu"]
43
+ end
44
+
45
+ def test_files
46
+ [
47
+ 'bricks/*/zena/test/unit/*_test.rb',
48
+ 'bricks/*/zena/test/functional/*_test.rb',
49
+ 'bricks/*/zena/test/integration/*_test.rb',
50
+ ]
51
+ end
52
+
53
+ # FIXME: remove
54
+ def old_foreach_brick(&block)
34
55
  bricks.each do |path|
35
56
  block.call(path)
36
57
  end
37
58
  end
38
59
 
60
+ # FIXME: remove
39
61
  def apply_patches(file_name = nil)
40
62
  file_name ||= caller[0].split('/').last.split(':').first
41
- foreach_brick do |brick_path|
63
+ old_foreach_brick do |brick_path|
42
64
  patch_file = File.join(brick_path, 'patch', file_name)
43
65
  if File.exist?(patch_file)
44
66
  load patch_file
@@ -46,32 +68,15 @@ module Bricks
46
68
  end
47
69
  end
48
70
 
49
- def load_bricks
50
- # load all libraries in bricks
51
- libs_paths.each do |lib_path|
52
- Dir.foreach(lib_path) do |f|
53
- next unless f =~ /\A.+\.rb\Z/
54
- require File.join(lib_path, f)
55
- end
56
- end
57
-
58
- # FIXME: do we really need to load these now, load_path isn't enough ?
59
- models_paths.each do |models_path|
60
- Dir.foreach(models_path) do |f|
61
- next unless f =~ /\A.+\.rb\Z/
62
- require File.join(models_path, f)
63
- end
64
- end
65
- end
66
-
67
- def load_misc(filename)
68
- bricks.map {|f| Dir["#{f}/misc/#{filename}.rb"] }.flatten.each do |file|
71
+ def load_filename(filename)
72
+ bricks.map {|f| Dir["#{f}/zena/#{filename}.rb"] }.flatten.each do |file|
69
73
  require file
70
74
  end
71
75
  end
72
76
 
77
+ # FIXME: remove
73
78
  def load_zafu(mod)
74
- foreach_brick do |brick_path|
79
+ old_foreach_brick do |brick_path|
75
80
  brick_name = File.basename(brick_path)
76
81
  zafu_path = File.join(brick_path, 'zafu')
77
82
  next unless File.exist?(zafu_path)
@@ -79,7 +84,24 @@ module Bricks
79
84
  next if rules_name =~ /\A\./
80
85
  load File.join(zafu_path, rules_name)
81
86
  end
82
- mod.send(:include, eval("Bricks::#{brick_name.capitalize}::Zafu"))
87
+ mod.send(:include, eval("Bricks::#{brick_name.capitalize}::ZafuMethods"))
88
+ end
89
+ end
90
+
91
+ def foreach_brick
92
+ bricks.each do |path|
93
+ yield File.basename(path)
94
+ end
95
+ end
96
+
97
+ def load_bricks
98
+ bricks.each do |path|
99
+ $LOAD_PATH << File.join(path, 'lib')
100
+ end
101
+
102
+ # load 'init'
103
+ init_paths.each do |init_path|
104
+ require init_path
83
105
  end
84
106
  end
85
107
  end
data/lib/exif_data.rb CHANGED
@@ -2,7 +2,27 @@ require 'json'
2
2
  require 'rational'
3
3
 
4
4
  class ExifData < Hash
5
- include RubyLess::SafeClass
5
+ include RubyLess
6
+
7
+ # Deserialization used by Property
8
+ def self.json_create(serialized)
9
+ if data = serialized['data']
10
+ ExifData.new(data)
11
+ else
12
+ nil
13
+ end
14
+ end
15
+
16
+ # Serialization used by Property
17
+ def to_json(*args)
18
+ { 'json_class' => 'ExifData', 'data' => Hash[self.to_a] }.to_json(*args)
19
+ end
20
+
21
+ # We need this extra rule to avoid ActiveSupport json encoder thinking Hash[self.to_a] is the
22
+ # same object as this. This is a temporary fix until ActiveSupport use object_id for :seen.
23
+ def ==(other)
24
+ other.class == self.class && super
25
+ end
6
26
 
7
27
  # You can create new ExifData objects with either a json representation (String), a
8
28
  # hash of key => value or an array of key,value pairs.
@@ -14,6 +14,9 @@ module Zena
14
14
  N_('document_tab') # edit form tab
15
15
  N_('contact_tab') # edit form tab
16
16
 
17
+ N_('attach_img') # version edit.rhtml
18
+ N_('dettach_img') # version edit.rhtml
19
+
17
20
  N_('file_tab') # document form tab name
18
21
  N_('template_tab') # document form tab name
19
22
  N_('text_doc_tab') # document form tab name
@@ -78,6 +81,8 @@ module Zena
78
81
  N_('btn_unpublish') # version action
79
82
  N_('btn_destroy')
80
83
  N_('btn_propose')
84
+ N_('btn_edit')
85
+ N_('btn_drive')
81
86
  N_('btn_refuse')
82
87
  N_('btn_destroy_version')
83
88
  N_('btn_redit')
@@ -153,7 +158,9 @@ module Zena
153
158
  N_('redaction saved')
154
159
 
155
160
  # failed to find
156
- N_('rebuild') # application
161
+ N_('rebuild') # zafu_templates.rb
162
+ N_('rebuild_btn') # zafu_templates.rb
163
+ N_('turn_dev_off_btn') # zafu_templates.rb
157
164
  # contact
158
165
  N_('first_name')
159
166
  N_('name')
data/lib/tasks/zena.rake CHANGED
@@ -8,7 +8,7 @@ RAILS_ENV = 'test' if ARGV.join(' ') =~ /zena:test/
8
8
  require File.join(File.dirname(__FILE__), '..', 'zena', 'info') # to have Zena::ROOT
9
9
  require File.join(File.dirname(__FILE__), '..', 'bricks') # to have Bricks
10
10
 
11
- Bricks.load_misc('tasks')
11
+ Bricks.load_filename('tasks')
12
12
 
13
13
  def symlink_assets(from, to)
14
14
  from = File.expand_path(from)
@@ -254,7 +254,7 @@ namespace :zena do
254
254
  # migrate 'db/migrate'
255
255
  Zena::Migrator.migrate("#{Zena::ROOT}/db/migrate", ENV["BRICK"], ENV["VERSION"] ? ENV["VERSION"].to_i : nil)
256
256
  else
257
- mig_path = "#{Zena::ROOT}/bricks/#{ENV['BRICK']}/migrate"
257
+ mig_path = Bricks.migrations_for(ENV['BRICK'])
258
258
  if File.exist?(mig_path) && File.directory?(mig_path)
259
259
  Zena::Migrator.migrate(mig_path, ENV["BRICK"], ENV["VERSION"] ? ENV["VERSION"].to_i : nil)
260
260
  else
@@ -266,9 +266,8 @@ namespace :zena do
266
266
  paths = {'zena' => "#{RAILS_ROOT}/db/migrate"}
267
267
  bricks = ['zena']
268
268
 
269
- Bricks.foreach_brick do |brick_path|
270
- brick_name = brick_path.split('/').last
271
- migration_path = File.join(brick_path, 'migrate')
269
+ Bricks.foreach_brick do |brick_name|
270
+ migration_path = Bricks.migrations_for(brick_name)
272
271
  next unless File.exist?(migration_path) && File.directory?(migration_path)
273
272
  paths[brick_name] = migration_path
274
273
  bricks << brick_name
@@ -282,35 +281,73 @@ namespace :zena do
282
281
  Rake::Task["db:schema:dump"].invoke if ActiveRecord::Base.schema_format == :ruby
283
282
  end
284
283
 
284
+ desc 'Reset development environment (drop database, migrate, rebuild and load fixtures, clone to test)'
285
+ task :reset => :environment do
286
+ if RAILS_ENV == 'production'
287
+ puts "You cannot reset database in production !"
288
+ else
289
+ %w{db:drop db:create zena:migrate zena:build_fixtures db:test:clone}.each do |task|
290
+ puts "******************************* #{task}"
291
+ Rake::Task[task].invoke
292
+ end
293
+ end
294
+ end
295
+
285
296
  desc 'Rebuild foxy fixtures for all sites'
286
297
  task :build_fixtures => :environment do
298
+ Dir["#{RAILS_ROOT}/test/fixtures/*.yml"].each do |f|
299
+ FileUtils.rm f
300
+ end
301
+
287
302
  tables = Node.connection.tables
288
- # 0. # 1. # need vc # vers. # nodes # need vc. # need nodes
289
- ordered_tables = ['virtual_classes', 'versions', 'nodes', 'zips', 'relations', 'links']
303
+ ordered_tables = %w{roles versions nodes attachments zips relations links}
304
+
290
305
  tables -= ordered_tables
291
306
  tables += ordered_tables
292
- virtual_classes, versions, nodes = nil, nil, nil
307
+ roles, versions, nodes = nil, nil, nil
293
308
  tables.each do |table|
294
309
  case table
295
- when 'virtual_classes'
296
- virtual_classes = Zena::FoxyParser.new(table)
297
- virtual_classes.run
310
+ when 'roles'
311
+ roles = Zena::FoxyParser.new(table)
312
+ roles.run
298
313
  when 'versions'
299
314
  versions = Zena::FoxyParser.new(table)
300
315
  versions.run
301
316
  when 'nodes'
302
- nodes = Zena::FoxyParser.new(table, :versions => versions, :virtual_classes => virtual_classes)
317
+ nodes = Zena::FoxyParser.new(table, :versions => versions, :roles => roles)
303
318
  nodes.run
304
319
  when 'zips'
305
320
  Zena::FoxyParser.new(table, :nodes => nodes).run
306
321
  when 'relations'
307
- Zena::FoxyParser.new(table, :virtual_classes => virtual_classes).run
322
+ Zena::FoxyParser.new(table, :roles => roles).run
308
323
  when 'links'
309
324
  Zena::FoxyParser.new(table, :nodes => nodes).run
310
325
  else
311
326
  Zena::FoxyParser.new(table).run
312
327
  end
313
328
  end
329
+
330
+ %w{db:fixtures:load zena:rebuild_index}.each do |task|
331
+ puts "******************************* #{task}"
332
+ Rake::Task[task].invoke
333
+ end
334
+
335
+ index_tables = Node.connection.tables.select {|t| t =~ /^idx_/ }
336
+ Zena::FoxyParser.dump_fixtures(index_tables)
337
+ end
338
+
339
+ desc 'Rebuild index for all sites (without SiteWorker)'
340
+ task :rebuild_index => :environment do
341
+ include Zena::Acts::Secure
342
+
343
+ Site.all.each do |site|
344
+ # We avoid SiteWorker because it's async.
345
+ Thread.current[:visitor] = User.find_by_login_and_site_id(nil, site.id)
346
+ nodes = Node.find(:all,
347
+ :conditions => ['site_id = ?', site.id]
348
+ )
349
+ site.rebuild_index(secure_result(nodes))
350
+ end
314
351
  end
315
352
 
316
353
  Rake::RDocTask.new do |rdoc|
@@ -334,12 +371,9 @@ namespace :zena do
334
371
  end
335
372
  end
336
373
 
337
- # do not change the order in which these elements are loaded (adding 'lib/**/test/*_test.rb' fails)
338
- tests = ['test/helpers/**/*_test.rb', 'test/unit/**/*_test.rb',
339
- 'lib/parser/test/*_test.rb', 'lib/query_builder/test/*_test.rb',
340
- 'test/functional/*_test.rb', #'test/integration/*_test.rb',
341
- 'bricks/**/test/unit/*_test.rb', 'bricks/**/test/functional/*_test.rb',
342
- 'bricks/**/test/integration/*_test.rb'].map {|p| "#{Zena::ROOT}/#{p}"}
374
+ tests = ['test/unit/**/*_test.rb', 'test/functional/*_test.rb', 'test/integration/*_test.rb'].map {|p| "#{Zena::ROOT}/#{p}"}
375
+
376
+ tests += Bricks.test_files
343
377
 
344
378
  Rake::TestTask.new(:test => ["zena:test:prepare", "zena:build_fixtures"]) do |t|
345
379
  t.libs << "test"
@@ -428,7 +462,8 @@ namespace :zena do
428
462
  # FIXME: how to run sub-task
429
463
  ENV['RAILS_ENV'] = RAILS_ENV || 'production'
430
464
  ENV['HOST'] ||= 'localhost'
431
- ENV['LANG'] ||= 'en'
465
+ ENV['LANG'] = ENV['LANG'].to_s
466
+ ENV['LANG'] = 'en' if ENV['LANG'].empty?
432
467
  ENV['PASSWORD'] ||= 'admin'
433
468
 
434
469
  Rake::Task["db:create"].invoke
@@ -0,0 +1,323 @@
1
+ =begin rdoc
2
+ A version implements versioning and permits multiple publications (one for each language).
3
+
4
+ === Status
5
+
6
+ A version's status changes over time. A version usually starts by being a 'redaction', these eventually a 'proposition', etc. The version's status changes by executing actions on the node (publish, remove, etc). Have a look at Acts::As::Multiversion for details. Zena::Status are :
7
+
8
+ red (70):: version is being written (the redaction is only seen by its author)
9
+ prop_with (65):: document proposed with the redaction. Will be automatically published/removed with the redaction.
10
+ prop (60):: proposed for publication (seen only by the members of the publish group of the node)
11
+ pub (50):: version is published (can be seen by all readers)
12
+ rep (20):: replaced by a newer version (can be an elligible version for rollback)
13
+ rem (10):: removed (from a rollback)
14
+ del (0):: this is like 'moved to trash'
15
+
16
+ === Version attributes
17
+
18
+ title:: Node title.
19
+ comment:: The comment is a little word saying what this particular version is about or a full text on all the modifications done or to be done or anything usefull that should be communicated inside the team.
20
+ text:: The text is the full content of a version. The text usually contains zazen formatted text (textile with additions). See Zazen for details.
21
+
22
+ === Dynamic attributes
23
+
24
+ Any attribute written using version.prop[:blah] = 'some text' is stored as a dynamic attribute. See DynAttributes for details.
25
+
26
+ == Content
27
+ If a we need to create a more sophisticated version class, all the required fields go in a 'content' class, like
28
+ #DocumentContent stores document type and size for #DocumentVersion. See #Document for the details on the relation between Version and Content.
29
+ =end
30
+ class VersionOff < ActiveRecord::Base
31
+
32
+ # readable
33
+ include RubyLess
34
+ # writable
35
+ attr_accessible :title, :text, :summary, :comment, :publish_from, :lang, :status, :content_attributes, :dyn_attributes
36
+ safe_context :author => 'BaseContact', :user => 'User', :node => 'Node'
37
+
38
+ belongs_to :user
39
+ before_validation :version_before_validation
40
+ validates_presence_of :user, :site_id
41
+ validate :valid_version
42
+ after_save :save_content
43
+ after_save :set_updated_at
44
+ after_destroy :destroy_content
45
+ before_create :set_number
46
+
47
+ include Zena::Use::DynAttributes::ModelMethods
48
+ extend Zena::Acts::Multiversion
49
+
50
+ acts_as_version
51
+
52
+ class << self
53
+ # Some #Version sub-classes need to have more specific content than just 'text' and 'summary'.
54
+ # this content is stored in a delegate 'content' object found with the 'content_class' class method
55
+ def content_class
56
+ nil
57
+ end
58
+ end
59
+
60
+ def author
61
+ user.contact
62
+ end
63
+
64
+ # FIXME: This should not be needed ! Remove when find by id is cached.
65
+ def set_node(node)
66
+ @node ||= node
67
+ end
68
+
69
+ def user_zip
70
+ user_id
71
+ end
72
+
73
+ def zip
74
+ "#{node.zip}.#{number}"
75
+ end
76
+
77
+ # Return the content for the version. Can it's 'own' content or the same as the version this one was copied from.
78
+ def content
79
+ return nil unless content_class
80
+ return @content if @content
81
+ if self[:content_id]
82
+ @content = content_class.find_by_version_id(self[:content_id])
83
+ @content.preload_version(self) if @content
84
+ else
85
+ @content = content_class.find_by_version_id(self[:id])
86
+ @content.preload_version(self) if @content
87
+ end
88
+ unless @content
89
+ # create new content
90
+ @content = content_class.new
91
+ self[:content_id] = nil
92
+ @content.preload_version(self)
93
+ @redaction_content = @content
94
+ end
95
+ @content
96
+ end
97
+
98
+ # Return the version's own content or creates a new one so it can be edited.
99
+ def redaction_content
100
+ return @redaction_content if @redaction_content
101
+ return nil unless content_class
102
+ @content = content
103
+ if @content && @content[:version_id] == self[:id]
104
+ # own content, make sure no published version links to this content
105
+ if !new_record? && slave_version = Version.find(:first, :select=>'id', :conditions=>["content_id = ?",self[:id]])
106
+ # shared content, we need to build our own and alter others:
107
+ #
108
+ # 1. Current state
109
+ # version[@id = A, @content_id = nil] ===> content[@version_id = A] <--- version[@content_id = A, @id = B]
110
+ #
111
+ # 2. Changes to
112
+ # version[@id = A, @content_id = B ] ---> content[@version_id = B] <=== version[@content_id = nil, @id = B]
113
+ #
114
+ # Whatchout: we could have a race condition here...
115
+ old_master_id = self[:id]
116
+ new_master_id = slave_version[:id]
117
+ content_id = @content[:id]
118
+ # version[@id = B, @content_id => nil]
119
+ Version.connection.execute "UPDATE #{Version.table_name} SET content_id = NULL WHERE id = #{new_master_id}"
120
+ # version[@id = A, @content_id => B]
121
+ Version.connection.execute "UPDATE #{Version.table_name} SET content_id = #{new_master_id} WHERE id = #{old_master_id}"
122
+ # content[@version_id => B]
123
+ Version.connection.execute "UPDATE #{@content.class.table_name} SET version_id = #{new_master_id} WHERE id = #{content_id}"
124
+
125
+ # content shared, make it our own
126
+ @old_content = @content # keep the old one in case we cannot save and need to rollback
127
+ @content = @old_content.clone
128
+ self[:content_id] = nil
129
+ @content[:version_id] = nil # will be set on save
130
+ @content.preload_version(self)
131
+ end
132
+ elsif @content
133
+ # content shared, make it our own
134
+ @old_content = @content # keep the old one in case we cannot save and need to rollback
135
+ @content = @old_content.clone
136
+ self[:content_id] = nil
137
+ @content[:version_id] = nil # will be set on save
138
+ @content.preload_version(self)
139
+ else
140
+ # create new content
141
+ @content = content_class.new
142
+ self[:content_id] = nil
143
+ @content.preload_version(self)
144
+ end
145
+ @redaction_content = @content
146
+ end
147
+
148
+ def content_class
149
+ self.class.content_class
150
+ end
151
+
152
+ def content_attributes=(h)
153
+ if content.would_edit?(h) && redaction_content
154
+ redaction_content.attributes = h
155
+ else
156
+ # ignore
157
+ end
158
+ end
159
+
160
+ # Return a new redaction from this version
161
+ def clone
162
+ ignore_attributes = self.attributes_to_ignore_on_clone
163
+ attrs = attributes.dup.reject {|k,v| ignore_attributes.include?(k.to_s) }
164
+
165
+ new_clone = self.class.new(attrs)
166
+ protected_attributes_on_clone.each do |k,v|
167
+ new_clone.send("#{k}=", v)
168
+ end
169
+ new_clone
170
+ end
171
+
172
+ # List of attribute keys to export in a zml file.
173
+ def export_keys
174
+ {
175
+ :zazen => {'title' => title, 'text' => text, 'summary' => summary}.merge(Hash[*dyn.map{|k,v| ["d_#{k}", v]}.flatten]),
176
+ :dates => {},
177
+ }
178
+ end
179
+
180
+ def attributes_to_ignore_on_clone
181
+ # /_ok$/ ?
182
+ %w{ user_id type created_at updated_at id }
183
+ end
184
+
185
+ def protected_attributes_on_clone
186
+ { 'content_id' => (content_class ? (content_id || id) : nil),
187
+ 'user_id' => visitor.id,
188
+ 'node' => self.node,
189
+ 'number' => self.number,
190
+ 'dyn' => self.dyn,
191
+ 'status' => Zena::Status[:red],
192
+ 'lang' => visitor.lang }
193
+ end
194
+
195
+ # Return true if the version can be updated by the current visitor without creating
196
+ # a new redaction.
197
+ def reusable?(lang, target_status)
198
+ self.lang == lang &&
199
+ user_id == visitor.id &&
200
+ [Zena::Status[:red], Zena::Status[:pub]].include?(status) &&
201
+ target_status == status &&
202
+ Time.now < created_at + current_site[:redit_time].to_i
203
+ end
204
+
205
+ # Return true if we would need to create a new version or re-edit depending
206
+ # on the attributes
207
+ def would_edit?(new_attrs)
208
+ new_attrs.each do |k,v|
209
+ next if ['status', 'publish_from'].include?(k.to_s)
210
+ if k.to_s == 'content_attributes'
211
+ return true if content.would_edit?(v)
212
+ elsif k.to_s == 'dyn_attributes'
213
+ return true if dyn.would_edit?(v)
214
+ elsif type = self.class.safe_method_type([k])
215
+ return true if field_changed?(k, self.send(type[:method]), v)
216
+ end
217
+ end
218
+ false
219
+ end
220
+
221
+ def safe_content_read(signature)
222
+ if c = content
223
+ c.send(:safe_read, signature)
224
+ else
225
+ nil
226
+ end
227
+ end
228
+
229
+ # Return true if the version has been edited (not just status / publication date change)
230
+ # TODO: test
231
+ def edited?
232
+ new_record? || (changes.keys - ['status', 'publish_from'] != []) || (@redaction_content && @redaction_content.changed?)
233
+ end
234
+
235
+ def should_save?
236
+ new_record? || changed? || dyn.changed? || (@redaction_content && @redaction_content.changed?)
237
+ end
238
+
239
+ def attributes_with_defaults=(attrs)
240
+ self.attributes_without_defaults = attrs
241
+ %W{title summary text comment}.each do |txt_field|
242
+ self[txt_field] ||= ''
243
+ end
244
+ end
245
+ alias_method_chain :attributes=, :defaults
246
+
247
+ private
248
+ def set_number
249
+ last_record = node.id ? self.connection.select_one("select number from #{self.class.table_name} where node_id = '#{node[:id]}' ORDER BY number DESC LIMIT 1") : nil
250
+ self[:number] = (last_record || {})['number'].to_i + 1
251
+ end
252
+
253
+ def save_content
254
+ # TODO: Why don't we use @redaction_content ?
255
+ if @content && @content.changed?
256
+ @content[:version_id] ||= self[:id]
257
+ # validations checked with 'valid_content'
258
+ @content.save_without_validation
259
+ else
260
+ true
261
+ end
262
+ end
263
+
264
+ def set_updated_at
265
+ if @content_updated_but_not_saved
266
+ # not saved, set updated_at manually
267
+ Zena::Db.set_attribute(self, :updated_at, Time.now)
268
+ end
269
+ @content_updated_but_not_saved = nil
270
+ true
271
+ end
272
+
273
+ def destroy_content
274
+ content.destroy if content_class && content.can_destroy?
275
+ end
276
+
277
+ # Set version number and site_id before validation tests.
278
+ def version_before_validation
279
+ self[:site_id] = visitor.site.id
280
+ return unless node
281
+ self.title = node.name if self.title.blank?
282
+ self.type ||= self.class.to_s
283
+
284
+ self.lang = visitor.lang if self.lang.blank?
285
+ self.status ||= current_site.auto_publish? ? Zena::Status[:pub] : Zena::Status[:red]
286
+ self.publish_from ||= Time.now if self.status == Zena::Status[:pub]
287
+ self.user_id = visitor[:id] if new_record?
288
+
289
+ if @content
290
+ @content[:site_id] = self[:site_id]
291
+ end
292
+ end
293
+
294
+ # Make sure the version and it's related content are in a correct state.
295
+ def valid_version
296
+ errors.add('node', "can't be blank") unless node
297
+
298
+ # validate content
299
+ # TODO: we could use autosave here
300
+ @content_updated_but_not_saved = !changed? && @content && @content.changed?
301
+
302
+ if @content && @content.changed? && !@content.valid?
303
+ @content.errors.each_error do |attribute,message|
304
+ if attribute.to_s == 'base'
305
+ errors.add('content', message)
306
+ else
307
+ attribute = "content_#{attribute}"
308
+ errors.add(attribute, message) unless errors[attribute] # FIXME: rails 3: if errors[attribute].empty?
309
+ end
310
+ end
311
+
312
+ if @old_content
313
+ @content = @old_content # rollback initial content
314
+ else
315
+ # clean empty content
316
+ @content = content_class.new
317
+ @content.preload_version(self)
318
+ self[:content_id] = nil
319
+ @redaction_content = @content
320
+ end
321
+ end
322
+ end
323
+ end