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.
- data/History.txt +29 -0
- data/Rakefile +2 -0
- data/TODO_ZENA_1_0 +13 -23
- data/app/controllers/columns_controller.rb +1 -1
- data/app/controllers/comments_controller.rb +4 -3
- data/app/controllers/documents_controller.rb +8 -11
- data/app/controllers/nodes_controller.rb +39 -21
- data/app/controllers/users_controller.rb +8 -3
- data/app/controllers/versions_controller.rb +2 -2
- data/app/controllers/virtual_classes_controller.rb +17 -11
- data/app/helpers/documents_helper.rb +0 -3
- data/app/helpers/users_helper.rb +17 -0
- data/app/models/cache.rb +36 -31
- data/app/models/column.rb +48 -5
- data/app/models/comment.rb +14 -5
- data/app/models/data_entry.rb +2 -2
- data/app/models/document.rb +23 -33
- data/app/models/idx_nodes_datetime.rb +4 -0
- data/app/models/idx_nodes_float.rb +4 -0
- data/app/models/idx_project.rb +3 -0
- data/app/models/node.rb +372 -308
- data/app/models/page.rb +1 -31
- data/app/models/relation.rb +4 -4
- data/app/models/relation_proxy.rb +128 -17
- data/app/models/role.rb +27 -2
- data/app/models/site.rb +64 -56
- data/app/models/template.rb +11 -12
- data/app/models/text_document.rb +6 -7
- data/app/models/user.rb +95 -46
- data/app/models/version.rb +2 -2
- data/app/models/virtual_class.rb +418 -73
- data/app/views/columns/_form.html.erb +1 -1
- data/app/views/columns/_li.html.erb +1 -1
- data/app/views/comments/_form.rhtml +1 -1
- data/app/views/comments/_li.rhtml +1 -1
- data/app/views/comments/_li_simple.rhtml +1 -1
- data/app/views/groups/_form.rhtml +1 -1
- data/app/views/links/_li.rhtml +1 -1
- data/app/views/nodes/_groups.rhtml +1 -1
- data/app/views/nodes/_import_results.rhtml +1 -1
- data/app/views/nodes/_parent.rhtml +1 -1
- data/app/views/nodes/_results.rhtml +1 -1
- data/app/views/nodes/create.rjs +4 -2
- data/app/views/relations/_li.erb +2 -2
- data/app/views/templates/document_create_tabs/_file.rhtml +1 -1
- data/app/views/templates/document_create_tabs/_template.rhtml +2 -2
- data/app/views/templates/document_create_tabs/_text_document.rhtml +2 -2
- data/app/views/templates/edit_tabs/_help.rhtml +1 -1
- data/app/views/templates/edit_tabs/_title.rhtml +0 -3
- data/app/views/users/_form.rhtml +2 -6
- data/app/views/users/_li.rhtml +1 -3
- data/app/views/users/create.rjs +4 -4
- data/app/views/users/preferences.html.erb +1 -4
- data/app/views/versions/custom_tab.rhtml +5 -0
- data/app/views/virtual_classes/_form.erb +20 -10
- data/app/views/virtual_classes/_li.erb +21 -8
- data/app/views/zafu/default/Node-+search.zafu +1 -1
- data/app/views/zafu/default/Node.zafu +3 -3
- data/bricks/captcha/lib/bricks/captcha.rb +1 -1
- data/bricks/mongrel/zena/deploy.rb +14 -0
- data/bricks/{data2pdf → pdf}/.document +0 -0
- data/bricks/pdf/README +33 -0
- data/bricks/{data2pdf → pdf}/Rakefile +0 -0
- data/bricks/pdf/VERSION +1 -0
- data/bricks/pdf/lib/bricks/pdf.rb +110 -0
- data/bricks/pdf/lib/bricks/pdf/engine/prince.rb +38 -0
- data/bricks/pdf/lib/bricks/pdf/engine/xhtml2pdf.rb +9 -0
- data/bricks/pdf/lib/bricks/pdf/install.rb +121 -0
- data/bricks/pdf/test/engines/test_prince.rb +15 -0
- data/bricks/pdf/test/engines/test_xhtml2pdf.rb +15 -0
- data/bricks/{data2pdf → pdf}/test/fixtures/application.css +0 -0
- data/bricks/{data2pdf → pdf}/test/fixtures/contact.html +0 -0
- data/bricks/{data2pdf → pdf}/test/fixtures/pisa-default.css +0 -0
- data/bricks/{data2pdf → pdf}/test/fixtures/sheet1.css +0 -0
- data/bricks/{data2pdf → pdf}/test/fixtures/sheet2.css +0 -0
- data/bricks/{data2pdf → pdf}/test/fixtures/simple-html.html +0 -0
- data/bricks/{data2pdf → pdf}/test/fixtures/simple-text.txt +0 -0
- data/bricks/{data2pdf → pdf}/test/helper.rb +4 -5
- data/bricks/pdf/test/shoulda_macros/shoulda_pdf.rb +72 -0
- data/bricks/pdf/zena/init.rb +5 -0
- data/bricks/pdf/zena/tasks.rb +17 -0
- data/bricks/sphinx/lib/{use_sphinx.rb → bricks/sphinx.rb} +1 -1
- data/bricks/tags/zena/init.rb +2 -2
- data/bricks/tags/zena/test/zafu/tags.yml +4 -4
- data/bricks/zena/zena/migrate/01_base.rb +482 -0
- data/config/bricks.yml +22 -6
- data/config/gems.yml +8 -6
- data/db/20100628074512_zena0x_to1x.rb +6 -1
- data/db/fix/024_correct_vclass_kpath.rb +11 -0
- data/db/fix/025_move_tag_into_vclass.rb +13 -0
- data/db/{migrate → fix}/026_rename_templates.rb +0 -0
- data/db/{migrate → fix}/045_avoid_star_in_templates.rb +0 -0
- data/db/{migrate → fix}/046_fix_zazen_image_tag.rb +0 -0
- data/db/{migrate → fix}/047_change_default_link_id_to_zero.rb +1 -3
- data/db/{migrate → fix}/049_fix_publish_from_is_null.rb +0 -0
- data/db/{migrate → fix}/20090924141459_zafu_fix_sept09.rb +0 -0
- data/db/{migrate → fix}/20091013100351_rename_publish_group_to_drive_group.rb +1 -3
- data/db/{migrate → fix}/20091124161608_rebuild_fullpath.rb +0 -1
- data/db/{migrate → fix}/20100115134729_rebuild_fullpath_after_fix.rb +0 -0
- data/db/{migrate → fix}/20100526090140_renamed_contact_model_to_base_contact.rb +2 -4
- data/db/{migrate → fix/old_migrations}/001_create_base.rb +0 -1
- data/db/{migrate → fix/old_migrations}/002_add_time_zone_to_users.rb +0 -0
- data/db/{migrate → fix/old_migrations}/003_add_custom_base_flag.rb +0 -0
- data/db/{migrate → fix/old_migrations}/004_rename_template_skin.rb +0 -0
- data/db/{migrate → fix/old_migrations}/005_create_cached_pages.rb +0 -0
- data/db/{migrate → fix/old_migrations}/006_create_sites.rb +0 -0
- data/db/{migrate → fix/old_migrations}/007_replace_id_by_zip.rb +0 -0
- data/db/{migrate → fix/old_migrations}/008_user_status.rb +0 -0
- data/db/{migrate → fix/old_migrations}/009_fulltext.rb +0 -0
- data/db/fix/old_migrations/010_create_template_content.rb +17 -0
- data/db/{migrate → fix/old_migrations}/011_project_to_section.rb +0 -0
- data/db/{migrate → fix/old_migrations}/012_add_project_id.rb +0 -0
- data/db/{migrate → fix/old_migrations}/013_remove_defaults.rb +0 -0
- data/db/{migrate → fix/old_migrations}/014_add_sort_field.rb +0 -0
- data/db/{migrate → fix/old_migrations}/015_add_dyn_attributes.rb +0 -0
- data/db/{migrate → fix/old_migrations}/016_remove_translations.rb +0 -0
- data/db/{migrate → fix/old_migrations}/017_rename_authorize.rb +0 -0
- data/db/{migrate → fix/old_migrations}/018_add_auth_option.rb +0 -0
- data/db/{migrate → fix/old_migrations}/019_remove_user_status.rb +0 -0
- data/db/{migrate → fix/old_migrations}/020_create_participation.rb +0 -0
- data/db/{migrate → fix/old_migrations}/021_create_relations.rb +0 -0
- data/db/{migrate → fix/old_migrations}/022_create_virtual_classes.rb +0 -0
- data/db/{migrate → fix/old_migrations}/023_ip_on_anonymous_comment.rb +0 -0
- data/db/{migrate → fix/old_migrations}/027_add_country_to_contacts.rb +0 -0
- data/db/{migrate → fix/old_migrations}/028_change_size_of_conten_type_field.rb +0 -0
- data/db/{migrate → fix/old_migrations}/029_create_data_entries.rb +0 -0
- data/db/{migrate → fix/old_migrations}/030_redit_auto_publish_site_settings.rb +0 -0
- data/db/{migrate → fix/old_migrations}/031_create_iformats.rb +0 -0
- data/db/{migrate → fix/old_migrations}/032_caches_context_as_hash.rb +0 -0
- data/db/{migrate → fix/old_migrations}/033_documents_kpath_change.rb +0 -0
- data/db/{migrate → fix/old_migrations}/034_change_file_storage.rb +0 -0
- data/db/{migrate → fix/old_migrations}/035_add_status_to_link.rb +0 -0
- data/db/{migrate → fix/old_migrations}/036_add_flag_fields_on_nodes.rb +0 -0
- data/db/{migrate → fix/old_migrations}/037_add_auto_create_discussion_to_v_class.rb +0 -0
- data/db/{migrate → fix/old_migrations}/038_create_site_attributes.rb +0 -0
- data/db/{migrate → fix/old_migrations}/039_default_position.rb +0 -0
- data/db/{migrate → fix/old_migrations}/040_second_value_for_data_entry.rb +0 -0
- data/db/{migrate → fix/old_migrations}/041_add_attributes_to_v_class.rb +0 -0
- data/db/{migrate → fix/old_migrations}/042_fix_position_should_be_float.rb +0 -0
- data/db/{migrate → fix/old_migrations}/043_move_user_lang_into_participation.rb +0 -0
- data/db/{migrate → fix/old_migrations}/044_remove_monolingual_site_option.rb +0 -0
- data/db/{migrate → fix/old_migrations}/048_link_source_target_can_be_null.rb +0 -0
- data/db/{migrate → fix/old_migrations}/050_date_in_links.rb +0 -0
- data/db/{migrate → fix/old_migrations}/051_add_exif_tags_to_images.rb +0 -0
- data/db/{migrate → fix/old_migrations}/20090825201159_insert_zero_link.rb +0 -0
- data/db/{migrate → fix/old_migrations}/20090825201200_merge_bricks_migrations_with_std_migrations.rb +0 -0
- data/db/{migrate → fix/old_migrations}/20090927125912_allow_null_in_text_fields.rb +0 -0
- data/db/{migrate → fix/old_migrations}/20090928133440_no_more_private_nodes.rb +0 -0
- data/db/{migrate → fix/old_migrations}/20090928143754_version_status_change.rb +0 -0
- data/db/{migrate → fix/old_migrations}/20091001084025_change_status_values_for_comments.rb +0 -0
- data/db/{migrate → fix/old_migrations}/20091009084057_add_vhash_in_node.rb +0 -0
- data/db/{migrate → fix/old_migrations}/20091014130833_fix_template_title.rb +0 -0
- data/db/{migrate → fix/old_migrations}/20091014183726_merge_participation_into_users.rb +0 -0
- data/db/{migrate → fix/old_migrations}/20091018200734_add_popup_info_to_image_format.rb +0 -0
- data/db/{migrate → fix/old_migrations}/20091026161708_add_persistence_token.rb +0 -0
- data/db/{migrate → fix/old_migrations}/20091101184952_add_session_table.rb +0 -0
- data/db/{migrate → fix/old_migrations}/20091123175137_add_single_access_token.rb +0 -0
- data/db/{migrate → fix/old_migrations}/20100125062254_add_dynamo_to_version.rb +0 -0
- data/db/{migrate → fix/old_migrations}/20100201133242_remove_default_status_on_version.rb +0 -0
- data/db/{migrate → fix/old_migrations}/20100208194210_create_attachments.rb +0 -0
- data/db/{migrate → fix/old_migrations}/20100210112319_change_dynamo_to_property.rb +0 -0
- data/db/{migrate → fix/old_migrations}/20100320145726_transform_template_contents_into_index.rb +0 -0
- data/db/{migrate → fix/old_migrations}/20100328125634_change_skin_name_to_id.rb +0 -0
- data/db/{migrate → fix/old_migrations}/20100417061257_add_properties_to_sites.rb +0 -0
- data/db/{migrate → fix/old_migrations}/20100419163149_rename_name_to_node_name.rb +0 -0
- data/db/{migrate → fix/old_migrations}/20100422091606_change_v_class_table_into_roles.rb +0 -0
- data/db/{migrate → fix/old_migrations}/20100422094048_node_habtm_roles.rb +0 -0
- data/db/{migrate → fix/old_migrations}/20100422115935_create_columns.rb +0 -0
- data/db/{migrate → fix/old_migrations}/20100513181529_add_site_id_to_columns.rb +0 -0
- data/db/{migrate → fix/old_migrations}/20100519091711_add_index_definition_to_columns.rb +0 -0
- data/db/{migrate → fix/old_migrations}/20100519091940_create_idx_nodes_string.rb +0 -0
- data/db/{migrate → fix/old_migrations}/20100519232432_create_idx_nodes_ml_string.rb +0 -0
- data/db/{migrate → fix/old_migrations}/20100525113858_add_porperties_to_users.rb +0 -0
- data/db/{migrate → fix/old_migrations}/20100527130937_change_column_index_to_string.rb +0 -0
- data/db/{migrate → fix/old_migrations}/20100531135128_add_fulltext_builder_fields.rb +0 -0
- data/db/{migrate → fix/old_migrations}/20100915062903_add_api_group_id_to_site.rb +0 -0
- data/db/fix/old_migrations/20100923154807_remove_base_contact.rb +84 -0
- data/db/fix/old_migrations/20100926192223_remove_su_user.rb +8 -0
- data/db/fix/old_migrations/20100927141658_add_eval_attributes_to_v_class.rb +12 -0
- data/db/fix/old_migrations/20100928185257_add_obvious_idx.rb +52 -0
- data/db/fix/old_migrations/20100929143111_remove_node_name.rb +11 -0
- data/db/fix/old_migrations/20101006090454_store_properties_in_long_text.rb +9 -0
- data/db/fix/old_migrations/20101014185753_remove_user_prototype_id.rb +9 -0
- data/db/fix/old_migrations/20101101084318_create_scope_index.rb +35 -0
- data/db/fix/old_migrations/20101109074232_create_idx_nodes_tables.rb +65 -0
- data/db/fix/old_migrations/20101110184235_add_role_update_to_site.rb +9 -0
- data/db/fix/old_migrations/20101116103920_change_scope_index.rb +31 -0
- data/db/fix/old_migrations/20101123125822_add_integer_idx.rb +17 -0
- data/db/fix/old_migrations/20101130134522_add_index_field.rb +13 -0
- data/db/fix/old_migrations/20101213133816_add_group_to_relation.rb +9 -0
- data/db/init/base/help.fr.zml +1 -1
- data/db/init/base/skins/default.zml +0 -1
- data/db/init/base/skins/default/Node-+search.zafu +1 -1
- data/db/init/base/skins/default/Node-tree.zafu +3 -3
- data/db/init/base/skins/default/Node.zafu +3 -3
- data/lib/bricks/loader.rb +4 -1
- data/lib/bricks/requirements_validation.rb +11 -6
- data/lib/log_recorder/lib/log_recorder.rb +2 -2
- data/lib/tasks/zena.rake +25 -15
- data/lib/zena.rb +42 -9
- data/lib/zena/acts/enrollable.rb +81 -99
- data/lib/zena/acts/secure.rb +27 -23
- data/lib/zena/acts/secure_node.rb +10 -55
- data/lib/zena/acts/serializable.rb +9 -10
- data/lib/zena/app.rb +0 -2
- data/lib/zena/code_syntax.rb +1 -1
- data/lib/zena/controller/test_case.rb +0 -5
- data/lib/zena/core_ext/string.rb +48 -20
- data/lib/zena/db.rb +10 -442
- data/lib/zena/db_helper/abstract_db.rb +184 -0
- data/lib/zena/db_helper/mysql.rb +150 -0
- data/lib/zena/db_helper/postgresql.rb +79 -0
- data/lib/zena/db_helper/sqlite3.rb +135 -0
- data/lib/zena/deploy.rb +4 -1
- data/lib/zena/deploy/httpd.rhtml +3 -3
- data/lib/zena/deploy/vhost.rhtml +1 -1
- data/lib/zena/foxy_parser.rb +37 -18
- data/lib/zena/info.rb +3 -13
- data/lib/zena/migrator.rb +0 -1
- data/lib/zena/parser/zafu_rules.rb +9 -4
- data/lib/zena/parser/zazen_rules.rb +5 -5
- data/lib/zena/parser/zena_rules.rb +1 -1
- data/lib/zena/remote/interface.rb +1 -1
- data/lib/zena/site_worker.rb +3 -3
- data/lib/zena/test_controller.rb +10 -10
- data/lib/zena/use/action.rb +66 -6
- data/lib/zena/use/ajax.rb +39 -13
- data/lib/zena/use/ancestry.rb +210 -0
- data/lib/zena/use/authlogic.rb +30 -1
- data/lib/zena/use/calendar.rb +158 -0
- data/lib/zena/use/conditional.rb +3 -2
- data/lib/zena/use/context.rb +42 -12
- data/lib/zena/use/dates.rb +15 -14
- data/lib/zena/use/display.rb +54 -7
- data/lib/zena/use/error_rendering.rb +1 -0
- data/lib/zena/use/field_index.rb +20 -0
- data/lib/zena/use/fixtures.rb +12 -9
- data/lib/zena/use/forms.rb +230 -106
- data/lib/zena/use/fulltext.rb +28 -14
- data/lib/zena/use/html_tags.rb +1 -24
- data/lib/zena/use/i18n.rb +69 -14
- data/lib/zena/use/kpath.rb +60 -0
- data/lib/zena/use/ml_index.rb +6 -4
- data/lib/zena/use/node_context.rb +63 -0
- data/lib/zena/use/prop_eval.rb +90 -0
- data/lib/zena/use/query_builder.rb +159 -29
- data/lib/zena/use/query_comment.rb +1 -1
- data/lib/zena/use/query_node.rb +147 -56
- data/lib/zena/use/recursion.rb +2 -2
- data/lib/zena/use/relations.rb +31 -19
- data/lib/zena/use/rendering.rb +111 -121
- data/lib/zena/use/scope_index.rb +230 -0
- data/lib/zena/use/search.rb +7 -7
- data/lib/zena/use/urls.rb +87 -25
- data/lib/zena/use/version_hash.rb +113 -113
- data/lib/zena/use/workflow.rb +5 -1
- data/lib/zena/use/zafu_attributes.rb +11 -14
- data/lib/zena/use/zafu_eval.rb +1 -1
- data/lib/zena/use/zafu_safe_definitions.rb +91 -9
- data/lib/zena/use/zafu_templates.rb +146 -102
- data/lib/zena/use/zazen.rb +5 -4
- data/lib/zena/zafu_compiler.rb +1 -0
- data/locale/en/LC_MESSAGES/zena.mo +0 -0
- data/locale/en/zena.po +0 -1
- data/locale/fr/LC_MESSAGES/zena.mo +0 -0
- data/locale/fr/zena.mo +0 -0
- data/locale/fr/zena.po +4 -4
- data/misc/zena +35 -0
- data/misc/zena_init +41 -0
- data/public/images/ext/{basecontact.png → contact.png} +0 -0
- data/public/javascripts/zena.js +35 -7
- data/public/stylesheets/admin.css +5 -2
- data/public/stylesheets/default.css +2 -1
- data/public/stylesheets/popup.css +1 -1
- data/public/stylesheets/zena.css +2 -2
- data/test/custom_queries/complex.host.yml +12 -5
- data/test/fixtures/files/Node-test.zafu +3 -3
- data/test/fixtures/files/translations_fr.yml +4 -2
- data/test/functional/documents_controller_test.rb +31 -0
- data/test/functional/nodes_controller_commit_test.rb +1 -5
- data/test/functional/nodes_controller_test.rb +92 -12
- data/test/functional/user_sessions_controller_test.rb +2 -2
- data/test/functional/users_controller_test.rb +31 -29
- data/test/functional/versions_controller_test.rb +2 -2
- data/test/functional/virtual_classes_controller_test.rb +2 -2
- data/test/integration/multiple_hosts_test.rb +19 -8
- data/test/integration/navigation_test.rb +91 -12
- data/test/integration/query_node/basic.yml +40 -37
- data/test/integration/query_node/complex.yml +23 -18
- data/test/integration/query_node/dates.yml +3 -3
- data/test/integration/query_node/errors.yml +7 -1
- data/test/integration/query_node/filters.yml +41 -35
- data/test/integration/query_node/idx_fields.yml +11 -0
- data/test/integration/query_node/idx_key_value.yml +77 -0
- data/test/integration/query_node/idx_scope.yml +33 -0
- data/test/integration/query_node/relations.yml +13 -13
- data/test/integration/query_node_test.rb +6 -10
- data/test/integration/zafu_compiler/action.yml +19 -6
- data/test/integration/zafu_compiler/ajax.yml +111 -51
- data/test/integration/zafu_compiler/apphelper.yml +1 -1
- data/test/integration/zafu_compiler/asset.yml +1 -1
- data/test/integration/zafu_compiler/basic.yml +42 -52
- data/test/integration/zafu_compiler/calendar.yml +3 -3
- data/test/integration/zafu_compiler/complex.yml +16 -16
- data/test/integration/zafu_compiler/complex_ok.yml +2 -2
- data/test/integration/zafu_compiler/conditional.yml +42 -33
- data/test/integration/zafu_compiler/data.yml +3 -3
- data/test/integration/zafu_compiler/dates.yml +25 -10
- data/test/integration/zafu_compiler/display.yml +49 -12
- data/test/integration/zafu_compiler/errors.yml +26 -6
- data/test/integration/zafu_compiler/eval.yml +4 -4
- data/test/integration/zafu_compiler/forms.yml +89 -15
- data/test/integration/zafu_compiler/i18n.yml +23 -18
- data/test/integration/zafu_compiler/idx_scope.yml +7 -0
- data/test/integration/zafu_compiler/later.yml +10 -16
- data/test/integration/zafu_compiler/off/off.yml +2 -2
- data/test/integration/zafu_compiler/query.yml +207 -0
- data/test/integration/zafu_compiler/recursion.yml +2 -2
- data/test/integration/zafu_compiler/relations.yml +144 -168
- data/test/integration/zafu_compiler/roles.yml +86 -10
- data/test/integration/zafu_compiler/rubyless.yml +49 -6
- data/test/integration/zafu_compiler/safe_definitions.yml +35 -6
- data/test/integration/zafu_compiler/search.yml +1 -1
- data/test/integration/zafu_compiler/security.yml +37 -0
- data/test/integration/zafu_compiler/urls.yml +50 -40
- data/test/integration/zafu_compiler/user.yml +21 -6
- data/test/integration/zafu_compiler/version.yml +6 -6
- data/test/integration/zafu_compiler/zafu_attributes.yml +43 -34
- data/test/integration/zafu_compiler/zazen.yml +10 -10
- data/test/integration/zafu_compiler_test.rb +19 -13
- data/test/sites/complex/nodes.yml +0 -2
- data/test/sites/complex/roles.yml +9 -1
- data/test/sites/complex/sites.yml +0 -1
- data/test/sites/complex/users.yml +2 -5
- data/test/sites/ocean/nodes.yml +2 -5
- data/test/sites/ocean/roles.yml +8 -0
- data/test/sites/ocean/sites.yml +0 -1
- data/test/sites/ocean/users.yml +0 -13
- data/test/sites/zena/columns.yml +27 -5
- data/test/sites/zena/idx_projects.yml +5 -0
- data/test/sites/zena/nodes.yml +8 -32
- data/test/sites/zena/relations.yml +5 -0
- data/test/sites/zena/roles.yml +25 -3
- data/test/sites/zena/sites.yml +2 -2
- data/test/sites/zena/users.yml +1 -21
- data/test/sites/zena/versions.yml +35 -12
- data/test/test_helper.rb +7 -0
- data/test/unit/after_commit_test.rb +7 -7
- data/test/unit/cache_test.rb +32 -0
- data/test/unit/cached_page_test.rb +1 -1
- data/test/unit/column_test.rb +31 -7
- data/test/unit/comment_test.rb +2 -2
- data/test/unit/core_ext_test.rb +38 -7
- data/test/unit/document_test.rb +14 -42
- data/test/unit/node_test.rb +311 -324
- data/test/unit/note_test.rb +23 -31
- data/test/unit/page_test.rb +16 -58
- data/test/unit/project_test.rb +2 -2
- data/test/unit/relation_proxy_test.rb +148 -21
- data/test/unit/relation_test.rb +23 -3
- data/test/unit/remote_test.rb +15 -9
- data/test/unit/role_test.rb +9 -0
- data/test/unit/site_test.rb +49 -47
- data/test/unit/skin_test.rb +16 -0
- data/test/unit/template_test.rb +60 -69
- data/test/unit/text_document_test.rb +15 -14
- data/test/unit/user_test.rb +101 -41
- data/test/unit/version_test.rb +4 -4
- data/test/unit/virtual_class_test.rb +577 -36
- data/test/unit/workflow_test.rb +58 -21
- data/test/unit/zena/acts/enrollable_test.rb +36 -127
- data/test/unit/zena/acts/secure_test.rb +6 -22
- data/test/unit/zena/acts/serializable_test.rb +18 -0
- data/test/unit/zena/db_test.rb +14 -14
- data/test/unit/zena/parser/zafu.yml +5 -3
- data/test/unit/zena/use/ancestry_test.rb +198 -0
- data/test/unit/zena/use/calendar_test.rb +8 -8
- data/test/unit/zena/use/dates_test.rb +2 -0
- data/test/unit/zena/use/fulltext_test.rb +9 -1
- data/test/unit/zena/use/html_tags_test.rb +2 -16
- data/test/unit/zena/use/i18n_test.rb +2 -2
- data/test/unit/zena/use/kpath_test.rb +13 -0
- data/test/unit/zena/use/ml_index_test.rb +60 -12
- data/test/unit/zena/use/prop_eval_test.rb +170 -0
- data/test/unit/zena/use/query_node_test.rb +9 -2
- data/test/unit/zena/use/rendering_test.rb +98 -1
- data/test/unit/zena/use/scope_index_test.rb +464 -0
- data/test/unit/zena/use/urls_test.rb +23 -13
- data/test/unit/zena/use/version_hash_test.rb +2 -2
- data/test/unit/zena/use/zafu_template_test.rb +21 -8
- data/test/unit/zena/use/zazen_test.rb +47 -47
- data/zena.gemspec +177 -143
- metadata +222 -141
- data/app/models/base_contact.rb +0 -79
- data/app/models/book.rb +0 -242
- data/app/models/contact_content.rb +0 -70
- data/app/models/contact_version.rb +0 -40
- data/app/models/reference.rb +0 -18
- data/app/views/templates/edit_tabs/_basecontact.rhtml +0 -8
- data/bricks/data2pdf/README +0 -19
- data/bricks/data2pdf/VERSION +0 -1
- data/bricks/data2pdf/lib/data2pdf.rb +0 -60
- data/bricks/data2pdf/lib/engines/prince.rb +0 -39
- data/bricks/data2pdf/lib/engines/xhtml2pdf.rb +0 -41
- data/bricks/data2pdf/lib/install.rb +0 -111
- data/bricks/data2pdf/test/engines/test_prince.rb +0 -14
- data/bricks/data2pdf/test/engines/test_xhtml2pdf.rb +0 -14
- data/bricks/data2pdf/test/shoulda_macros/shoulda_data2pdf.rb +0 -91
- data/bricks/data2pdf/test/unit/test_rendering.rb +0 -37
- data/config/routes.rb +0 -3
- data/db/migrate/010_create_template_content.rb +0 -17
- data/db/migrate/024_correct_vclass_kpath.rb +0 -13
- data/db/migrate/025_move_tag_into_vclass.rb +0 -15
- data/lib/version_off.rb +0 -323
- data/lib/zena/use/node_name.rb +0 -94
- data/test/integration/query_node/properties.yml +0 -41
- data/test/unit/base_contact_test.rb +0 -242
- data/test/unit/node_name_test.rb +0 -137
data/test/unit/remote_test.rb
CHANGED
@@ -29,7 +29,7 @@ class RemoteTest < Zena::Integration::TestCase
|
|
29
29
|
assert_equal 'Banana', remote.title
|
30
30
|
end
|
31
31
|
end
|
32
|
-
|
32
|
+
|
33
33
|
should 'respond to new' do
|
34
34
|
node = subject.new(:title => 'Banana', :parent_id => nodes_zip(:cleanWater))
|
35
35
|
assert_difference('Node.count', 1) do
|
@@ -47,7 +47,7 @@ class RemoteTest < Zena::Integration::TestCase
|
|
47
47
|
end
|
48
48
|
|
49
49
|
should 'find with all' do
|
50
|
-
assert_equal ["Art", "
|
50
|
+
assert_equal ["Art", "News list", "Top menu"], subject.all.map(&:title)
|
51
51
|
end
|
52
52
|
|
53
53
|
should 'find with filters' do
|
@@ -82,6 +82,12 @@ class RemoteTest < Zena::Integration::TestCase
|
|
82
82
|
subject
|
83
83
|
end
|
84
84
|
end
|
85
|
+
|
86
|
+
should 'return node zip as id' do
|
87
|
+
subject
|
88
|
+
last = Node.find(:first, :order => 'id desc')
|
89
|
+
assert_equal last.zip, subject.id
|
90
|
+
end
|
85
91
|
|
86
92
|
should 'use attributes to create node' do
|
87
93
|
node = remote_node(subject.id)
|
@@ -223,7 +229,7 @@ class RemoteTest < Zena::Integration::TestCase
|
|
223
229
|
|
224
230
|
context 'paginating results' do
|
225
231
|
subject do
|
226
|
-
@app.all('pages order by
|
232
|
+
@app.all('pages order by title asc', :page => 2, :per_page => 3)
|
227
233
|
end
|
228
234
|
|
229
235
|
should 'paginate' do
|
@@ -250,18 +256,18 @@ class RemoteTest < Zena::Integration::TestCase
|
|
250
256
|
|
251
257
|
should 'map missing attributes as first queries' do
|
252
258
|
assert_equal 'Clean Water project', subject.icon_for.title
|
253
|
-
assert_equal ["
|
259
|
+
assert_equal ["crocodiles", "Keeping things clean !", "Nice Bananas", "status title"], subject.project.pages.map(&:title)
|
254
260
|
end
|
255
261
|
|
256
262
|
should 'map missing attributes as queries' do
|
257
|
-
assert_equal "
|
258
|
-
assert_equal ["
|
259
|
-
"crocodiles",
|
263
|
+
assert_equal "crocodiles", subject.project.page.title
|
264
|
+
assert_equal ["crocodiles",
|
260
265
|
"it's a lake",
|
266
|
+
"Keeping things clean !",
|
261
267
|
"The lake we love",
|
268
|
+
"Nice Bananas",
|
262
269
|
"parc opening",
|
263
270
|
"status title",
|
264
|
-
"Keeping things clean !",
|
265
271
|
"water"], subject.parent.nodes.map(&:title)
|
266
272
|
end
|
267
273
|
end # and a found remote node
|
@@ -298,7 +304,7 @@ class RemoteTest < Zena::Integration::TestCase
|
|
298
304
|
subject.save
|
299
305
|
end
|
300
306
|
|
301
|
-
assert_equal subject.id, tag.first("tagged where title = '
|
307
|
+
assert_equal subject.id, tag.first("tagged where title = 'Panthera Leo Verneyi'").id
|
302
308
|
end
|
303
309
|
end # with a new relation
|
304
310
|
|
data/test/unit/role_test.rb
CHANGED
@@ -117,6 +117,15 @@ class RoleTest < Zena::Unit::TestCase
|
|
117
117
|
end
|
118
118
|
end # with an admin visitor
|
119
119
|
end # Creating a new Role
|
120
|
+
|
121
|
+
context 'with a role' do
|
122
|
+
subject do
|
123
|
+
roles(:Original)
|
124
|
+
end
|
120
125
|
|
126
|
+
should 'return all defined safe columns' do
|
127
|
+
assert_equal %w{origin tz weight}, subject.defined_safe_columns.map(&:name)
|
128
|
+
end
|
129
|
+
end # with a virtual class
|
121
130
|
# Indexed columns in role tested in NodeTest
|
122
131
|
end
|
data/test/unit/site_test.rb
CHANGED
@@ -4,25 +4,33 @@ class SiteTest < Zena::Unit::TestCase
|
|
4
4
|
|
5
5
|
context 'on site creation' do
|
6
6
|
setup do
|
7
|
-
|
7
|
+
Thread.current[:visitor] = nil
|
8
8
|
end
|
9
9
|
|
10
|
-
|
11
|
-
|
12
|
-
assert_not_equal users(:su), @site.su[:id]
|
10
|
+
subject do
|
11
|
+
Site.create_for_host('super.host', 'secret')
|
13
12
|
end
|
14
13
|
|
15
|
-
should '
|
16
|
-
|
17
|
-
|
18
|
-
|
14
|
+
should 'create valid site' do
|
15
|
+
# should populate site
|
16
|
+
assert_difference('Node.count', 18) do
|
17
|
+
subject
|
18
|
+
end
|
19
19
|
|
20
|
-
|
21
|
-
|
22
|
-
|
20
|
+
# should create anon user
|
21
|
+
assert_nil subject.anon.login
|
22
|
+
|
23
|
+
assert_equal 'Anonymous User', subject.anon.node.title
|
24
|
+
|
25
|
+
# should create an admin user
|
26
|
+
assert_equal 1, subject.admin_user_ids.size
|
23
27
|
|
24
|
-
|
25
|
-
|
28
|
+
admin = secure(User) { User.find(:first, :conditions => "status >= #{User::Status[:admin]}") }
|
29
|
+
|
30
|
+
assert_equal 'Admin User', admin.node.title
|
31
|
+
|
32
|
+
# should return a new project as root node
|
33
|
+
assert_kind_of Project, subject.root_node
|
26
34
|
end
|
27
35
|
end
|
28
36
|
|
@@ -103,7 +111,7 @@ class SiteTest < Zena::Unit::TestCase
|
|
103
111
|
anon = site.anon
|
104
112
|
assert_kind_of User, anon
|
105
113
|
assert anon.is_anon?
|
106
|
-
assert_equal '
|
114
|
+
assert_equal 'Mr nobody', anon.node.title
|
107
115
|
assert_equal users_id(:anon), anon[:id]
|
108
116
|
anon.site = site
|
109
117
|
assert anon.is_anon?
|
@@ -111,51 +119,34 @@ class SiteTest < Zena::Unit::TestCase
|
|
111
119
|
login(:incognito)
|
112
120
|
site = sites(:ocean)
|
113
121
|
anon = site.anon
|
114
|
-
assert_equal 'Miss', anon.
|
122
|
+
assert_equal 'Miss incognito', anon.node.title
|
115
123
|
assert_equal users_id(:incognito), anon[:id]
|
116
124
|
anon.site = site
|
117
125
|
assert anon.is_anon?
|
118
126
|
end
|
119
127
|
|
120
|
-
def test_su
|
121
|
-
login(:anon)
|
122
|
-
site = sites(:zena)
|
123
|
-
su = site.su
|
124
|
-
assert_kind_of User, su
|
125
|
-
assert_equal 'Super', su.first_name
|
126
|
-
assert_equal users_id(:su), su[:id]
|
127
|
-
su.site = site
|
128
|
-
assert su.is_su?
|
129
|
-
|
130
|
-
login(:incognito)
|
131
|
-
site = sites(:ocean)
|
132
|
-
su = site.su
|
133
|
-
assert_kind_of User, su
|
134
|
-
assert_equal 'Hyper', su.first_name
|
135
|
-
assert_equal users_id(:ocean_su), su[:id]
|
136
|
-
su.site = site
|
137
|
-
assert su.is_su?
|
138
|
-
end
|
139
|
-
|
140
128
|
def test_public_group
|
129
|
+
login(:anon)
|
141
130
|
site = sites(:zena)
|
142
131
|
grp = site.public_group
|
143
132
|
assert_kind_of Group, grp
|
144
133
|
assert_equal groups_id(:public), grp[:id]
|
145
134
|
|
135
|
+
login(:incognito)
|
146
136
|
site = sites(:ocean)
|
147
|
-
$_test_site = 'ocean'
|
148
137
|
grp = site.public_group
|
149
138
|
assert_kind_of Group, grp
|
150
139
|
assert_equal groups_id(:public), grp[:id]
|
151
140
|
end
|
152
141
|
|
153
142
|
def test_site_group
|
143
|
+
login(:anon)
|
154
144
|
site = sites(:zena)
|
155
145
|
grp = site.site_group
|
156
146
|
assert_kind_of Group, grp
|
157
147
|
assert_equal groups_id(:workers), grp[:id]
|
158
|
-
|
148
|
+
|
149
|
+
login(:incognito)
|
159
150
|
site = sites(:ocean)
|
160
151
|
grp = site.site_group
|
161
152
|
assert_kind_of Group, grp
|
@@ -236,19 +227,19 @@ class SiteTest < Zena::Unit::TestCase
|
|
236
227
|
opening = secure(Node) { nodes(:opening) }
|
237
228
|
cleanWater = secure(Node) { nodes(:cleanWater) }
|
238
229
|
art = secure(Node) { nodes(:art) }
|
239
|
-
assert_equal
|
240
|
-
assert_equal
|
230
|
+
assert_equal fullpath(:projects, :cleanWater, :status), status.fullpath
|
231
|
+
assert_equal fullpath(:projects, :cleanWater), status.basepath
|
241
232
|
assert_equal false, status.custom_base
|
242
233
|
|
243
|
-
assert_equal
|
244
|
-
assert_equal
|
234
|
+
assert_equal fullpath(:projects, :cleanWater, :opening), opening.fullpath
|
235
|
+
assert_equal fullpath(:projects, :cleanWater), opening.basepath
|
245
236
|
assert_equal false, opening.custom_base
|
246
237
|
|
247
|
-
assert_equal
|
248
|
-
assert_equal
|
238
|
+
assert_equal fullpath(:projects, :cleanWater), cleanWater.fullpath
|
239
|
+
assert_equal fullpath(:projects, :cleanWater), cleanWater.basepath
|
249
240
|
assert_equal true, cleanWater.custom_base
|
250
241
|
|
251
|
-
assert_equal
|
242
|
+
assert_equal fullpath(:collections, :art), art.fullpath
|
252
243
|
assert_equal '', art.basepath
|
253
244
|
assert_equal false, art.custom_base
|
254
245
|
end
|
@@ -264,10 +255,10 @@ class SiteTest < Zena::Unit::TestCase
|
|
264
255
|
|
265
256
|
should 'not alter fullpath' do
|
266
257
|
node = secure!(Node) { nodes(:status) }
|
267
|
-
assert_equal
|
258
|
+
assert_equal fullpath(:projects, :cleanWater, :status), node.fullpath
|
268
259
|
subject.clear_cache
|
269
260
|
node = secure!(Node) { nodes(:status) }
|
270
|
-
assert_equal
|
261
|
+
assert_equal fullpath(:projects, :cleanWater, :status), node.fullpath
|
271
262
|
end
|
272
263
|
end
|
273
264
|
|
@@ -288,7 +279,12 @@ class SiteTest < Zena::Unit::TestCase
|
|
288
279
|
end
|
289
280
|
|
290
281
|
should 'rebuild visible entries for all objects' do
|
291
|
-
assert_difference('IdxNodesMlString.count',
|
282
|
+
assert_difference('IdxNodesMlString.count',
|
283
|
+
# title index on all nodes
|
284
|
+
subject.lang_list.count * Node.count(:conditions => {:site_id => subject.id}) +
|
285
|
+
# search index on Letter nodes
|
286
|
+
subject.lang_list.count * Node.count(:conditions => ['site_id = ? AND kpath like ?', subject.id, 'NNL%'])
|
287
|
+
) do
|
292
288
|
subject.rebuild_index
|
293
289
|
end
|
294
290
|
end
|
@@ -303,4 +299,10 @@ class SiteTest < Zena::Unit::TestCase
|
|
303
299
|
'en'=>'status title'], ml_indices
|
304
300
|
end
|
305
301
|
end
|
302
|
+
|
303
|
+
|
304
|
+
private
|
305
|
+
def fullpath(*args)
|
306
|
+
args.map {|sym| nodes_zip(sym).to_s}.join('/')
|
307
|
+
end
|
306
308
|
end
|
data/test/unit/skin_test.rb
CHANGED
@@ -1,5 +1,21 @@
|
|
1
1
|
require 'test_helper'
|
2
2
|
|
3
3
|
class SkinTest < Zena::Unit::TestCase
|
4
|
+
context 'With a writer' do
|
5
|
+
setup do
|
6
|
+
login(:tiger)
|
7
|
+
end
|
8
|
+
|
9
|
+
context 'creating new objects' do
|
10
|
+
subject do
|
11
|
+
secure(Page) { Page.create(:parent_id => nodes_id(:zena), :title => 'snow') }
|
12
|
+
end
|
13
|
+
|
14
|
+
should 'inherit skin_id' do
|
15
|
+
assert_equal nodes_id(:default), subject.skin_id
|
16
|
+
end
|
17
|
+
end # creating new objects
|
18
|
+
|
19
|
+
end # With a writer
|
4
20
|
|
5
21
|
end
|
data/test/unit/template_test.rb
CHANGED
@@ -21,8 +21,8 @@ class TemplateTest < Zena::Unit::TestCase
|
|
21
21
|
assert_equal 'Project', subject.target_klass
|
22
22
|
end
|
23
23
|
|
24
|
-
should 'remove extension from
|
25
|
-
assert_equal 'Project-collab-xml', subject.
|
24
|
+
should 'remove extension from title' do
|
25
|
+
assert_equal 'Project-collab-xml', subject.title
|
26
26
|
end
|
27
27
|
|
28
28
|
should 'set extension to zafu' do
|
@@ -53,9 +53,9 @@ class TemplateTest < Zena::Unit::TestCase
|
|
53
53
|
|
54
54
|
context 'creating a template' do
|
55
55
|
|
56
|
-
context 'with a capitalized
|
56
|
+
context 'with a capitalized title' do
|
57
57
|
subject do
|
58
|
-
secure(Template) { Template.create(:parent_id => nodes_id(:default), :
|
58
|
+
secure(Template) { Template.create(:parent_id => nodes_id(:default), :title => 'Project.zafu') }
|
59
59
|
end
|
60
60
|
|
61
61
|
should 'create a new Template' do
|
@@ -70,7 +70,7 @@ class TemplateTest < Zena::Unit::TestCase
|
|
70
70
|
end
|
71
71
|
end
|
72
72
|
|
73
|
-
should 'use
|
73
|
+
should 'use title as target class' do
|
74
74
|
assert_equal 'Project', subject.target_klass
|
75
75
|
end
|
76
76
|
|
@@ -85,7 +85,7 @@ class TemplateTest < Zena::Unit::TestCase
|
|
85
85
|
|
86
86
|
context 'with minimal arguments' do
|
87
87
|
subject do
|
88
|
-
secure(Document) { Document.create(:parent_id => nodes_id(:default), :
|
88
|
+
secure(Document) { Document.create(:parent_id => nodes_id(:default), :title => 'foo.zafu') }
|
89
89
|
end
|
90
90
|
|
91
91
|
should 'create a new Template' do
|
@@ -105,15 +105,14 @@ class TemplateTest < Zena::Unit::TestCase
|
|
105
105
|
assert_equal 'text/zafu', subject.content_type
|
106
106
|
end
|
107
107
|
|
108
|
-
should 'remove extension from
|
108
|
+
should 'remove extension from title' do
|
109
109
|
assert_equal 'foo', subject.title
|
110
|
-
assert_equal 'foo', subject.node_name
|
111
110
|
end
|
112
111
|
end
|
113
112
|
|
114
113
|
context 'with a blank mode' do
|
115
114
|
subject do
|
116
|
-
secure(Document) { Document.create(:parent_id => nodes_id(:default), :
|
115
|
+
secure(Document) { Document.create(:parent_id => nodes_id(:default), :title => 'super.zafu', :mode => '') }
|
117
116
|
end
|
118
117
|
|
119
118
|
should 'not complain' do
|
@@ -122,43 +121,35 @@ class TemplateTest < Zena::Unit::TestCase
|
|
122
121
|
end
|
123
122
|
end # with a blank mode
|
124
123
|
|
125
|
-
context 'with a blank
|
124
|
+
context 'with a blank title' do
|
126
125
|
subject do
|
127
126
|
secure(Template) { Template.create(:parent_id=>nodes_id(:default), :target_klass => 'Section') }
|
128
127
|
end
|
129
128
|
|
130
|
-
should 'use target_klass as
|
129
|
+
should 'use target_klass as title' do
|
131
130
|
assert !subject.new_record?
|
132
|
-
assert_equal 'Section', subject.
|
131
|
+
assert_equal 'Section', subject.title
|
133
132
|
end
|
134
|
-
end # with a blank
|
133
|
+
end # with a blank title
|
135
134
|
|
136
135
|
context 'with a format' do
|
137
136
|
subject do
|
138
|
-
secure(Template) { Template.create(:parent_id=>nodes_id(:default), :
|
137
|
+
secure(Template) { Template.create(:parent_id=>nodes_id(:default), :title => 'Node-tree', :format => 'xml') }
|
139
138
|
end
|
140
139
|
|
141
|
-
should 'use format in
|
140
|
+
should 'use format in title' do
|
142
141
|
assert !subject.new_record?
|
143
|
-
assert_equal 'Node-tree-xml', subject.
|
142
|
+
assert_equal 'Node-tree-xml', subject.title
|
144
143
|
end
|
145
|
-
end # with a blank
|
144
|
+
end # with a blank title
|
146
145
|
|
147
146
|
context 'with class format and mode in title' do
|
148
147
|
subject do
|
149
148
|
secure!(Document) { Document.create(:parent_id => nodes_id(:default), :title => 'Project-collab-xml.zafu')}
|
150
|
-
end # with class format and mode in title
|
151
|
-
|
152
|
-
should_set_target_class_mode_and_format
|
153
|
-
end
|
154
|
-
|
155
|
-
context 'with class format and mode in node_name' do
|
156
|
-
subject do
|
157
|
-
secure!(Document) { Document.create(:parent_id => nodes_id(:default), :node_name => 'Project-collab-xml.zafu')}
|
158
149
|
end
|
159
150
|
|
160
151
|
should_set_target_class_mode_and_format
|
161
|
-
end # with class format and mode in
|
152
|
+
end # with class format and mode in title
|
162
153
|
|
163
154
|
context 'with a file' do
|
164
155
|
subject do
|
@@ -173,14 +164,14 @@ class TemplateTest < Zena::Unit::TestCase
|
|
173
164
|
assert_kind_of Template, subject
|
174
165
|
end
|
175
166
|
|
176
|
-
should 'use title for
|
177
|
-
assert_equal 'skiny', subject.
|
167
|
+
should 'use title for title' do
|
168
|
+
assert_equal 'skiny', subject.title
|
178
169
|
end
|
179
170
|
end # with a file
|
180
171
|
|
181
172
|
context 'with an html extension' do
|
182
173
|
subject do
|
183
|
-
secure!(Document) { Document.create(:parent_id => nodes_id(:default), :
|
174
|
+
secure!(Document) { Document.create(:parent_id => nodes_id(:default), :title => 'sub.html')}
|
184
175
|
end
|
185
176
|
|
186
177
|
should 'create a Template' do
|
@@ -191,7 +182,7 @@ class TemplateTest < Zena::Unit::TestCase
|
|
191
182
|
|
192
183
|
context 'not in a Skin section' do
|
193
184
|
subject do
|
194
|
-
secure!(Document) { Document.create(:parent_id => nodes_id(:cleanWater), :
|
185
|
+
secure!(Document) { Document.create(:parent_id => nodes_id(:cleanWater), :title => 'super.zafu')}
|
195
186
|
end
|
196
187
|
|
197
188
|
should 'return an error on parent' do
|
@@ -282,92 +273,92 @@ class TemplateTest < Zena::Unit::TestCase
|
|
282
273
|
end # A visitor with drive access
|
283
274
|
|
284
275
|
|
285
|
-
def
|
276
|
+
def test_set_by_title_without_mode
|
286
277
|
login(:tiger)
|
287
|
-
doc = secure!(Document) { Document.create(:parent_id=>nodes_id(:default), :
|
278
|
+
doc = secure!(Document) { Document.create(:parent_id=>nodes_id(:default), :title => 'Project--xml.zafu')}
|
288
279
|
assert_kind_of Template, doc
|
289
280
|
assert !doc.new_record?, "Saved"
|
290
281
|
assert_nil doc.mode
|
291
282
|
assert_equal 'xml', doc.format
|
292
283
|
assert_equal 'NPP', doc.tkpath
|
293
284
|
assert_equal 'Project', doc.target_klass
|
294
|
-
assert_equal 'Project--xml', doc.
|
285
|
+
assert_equal 'Project--xml', doc.title
|
295
286
|
end
|
296
287
|
|
297
288
|
|
298
|
-
def
|
289
|
+
def test_set_blank_title
|
299
290
|
login(:tiger)
|
300
|
-
doc = secure!(Template) { Template.create(:parent_id=>nodes_id(:default), 'mode' => 'collab', 'target_klass' => 'Page', '
|
291
|
+
doc = secure!(Template) { Template.create(:parent_id=>nodes_id(:default), 'mode' => 'collab', 'target_klass' => 'Page', 'title' => '', 'format' => '')}
|
301
292
|
assert_kind_of Template, doc
|
302
293
|
assert !doc.new_record?, "Saved"
|
303
294
|
assert_equal 'collab', doc.mode
|
304
295
|
assert_equal 'html', doc.format
|
305
296
|
assert_equal 'NP', doc.tkpath
|
306
297
|
assert_equal 'Page', doc.target_klass
|
307
|
-
assert_equal 'Page-collab', doc.
|
298
|
+
assert_equal 'Page-collab', doc.title
|
308
299
|
end
|
309
300
|
|
310
|
-
def
|
301
|
+
def test_change_title
|
311
302
|
login(:tiger)
|
312
|
-
doc = secure!(Template) { Template.create(:parent_id=>nodes_id(:default), :
|
303
|
+
doc = secure!(Template) { Template.create(:parent_id=>nodes_id(:default), :title => 'Project-collab-xml.zafu')}
|
313
304
|
assert_kind_of Template, doc
|
314
305
|
assert !doc.new_record?, "Saved"
|
315
306
|
doc = secure!(Node) { Node.find(doc[:id]) } # reload
|
316
|
-
assert doc.update_attributes(:
|
307
|
+
assert doc.update_attributes(:title => "Page-super")
|
317
308
|
assert_equal 'super', doc.mode
|
318
309
|
assert_equal 'html', doc.format
|
319
310
|
assert_equal 'NP', doc.tkpath
|
320
311
|
assert_equal 'Page', doc.target_klass
|
321
|
-
assert_equal 'Page-super', doc.
|
312
|
+
assert_equal 'Page-super', doc.title
|
322
313
|
end
|
323
314
|
|
324
315
|
def test_update_title_blank_mode
|
325
316
|
login(:tiger)
|
326
|
-
doc = secure!(Template) { Template.create(:parent_id=>nodes_id(:default), :
|
317
|
+
doc = secure!(Template) { Template.create(:parent_id=>nodes_id(:default), :title => 'Project-collab-xml.zafu')}
|
327
318
|
assert_kind_of Template, doc
|
328
319
|
assert !doc.new_record?, "Saved"
|
329
320
|
assert doc.update_attributes(:mode => "", :title=> "Project-collab-xml")
|
330
321
|
assert_nil doc.mode
|
331
322
|
assert_equal 'xml', doc.format
|
332
|
-
assert_equal 'Project--xml', doc.
|
323
|
+
assert_equal 'Project--xml', doc.title
|
333
324
|
assert_equal 'Project--xml', doc.title
|
334
325
|
end
|
335
326
|
|
336
327
|
def test_update_blank_mode
|
337
328
|
login(:tiger)
|
338
|
-
doc = secure!(Template) { Template.create(:parent_id=>nodes_id(:default), :
|
329
|
+
doc = secure!(Template) { Template.create(:parent_id=>nodes_id(:default), :title => 'Project-collab-xml.zafu')}
|
339
330
|
assert_kind_of Template, doc
|
340
331
|
assert !doc.new_record?, "Saved"
|
341
332
|
assert_equal 'collab', doc.mode
|
342
333
|
doc = secure!(Node) { Node.find(doc[:id]) } # reload
|
343
|
-
assert doc.update_attributes(:mode => "", :
|
334
|
+
assert doc.update_attributes(:mode => "", :title => "Project-collab-xml") # name does not change, only mode is updated
|
344
335
|
assert_nil doc.mode
|
345
336
|
assert_equal 'xml', doc.format
|
346
337
|
assert_equal 'Project', doc.target_klass
|
347
|
-
assert_equal 'Project--xml', doc.
|
338
|
+
assert_equal 'Project--xml', doc.title
|
348
339
|
assert_equal 'Project--xml', doc.title
|
349
340
|
end
|
350
341
|
|
351
|
-
def
|
342
|
+
def test_cannot_change_title_not_master
|
352
343
|
login(:tiger)
|
353
|
-
doc = secure!(Template) { Template.create(:parent_id=>nodes_id(:default), :
|
344
|
+
doc = secure!(Template) { Template.create(:parent_id=>nodes_id(:default), :title => 'Project-collab-xml.zafu')}
|
354
345
|
assert_kind_of Template, doc
|
355
346
|
assert !doc.new_record?, "Saved"
|
356
347
|
doc = secure!(Node) { Node.find(doc[:id]) } # reload
|
357
|
-
assert doc.update_attributes(:
|
348
|
+
assert doc.update_attributes(:title => "simple-thing", :v_status => Zena::Status[:pub])
|
358
349
|
assert_nil doc.target_klass
|
359
350
|
assert_nil doc.mode
|
360
351
|
assert_nil doc.format
|
361
352
|
assert_nil doc.tkpath
|
362
|
-
assert_equal '
|
353
|
+
assert_equal 'simple-thing', doc.title
|
363
354
|
end
|
364
355
|
|
365
|
-
def
|
356
|
+
def test_set_title_no_extension
|
366
357
|
login(:tiger)
|
367
|
-
doc = secure!(Template) { Template.create(:parent_id=>nodes_id(:default), :
|
358
|
+
doc = secure!(Template) { Template.create(:parent_id=>nodes_id(:default), :title => 'Project-collab')}
|
368
359
|
assert_kind_of Template, doc
|
369
360
|
assert !doc.new_record?, "Saved"
|
370
|
-
assert_equal 'Project-collab', doc.
|
361
|
+
assert_equal 'Project-collab', doc.title
|
371
362
|
assert_equal 'collab', doc.mode
|
372
363
|
assert_equal 'html', doc.format
|
373
364
|
assert_equal 'NPP', doc.tkpath
|
@@ -376,58 +367,58 @@ class TemplateTest < Zena::Unit::TestCase
|
|
376
367
|
|
377
368
|
def test_set_target_klass
|
378
369
|
login(:tiger)
|
379
|
-
doc = secure!(Template) { Template.create(:parent_id=>nodes_id(:default), :
|
370
|
+
doc = secure!(Template) { Template.create(:parent_id=>nodes_id(:default), :title => 'Spider-man-xml',
|
380
371
|
:target_klass => 'Page',
|
381
372
|
:format => 'ical')}
|
382
373
|
assert_kind_of Template, doc
|
383
374
|
assert !doc.new_record?, "Saved"
|
384
|
-
assert_equal 'Page-man-ical', doc.
|
375
|
+
assert_equal 'Page-man-ical', doc.title
|
385
376
|
assert_equal 'man', doc.mode
|
386
377
|
assert_equal 'ical', doc.format
|
387
378
|
assert_equal 'NP', doc.tkpath
|
388
379
|
assert_equal 'Page', doc.target_klass
|
389
380
|
end
|
390
381
|
|
391
|
-
def
|
382
|
+
def test_set_blank_title_not_unique
|
392
383
|
login(:tiger)
|
393
|
-
doc = secure!(Template) { Template.create(:parent_id=>nodes_id(:default), 'mode' => '', 'target_klass' => '
|
384
|
+
doc = secure!(Template) { Template.create(:parent_id=>nodes_id(:default), 'mode' => '', 'target_klass' => 'Contact', 'title' => '', 'format' => '')}
|
394
385
|
assert_kind_of Template, doc
|
395
386
|
assert !doc.new_record?, "Saved"
|
396
387
|
assert_nil doc.mode
|
397
388
|
assert_equal 'html', doc.format
|
398
389
|
assert_equal 'NRC', doc.tkpath
|
399
|
-
assert_equal '
|
400
|
-
assert_equal '
|
401
|
-
doc = secure!(Template) { Template.create(:parent_id=>nodes_id(:default), 'mode' => '', 'target_klass' => '
|
390
|
+
assert_equal 'Contact', doc.target_klass
|
391
|
+
assert_equal 'Contact', doc.title
|
392
|
+
doc = secure!(Template) { Template.create(:parent_id=>nodes_id(:default), 'mode' => '', 'target_klass' => 'Contact', 'title' => '', 'format' => 'vcard')}
|
402
393
|
assert_kind_of Template, doc
|
403
394
|
assert !doc.new_record?, "Saved"
|
404
395
|
assert_nil doc.mode
|
405
396
|
assert_equal 'vcard', doc.format
|
406
397
|
assert_equal 'NRC', doc.tkpath
|
407
|
-
assert_equal '
|
408
|
-
assert_equal '
|
398
|
+
assert_equal 'Contact', doc.target_klass
|
399
|
+
assert_equal 'Contact--vcard', doc.title
|
409
400
|
end
|
410
401
|
|
411
|
-
def
|
402
|
+
def test_update_format_updates_title
|
412
403
|
login(:lion)
|
413
|
-
doc = secure!(Template) { Template.create(:parent_id=>nodes_id(:default), 'mode' => '', 'target_klass' => '
|
404
|
+
doc = secure!(Template) { Template.create(:parent_id=>nodes_id(:default), 'mode' => '', 'target_klass' => 'Contact', 'title' => '', 'format' => 'vcard')}
|
414
405
|
assert_kind_of Template, doc
|
415
406
|
assert !doc.new_record?, "Saved"
|
416
407
|
assert_nil doc.mode
|
417
408
|
assert_equal 'vcard', doc.format
|
418
409
|
assert_equal 'NRC', doc.tkpath
|
419
|
-
assert_equal '
|
420
|
-
assert_equal '
|
410
|
+
assert_equal 'Contact', doc.target_klass
|
411
|
+
assert_equal 'Contact--vcard', doc.title
|
421
412
|
assert doc.update_attributes(:format => 'vcf')
|
422
413
|
assert_equal 'vcf', doc.format
|
423
414
|
assert_equal 'NRC', doc.tkpath
|
424
|
-
assert_equal '
|
425
|
-
assert_equal '
|
415
|
+
assert_equal 'Contact', doc.target_klass
|
416
|
+
assert_equal 'Contact--vcf', doc.title
|
426
417
|
end
|
427
418
|
|
428
419
|
def test_default_text_Node
|
429
420
|
login(:lion)
|
430
|
-
doc = secure!(Template) { Template.create(:parent_id=>nodes_id(:default), 'target_klass' => 'Node', '
|
421
|
+
doc = secure!(Template) { Template.create(:parent_id=>nodes_id(:default), 'target_klass' => 'Node', 'title' => '')}
|
431
422
|
assert_kind_of Template, doc
|
432
423
|
assert !doc.new_record?, "Saved"
|
433
424
|
assert_match %r{xmlns.*www\.w3\.org.*body}m, doc.text
|
@@ -435,7 +426,7 @@ class TemplateTest < Zena::Unit::TestCase
|
|
435
426
|
|
436
427
|
def test_default_text_other_format
|
437
428
|
login(:lion)
|
438
|
-
doc = secure!(Template) { Template.create(:parent_id=>nodes_id(:default), 'format' => 'vcard', 'target_klass' => 'Node', '
|
429
|
+
doc = secure!(Template) { Template.create(:parent_id=>nodes_id(:default), 'format' => 'vcard', 'target_klass' => 'Node', 'title' => '')}
|
439
430
|
assert_kind_of Template, doc
|
440
431
|
assert !doc.new_record?, "Saved"
|
441
432
|
assert doc.text.blank?
|