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
data/test/sites/complex/nodes.yml CHANGED
@@ -14,240 +14,241 @@ complex:
14
14
  wgroup: complex
15
15
  dgroup: admin
16
16
  skin: cskin
17
- v_title: complex site
17
+ title: complex site
18
18
 
19
19
  cskin:
20
20
  class: Skin
21
21
  parent: complex
22
- v_title: cskin
22
+ title: cskin
23
23
 
24
24
  Node_zafu:
25
25
  class: Template
26
26
  parent: cskin
27
- name: Node
28
- v_title: Node
29
- c_skin_name: cskin
30
- c_format: html
31
- c_tkpath: N
32
- c_klass: Node
27
+ node_name: Node
28
+ title: Node
29
+ v_prop:
30
+ target_klass: Node
31
+ template:
32
+ format: html
33
+ tkpath: N
33
34
 
34
35
  # ------------- EMPLOYEES
35
36
  employees:
36
37
  class: Section
37
38
  parent: complex
38
- v_title: list of employees
39
+ title: list of employees
39
40
 
40
41
  roger:
41
42
  class: Employee
42
43
  parent: employees
43
- v_title: Roger Ubercool
44
+ title: Roger Ubercool
44
45
 
45
46
  joe:
46
47
  class: Employee
47
48
  parent: employees
48
- v_title: Joe Friendly
49
+ title: Joe Friendly
49
50
 
50
51
  mike:
51
52
  class: Employee
52
53
  parent: employees
53
- v_title: Mike Mean
54
+ title: Mike Mean
54
55
 
55
56
  # ------------- JOBS
56
57
  jobs:
57
58
  class: Section
58
59
  parent: complex
59
- v_title: jobs
60
+ title: jobs
60
61
 
61
62
  driver:
62
63
  class: Job
63
64
  parent: jobs
64
- v_title: driver
65
+ title: driver
65
66
 
66
67
  driver_security:
67
68
  class: Page
68
69
  parent: driver
69
- v_title: security
70
+ title: security
70
71
  custom_a: 10
71
72
 
72
73
  driver_team:
73
74
  class: Page
74
75
  parent: driver
75
- v_title: team work
76
+ title: team work
76
77
 
77
78
  driver_mechanical:
78
79
  class: Page
79
80
  parent: driver
80
- v_title: mechanical
81
+ title: mechanical
81
82
 
82
83
  technician:
83
84
  class: Job
84
85
  parent: jobs
85
- v_title: technician
86
+ title: technician
86
87
 
87
88
  technician_security:
88
89
  class: Page
89
90
  parent: technician
90
- v_title: security
91
+ title: security
91
92
  custom_a: 10
92
93
 
93
94
  technician_team:
94
95
  class: Page
95
96
  parent: technician
96
- v_title: team work
97
+ title: team work
97
98
  custom_a: 1
98
99
 
99
100
  technician_fiber:
100
101
  class: Page
101
102
  parent: technician
102
- v_title: optical fiber
103
+ title: optical fiber
103
104
 
104
105
  chief:
105
106
  class: Job
106
107
  parent: jobs
107
- v_title: chief
108
- name: chief
108
+ title: chief
109
+ node_name: chief
109
110
 
110
111
  chief_motivation:
111
112
  class: Page
112
113
  parent: chief
113
- v_title: team motivation
114
+ title: team motivation
114
115
  custom_a: 10
115
116
 
116
117
  chief_image:
117
118
  class: Page
118
119
  parent: chief
119
- v_title: corporate image
120
+ title: corporate image
120
121
 
121
122
  # ------------- COURSES
122
123
  courses:
123
124
  class: Page
124
125
  parent: complex
125
- v_title: courses list
126
+ title: courses list
126
127
 
127
128
  dangerous_transportations:
128
129
  class: Course
129
130
  parent: courses
130
131
  # 2 years = 2 * 12 months = 24
131
132
  custom_a: 24
132
- v_title: dangerous transportations
133
+ title: dangerous transportations
133
134
 
134
135
  formulate_problems:
135
136
  class: Course
136
137
  parent: courses
137
- v_title: problem formulation
138
+ title: problem formulation
138
139
 
139
140
  transmit_information:
140
141
  class: Course
141
142
  parent: courses
142
143
  custom_a: 12
143
- v_title: information transmission
144
+ title: information transmission
144
145
 
145
146
  engine:
146
147
  class: Course
147
148
  parent: courses
148
149
  custom_a: 24
149
- v_title: engine maintenance
150
+ title: engine maintenance
150
151
 
151
152
  secure_a_site:
152
153
  class: Course
153
154
  parent: courses
154
155
  custom_a: 24
155
- v_title: secure a site
156
+ title: secure a site
156
157
 
157
158
  winch_usage:
158
159
  class: Course
159
160
  parent: courses
160
161
  custom_a: 24
161
- v_title: how to use the winch
162
+ title: how to use the winch
162
163
 
163
164
  radio_usage:
164
165
  class: Course
165
166
  parent: courses
166
167
  custom_a: 24
167
- v_title: how to use the radio
168
+ title: how to use the radio
168
169
 
169
170
  fiber_junction:
170
171
  class: Course
171
172
  parent: courses
172
173
  custom_a: 24
173
- v_title: fiber junction
174
+ title: fiber junction
174
175
 
175
176
  resp_management:
176
177
  class: Course
177
178
  parent: courses
178
179
  custom_a: 24
179
- v_title: responsabilities management
180
+ title: responsabilities management
180
181
 
181
182
  team_motivation:
182
183
  class: Course
183
184
  parent: courses
184
185
  custom_a: 24
185
- v_title: motivate your team
186
+ title: motivate your team
186
187
 
187
188
  vision:
188
189
  class: Course
189
190
  parent: courses
190
191
  custom_a: 24
191
- v_title: our vision
192
+ title: our vision
192
193
 
193
194
  # ------------- FORMATIONS
194
195
 
195
196
  transp2004:
196
197
  class: Formation
197
198
  parent: dangerous_transportations
198
- v_title: dtransp 2004
199
+ title: dtransp 2004
199
200
  event_at: 2004-03-15
200
201
 
201
202
  transp2006:
202
203
  class: Formation
203
204
  parent: dangerous_transportations
204
- v_title: dtransp 2006
205
+ title: dtransp 2006
205
206
  event_at: 2006-04-21
206
207
 
207
208
  fiber2002:
208
209
  class: Formation
209
210
  parent: fiber_junction
210
- v_title: fiber 2002
211
+ title: fiber 2002
211
212
  event_at: 2002-02-02
212
213
 
213
214
  fiber2003:
214
215
  class: Formation
215
216
  parent: fiber_junction
216
- v_title: fiber 2003
217
+ title: fiber 2003
217
218
  event_at: 2003-03-03
218
219
 
219
220
  form2005:
220
221
  class: Formation
221
222
  parent: formulate_problems
222
- v_title: formprobs 2005
223
+ title: formprobs 2005
223
224
  event_at: 2005-03-20
224
225
 
225
226
  form2006:
226
227
  class: Formation
227
228
  parent: formulate_problems
228
- v_title: formprobs 2006
229
+ title: formprobs 2006
229
230
  event_at: 2006-03-20
230
231
 
231
232
  transm2001:
232
233
  class: Formation
233
234
  parent: transmit_information
234
- v_title: transinfo 2001
235
+ title: transinfo 2001
235
236
  event_at: 2001-06-15
236
237
 
237
238
  transm2002:
238
239
  class: Formation
239
240
  parent: transmit_information
240
- v_title: transinfo 2002
241
+ title: transinfo 2002
241
242
  event_at: 2002-05-05
242
243
 
243
244
  transm2003:
244
245
  class: Formation
245
246
  parent: transmit_information
246
- v_title: transinfo 2003
247
+ title: transinfo 2003
247
248
  event_at: 2003-03-20
248
249
 
249
250
  vision2003:
250
251
  class: Formation
251
252
  parent: vision
252
- v_title: vision 2003
253
+ title: vision 2003
253
254
  event_at: 2003-04-05
data/test/sites/complex/{virtual_classes.yml → roles.yml} RENAMED
@@ -1,10 +1,11 @@
1
1
  DEFAULTS:
2
2
  create_group: public
3
3
  icon: ""
4
+ type: VirtualClass
4
5
 
5
6
  Employee:
6
7
  kpath: NRCE
7
- real_class: Contact
8
+ real_class: BaseContact
8
9
 
9
10
  Job:
10
11
  kpath: NPPJ
data/test/sites/ocean/nodes.yml CHANGED
@@ -8,7 +8,7 @@ DEFAULTS:
8
8
 
9
9
  ocean:
10
10
  class: Project
11
- name: other
11
+ node_name: other
12
12
  inherit: no
13
13
  rgroup: public
14
14
  wgroup: masters
@@ -16,21 +16,21 @@ ocean:
16
16
  skin: default
17
17
 
18
18
  incognito:
19
- class: Contact
19
+ class: BaseContact
20
20
  parent: ocean
21
21
  skin: default
22
22
 
23
23
  whale:
24
- class: Contact
25
- name: whale
24
+ class: BaseContact
25
+ node_name: whale
26
26
  parent: ocean
27
27
  skin: default
28
28
 
29
- skin:
29
+ default:
30
30
  class: Skin
31
- name: default
31
+ node_name: default
32
32
  parent: ocean
33
33
 
34
34
  Node:
35
35
  class: Template
36
- parent: skin
36
+ parent: default
data/test/sites/ocean/versions.yml CHANGED
@@ -1,48 +1,57 @@
1
1
  DEFAULTS:
2
- type: Version
3
2
  created_at: 2006-03-10
4
3
  updated_at: 2006-04-11
5
4
  publish_from: 2006-03-10
6
5
  status: pub
7
6
  lang: en
8
- comment: ""
9
- summary: ""
10
- text: ""
11
7
  number: 1
8
+ # prop:
9
+ # comment: ""
10
+ # summary: ""
11
+ # text: ""
12
12
 
13
13
  ocean_en:
14
- type: Version
15
14
  node: ocean
16
15
  user: whale
17
- comment: new site
18
- title: Deep Ocean
19
- summary: The deep sound of peace
20
- text: Our oceans, when kept full of life, are full of animals
16
+ prop:
17
+ comment: new site
18
+ title: Deep Ocean
19
+ summary: The deep sound of peace
20
+ text: Our oceans, when kept full of life, are full of animals
21
21
 
22
22
 
23
23
  incognito_en:
24
- type: ContactVersion
25
24
  node: incognito
26
25
  user: whale
27
- comment: anonymous user
28
- title: Miss incognito
29
-
26
+ prop:
27
+ comment: anonymous user
28
+ title: Miss incognito
29
+ first_name: Miss
30
+ name: Incognito
31
+ address: c/o Lilith
32
+ postal_code: 804
33
+ city: Somewhere
30
34
 
31
35
  whale_en:
32
- type: ContactVersion
33
36
  node: whale
34
37
  user: whale
35
- comment: admin user
36
- title: Miss Whale
38
+ prop:
39
+ comment: admin user
40
+ title: Miss Whale
41
+ first_name: Humpback
42
+ name: Whale
43
+ address: Anywhere Left Alone
44
+ postal_code: 903
45
+ city: Ocean
37
46
 
38
47
  skin_en:
39
- type: TemplateVersion
40
- node: skin
48
+ node: default
41
49
  user: whale
42
- title: skin
50
+ prop:
51
+ title: skin
43
52
 
44
53
  Node_en:
45
- type: TemplateVersion
46
54
  node: Node
47
55
  user: whale
48
- text: "<html><body><h1 do='[v_title]'/></body></html>"
56
+ prop:
57
+ text: "<html><body><h1 do='[title]'/></body></html>"
data/test/sites/zena/columns.yml ADDED
@@ -0,0 +1,12 @@
1
+ Task_assigned:
2
+ ptype: string
3
+
4
+ Original_origin:
5
+ ptype: string
6
+ index: string
7
+
8
+ Original_weight:
9
+ ptype: integer
10
+
11
+ Letter_paper:
12
+ ptype: string
data/test/sites/zena/nodes.yml CHANGED
@@ -24,7 +24,7 @@ people:
24
24
 
25
25
  ant:
26
26
  zip: 13
27
- class: Contact
27
+ class: BaseContact
28
28
  parent: people
29
29
  user: ant
30
30
 
@@ -37,18 +37,18 @@ myLife:
37
37
 
38
38
  anonymous:
39
39
  zip: 47
40
- class: Contact
40
+ class: BaseContact
41
41
  parent: people
42
42
  user: lion
43
43
 
44
44
  tiger:
45
45
  zip: 14
46
- class: Contact
46
+ class: BaseContact
47
47
  parent: people
48
48
 
49
49
  lion:
50
50
  zip: 15
51
- class: Contact
51
+ class: BaseContact
52
52
  parent: people
53
53
  user: lion
54
54
 
@@ -99,22 +99,22 @@ status:
99
99
 
100
100
  lake:
101
101
  zip: 23
102
- class: Contact
103
- name: lakeAddress
102
+ class: BaseContact
103
+ node_name: lakeAddress
104
104
  parent: cleanWater
105
105
  user: ant
106
106
 
107
107
  lake_jpg:
108
108
  zip: 24
109
109
  class: Image
110
- name: lake
110
+ node_name: lake
111
111
  parent: cleanWater
112
112
  user: ant
113
113
 
114
114
  water_pdf:
115
115
  zip: 25
116
116
  class: Document
117
- name: water
117
+ node_name: water
118
118
  parent: cleanWater
119
119
 
120
120
  crocodiles:
@@ -157,14 +157,14 @@ wiki:
157
157
  bird_jpg:
158
158
  zip: 30
159
159
  class: Image
160
- name: bird
160
+ node_name: bird
161
161
  parent: wiki
162
162
  user: anon
163
163
 
164
164
  flower_jpg:
165
165
  zip: 31
166
166
  class: Image
167
- name: flower
167
+ node_name: flower
168
168
  parent: wiki
169
169
  user: anon
170
170
 
@@ -225,14 +225,15 @@ nature:
225
225
  tree_jpg:
226
226
  zip: 40
227
227
  class: Image
228
- name: tree
228
+ node_name: tree
229
229
  parent: nature
230
230
  user: ant
231
+ roles: zena_Original
231
232
 
232
233
  forest_pdf:
233
234
  zip: 41
234
235
  class: Document
235
- name: forest
236
+ node_name: forest
236
237
  parent: nature
237
238
  user: ant
238
239
 
@@ -243,27 +244,27 @@ letter:
243
244
  event_at: 2008-01-10
244
245
  log_at: 2006-04-05
245
246
 
246
- wiki_skin:
247
+ wikiSkin:
247
248
  zip: 43
248
249
  class: Skin
249
- name: wikiSkin
250
+ node_name: wikiSkin
250
251
  # yes it's not good to have this here but changing it would mess up many tests.
251
252
  parent: collections
252
253
 
253
254
  wiki_Project_changes_xml_zafu:
254
255
  class: Template
255
- name: Project-changes-xml
256
- parent: wiki_skin
256
+ node_name: Project-changes-xml
257
+ parent: wikiSkin
257
258
 
258
259
  wiki_Page_changes_zafu:
259
260
  class: Template
260
- name: Page-changes
261
- parent: wiki_skin
261
+ node_name: Page-changes
262
+ parent: wikiSkin
262
263
 
263
264
  wiki_Node_zafu:
264
265
  class: Template
265
- name: Node
266
- parent: wiki_skin
266
+ node_name: Node
267
+ parent: wikiSkin
267
268
 
268
269
 
269
270
 
@@ -274,63 +275,63 @@ skins:
274
275
 
275
276
  default:
276
277
  class: Skin
277
- name: default
278
+ node_name: default
278
279
  parent: skins
279
280
 
280
281
  Node_search_zafu:
281
282
  class: Template
282
- name: Node-search
283
+ node_name: Node-search
283
284
  parent: default
284
285
 
285
286
  style_css:
286
287
  zip: 53
287
288
  class: TextDocument
288
- name: style
289
+ node_name: style
289
290
  parent: default
290
291
 
291
292
  Node_zafu:
292
293
  class: Template
293
- name: Node
294
+ node_name: Node
294
295
  parent: default
295
296
 
296
297
  Node_admin_layout_zafu:
297
298
  class: Template
298
- name: Node-+adminLayout
299
+ node_name: Node-+adminLayout
299
300
  parent: default
300
301
 
301
302
  Node_index_zafu:
302
303
  class: Template
303
- name: Node-+index
304
+ node_name: Node-+index
304
305
  parent: default
305
306
 
306
307
  Node_not_found_zafu:
307
308
  class: Template
308
- name: Node-+notFound
309
+ node_name: Node-+notFound
309
310
  parent: default
310
311
 
311
312
  Node_popup_layout_zafu:
312
313
  class: Template
313
- name: Node-+popupLayout
314
+ node_name: Node-+popupLayout
314
315
  parent: default
315
316
 
316
317
  notes_zafu:
317
318
  class: Template
318
- name: notes
319
+ node_name: notes
319
320
  parent: default
320
321
 
321
322
  Node_test_zafu:
322
323
  class: Template
323
- name: Node-test
324
+ node_name: Node-test
324
325
  parent: default
325
326
 
326
327
  Project_zafu:
327
328
  class: Template
328
- name: Project
329
+ node_name: Project
329
330
  parent: default
330
331
 
331
332
  Node_login_zafu:
332
333
  class: Template
333
- name: Node-+login
334
+ node_name: Node-+login
334
335
  parent: default
335
336
 
336
337
  translations: