zena 1.0.0.beta3 → 1.0.0.rc1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (418) hide show
  1. data/History.txt +29 -0
  2. data/Rakefile +2 -0
  3. data/TODO_ZENA_1_0 +13 -23
  4. data/app/controllers/columns_controller.rb +1 -1
  5. data/app/controllers/comments_controller.rb +4 -3
  6. data/app/controllers/documents_controller.rb +8 -11
  7. data/app/controllers/nodes_controller.rb +39 -21
  8. data/app/controllers/users_controller.rb +8 -3
  9. data/app/controllers/versions_controller.rb +2 -2
  10. data/app/controllers/virtual_classes_controller.rb +17 -11
  11. data/app/helpers/documents_helper.rb +0 -3
  12. data/app/helpers/users_helper.rb +17 -0
  13. data/app/models/cache.rb +36 -31
  14. data/app/models/column.rb +48 -5
  15. data/app/models/comment.rb +14 -5
  16. data/app/models/data_entry.rb +2 -2
  17. data/app/models/document.rb +23 -33
  18. data/app/models/idx_nodes_datetime.rb +4 -0
  19. data/app/models/idx_nodes_float.rb +4 -0
  20. data/app/models/idx_project.rb +3 -0
  21. data/app/models/node.rb +372 -308
  22. data/app/models/page.rb +1 -31
  23. data/app/models/relation.rb +4 -4
  24. data/app/models/relation_proxy.rb +128 -17
  25. data/app/models/role.rb +27 -2
  26. data/app/models/site.rb +64 -56
  27. data/app/models/template.rb +11 -12
  28. data/app/models/text_document.rb +6 -7
  29. data/app/models/user.rb +95 -46
  30. data/app/models/version.rb +2 -2
  31. data/app/models/virtual_class.rb +418 -73
  32. data/app/views/columns/_form.html.erb +1 -1
  33. data/app/views/columns/_li.html.erb +1 -1
  34. data/app/views/comments/_form.rhtml +1 -1
  35. data/app/views/comments/_li.rhtml +1 -1
  36. data/app/views/comments/_li_simple.rhtml +1 -1
  37. data/app/views/groups/_form.rhtml +1 -1
  38. data/app/views/links/_li.rhtml +1 -1
  39. data/app/views/nodes/_groups.rhtml +1 -1
  40. data/app/views/nodes/_import_results.rhtml +1 -1
  41. data/app/views/nodes/_parent.rhtml +1 -1
  42. data/app/views/nodes/_results.rhtml +1 -1
  43. data/app/views/nodes/create.rjs +4 -2
  44. data/app/views/relations/_li.erb +2 -2
  45. data/app/views/templates/document_create_tabs/_file.rhtml +1 -1
  46. data/app/views/templates/document_create_tabs/_template.rhtml +2 -2
  47. data/app/views/templates/document_create_tabs/_text_document.rhtml +2 -2
  48. data/app/views/templates/edit_tabs/_help.rhtml +1 -1
  49. data/app/views/templates/edit_tabs/_title.rhtml +0 -3
  50. data/app/views/users/_form.rhtml +2 -6
  51. data/app/views/users/_li.rhtml +1 -3
  52. data/app/views/users/create.rjs +4 -4
  53. data/app/views/users/preferences.html.erb +1 -4
  54. data/app/views/versions/custom_tab.rhtml +5 -0
  55. data/app/views/virtual_classes/_form.erb +20 -10
  56. data/app/views/virtual_classes/_li.erb +21 -8
  57. data/app/views/zafu/default/Node-+search.zafu +1 -1
  58. data/app/views/zafu/default/Node.zafu +3 -3
  59. data/bricks/captcha/lib/bricks/captcha.rb +1 -1
  60. data/bricks/mongrel/zena/deploy.rb +14 -0
  61. data/bricks/{data2pdf → pdf}/.document +0 -0
  62. data/bricks/pdf/README +33 -0
  63. data/bricks/{data2pdf → pdf}/Rakefile +0 -0
  64. data/bricks/pdf/VERSION +1 -0
  65. data/bricks/pdf/lib/bricks/pdf.rb +110 -0
  66. data/bricks/pdf/lib/bricks/pdf/engine/prince.rb +38 -0
  67. data/bricks/pdf/lib/bricks/pdf/engine/xhtml2pdf.rb +9 -0
  68. data/bricks/pdf/lib/bricks/pdf/install.rb +121 -0
  69. data/bricks/pdf/test/engines/test_prince.rb +15 -0
  70. data/bricks/pdf/test/engines/test_xhtml2pdf.rb +15 -0
  71. data/bricks/{data2pdf → pdf}/test/fixtures/application.css +0 -0
  72. data/bricks/{data2pdf → pdf}/test/fixtures/contact.html +0 -0
  73. data/bricks/{data2pdf → pdf}/test/fixtures/pisa-default.css +0 -0
  74. data/bricks/{data2pdf → pdf}/test/fixtures/sheet1.css +0 -0
  75. data/bricks/{data2pdf → pdf}/test/fixtures/sheet2.css +0 -0
  76. data/bricks/{data2pdf → pdf}/test/fixtures/simple-html.html +0 -0
  77. data/bricks/{data2pdf → pdf}/test/fixtures/simple-text.txt +0 -0
  78. data/bricks/{data2pdf → pdf}/test/helper.rb +4 -5
  79. data/bricks/pdf/test/shoulda_macros/shoulda_pdf.rb +72 -0
  80. data/bricks/pdf/zena/init.rb +5 -0
  81. data/bricks/pdf/zena/tasks.rb +17 -0
  82. data/bricks/sphinx/lib/{use_sphinx.rb → bricks/sphinx.rb} +1 -1
  83. data/bricks/tags/zena/init.rb +2 -2
  84. data/bricks/tags/zena/test/zafu/tags.yml +4 -4
  85. data/bricks/zena/zena/migrate/01_base.rb +482 -0
  86. data/config/bricks.yml +22 -6
  87. data/config/gems.yml +8 -6
  88. data/db/20100628074512_zena0x_to1x.rb +6 -1
  89. data/db/fix/024_correct_vclass_kpath.rb +11 -0
  90. data/db/fix/025_move_tag_into_vclass.rb +13 -0
  91. data/db/{migrate → fix}/026_rename_templates.rb +0 -0
  92. data/db/{migrate → fix}/045_avoid_star_in_templates.rb +0 -0
  93. data/db/{migrate → fix}/046_fix_zazen_image_tag.rb +0 -0
  94. data/db/{migrate → fix}/047_change_default_link_id_to_zero.rb +1 -3
  95. data/db/{migrate → fix}/049_fix_publish_from_is_null.rb +0 -0
  96. data/db/{migrate → fix}/20090924141459_zafu_fix_sept09.rb +0 -0
  97. data/db/{migrate → fix}/20091013100351_rename_publish_group_to_drive_group.rb +1 -3
  98. data/db/{migrate → fix}/20091124161608_rebuild_fullpath.rb +0 -1
  99. data/db/{migrate → fix}/20100115134729_rebuild_fullpath_after_fix.rb +0 -0
  100. data/db/{migrate → fix}/20100526090140_renamed_contact_model_to_base_contact.rb +2 -4
  101. data/db/{migrate → fix/old_migrations}/001_create_base.rb +0 -1
  102. data/db/{migrate → fix/old_migrations}/002_add_time_zone_to_users.rb +0 -0
  103. data/db/{migrate → fix/old_migrations}/003_add_custom_base_flag.rb +0 -0
  104. data/db/{migrate → fix/old_migrations}/004_rename_template_skin.rb +0 -0
  105. data/db/{migrate → fix/old_migrations}/005_create_cached_pages.rb +0 -0
  106. data/db/{migrate → fix/old_migrations}/006_create_sites.rb +0 -0
  107. data/db/{migrate → fix/old_migrations}/007_replace_id_by_zip.rb +0 -0
  108. data/db/{migrate → fix/old_migrations}/008_user_status.rb +0 -0
  109. data/db/{migrate → fix/old_migrations}/009_fulltext.rb +0 -0
  110. data/db/fix/old_migrations/010_create_template_content.rb +17 -0
  111. data/db/{migrate → fix/old_migrations}/011_project_to_section.rb +0 -0
  112. data/db/{migrate → fix/old_migrations}/012_add_project_id.rb +0 -0
  113. data/db/{migrate → fix/old_migrations}/013_remove_defaults.rb +0 -0
  114. data/db/{migrate → fix/old_migrations}/014_add_sort_field.rb +0 -0
  115. data/db/{migrate → fix/old_migrations}/015_add_dyn_attributes.rb +0 -0
  116. data/db/{migrate → fix/old_migrations}/016_remove_translations.rb +0 -0
  117. data/db/{migrate → fix/old_migrations}/017_rename_authorize.rb +0 -0
  118. data/db/{migrate → fix/old_migrations}/018_add_auth_option.rb +0 -0
  119. data/db/{migrate → fix/old_migrations}/019_remove_user_status.rb +0 -0
  120. data/db/{migrate → fix/old_migrations}/020_create_participation.rb +0 -0
  121. data/db/{migrate → fix/old_migrations}/021_create_relations.rb +0 -0
  122. data/db/{migrate → fix/old_migrations}/022_create_virtual_classes.rb +0 -0
  123. data/db/{migrate → fix/old_migrations}/023_ip_on_anonymous_comment.rb +0 -0
  124. data/db/{migrate → fix/old_migrations}/027_add_country_to_contacts.rb +0 -0
  125. data/db/{migrate → fix/old_migrations}/028_change_size_of_conten_type_field.rb +0 -0
  126. data/db/{migrate → fix/old_migrations}/029_create_data_entries.rb +0 -0
  127. data/db/{migrate → fix/old_migrations}/030_redit_auto_publish_site_settings.rb +0 -0
  128. data/db/{migrate → fix/old_migrations}/031_create_iformats.rb +0 -0
  129. data/db/{migrate → fix/old_migrations}/032_caches_context_as_hash.rb +0 -0
  130. data/db/{migrate → fix/old_migrations}/033_documents_kpath_change.rb +0 -0
  131. data/db/{migrate → fix/old_migrations}/034_change_file_storage.rb +0 -0
  132. data/db/{migrate → fix/old_migrations}/035_add_status_to_link.rb +0 -0
  133. data/db/{migrate → fix/old_migrations}/036_add_flag_fields_on_nodes.rb +0 -0
  134. data/db/{migrate → fix/old_migrations}/037_add_auto_create_discussion_to_v_class.rb +0 -0
  135. data/db/{migrate → fix/old_migrations}/038_create_site_attributes.rb +0 -0
  136. data/db/{migrate → fix/old_migrations}/039_default_position.rb +0 -0
  137. data/db/{migrate → fix/old_migrations}/040_second_value_for_data_entry.rb +0 -0
  138. data/db/{migrate → fix/old_migrations}/041_add_attributes_to_v_class.rb +0 -0
  139. data/db/{migrate → fix/old_migrations}/042_fix_position_should_be_float.rb +0 -0
  140. data/db/{migrate → fix/old_migrations}/043_move_user_lang_into_participation.rb +0 -0
  141. data/db/{migrate → fix/old_migrations}/044_remove_monolingual_site_option.rb +0 -0
  142. data/db/{migrate → fix/old_migrations}/048_link_source_target_can_be_null.rb +0 -0
  143. data/db/{migrate → fix/old_migrations}/050_date_in_links.rb +0 -0
  144. data/db/{migrate → fix/old_migrations}/051_add_exif_tags_to_images.rb +0 -0
  145. data/db/{migrate → fix/old_migrations}/20090825201159_insert_zero_link.rb +0 -0
  146. data/db/{migrate → fix/old_migrations}/20090825201200_merge_bricks_migrations_with_std_migrations.rb +0 -0
  147. data/db/{migrate → fix/old_migrations}/20090927125912_allow_null_in_text_fields.rb +0 -0
  148. data/db/{migrate → fix/old_migrations}/20090928133440_no_more_private_nodes.rb +0 -0
  149. data/db/{migrate → fix/old_migrations}/20090928143754_version_status_change.rb +0 -0
  150. data/db/{migrate → fix/old_migrations}/20091001084025_change_status_values_for_comments.rb +0 -0
  151. data/db/{migrate → fix/old_migrations}/20091009084057_add_vhash_in_node.rb +0 -0
  152. data/db/{migrate → fix/old_migrations}/20091014130833_fix_template_title.rb +0 -0
  153. data/db/{migrate → fix/old_migrations}/20091014183726_merge_participation_into_users.rb +0 -0
  154. data/db/{migrate → fix/old_migrations}/20091018200734_add_popup_info_to_image_format.rb +0 -0
  155. data/db/{migrate → fix/old_migrations}/20091026161708_add_persistence_token.rb +0 -0
  156. data/db/{migrate → fix/old_migrations}/20091101184952_add_session_table.rb +0 -0
  157. data/db/{migrate → fix/old_migrations}/20091123175137_add_single_access_token.rb +0 -0
  158. data/db/{migrate → fix/old_migrations}/20100125062254_add_dynamo_to_version.rb +0 -0
  159. data/db/{migrate → fix/old_migrations}/20100201133242_remove_default_status_on_version.rb +0 -0
  160. data/db/{migrate → fix/old_migrations}/20100208194210_create_attachments.rb +0 -0
  161. data/db/{migrate → fix/old_migrations}/20100210112319_change_dynamo_to_property.rb +0 -0
  162. data/db/{migrate → fix/old_migrations}/20100320145726_transform_template_contents_into_index.rb +0 -0
  163. data/db/{migrate → fix/old_migrations}/20100328125634_change_skin_name_to_id.rb +0 -0
  164. data/db/{migrate → fix/old_migrations}/20100417061257_add_properties_to_sites.rb +0 -0
  165. data/db/{migrate → fix/old_migrations}/20100419163149_rename_name_to_node_name.rb +0 -0
  166. data/db/{migrate → fix/old_migrations}/20100422091606_change_v_class_table_into_roles.rb +0 -0
  167. data/db/{migrate → fix/old_migrations}/20100422094048_node_habtm_roles.rb +0 -0
  168. data/db/{migrate → fix/old_migrations}/20100422115935_create_columns.rb +0 -0
  169. data/db/{migrate → fix/old_migrations}/20100513181529_add_site_id_to_columns.rb +0 -0
  170. data/db/{migrate → fix/old_migrations}/20100519091711_add_index_definition_to_columns.rb +0 -0
  171. data/db/{migrate → fix/old_migrations}/20100519091940_create_idx_nodes_string.rb +0 -0
  172. data/db/{migrate → fix/old_migrations}/20100519232432_create_idx_nodes_ml_string.rb +0 -0
  173. data/db/{migrate → fix/old_migrations}/20100525113858_add_porperties_to_users.rb +0 -0
  174. data/db/{migrate → fix/old_migrations}/20100527130937_change_column_index_to_string.rb +0 -0
  175. data/db/{migrate → fix/old_migrations}/20100531135128_add_fulltext_builder_fields.rb +0 -0
  176. data/db/{migrate → fix/old_migrations}/20100915062903_add_api_group_id_to_site.rb +0 -0
  177. data/db/fix/old_migrations/20100923154807_remove_base_contact.rb +84 -0
  178. data/db/fix/old_migrations/20100926192223_remove_su_user.rb +8 -0
  179. data/db/fix/old_migrations/20100927141658_add_eval_attributes_to_v_class.rb +12 -0
  180. data/db/fix/old_migrations/20100928185257_add_obvious_idx.rb +52 -0
  181. data/db/fix/old_migrations/20100929143111_remove_node_name.rb +11 -0
  182. data/db/fix/old_migrations/20101006090454_store_properties_in_long_text.rb +9 -0
  183. data/db/fix/old_migrations/20101014185753_remove_user_prototype_id.rb +9 -0
  184. data/db/fix/old_migrations/20101101084318_create_scope_index.rb +35 -0
  185. data/db/fix/old_migrations/20101109074232_create_idx_nodes_tables.rb +65 -0
  186. data/db/fix/old_migrations/20101110184235_add_role_update_to_site.rb +9 -0
  187. data/db/fix/old_migrations/20101116103920_change_scope_index.rb +31 -0
  188. data/db/fix/old_migrations/20101123125822_add_integer_idx.rb +17 -0
  189. data/db/fix/old_migrations/20101130134522_add_index_field.rb +13 -0
  190. data/db/fix/old_migrations/20101213133816_add_group_to_relation.rb +9 -0
  191. data/db/init/base/help.fr.zml +1 -1
  192. data/db/init/base/skins/default.zml +0 -1
  193. data/db/init/base/skins/default/Node-+search.zafu +1 -1
  194. data/db/init/base/skins/default/Node-tree.zafu +3 -3
  195. data/db/init/base/skins/default/Node.zafu +3 -3
  196. data/lib/bricks/loader.rb +4 -1
  197. data/lib/bricks/requirements_validation.rb +11 -6
  198. data/lib/log_recorder/lib/log_recorder.rb +2 -2
  199. data/lib/tasks/zena.rake +25 -15
  200. data/lib/zena.rb +42 -9
  201. data/lib/zena/acts/enrollable.rb +81 -99
  202. data/lib/zena/acts/secure.rb +27 -23
  203. data/lib/zena/acts/secure_node.rb +10 -55
  204. data/lib/zena/acts/serializable.rb +9 -10
  205. data/lib/zena/app.rb +0 -2
  206. data/lib/zena/code_syntax.rb +1 -1
  207. data/lib/zena/controller/test_case.rb +0 -5
  208. data/lib/zena/core_ext/string.rb +48 -20
  209. data/lib/zena/db.rb +10 -442
  210. data/lib/zena/db_helper/abstract_db.rb +184 -0
  211. data/lib/zena/db_helper/mysql.rb +150 -0
  212. data/lib/zena/db_helper/postgresql.rb +79 -0
  213. data/lib/zena/db_helper/sqlite3.rb +135 -0
  214. data/lib/zena/deploy.rb +4 -1
  215. data/lib/zena/deploy/httpd.rhtml +3 -3
  216. data/lib/zena/deploy/vhost.rhtml +1 -1
  217. data/lib/zena/foxy_parser.rb +37 -18
  218. data/lib/zena/info.rb +3 -13
  219. data/lib/zena/migrator.rb +0 -1
  220. data/lib/zena/parser/zafu_rules.rb +9 -4
  221. data/lib/zena/parser/zazen_rules.rb +5 -5
  222. data/lib/zena/parser/zena_rules.rb +1 -1
  223. data/lib/zena/remote/interface.rb +1 -1
  224. data/lib/zena/site_worker.rb +3 -3
  225. data/lib/zena/test_controller.rb +10 -10
  226. data/lib/zena/use/action.rb +66 -6
  227. data/lib/zena/use/ajax.rb +39 -13
  228. data/lib/zena/use/ancestry.rb +210 -0
  229. data/lib/zena/use/authlogic.rb +30 -1
  230. data/lib/zena/use/calendar.rb +158 -0
  231. data/lib/zena/use/conditional.rb +3 -2
  232. data/lib/zena/use/context.rb +42 -12
  233. data/lib/zena/use/dates.rb +15 -14
  234. data/lib/zena/use/display.rb +54 -7
  235. data/lib/zena/use/error_rendering.rb +1 -0
  236. data/lib/zena/use/field_index.rb +20 -0
  237. data/lib/zena/use/fixtures.rb +12 -9
  238. data/lib/zena/use/forms.rb +230 -106
  239. data/lib/zena/use/fulltext.rb +28 -14
  240. data/lib/zena/use/html_tags.rb +1 -24
  241. data/lib/zena/use/i18n.rb +69 -14
  242. data/lib/zena/use/kpath.rb +60 -0
  243. data/lib/zena/use/ml_index.rb +6 -4
  244. data/lib/zena/use/node_context.rb +63 -0
  245. data/lib/zena/use/prop_eval.rb +90 -0
  246. data/lib/zena/use/query_builder.rb +159 -29
  247. data/lib/zena/use/query_comment.rb +1 -1
  248. data/lib/zena/use/query_node.rb +147 -56
  249. data/lib/zena/use/recursion.rb +2 -2
  250. data/lib/zena/use/relations.rb +31 -19
  251. data/lib/zena/use/rendering.rb +111 -121
  252. data/lib/zena/use/scope_index.rb +230 -0
  253. data/lib/zena/use/search.rb +7 -7
  254. data/lib/zena/use/urls.rb +87 -25
  255. data/lib/zena/use/version_hash.rb +113 -113
  256. data/lib/zena/use/workflow.rb +5 -1
  257. data/lib/zena/use/zafu_attributes.rb +11 -14
  258. data/lib/zena/use/zafu_eval.rb +1 -1
  259. data/lib/zena/use/zafu_safe_definitions.rb +91 -9
  260. data/lib/zena/use/zafu_templates.rb +146 -102
  261. data/lib/zena/use/zazen.rb +5 -4
  262. data/lib/zena/zafu_compiler.rb +1 -0
  263. data/locale/en/LC_MESSAGES/zena.mo +0 -0
  264. data/locale/en/zena.po +0 -1
  265. data/locale/fr/LC_MESSAGES/zena.mo +0 -0
  266. data/locale/fr/zena.mo +0 -0
  267. data/locale/fr/zena.po +4 -4
  268. data/misc/zena +35 -0
  269. data/misc/zena_init +41 -0
  270. data/public/images/ext/{basecontact.png → contact.png} +0 -0
  271. data/public/javascripts/zena.js +35 -7
  272. data/public/stylesheets/admin.css +5 -2
  273. data/public/stylesheets/default.css +2 -1
  274. data/public/stylesheets/popup.css +1 -1
  275. data/public/stylesheets/zena.css +2 -2
  276. data/test/custom_queries/complex.host.yml +12 -5
  277. data/test/fixtures/files/Node-test.zafu +3 -3
  278. data/test/fixtures/files/translations_fr.yml +4 -2
  279. data/test/functional/documents_controller_test.rb +31 -0
  280. data/test/functional/nodes_controller_commit_test.rb +1 -5
  281. data/test/functional/nodes_controller_test.rb +92 -12
  282. data/test/functional/user_sessions_controller_test.rb +2 -2
  283. data/test/functional/users_controller_test.rb +31 -29
  284. data/test/functional/versions_controller_test.rb +2 -2
  285. data/test/functional/virtual_classes_controller_test.rb +2 -2
  286. data/test/integration/multiple_hosts_test.rb +19 -8
  287. data/test/integration/navigation_test.rb +91 -12
  288. data/test/integration/query_node/basic.yml +40 -37
  289. data/test/integration/query_node/complex.yml +23 -18
  290. data/test/integration/query_node/dates.yml +3 -3
  291. data/test/integration/query_node/errors.yml +7 -1
  292. data/test/integration/query_node/filters.yml +41 -35
  293. data/test/integration/query_node/idx_fields.yml +11 -0
  294. data/test/integration/query_node/idx_key_value.yml +77 -0
  295. data/test/integration/query_node/idx_scope.yml +33 -0
  296. data/test/integration/query_node/relations.yml +13 -13
  297. data/test/integration/query_node_test.rb +6 -10
  298. data/test/integration/zafu_compiler/action.yml +19 -6
  299. data/test/integration/zafu_compiler/ajax.yml +111 -51
  300. data/test/integration/zafu_compiler/apphelper.yml +1 -1
  301. data/test/integration/zafu_compiler/asset.yml +1 -1
  302. data/test/integration/zafu_compiler/basic.yml +42 -52
  303. data/test/integration/zafu_compiler/calendar.yml +3 -3
  304. data/test/integration/zafu_compiler/complex.yml +16 -16
  305. data/test/integration/zafu_compiler/complex_ok.yml +2 -2
  306. data/test/integration/zafu_compiler/conditional.yml +42 -33
  307. data/test/integration/zafu_compiler/data.yml +3 -3
  308. data/test/integration/zafu_compiler/dates.yml +25 -10
  309. data/test/integration/zafu_compiler/display.yml +49 -12
  310. data/test/integration/zafu_compiler/errors.yml +26 -6
  311. data/test/integration/zafu_compiler/eval.yml +4 -4
  312. data/test/integration/zafu_compiler/forms.yml +89 -15
  313. data/test/integration/zafu_compiler/i18n.yml +23 -18
  314. data/test/integration/zafu_compiler/idx_scope.yml +7 -0
  315. data/test/integration/zafu_compiler/later.yml +10 -16
  316. data/test/integration/zafu_compiler/off/off.yml +2 -2
  317. data/test/integration/zafu_compiler/query.yml +207 -0
  318. data/test/integration/zafu_compiler/recursion.yml +2 -2
  319. data/test/integration/zafu_compiler/relations.yml +144 -168
  320. data/test/integration/zafu_compiler/roles.yml +86 -10
  321. data/test/integration/zafu_compiler/rubyless.yml +49 -6
  322. data/test/integration/zafu_compiler/safe_definitions.yml +35 -6
  323. data/test/integration/zafu_compiler/search.yml +1 -1
  324. data/test/integration/zafu_compiler/security.yml +37 -0
  325. data/test/integration/zafu_compiler/urls.yml +50 -40
  326. data/test/integration/zafu_compiler/user.yml +21 -6
  327. data/test/integration/zafu_compiler/version.yml +6 -6
  328. data/test/integration/zafu_compiler/zafu_attributes.yml +43 -34
  329. data/test/integration/zafu_compiler/zazen.yml +10 -10
  330. data/test/integration/zafu_compiler_test.rb +19 -13
  331. data/test/sites/complex/nodes.yml +0 -2
  332. data/test/sites/complex/roles.yml +9 -1
  333. data/test/sites/complex/sites.yml +0 -1
  334. data/test/sites/complex/users.yml +2 -5
  335. data/test/sites/ocean/nodes.yml +2 -5
  336. data/test/sites/ocean/roles.yml +8 -0
  337. data/test/sites/ocean/sites.yml +0 -1
  338. data/test/sites/ocean/users.yml +0 -13
  339. data/test/sites/zena/columns.yml +27 -5
  340. data/test/sites/zena/idx_projects.yml +5 -0
  341. data/test/sites/zena/nodes.yml +8 -32
  342. data/test/sites/zena/relations.yml +5 -0
  343. data/test/sites/zena/roles.yml +25 -3
  344. data/test/sites/zena/sites.yml +2 -2
  345. data/test/sites/zena/users.yml +1 -21
  346. data/test/sites/zena/versions.yml +35 -12
  347. data/test/test_helper.rb +7 -0
  348. data/test/unit/after_commit_test.rb +7 -7
  349. data/test/unit/cache_test.rb +32 -0
  350. data/test/unit/cached_page_test.rb +1 -1
  351. data/test/unit/column_test.rb +31 -7
  352. data/test/unit/comment_test.rb +2 -2
  353. data/test/unit/core_ext_test.rb +38 -7
  354. data/test/unit/document_test.rb +14 -42
  355. data/test/unit/node_test.rb +311 -324
  356. data/test/unit/note_test.rb +23 -31
  357. data/test/unit/page_test.rb +16 -58
  358. data/test/unit/project_test.rb +2 -2
  359. data/test/unit/relation_proxy_test.rb +148 -21
  360. data/test/unit/relation_test.rb +23 -3
  361. data/test/unit/remote_test.rb +15 -9
  362. data/test/unit/role_test.rb +9 -0
  363. data/test/unit/site_test.rb +49 -47
  364. data/test/unit/skin_test.rb +16 -0
  365. data/test/unit/template_test.rb +60 -69
  366. data/test/unit/text_document_test.rb +15 -14
  367. data/test/unit/user_test.rb +101 -41
  368. data/test/unit/version_test.rb +4 -4
  369. data/test/unit/virtual_class_test.rb +577 -36
  370. data/test/unit/workflow_test.rb +58 -21
  371. data/test/unit/zena/acts/enrollable_test.rb +36 -127
  372. data/test/unit/zena/acts/secure_test.rb +6 -22
  373. data/test/unit/zena/acts/serializable_test.rb +18 -0
  374. data/test/unit/zena/db_test.rb +14 -14
  375. data/test/unit/zena/parser/zafu.yml +5 -3
  376. data/test/unit/zena/use/ancestry_test.rb +198 -0
  377. data/test/unit/zena/use/calendar_test.rb +8 -8
  378. data/test/unit/zena/use/dates_test.rb +2 -0
  379. data/test/unit/zena/use/fulltext_test.rb +9 -1
  380. data/test/unit/zena/use/html_tags_test.rb +2 -16
  381. data/test/unit/zena/use/i18n_test.rb +2 -2
  382. data/test/unit/zena/use/kpath_test.rb +13 -0
  383. data/test/unit/zena/use/ml_index_test.rb +60 -12
  384. data/test/unit/zena/use/prop_eval_test.rb +170 -0
  385. data/test/unit/zena/use/query_node_test.rb +9 -2
  386. data/test/unit/zena/use/rendering_test.rb +98 -1
  387. data/test/unit/zena/use/scope_index_test.rb +464 -0
  388. data/test/unit/zena/use/urls_test.rb +23 -13
  389. data/test/unit/zena/use/version_hash_test.rb +2 -2
  390. data/test/unit/zena/use/zafu_template_test.rb +21 -8
  391. data/test/unit/zena/use/zazen_test.rb +47 -47
  392. data/zena.gemspec +177 -143
  393. metadata +222 -141
  394. data/app/models/base_contact.rb +0 -79
  395. data/app/models/book.rb +0 -242
  396. data/app/models/contact_content.rb +0 -70
  397. data/app/models/contact_version.rb +0 -40
  398. data/app/models/reference.rb +0 -18
  399. data/app/views/templates/edit_tabs/_basecontact.rhtml +0 -8
  400. data/bricks/data2pdf/README +0 -19
  401. data/bricks/data2pdf/VERSION +0 -1
  402. data/bricks/data2pdf/lib/data2pdf.rb +0 -60
  403. data/bricks/data2pdf/lib/engines/prince.rb +0 -39
  404. data/bricks/data2pdf/lib/engines/xhtml2pdf.rb +0 -41
  405. data/bricks/data2pdf/lib/install.rb +0 -111
  406. data/bricks/data2pdf/test/engines/test_prince.rb +0 -14
  407. data/bricks/data2pdf/test/engines/test_xhtml2pdf.rb +0 -14
  408. data/bricks/data2pdf/test/shoulda_macros/shoulda_data2pdf.rb +0 -91
  409. data/bricks/data2pdf/test/unit/test_rendering.rb +0 -37
  410. data/config/routes.rb +0 -3
  411. data/db/migrate/010_create_template_content.rb +0 -17
  412. data/db/migrate/024_correct_vclass_kpath.rb +0 -13
  413. data/db/migrate/025_move_tag_into_vclass.rb +0 -15
  414. data/lib/version_off.rb +0 -323
  415. data/lib/zena/use/node_name.rb +0 -94
  416. data/test/integration/query_node/properties.yml +0 -41
  417. data/test/unit/base_contact_test.rb +0 -242
  418. data/test/unit/node_name_test.rb +0 -137
@@ -80,6 +80,24 @@ class SerializableTest < Zena::Unit::TestCase
80
80
  end
81
81
  end
82
82
 
83
+ context 'with cached role ids' do
84
+ setup do
85
+ login(:tiger)
86
+ assert subject.update_attributes('properties' => {'assigned' => 'flat Eric'})
87
+ assert_equal [roles_id(:Task)], subject.cached_role_ids
88
+ end
89
+
90
+ subject do
91
+ secure(Node) { nodes(:letter) }
92
+ end
93
+
94
+ should_not_change_object_on_rewrite
95
+
96
+ should 'ignore cached_role_ids in xml' do
97
+ hash = Hash.from_xml(subject.to_xml)['node']
98
+ assert_nil hash['cached_role_ids']
99
+ end
100
+ end
83
101
  end # on a node
84
102
 
85
103
  context 'on many nodes' do
@@ -25,7 +25,7 @@ class DbTest < Zena::Unit::TestCase
25
25
  end
26
26
 
27
27
  def test_insensitive_find
28
- assert_equal nodes_zip(:status), secure(Node) { Zena::Db.insensitive_find(Node, :first, :node_name => 'sTatuS')}.zip
28
+ assert_equal nodes_zip(:status), secure(Node) { Zena::Db.insensitive_find(Node, :first, :_id => 'sTatuS')}.zip
29
29
  end
30
30
 
31
31
  def test_next_zip_rollback
@@ -36,16 +36,16 @@ class DbTest < Zena::Unit::TestCase
36
36
  end
37
37
 
38
38
  def test_fetch_row
39
- assert_equal "water", Zena::Db.fetch_attribute("SELECT node_name FROM nodes WHERE id = #{nodes_id(:water_pdf)}")
40
- assert_nil Zena::Db.fetch_attribute("SELECT node_name FROM nodes WHERE #{Zena::Db::FALSE}")
39
+ assert_equal "water_pdf", Zena::Db.fetch_attribute("SELECT _id FROM nodes WHERE id = #{nodes_id(:water_pdf)}")
40
+ assert_nil Zena::Db.fetch_attribute("SELECT _id FROM nodes WHERE #{Zena::Db::FALSE}")
41
41
  end
42
42
 
43
43
  def test_fetch_attributes
44
- assert_equal [{"node_name"=>"secret", "zip"=>"19"},
45
- {"node_name"=>"status", "zip"=>"22"},
46
- {"node_name"=>"strange", "zip"=>"36"},
47
- {"node_name"=>"skins", "zip"=>"51"},
48
- {"node_name"=>"style", "zip"=>"53"}], Zena::Db.fetch_attributes(['zip','node_name'], 'nodes', "node_name like 's%' and site_id = #{sites_id(:zena)} ORDER BY zip")
44
+ assert_equal [{"_id"=>"secret", "zip"=>"19"},
45
+ {"_id"=>"status", "zip"=>"22"},
46
+ {"_id"=>"strange", "zip"=>"36"},
47
+ {"_id"=>"skins", "zip"=>"51"},
48
+ {"_id"=>"style_css", "zip"=>"53"}], Zena::Db.fetch_attributes(['zip','_id'], 'nodes', "_id like 's%' and site_id = #{sites_id(:zena)} ORDER BY zip")
49
49
  end
50
50
 
51
51
  def test_migrated_once
@@ -60,25 +60,25 @@ class DbTest < Zena::Unit::TestCase
60
60
 
61
61
  should 'not change updated_at date' do
62
62
  old_updated_at = @node.updated_at
63
- Zena::Db.set_attribute(@node, :node_name, 'flop')
63
+ Zena::Db.set_attribute(@node, :_id, 'flop')
64
64
  @node = secure!(Node) { nodes(:status) } # reload
65
65
  assert_equal old_updated_at, @node.updated_at
66
66
  end
67
67
 
68
68
  should 'set attribute in node' do
69
- Zena::Db.set_attribute(@node, :node_name, 'flop')
70
- assert_equal 'flop', @node.node_name
69
+ Zena::Db.set_attribute(@node, :_id, 'flop')
70
+ assert_equal 'flop', @node._id
71
71
  end
72
72
 
73
73
  should 'not mark as dirty' do
74
- Zena::Db.set_attribute(@node, :node_name, 'flop')
74
+ Zena::Db.set_attribute(@node, :_id, 'flop')
75
75
  assert !@node.changed?
76
76
  end
77
77
 
78
78
  should 'set attribute in db' do
79
- Zena::Db.set_attribute(@node, :node_name, 'flop')
79
+ Zena::Db.set_attribute(@node, :_id, 'flop')
80
80
  @node = secure!(Node) { nodes(:status) } # reload
81
- assert_equal 'flop', @node.node_name
81
+ assert_equal 'flop', @node._id
82
82
  end
83
83
 
84
84
  should 'set a time' do
@@ -1,3 +1,5 @@
1
+ # FIXME: move these tests to Zafu gem
2
+
1
3
  empty:
2
4
  src: ""
3
5
  res: ""
@@ -18,9 +20,9 @@ ignore_tag:
18
20
  src: "there is <li do='ignore'>delete me</li>nothing"
19
21
  res: "there is nothing"
20
22
 
21
- ignore_do_empty:
22
- src: "there is <li do=''>delete me</li>nothing left"
23
- res: "there is nothing left"
23
+ #ignore_do_empty:
24
+ # src: "there is <li do=''>delete me</li>nothing left"
25
+ # res: "there is nothing left"
24
26
 
25
27
  hello_skip_content:
26
28
  src: "<r:hello>I want to live forever</r:hello>"
@@ -0,0 +1,198 @@
1
+ require 'test_helper'
2
+
3
+ class AncestryTest < Zena::Unit::TestCase
4
+
5
+ context 'On an object with a fullpath' do
6
+ setup do
7
+ login(:ant)
8
+ end
9
+
10
+ subject do
11
+ secure(Node) { nodes(:status) }
12
+ end
13
+
14
+ context 'on fullpath_as_title' do
15
+ should 'return path with titles' do
16
+ assert_equal ["projects list", "Clean Water project", "Etat des travaux"], subject.fullpath_as_title
17
+ end
18
+
19
+ should 'return double dot from rel_path' do
20
+ assert_equal '(../Clean Water project/Etat des travaux)', subject.pseudo_id(nodes(:wiki), :relative_path)
21
+ end
22
+ end # on fullpath_as_title
23
+
24
+ context 'on short_path' do
25
+ should 'return last two parent titles' do
26
+ assert_equal ["..", "Clean Water project", "Etat des travaux"], subject.short_path
27
+ end
28
+ end # on short_path
29
+
30
+ context 'and custom_base set' do
31
+ subject do
32
+ secure(Node) { nodes(:cleanWater) }
33
+ end
34
+
35
+ should 'set basepath' do
36
+ assert_equal fullpath(:projects, :cleanWater), subject.basepath
37
+ end
38
+
39
+ should 'set basepath in children' do
40
+ assert_equal fullpath(:projects, :cleanWater), nodes(:status).basepath
41
+ end
42
+ end # and custom_base set
43
+
44
+ context 'with a secret parent' do
45
+ subject do
46
+ secure(Node) { nodes(:talk) }
47
+ end
48
+
49
+ should 'replace parent by star on fullpath_as_title' do
50
+ assert_equal ["projects list", "*", "Talk"], subject.fullpath_as_title
51
+ end
52
+
53
+ should 'replace parent by star on short_path' do
54
+ assert_equal ["..", "*", "Talk"], subject.short_path
55
+ end
56
+ end # with a secret parent
57
+
58
+ end # On an object with a fullpath
59
+
60
+ context 'Moving an object' do
61
+ setup do
62
+ login(:lion)
63
+ subject.update_attributes(:parent_id => nodes_id(:lion))
64
+ end
65
+
66
+ subject do
67
+ secure(Node) { nodes(:secret) }
68
+ end
69
+
70
+ should 'rebuild fullpath in new parent' do
71
+ assert_equal fullpath(:people, :lion, :secret), subject.fullpath
72
+ end
73
+
74
+ should 'rebuild children fullpath' do
75
+ assert_equal fullpath(:people, :lion, :secret, :talk), nodes(:talk).fullpath
76
+ assert_equal fullpath(:people, :lion, :secret, :proposition), nodes(:proposition).fullpath
77
+ end
78
+
79
+ context 'with custom_base set' do
80
+ subject do
81
+ secure(Node) { nodes(:cleanWater) }
82
+ end
83
+
84
+ should 'rebuild basepath in new parent' do
85
+ assert_equal fullpath(:people, :lion, :cleanWater), subject.basepath
86
+ end
87
+
88
+ should 'rebuild children basepath' do
89
+ assert_equal fullpath(:people, :lion, :cleanWater), nodes(:status).basepath
90
+ end
91
+ end # with custom_base set
92
+
93
+
94
+ end # Moving an object
95
+
96
+ context 'Finding an object from a path' do
97
+ setup do
98
+ login(:lion)
99
+ end
100
+
101
+ subject do
102
+ secure(Node) { Node.find_by_path('projects list/Secret/Talk')}
103
+ end
104
+
105
+ should 'find object' do
106
+ assert_equal nodes_id(:talk), subject.id
107
+ end
108
+
109
+ context 'without access to secret parent' do
110
+ setup do
111
+ login(:anon)
112
+ end
113
+
114
+ should 'not find object' do
115
+ assert_nil subject
116
+ end
117
+ end # without access to secret parent
118
+
119
+ context 'without access to the object' do
120
+ setup do
121
+ login(:anon)
122
+ end
123
+
124
+ subject do
125
+ secure(Node) { Node.find_by_path('projects list/Secret') }
126
+ end
127
+
128
+ should 'not find object' do
129
+ assert_nil subject
130
+ end
131
+ end # without access to the object
132
+
133
+ end # Finding an object
134
+
135
+ context 'A node with ancestors' do
136
+ subject do
137
+ secure(Node) { nodes(:cleanWater) }
138
+ end
139
+
140
+ should 'return list of ancestors on ancestors' do
141
+ assert_equal nodes_zip(:zena, :projects), subject.ancestors.map(&:zip)
142
+ end
143
+
144
+ context 'with a secret parent' do
145
+ subject do
146
+ secure(Node) { nodes(:talk) }
147
+ end
148
+
149
+ should 'skip secret parent in ancestors' do
150
+ assert_equal nodes_zip(:zena, :projects), subject.ancestors.map(&:zip)
151
+ end
152
+ end # with a secret parent
153
+ end # A node with ancestors
154
+
155
+ context 'A visitor with write access' do
156
+ setup do
157
+ login(:tiger)
158
+ end
159
+
160
+ context 'creating a node' do
161
+ subject do
162
+ secure(Node) { Node.create(:parent_id => nodes_id(:projects), :title => 'Kyma')}
163
+ end
164
+
165
+ should 'build fullpath' do
166
+ assert_equal [nodes_zip(:projects), subject.zip].join('/'), subject.fullpath
167
+ end
168
+
169
+ should 'build basepath' do
170
+ err subject
171
+ assert_equal [nodes_zip(:projects), subject.zip].join('/'), subject.fullpath
172
+ end
173
+ end # creating a node
174
+
175
+ end # A visitor with write access
176
+
177
+
178
+ context 'A node in an ancestry loop' do
179
+ setup do
180
+ login(:ant)
181
+ Node.connection.execute "UPDATE nodes SET parent_id = #{nodes_id(:status)} WHERE id = #{nodes_id(:cleanWater)}"
182
+ end
183
+
184
+ subject do
185
+ secure(Node) { nodes(:lake_jpg) }
186
+ end
187
+
188
+ should 'raise Invalid record on site rebuild_fullpath' do
189
+ assert_raise(Zena::InvalidRecord) { current_site.rebuild_fullpath(subject.parent_id) }
190
+ end
191
+ end # A node in an ancestry loop
192
+
193
+
194
+ private
195
+ def fullpath(*args)
196
+ args.map {|sym| nodes_zip(sym).to_s}.join('/')
197
+ end
198
+ end
@@ -14,15 +14,15 @@ class CalendarTest < Zena::View::TestCase
14
14
  start_date, end_date = cal_start_end(Time.utc(2006,3,18), :month)
15
15
  assert_equal Date.civil(2006,02,26), start_date
16
16
  assert_equal Date.civil(2006,04,01), end_date
17
- secure!(Note) { Note.create(:parent_id => nodes_id(:zena), :node_name => 'foobar', :event_at => Time.utc(2006,03,20))}
17
+ secure!(Note) { Note.create(:parent_id => nodes_id(:zena), :title => 'foobar', :event_at => Time.utc(2006,03,20))}
18
18
  nodes = secure!(Note) { Note.find(:all, :conditions => ["nodes.event_at >= ? AND nodes.event_at <= ?", start_date, end_date])}
19
19
  res = cal_weeks('event_at', nodes, start_date, end_date) do |week, hash|
20
20
  weeks << week
21
21
  event_hash = hash
22
22
  end
23
23
  assert_equal ["2006-03-18 00", "2006-03-20 00"], event_hash.keys.sort
24
- assert_equal ['opening'], event_hash["2006-03-18 00"].map{|r| r.node_name}
25
- assert_equal ['foobar'], event_hash["2006-03-20 00"].map{|r| r.node_name}
24
+ assert_equal ['parc opening'], event_hash["2006-03-18 00"].map{|r| r.title}
25
+ assert_equal ['foobar'], event_hash["2006-03-20 00"].map{|r| r.title}
26
26
  end
27
27
 
28
28
  def test_cal_weeks_hours
@@ -34,16 +34,16 @@ class CalendarTest < Zena::View::TestCase
34
34
  start_date, end_date = cal_start_end(Time.utc(2006,3,18), :month)
35
35
  assert_equal Date.civil(2006,02,26), start_date
36
36
  assert_equal Date.civil(2006,04,01), end_date
37
- secure!(Note) { Note.create(:parent_id => nodes_id(:zena), :node_name => 'morning', :event_at => Time.utc(2006,03,20,9))}
38
- secure!(Note) { Note.create(:parent_id => nodes_id(:zena), :node_name => 'afternoon', :event_at => Time.utc(2006,03,20,14))}
37
+ secure!(Note) { Note.create(:parent_id => nodes_id(:zena), :title => 'morning', :event_at => Time.utc(2006,03,20,9))}
38
+ secure!(Note) { Note.create(:parent_id => nodes_id(:zena), :title => 'afternoon', :event_at => Time.utc(2006,03,20,14))}
39
39
  nodes = secure!(Note) { Note.find(:all, :conditions => ["nodes.event_at >= ? AND nodes.event_at <= ?", start_date, end_date])}
40
40
  res = cal_weeks('event_at', nodes, start_date, end_date, hours) do |week, hash|
41
41
  weeks << week
42
42
  event_hash = hash
43
43
  end
44
44
  assert_equal ["2006-03-18 12", "2006-03-20 00", "2006-03-20 12"], event_hash.keys.sort
45
- assert_equal ['opening'], event_hash["2006-03-18 12"].map{|r| r.node_name}
46
- assert_equal ['morning'], event_hash["2006-03-20 00"].map{|r| r.node_name}
47
- assert_equal ['afternoon'], event_hash["2006-03-20 12"].map{|r| r.node_name}
45
+ assert_equal ['parc opening'], event_hash["2006-03-18 12"].map{|r| r.title}
46
+ assert_equal ['morning'], event_hash["2006-03-20 00"].map{|r| r.title}
47
+ assert_equal ['afternoon'], event_hash["2006-03-20 12"].map{|r| r.title}
48
48
  end
49
49
  end
@@ -7,4 +7,6 @@ class DatesTest < Zena::View::TestCase
7
7
  visiting(:status)
8
8
  assert_match %r{span class="date_box".*img src="\/calendar\/iconCalendar.gif".*input id='datef.*' name='node\[updated_at\]' type='text' value='2006-04-11 00:00'}m, date_box(@node, 'updated_at')
9
9
  end
10
+
11
+ # see dates.yml
10
12
  end
@@ -18,10 +18,18 @@ class FulltextTest < Zena::Unit::TestCase
18
18
 
19
19
  context 'with valid code' do
20
20
  should 'succeed' do
21
- assert subject.update_attributes(:idx_text_high => %q{sender:#{title} paper:#{paper}})
21
+ assert subject.update_attributes(:idx_text_high => %q{%Q{sender:#{title} paper:#{paper}}})
22
+ assert_equal %q{%Q{sender:#{title} paper:#{paper}}}, subject.idx_text_high
22
23
  end
23
24
  end # with valid code
24
25
 
26
+ context 'with invalid return type' do
27
+ should 'fail' do
28
+ assert !subject.update_attributes(:idx_text_high => '89')
29
+ assert_match %r{Compilation should produce a String. Found Number.}, subject.errors[:idx_text_high]
30
+ end
31
+ end # with invalid return type
32
+
25
33
  context 'with syntax errors' do
26
34
  should 'fail' do
27
35
  assert !subject.update_attributes(:idx_text_high => %q[foo:#{tit}le} paper:#{paper}])
@@ -76,7 +76,7 @@ class HtmlTagsTest < Zena::View::TestCase
76
76
  end # with a document
77
77
 
78
78
  {
79
- 'basecontact' => :lake,
79
+ 'contact' => :lake,
80
80
  'project' => :cleanWater,
81
81
  'post' => :opening,
82
82
  'tag' => :art,
@@ -218,7 +218,7 @@ class HtmlTagsTest < Zena::View::TestCase
218
218
 
219
219
  def test_alt_with_apos
220
220
  doc = secure!(Node) { nodes(:lake_jpg) }
221
- assert_equal "<img src='/en/projects/cleanWater/image24.jpg?1144713600' width='600' height='440' alt='it&apos;s a lake' class='full'/>", img_tag(doc)
221
+ assert_equal "<img src='/en/projects-list/Clean-Water-project/image24.jpg?1144713600' width='600' height='440' alt='it&apos;s a lake' class='full'/>", img_tag(doc)
222
222
  end
223
223
 
224
224
  def test_select_id
@@ -246,20 +246,6 @@ class HtmlTagsTest < Zena::View::TestCase
246
246
  # assert_match %r{<select[^>]*></select>}, select
247
247
  # end
248
248
 
249
- def test_show_path_root
250
- login(:anon)
251
- @node = secure!(Node) { Node.find(nodes_id(:zena))}
252
- assert_equal "<li><a href='/en' class='current'>Zena the wild CMS</a></li>", show_path
253
- @node = secure!(Node) { Node.find(nodes_id(:status))}
254
- assert_match %r{.*Zena.*projects.*Clean Water.*li.*page22\.html' class='current'>status}m, show_path
255
- end
256
-
257
- def test_show_path_root_with_login
258
- login(:ant)
259
- @node = secure!(Node) { Node.find(nodes_id(:zena))}
260
- assert_equal "<li><a href='/#{AUTHENTICATED_PREFIX}' class='current'>Zena the wild CMS</a></li>", show_path
261
- end
262
-
263
249
  def map_actions(version)
264
250
  version_actions(version, :actions => :all
265
251
  ).split(%r{<.*/nodes/#{version.node.zip}/versions/#{version.number}/}).map{|l| l.gsub(/\?.*/,'').strip
@@ -27,7 +27,7 @@ class I18nTest < Zena::View::TestCase
27
27
  end
28
28
 
29
29
  should 'change lang with lang param' do
30
- assert_match %r{href=.*/oo/projects/cleanWater\?lang=.*fr.*}, lang_links
30
+ assert_match %r{href=.*/oo/projects-list/Clean-Water-project\?lang=.*fr.*}, lang_links
31
31
  end
32
32
  end # on lang_links
33
33
  end # With a logged in user
@@ -57,7 +57,7 @@ class I18nTest < Zena::View::TestCase
57
57
  end
58
58
 
59
59
  should 'change lang with prefix' do
60
- assert_match %r{href=.*/fr/projects/cleanWater.*fr.*}, lang_links
60
+ assert_match %r{href=.*/fr/projects-list/Clean-Water-project.*fr.*}, lang_links
61
61
  end
62
62
  end # on lang_links
63
63
  end # Without a login
@@ -0,0 +1,13 @@
1
+ require 'test_helper'
2
+
3
+ class KpathTest < Zena::Unit::TestCase
4
+ context 'A class path (kpath)' do
5
+ should 'represent the class hierarchy' do
6
+ assert_equal 'N', Node.kpath
7
+ assert_equal 'NP', Page.kpath
8
+ assert_equal 'U', PagerDummy.ksel
9
+ assert_equal 'NU', PagerDummy.kpath
10
+ assert_equal 'NUS', SubPagerDummy.kpath
11
+ end
12
+ end
13
+ end