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.
- data/.gitignore +16 -3
- data/CREDITS +8 -4
- data/History.txt +12 -15
- data/app/controllers/application_controller.rb +1 -0
- data/app/controllers/columns_controller.rb +130 -0
- data/app/controllers/documents_controller.rb +16 -4
- data/app/controllers/groups_controller.rb +1 -5
- data/app/controllers/iformats_controller.rb +1 -5
- data/app/controllers/nodes_controller.rb +116 -41
- data/app/controllers/preferences_controller.rb +2 -0
- data/app/controllers/relations_controller.rb +1 -5
- data/app/controllers/sites_controller.rb +1 -5
- data/app/controllers/user_sessions_controller.rb +8 -3
- data/app/controllers/users_controller.rb +23 -11
- data/app/controllers/versions_controller.rb +29 -46
- data/app/controllers/virtual_classes_controller.rb +20 -12
- data/app/helpers/documents_helper.rb +5 -1
- data/app/models/attachment.rb +41 -0
- data/app/models/base_contact.rb +79 -0
- data/app/models/cache.rb +2 -2
- data/app/models/cached_page.rb +5 -4
- data/app/models/column.rb +90 -0
- data/app/models/comment.rb +3 -1
- data/app/models/contact_content.rb +5 -5
- data/app/models/contact_version.rb +2 -2
- data/app/models/data_entry.rb +9 -8
- data/app/models/discussion.rb +4 -0
- data/app/models/document.rb +170 -42
- data/app/models/document_content.rb +5 -9
- data/app/models/group.rb +4 -3
- data/app/models/idx_nodes_ml_string.rb +5 -0
- data/app/models/idx_nodes_string.rb +5 -0
- data/app/models/idx_template.rb +35 -0
- data/app/models/iformat.rb +4 -4
- data/app/models/image.rb +193 -26
- data/app/models/link.rb +1 -1
- data/app/models/node.rb +358 -338
- data/app/models/note.rb +2 -4
- data/app/models/page.rb +10 -8
- data/app/models/reference.rb +1 -1
- data/app/models/relation.rb +40 -1
- data/app/models/relation_proxy.rb +37 -40
- data/app/models/role.rb +19 -0
- data/app/models/site.rb +54 -24
- data/app/models/skin.rb +1 -16
- data/app/models/template.rb +92 -62
- data/app/models/template_content.rb +12 -6
- data/app/models/text_document.rb +69 -36
- data/app/models/text_document_content.rb +3 -3
- data/app/models/user.rb +34 -13
- data/app/models/version.rb +47 -291
- data/app/models/virtual_class.rb +26 -29
- data/app/views/columns/_add.html.erb +6 -0
- data/app/views/columns/_form.html.erb +36 -0
- data/app/views/columns/_li.html.erb +11 -0
- data/app/views/columns/create.rjs +8 -0
- data/app/views/columns/destroy.rjs +6 -0
- data/app/views/columns/edit.html.erb +5 -0
- data/app/views/columns/index.html.erb +15 -0
- data/app/views/columns/new.html.erb +2 -0
- data/app/views/columns/show.rjs +1 -0
- data/app/views/columns/update.rjs +5 -0
- data/app/views/comments/_li.rhtml +1 -1
- data/app/views/comments/create.rjs +1 -1
- data/app/views/comments/index.rhtml +1 -1
- data/app/views/comments/publish.rjs +1 -1
- data/app/views/comments/remove.rjs +1 -1
- data/app/views/data_entries/_li.html.erb +1 -1
- data/app/views/discussions/create.rjs +1 -1
- data/app/views/documents/_crop.rhtml +4 -4
- data/app/views/documents/crop_form.rjs +1 -1
- data/app/views/documents/new.rhtml +1 -1
- data/app/views/documents/show.rhtml +4 -4
- data/app/views/groups/_form.rhtml +1 -1
- data/app/views/groups/index.rhtml +1 -1
- data/app/views/iformats/_form.rhtml +1 -1
- data/app/views/iformats/create.rjs +1 -1
- data/app/views/iformats/index.rhtml +1 -1
- data/app/views/links/create.rjs +1 -1
- data/app/views/links/destroy.rjs +1 -1
- data/app/views/links/show.rjs +1 -1
- data/app/views/nodes/_dates.rhtml +2 -2
- data/app/views/nodes/_gallery.rhtml +2 -2
- data/app/views/nodes/_list_nodes.rhtml +2 -2
- data/app/views/nodes/_parent.rhtml +1 -1
- data/app/views/nodes/_position.rhtml +2 -2
- data/app/views/nodes/_results.rhtml +1 -1
- data/app/views/nodes/create.rjs +1 -4
- data/app/views/nodes/destroy.erb +0 -0
- data/app/views/nodes/import.rhtml +1 -1
- data/app/views/nodes/save_text.rjs +3 -3
- data/app/views/nodes/table_update.rjs +1 -2
- data/app/views/nodes/update.rjs +1 -1
- data/app/views/relations/_form.erb +15 -15
- data/app/views/relations/_li.erb +5 -11
- data/app/views/relations/create.rjs +1 -1
- data/app/views/relations/index.erb +1 -1
- data/app/views/sites/_form.erb +3 -3
- data/app/views/sites/_li.erb +1 -1
- data/app/views/sites/index.erb +1 -1
- data/app/views/templates/document_create_tabs/_file.rhtml +3 -3
- data/app/views/templates/document_create_tabs/_template.rhtml +9 -9
- data/app/views/templates/document_create_tabs/{_text_doc.rhtml → _text_document.rhtml} +4 -4
- data/app/views/templates/edit_tabs/{_contact.rhtml → _basecontact.rhtml} +2 -2
- data/app/views/templates/edit_tabs/_document.rhtml +3 -3
- data/app/views/templates/edit_tabs/_help.rhtml +2 -2
- data/app/views/templates/edit_tabs/_image.rhtml +4 -4
- data/app/views/templates/edit_tabs/_template.rhtml +6 -6
- data/app/views/templates/edit_tabs/_text.rhtml +1 -1
- data/app/views/templates/edit_tabs/_textdocument.rhtml +4 -4
- data/app/views/templates/edit_tabs/_title.rhtml +9 -14
- data/app/views/users/_form.rhtml +1 -1
- data/app/views/users/change_info.rjs +1 -1
- data/app/views/users/change_password.rjs +1 -1
- data/app/views/users/index.rhtml +1 -1
- data/app/views/users/preferences.html.erb +10 -4
- data/app/views/users/update.rjs +1 -1
- data/app/views/versions/_list.rhtml +1 -1
- data/app/views/versions/_tr.rhtml +1 -1
- data/app/views/versions/backup.rjs +1 -1
- data/app/views/versions/destroy.rjs +6 -2
- data/app/views/versions/diff.rjs +1 -1
- data/app/views/versions/edit.rhtml +14 -6
- data/app/views/versions/preview.rjs +1 -1
- data/app/views/versions/show.rjs +1 -1
- data/app/views/virtual_classes/_add.erb +1 -1
- data/app/views/virtual_classes/_form.erb +15 -10
- data/app/views/virtual_classes/_li.erb +13 -7
- data/app/views/virtual_classes/create.rjs +2 -2
- data/app/views/virtual_classes/edit.html.erb +7 -0
- data/app/views/virtual_classes/index.erb +2 -2
- data/app/views/zafu/default/Node-+adminLayout.zafu +47 -0
- data/app/views/zafu/default/Node-+index.zafu +1 -0
- data/app/views/{templates/defaults/+login.zafu → zafu/default/Node-+login.zafu} +9 -7
- data/app/views/zafu/default/Node-+notFound.zafu +14 -0
- data/app/views/zafu/default/Node-+popupLayout.zafu +24 -0
- data/app/views/zafu/default/Node-+search.zafu +23 -0
- data/app/views/zafu/default/Node.zafu +95 -0
- data/bin/zena +0 -2
- data/bricks/captcha/lib/bricks/captcha.rb +62 -0
- data/bricks/captcha/zena/init.rb +11 -0
- data/bricks/data2pdf/.document +5 -0
- data/bricks/data2pdf/README +19 -0
- data/bricks/data2pdf/Rakefile +36 -0
- data/bricks/data2pdf/VERSION +1 -0
- data/bricks/data2pdf/lib/data2pdf.rb +60 -0
- data/bricks/data2pdf/lib/engines/prince.rb +39 -0
- data/bricks/data2pdf/lib/engines/xhtml2pdf.rb +41 -0
- data/bricks/data2pdf/lib/install.rb +111 -0
- data/bricks/data2pdf/test/engines/test_prince.rb +14 -0
- data/bricks/data2pdf/test/engines/test_xhtml2pdf.rb +14 -0
- data/bricks/data2pdf/test/fixtures/application.css +241 -0
- data/bricks/data2pdf/test/fixtures/contact.html +153 -0
- data/bricks/data2pdf/test/fixtures/pisa-default.css +207 -0
- data/bricks/data2pdf/test/fixtures/sheet1.css +207 -0
- data/bricks/data2pdf/test/fixtures/sheet2.css +207 -0
- data/bricks/data2pdf/test/fixtures/simple-html.html +337 -0
- data/bricks/data2pdf/test/fixtures/simple-text.txt +1 -0
- data/bricks/data2pdf/test/helper.rb +23 -0
- data/bricks/data2pdf/test/shoulda_macros/shoulda_data2pdf.rb +91 -0
- data/bricks/data2pdf/test/unit/test_rendering.rb +37 -0
- data/bricks/math/{patch/application_helper.rb → lib/bricks/math.rb} +0 -4
- data/bricks/math/zena/init.rb +4 -0
- data/bricks/sphinx/README +2 -2
- data/bricks/sphinx/lib/use_sphinx.rb +7 -11
- data/bricks/sphinx/{misc → zena}/deploy.rb +0 -0
- data/bricks/sphinx/{patch/node.rb → zena/init.rb} +1 -3
- data/bricks/sphinx/{migrate → zena/migrate}/20091102171258_add_delta_for_sphinx.rb +0 -0
- data/bricks/sphinx/{misc → zena}/sphinx.yml +0 -0
- data/bricks/sphinx/{misc → zena}/tasks.rb +0 -0
- data/bricks/tags/lib/{has_tags.rb → bricks/tags.rb} +12 -24
- data/bricks/tags/zena/init.rb +21 -0
- data/bricks/tags/{test → zena/test}/sites/zena/links.yml +0 -0
- data/bricks/tags/{test → zena/test}/unit/tags_test.rb +1 -1
- data/bricks/tags/zena/test/zafu/tags.yml +41 -0
- data/bricks/worker/README +2 -2
- data/bricks/worker/{misc → zena}/deploy.rb +0 -0
- data/bricks/worker/{misc → zena}/init.rb +2 -1
- data/bricks/worker/{migrate → zena/migrate}/20091104191643_create_delayed_jobs_table.rb +0 -0
- data/bricks/worker/{misc → zena}/tasks.rb +0 -0
- data/bricks/worker/{misc → zena}/worker +0 -0
- data/config/bricks.yml +2 -0
- data/config/deploy.rb +2 -7
- data/config/environment.rb +3 -5
- data/config/gems.yml +9 -4
- data/db/20100628074512_zena0x_to1x.rb +223 -0
- data/db/init/base/help.en.zml +3 -3
- data/db/init/base/help.fr.zml +3 -3
- data/db/init/base/skins.zml +2 -2
- data/db/init/base/skins/default.zml +4 -4
- data/db/init/base/skins/default/Node-+adminLayout.zafu +8 -7
- data/db/init/base/skins/default/Node-+login.zafu +9 -7
- data/db/init/base/skins/default/Node-+search.zafu +4 -1
- data/db/init/base/skins/default/Node-tree.zafu +3 -3
- data/db/init/base/skins/default/Node.zafu +20 -20
- data/db/init/base/skins/default/Project.zafu +1 -1
- data/db/init/base/skins/default/notes.zafu +5 -5
- data/db/init/base/skins/default/style.css +17 -12
- data/db/migrate/001_create_base.rb +1 -1
- data/db/migrate/008_user_status.rb +1 -1
- data/db/migrate/020_create_participation.rb +3 -3
- data/db/migrate/024_correct_vclass_kpath.rb +5 -3
- data/db/migrate/025_move_tag_into_vclass.rb +7 -5
- data/db/migrate/030_redit_auto_publish_site_settings.rb +2 -2
- data/db/migrate/032_caches_context_as_hash.rb +4 -2
- data/db/migrate/046_fix_zazen_image_tag.rb +2 -2
- data/db/migrate/047_change_default_link_id_to_zero.rb +4 -2
- data/db/migrate/20090825201159_insert_zero_link.rb +1 -1
- data/db/migrate/20090924141459_zafu_fix_sept09.rb +2 -2
- data/db/migrate/20100125062254_add_dynamo_to_version.rb +9 -0
- data/db/migrate/20100201133242_remove_default_status_on_version.rb +9 -0
- data/db/migrate/20100208194210_create_attachments.rb +17 -0
- data/db/migrate/20100210112319_change_dynamo_to_property.rb +9 -0
- data/db/migrate/20100320145726_transform_template_contents_into_index.rb +13 -0
- data/db/migrate/20100328125634_change_skin_name_to_id.rb +31 -0
- data/db/migrate/20100417061257_add_properties_to_sites.rb +9 -0
- data/db/migrate/20100419163149_rename_name_to_node_name.rb +9 -0
- data/db/migrate/20100422091606_change_v_class_table_into_roles.rb +27 -0
- data/db/migrate/20100422094048_node_habtm_roles.rb +13 -0
- data/db/migrate/20100422115935_create_columns.rb +15 -0
- data/db/migrate/20100513181529_add_site_id_to_columns.rb +9 -0
- data/db/migrate/20100519091711_add_index_definition_to_columns.rb +9 -0
- data/db/migrate/20100519091940_create_idx_nodes_string.rb +14 -0
- data/db/migrate/20100519232432_create_idx_nodes_ml_string.rb +15 -0
- data/db/migrate/20100525113858_add_porperties_to_users.rb +9 -0
- data/db/migrate/20100526090140_renamed_contact_model_to_base_contact.rb +13 -0
- data/db/migrate/20100527130937_change_column_index_to_string.rb +9 -0
- data/db/migrate/20100531135128_add_fulltext_builder_fields.rb +28 -0
- data/doc/zafu_changes.yml +2 -2
- data/lib/bricks/loader.rb +48 -26
- data/lib/exif_data.rb +21 -1
- data/lib/gettext_strings.rb +8 -1
- data/lib/tasks/zena.rake +55 -20
- data/lib/version_off.rb +323 -0
- data/lib/zazen_parser.rb +9 -0
- data/lib/zena.rb +13 -14
- data/lib/zena/acts/enrollable.rb +232 -0
- data/lib/zena/acts/secure.rb +86 -506
- data/lib/zena/acts/secure_node.rb +483 -0
- data/lib/zena/acts/serializable.rb +149 -0
- data/lib/zena/app.rb +36 -23
- data/lib/zena/code_syntax.rb +26 -2
- data/lib/zena/controller/test_case.rb +23 -2
- data/lib/zena/core_ext/file_utils.rb +3 -3
- data/lib/zena/core_ext/string.rb +2 -2
- data/lib/zena/db.rb +180 -24
- data/lib/zena/deploy.rb +140 -183
- data/lib/zena/deploy/awstats.conf.rhtml +4 -4
- data/lib/zena/deploy/httpd.rhtml +1 -2
- data/lib/zena/deploy/stats.vhost.rhtml +7 -7
- data/lib/zena/deploy/vhost.rhtml +1 -1
- data/lib/zena/deploy/vhost_www.rhtml +4 -4
- data/lib/zena/foxy_parser.rb +345 -295
- data/lib/zena/info.rb +1 -2
- data/lib/zena/integration/test_case.rb +70 -0
- data/lib/zena/loader/yaml_loader.rb +80 -0
- data/lib/zena/migrator.rb +2 -2
- data/lib/zena/parser.rb +19 -17
- data/lib/zena/parser/zafu_rules.rb +7 -0
- data/lib/zena/parser/zafu_tags.rb +2 -2
- data/lib/zena/parser/zazen_rules.rb +9 -29
- data/lib/zena/parser/zena_rules.rb +2 -2
- data/lib/zena/refactor/act_as_content.rb +6 -0
- data/lib/zena/routes.rb +9 -3
- data/lib/zena/site_worker.rb +48 -0
- data/lib/zena/test_controller.rb +49 -12
- data/lib/zena/use.rb +47 -0
- data/lib/zena/use/action.rb +230 -0
- data/lib/zena/use/ajax.rb +287 -13
- data/lib/zena/use/authlogic.rb +28 -12
- data/lib/zena/use/calendar.rb +2 -2
- data/lib/zena/use/conditional.rb +41 -0
- data/lib/zena/use/context.rb +187 -0
- data/lib/zena/use/dates.rb +87 -30
- data/lib/zena/use/display.rb +598 -0
- data/lib/zena/use/dyn_attributes.rb +4 -4
- data/lib/zena/use/error_rendering.rb +3 -1
- data/lib/zena/use/fixtures.rb +56 -22
- data/lib/zena/use/forms.rb +584 -0
- data/lib/zena/use/fulltext.rb +90 -0
- data/lib/zena/use/grid.rb +12 -7
- data/lib/zena/use/html_tags.rb +8 -459
- data/lib/zena/use/i18n.rb +172 -109
- data/lib/zena/use/image_builder.rb +1 -2
- data/lib/zena/use/ml_index.rb +56 -0
- data/lib/zena/use/nested_attributes_alias.rb +2 -2
- data/lib/zena/use/node_name.rb +94 -0
- data/lib/zena/use/query_builder.rb +355 -0
- data/lib/zena/use/query_comment.rb +63 -73
- data/lib/zena/use/query_node.rb +404 -317
- data/lib/zena/use/recursion.rb +71 -0
- data/lib/zena/use/refactor.rb +27 -40
- data/lib/zena/use/relations.rb +9 -3
- data/lib/zena/use/rendering.rb +143 -116
- data/lib/zena/use/search.rb +79 -21
- data/lib/zena/use/test_helper.rb +17 -9
- data/lib/zena/use/upload.rb +1 -1
- data/lib/zena/use/urls.rb +534 -28
- data/lib/zena/use/version_hash.rb +154 -0
- data/lib/zena/use/workflow.rb +635 -0
- data/lib/zena/use/zafu_attributes.rb +205 -0
- data/lib/zena/use/zafu_eval.rb +21 -0
- data/lib/zena/use/zafu_safe_definitions.rb +36 -0
- data/lib/zena/use/zafu_templates.rb +459 -0
- data/lib/zena/use/zazen.rb +53 -23
- data/lib/zena/view/test_case.rb +56 -7
- data/lib/zena/webdav_adapter.rb +8 -8
- data/lib/zena/zafu_compiler.rb +25 -0
- data/locale/de/LC_MESSAGES/zena.mo +0 -0
- data/locale/de/zena.mo +0 -0
- data/locale/de/zena.po +920 -781
- data/locale/en/LC_MESSAGES/zena.mo +0 -0
- data/locale/en/zena.mo +0 -0
- data/locale/en/zena.po +530 -405
- data/locale/fr/LC_MESSAGES/zena.mo +0 -0
- data/locale/fr/zena.mo +0 -0
- data/locale/fr/zena.po +588 -432
- data/locale/zena.pot +391 -353
- data/old_zafu/action.rb +129 -0
- data/{lib/zafu → old_zafu}/ajax.rb +0 -24
- data/{lib/zafu → old_zafu}/attributes.rb +2 -2
- data/{lib/zafu → old_zafu}/calendar.rb +1 -1
- data/{lib/zafu → old_zafu}/context.rb +4 -8
- data/{lib/zafu → old_zafu}/core/html.rb +1 -1
- data/old_zafu/core/move_to_parser.rb +74 -0
- data/old_zafu/dates.rb +20 -0
- data/{lib/zafu → old_zafu}/display.rb +33 -146
- data/{lib/zafu → old_zafu}/eval.rb +0 -0
- data/{lib/zafu → old_zafu}/experimental.rb +1 -1
- data/{lib/zafu → old_zafu}/i18n.rb +1 -1
- data/{lib/zafu → old_zafu}/meta.rb +0 -0
- data/old_zafu/query_node.rb +278 -0
- data/{lib/zafu → old_zafu}/refactor.rb +2 -12
- data/old_zafu/support/context.rb +146 -0
- data/{lib/zafu → old_zafu}/support/dom.rb +1 -43
- data/{lib/zafu → old_zafu}/support/erb.rb +0 -0
- data/{lib/zafu → old_zafu}/support/flow.rb +1 -13
- data/old_zafu/support/forms.rb +7 -0
- data/old_zafu/support/links.rb +75 -0
- data/{lib → old_zafu}/zafu_parser.rb +2 -2
- data/public/images/attach_window.png +0 -0
- data/public/images/dettach_window.png +0 -0
- data/public/images/ext/{contact.png → basecontact.png} +0 -0
- data/public/images/toggle_off.png +0 -0
- data/public/images/toggle_on.png +0 -0
- data/public/images/window/bottom_left.png +0 -0
- data/public/images/window/bottom_mid.png +0 -0
- data/public/images/window/bottom_right.png +0 -0
- data/public/images/window/center_left.png +0 -0
- data/public/images/window/center_right.png +0 -0
- data/public/images/window/close.png +0 -0
- data/public/images/window/maximize.png +0 -0
- data/public/images/window/minimize.png +0 -0
- data/public/images/window/overlay.png +0 -0
- data/public/images/window/sizer.png +0 -0
- data/public/images/window/top_left.png +0 -0
- data/public/images/window/top_mid.png +0 -0
- data/public/images/window/top_right.png +0 -0
- data/public/javascripts/builder.js +1 -3
- data/public/javascripts/controls.js +3 -5
- data/public/javascripts/dragdrop.js +5 -8
- data/public/javascripts/effects.js +6 -15
- data/public/javascripts/prototype.js +1574 -1020
- data/public/javascripts/scriptaculous.js +13 -7
- data/public/javascripts/slider.js +5 -7
- data/public/javascripts/sound.js +6 -4
- data/public/javascripts/unittest.js +69 -71
- data/public/javascripts/window.js +1843 -0
- data/public/javascripts/zena.js +216 -16
- data/public/stylesheets/admin.css +18 -13
- data/public/stylesheets/default.css +18 -17
- data/public/stylesheets/popup.css +4 -4
- data/public/stylesheets/window.css +155 -0
- data/public/stylesheets/zena.css +9 -8
- data/test/custom_queries/complex.host.yml +8 -8
- data/test/fixtures/files/Node-test.zafu +11 -11
- data/test/fixtures/files/import.tgz +0 -0
- data/test/fixtures/files/simple.zml.gz +0 -0
- data/test/fixtures/import/photos.en.zml +3 -3
- data/test/fixtures/import/photos/bird.jpg.en.zml +1 -1
- data/test/fixtures/import/photos/bird.jpg.fr.zml +1 -1
- data/test/fixtures/import/simple.zml +2 -2
- data/test/functional/application_controller_test.rb +2 -41
- data/test/functional/columns_controller_test.rb +140 -0
- data/test/functional/data_entries_controller_test.rb +1 -1
- data/test/functional/documents_controller_test.rb +88 -5
- data/test/functional/nodes_controller_commit_test.rb +71 -0
- data/test/functional/nodes_controller_test.rb +393 -93
- data/test/functional/note_controller_test.rb +5 -5
- data/test/functional/relations_controller_test.rb +1 -1
- data/test/functional/users_controller_test.rb +72 -14
- data/test/functional/versions_controller_test.rb +9 -8
- data/test/functional/virtual_classes_controller_test.rb +142 -65
- data/test/integration/multiple_hosts_test.rb +28 -20
- data/test/integration/navigation_test.rb +121 -83
- data/test/integration/query_node/basic.yml +128 -0
- data/test/integration/query_node/comments.yml +23 -0
- data/test/integration/query_node/complex.yml +111 -0
- data/test/integration/query_node/dates.yml +22 -0
- data/test/integration/query_node/errors.yml +12 -0
- data/test/integration/query_node/filters.yml +123 -0
- data/test/integration/query_node/properties.yml +41 -0
- data/test/integration/query_node/relations.yml +75 -0
- data/test/integration/query_node_test.rb +189 -0
- data/test/integration/xml_api_test.rb +166 -0
- data/test/integration/zafu_compiler/action.yml +67 -0
- data/test/integration/zafu_compiler/ajax.yml +263 -0
- data/test/{unit/zena/zena_tags → integration/zafu_compiler}/apphelper.yml +0 -0
- data/test/integration/zafu_compiler/asset.yml +13 -0
- data/test/integration/zafu_compiler/basic.yml +518 -0
- data/test/integration/zafu_compiler/calendar.yml +35 -0
- data/test/{unit/zena/zena_tags → integration/zafu_compiler}/complex.yml +16 -16
- data/test/integration/zafu_compiler/conditional.yml +173 -0
- data/test/{unit/zena/zena_tags → integration/zafu_compiler}/data.yml +3 -3
- data/test/integration/zafu_compiler/dates.yml +58 -0
- data/test/integration/zafu_compiler/display.yml +273 -0
- data/test/integration/zafu_compiler/errors.yml +79 -0
- data/test/{unit/zena/zena_tags → integration/zafu_compiler}/eval.yml +6 -2
- data/test/integration/zafu_compiler/forms.yml +130 -0
- data/test/integration/zafu_compiler/i18n.yml +107 -0
- data/test/integration/zafu_compiler/later.yml +31 -0
- data/test/integration/zafu_compiler/off/off.yml +15 -0
- data/test/integration/zafu_compiler/recursion.yml +28 -0
- data/test/integration/zafu_compiler/relations.yml +487 -0
- data/test/integration/zafu_compiler/roles.yml +28 -0
- data/test/{unit/zena/zena_tags → integration/zafu_compiler}/rubyless.yml +10 -9
- data/test/integration/zafu_compiler/safe_definitions.yml +65 -0
- data/test/integration/zafu_compiler/search.yml +13 -0
- data/test/integration/zafu_compiler/security.yml +30 -0
- data/test/integration/zafu_compiler/site.yml +14 -0
- data/test/integration/zafu_compiler/urls.yml +189 -0
- data/test/integration/zafu_compiler/user.yml +32 -0
- data/test/integration/zafu_compiler/version.yml +47 -0
- data/test/integration/zafu_compiler/workflow.yml +36 -0
- data/test/integration/zafu_compiler/zafu_attributes.yml +169 -0
- data/test/{unit/zena/zena_tags → integration/zafu_compiler}/zazen.yml +7 -3
- data/test/{unit/zena/zena_tags_test.rb → integration/zafu_compiler_test.rb} +137 -57
- data/test/sites/complex/nodes.yml +48 -47
- data/test/sites/complex/{virtual_classes.yml → roles.yml} +2 -1
- data/test/sites/ocean/nodes.yml +7 -7
- data/test/sites/ocean/versions.yml +30 -21
- data/test/sites/zena/columns.yml +12 -0
- data/test/sites/zena/nodes.yml +33 -32
- data/test/sites/zena/{virtual_classes.yml → roles.yml} +11 -1
- data/test/sites/zena/sites.yml +4 -1
- data/test/sites/zena/users.yml +5 -4
- data/test/sites/zena/versions.yml +398 -279
- data/test/test_helper.rb +2 -1
- data/test/test_zena.rb +3 -8
- data/test/unit/after_commit_test.rb +103 -0
- data/test/unit/attachment_test.rb +266 -0
- data/test/unit/base_contact_test.rb +242 -0
- data/test/unit/cached_page_test.rb +6 -6
- data/test/unit/column_test.rb +77 -0
- data/test/unit/comment_test.rb +1 -1
- data/test/unit/data_entry_test.rb +8 -2
- data/test/unit/document_test.rb +393 -211
- data/test/unit/exif_data_test.rb +1 -1
- data/test/unit/iformat_test.rb +9 -9
- data/test/unit/image_test.rb +358 -284
- data/test/unit/multi_version_test.rb +4 -0
- data/test/unit/multiversion_test.rb +2 -1013
- data/test/unit/node_name_test.rb +137 -0
- data/test/unit/node_test.rb +374 -461
- data/test/unit/note_test.rb +23 -23
- data/test/unit/page_test.rb +23 -23
- data/test/unit/project_test.rb +2 -2
- data/test/unit/relation_proxy_test.rb +25 -6
- data/test/unit/relation_test.rb +156 -24
- data/test/unit/role_test.rb +122 -0
- data/test/unit/section_test.rb +2 -2
- data/test/unit/site_test.rb +48 -12
- data/test/unit/skin_test.rb +0 -13
- data/test/unit/template_test.rb +361 -314
- data/test/unit/text_document_test.rb +105 -33
- data/test/unit/transparent_version_test.rb +4 -0
- data/test/unit/user_test.rb +10 -10
- data/test/unit/version_test.rb +209 -301
- data/test/unit/virtual_class_test.rb +21 -29
- data/test/unit/workflow_test.rb +1075 -0
- data/test/unit/zena/acts/enrollable_test.rb +211 -0
- data/test/unit/{secure_test.rb → zena/acts/secure_test.rb} +190 -105
- data/test/unit/zena/acts/serializable_test.rb +85 -0
- data/test/unit/zena/db_test.rb +27 -14
- data/test/unit/zena/parser/zazen.yml +1 -1
- data/test/unit/zena/use/action_test.rb +109 -0
- data/test/unit/zena/use/calendar_test.rb +8 -8
- data/test/unit/zena/use/dates_test.rb +10 -0
- data/test/unit/zena/use/dates_view_methods_test.rb +8 -12
- data/test/unit/zena/use/fulltext_test.rb +82 -0
- data/test/unit/zena/use/html_tags_test.rb +225 -201
- data/test/unit/zena/use/i18n_test.rb +56 -26
- data/test/unit/zena/use/ml_index_test.rb +129 -0
- data/test/unit/zena/use/nested_attributes_alias_view_test.rb +10 -10
- data/test/unit/zena/use/query_node_test.rb +104 -0
- data/test/unit/zena/use/refactor_test.rb +4 -15
- data/test/unit/zena/use/rendering_test.rb +23 -16
- data/test/unit/zena/use/upload_test.rb +2 -2
- data/test/unit/zena/use/urls_test.rb +2 -0
- data/test/unit/zena/use/version_hash_test.rb +126 -0
- data/test/unit/zena/use/zafu_template_test.rb +135 -0
- data/test/unit/zena/use/zazen_test.rb +85 -61
- data/vendor/plugins/gettext_i18n_rails/README.markdown +26 -22
- data/vendor/plugins/gettext_i18n_rails/Rakefile +31 -5
- data/vendor/plugins/gettext_i18n_rails/VERSION +1 -0
- data/vendor/plugins/gettext_i18n_rails/gettext_i18n_rails.gemspec +64 -0
- data/vendor/plugins/gettext_i18n_rails/init.rb +7 -3
- data/vendor/plugins/gettext_i18n_rails/lib/gettext_i18n_rails.rb +5 -6
- data/vendor/plugins/gettext_i18n_rails/lib/gettext_i18n_rails/active_record.rb +6 -2
- data/vendor/plugins/gettext_i18n_rails/lib/gettext_i18n_rails/backend.rb +1 -1
- data/vendor/plugins/gettext_i18n_rails/lib/gettext_i18n_rails/model_attributes_finder.rb +2 -2
- data/vendor/plugins/gettext_i18n_rails/{tasks → lib/tasks}/gettext_rails_i18n.rake +10 -9
- data/vendor/plugins/gettext_i18n_rails/spec/gettext_i18n_rails/action_controller_spec.rb +7 -3
- data/vendor/plugins/gettext_i18n_rails/spec/gettext_i18n_rails/active_record_spec.rb +7 -5
- data/vendor/plugins/gettext_i18n_rails/spec/gettext_i18n_rails/backend_spec.rb +7 -7
- data/vendor/plugins/gettext_i18n_rails/spec/gettext_i18n_rails_spec.rb +4 -0
- data/vendor/plugins/gettext_i18n_rails/spec/spec_helper.rb +11 -9
- data/vendor/plugins/mysql_timezone_utc/init.rb +1 -0
- data/vendor/plugins/mysql_timezone_utc/lib/mysql_timezone_utc.rb +14 -0
- data/vendor/plugins/postgresql_timezone_utc/init.rb +1 -0
- data/vendor/plugins/postgresql_timezone_utc/lib/postgresql_timezone_utc.rb +14 -0
- data/zena.gemspec +281 -123
- metadata +354 -160
- data/app/models/contact.rb +0 -32
- data/app/models/document_version.rb +0 -13
- data/app/models/image_version.rb +0 -21
- data/app/models/text_document_version.rb +0 -29
- data/app/views/templates/defaults/+adminLayout.zafu +0 -69
- data/bricks/captcha/patch/application_controller.rb +0 -10
- data/bricks/captcha/patch/application_helper.rb +0 -32
- data/bricks/captcha/patch/site.rb +0 -2
- data/bricks/captcha/zafu/captcha.rb +0 -29
- data/bricks/tags/patch/node.rb +0 -15
- data/bricks/tags/test/zafu/tags.yml +0 -40
- data/db/schema.rb +0 -295
- data/lib/zafu/action.rb +0 -285
- data/lib/zafu/core/move_to_parser.rb +0 -167
- data/lib/zafu/dates.rb +0 -58
- data/lib/zafu/support/context.rb +0 -265
- data/lib/zafu/support/forms.rb +0 -461
- data/lib/zafu/support/links.rb +0 -306
- data/lib/zena/acts/multiversion.rb +0 -755
- data/lib/zena/fix/mysql_connection.rb +0 -17
- data/lib/zena/use/query_node_finders.rb +0 -91
- data/lib/zena/use/zafu.rb +0 -514
- data/test/helpers/query_node/basic.yml +0 -149
- data/test/helpers/query_node/comments.yml +0 -18
- data/test/helpers/query_node/complex.yml +0 -98
- data/test/helpers/query_node/filters.yml +0 -110
- data/test/helpers/query_node/relations.yml +0 -43
- data/test/helpers/query_node_test.rb +0 -116
- data/test/sites/ocean/contact_contents.yml +0 -19
- data/test/sites/ocean/template_contents.yml +0 -8
- data/test/sites/zena/contact_contents.yml +0 -55
- data/test/sites/zena/document_contents.yml +0 -76
- data/test/sites/zena/dyn_attributes.yml +0 -43
- data/test/sites/zena/template_contents.yml +0 -103
- data/test/unit/contact_content_test.rb +0 -33
- data/test/unit/contact_test.rb +0 -39
- data/test/unit/contact_version_test.rb +0 -48
- data/test/unit/document_content_test.rb +0 -110
- data/test/unit/document_version_test.rb +0 -11
- data/test/unit/dyn_attributes_test.rb +0 -229
- data/test/unit/image_content_test.rb +0 -154
- data/test/unit/image_version_test.rb +0 -18
- data/test/unit/template_content_test.rb +0 -9
- data/test/unit/text_document_version_test.rb +0 -37
- data/test/unit/zena/use/zafu_test.rb +0 -41
- data/test/unit/zena/zena_tags/ajax.yml +0 -233
- data/test/unit/zena/zena_tags/basic.yml +0 -1306
- data/test/unit/zena/zena_tags/errors.yml +0 -71
- data/test/unit/zena/zena_tags/relations.yml +0 -405
@@ -7,18 +7,18 @@ class NoteControllerTest < Zena::Controller::TestCase
|
|
7
7
|
opening = secure!(Node) { nodes(:opening) }
|
8
8
|
get 'day_list', :id=>opening.project_id, :find=>'news', :using=>'log_at', :date=>opening.log_at.strftime('%Y-%m-%d'), :selected=>opening[:id].to_s
|
9
9
|
assert_response :success
|
10
|
-
assert_tag :li, :attributes=>{:class=>'note'}, :descendant=>{:tag=>'span', :attributes=>{:id=>"
|
10
|
+
assert_tag :li, :attributes=>{:class=>'note'}, :descendant=>{:tag=>'span', :attributes=>{:id=>"title#{opening.v_id}"}, :content=>'parc opening'}
|
11
11
|
end
|
12
12
|
|
13
13
|
def test_create_without_rights
|
14
|
-
post 'create', :note=>{:klass=>'Note', :log_at=>'2006-10-03 15:20', :parent_id=>nodes_id(:zena), :
|
14
|
+
post 'create', :note=>{:klass=>'Note', :log_at=>'2006-10-03 15:20', :parent_id=>nodes_id(:zena), :title=>'this is a test'}
|
15
15
|
assert_response :success
|
16
16
|
assert assigns['note'].new_record?
|
17
17
|
assert_equal 'invalid reference', assigns['note'].errors[:parent_id]
|
18
18
|
end
|
19
19
|
|
20
20
|
def test_create_bad_parent
|
21
|
-
post 'create', :note=>{:klass=>'Note', :log_at=>'2006-10-03 15:20', :parent_id=>nodes_id(:status), :
|
21
|
+
post 'create', :note=>{:klass=>'Note', :log_at=>'2006-10-03 15:20', :parent_id=>nodes_id(:status), :title=>'this is a test'}
|
22
22
|
assert_response :success
|
23
23
|
assert assigns['note'].new_record?
|
24
24
|
assert_equal 'invalid reference', assigns['note'].errors[:parent_id]
|
@@ -26,7 +26,7 @@ class NoteControllerTest < Zena::Controller::TestCase
|
|
26
26
|
|
27
27
|
def test_create_bad_klass
|
28
28
|
login(:tiger)
|
29
|
-
post 'create', :note=>{:klass=>'system "pwd"', :log_at=>'2006-10-03 15:20', :parent_id=>nodes_id(:zena), :
|
29
|
+
post 'create', :note=>{:klass=>'system "pwd"', :log_at=>'2006-10-03 15:20', :parent_id=>nodes_id(:zena), :title=>'this is a test'}
|
30
30
|
assert_response :success
|
31
31
|
note = assigns['note']
|
32
32
|
assert_equal 'invalid', note.errors[:klass]
|
@@ -41,7 +41,7 @@ class NoteControllerTest < Zena::Controller::TestCase
|
|
41
41
|
|
42
42
|
def test_create_ok
|
43
43
|
login(:tiger)
|
44
|
-
post 'create', :note=>{:klass=>'Note', :log_at=>'2006-10-03 15:20', :parent_id=>nodes_id(:zena), :
|
44
|
+
post 'create', :note=>{:klass=>'Note', :log_at=>'2006-10-03 15:20', :parent_id=>nodes_id(:zena), :title=>'this is a test'}
|
45
45
|
assert_response :success
|
46
46
|
note = assigns['note']
|
47
47
|
assert_kind_of Note, note
|
@@ -26,7 +26,7 @@ class RelationsControllerTest < Zena::Controller::TestCase
|
|
26
26
|
|
27
27
|
def test_should_create_relation
|
28
28
|
assert_difference('Relation.count', 1) do
|
29
|
-
post :create, :relation => {:
|
29
|
+
post :create, :relation => {:source_kpath => 'NR', :target_kpath => 'NP'}
|
30
30
|
end
|
31
31
|
assert_redirected_to relation_path(assigns(:relation))
|
32
32
|
end
|
@@ -28,7 +28,7 @@ class UsersControllerTest < Zena::Controller::TestCase
|
|
28
28
|
context " if layout is invalid" do
|
29
29
|
setup do
|
30
30
|
login(:lion)
|
31
|
-
Version.connection.execute "UPDATE #{Version.table_name} SET
|
31
|
+
Version.connection.execute "UPDATE #{Version.table_name} SET properties = '{\"data\":{\"text\":\"empty\"},\"json_class\":\"Property::Properties\"}' WHERE id = #{versions_id(:Node_admin_layout_zafu_en)}"
|
32
32
|
without_files('test.host/zafu') do
|
33
33
|
get 'index'
|
34
34
|
end
|
@@ -46,32 +46,90 @@ class UsersControllerTest < Zena::Controller::TestCase
|
|
46
46
|
get(:show, {'id'=>visitor.id})
|
47
47
|
end
|
48
48
|
|
49
|
-
|
49
|
+
should 'succeed' do
|
50
|
+
assert_response :success
|
51
|
+
end
|
52
|
+
|
50
53
|
should_render_without_layout
|
51
54
|
end
|
52
55
|
|
53
|
-
context '
|
56
|
+
context 'With an admin user' do
|
54
57
|
setup do
|
55
|
-
login(:
|
56
|
-
get(:preferences, {'id'=>visitor.id})
|
58
|
+
login(:lion)
|
57
59
|
end
|
58
60
|
|
59
|
-
|
60
|
-
|
61
|
-
|
61
|
+
context 'setting dev_skin' do
|
62
|
+
subject do
|
63
|
+
get(:dev_skin, {'skin_id' => nodes_zip(:wikiSkin)})
|
64
|
+
end
|
65
|
+
|
66
|
+
should 'store value in visitor properties' do
|
67
|
+
subject
|
68
|
+
assert_equal nodes_zip(:wikiSkin), visitor.dev_skin_id
|
69
|
+
end
|
70
|
+
end # setting dev_skin
|
71
|
+
|
72
|
+
context 'calling rescue' do
|
73
|
+
subject do
|
74
|
+
get(:rescue)
|
75
|
+
end
|
76
|
+
|
77
|
+
should 'set dev_skin in visitor properties' do
|
78
|
+
subject
|
79
|
+
assert_equal -1, visitor.dev_skin_id
|
80
|
+
end
|
81
|
+
end # setting dev_skin
|
82
|
+
|
83
|
+
context 'creating a new user' do
|
84
|
+
subject do
|
85
|
+
{
|
86
|
+
:user => {
|
87
|
+
"name" => "Dupont",
|
88
|
+
"lang" => "fr",
|
89
|
+
"time_zone" => "Europe/Zurich",
|
90
|
+
"status" => "50",
|
91
|
+
"password" => "secret",
|
92
|
+
"login" => "bolomey",
|
93
|
+
"first_name" => "Paul"
|
94
|
+
|
95
|
+
},
|
96
|
+
:action => 'create'
|
97
|
+
}
|
98
|
+
end
|
99
|
+
|
100
|
+
should 'succeed' do
|
101
|
+
post_subject
|
102
|
+
assert_response :success
|
103
|
+
user = assigns(:user)
|
104
|
+
err user
|
105
|
+
assert !user.new_record?
|
106
|
+
end
|
107
|
+
|
108
|
+
should 'create a new user' do
|
109
|
+
assert_difference('User.count', 1) do
|
110
|
+
post_subject
|
111
|
+
end
|
112
|
+
end
|
113
|
+
|
114
|
+
should 'create a new node' do
|
115
|
+
assert_difference('Node.count', 1) do
|
116
|
+
post_subject
|
117
|
+
end
|
118
|
+
end
|
119
|
+
end # creating a new user
|
120
|
+
end # With an admin user
|
121
|
+
|
62
122
|
|
63
|
-
context 'on GET
|
123
|
+
context 'on GET preferences' do
|
64
124
|
setup do
|
65
125
|
login(:su)
|
66
|
-
get(:
|
126
|
+
get(:preferences, {'id'=>visitor.id})
|
67
127
|
end
|
68
128
|
|
69
|
-
|
70
|
-
|
129
|
+
should_respond_with :success
|
130
|
+
should_render_with_layout :_main
|
71
131
|
end
|
72
132
|
|
73
|
-
|
74
|
-
|
75
133
|
context "on PUT" do
|
76
134
|
context "in order to update parameters" do
|
77
135
|
setup do
|
@@ -59,12 +59,13 @@ class VersionsControllerTest < Zena::Controller::TestCase
|
|
59
59
|
login(:anon)
|
60
60
|
get 'edit', version_hash(:wiki_en)
|
61
61
|
assert_response :success
|
62
|
-
|
62
|
+
# TODO: move assertion to rendering_test
|
63
|
+
assert_match %r{\$default/Node-\+popupLayout/en/_main$}, @response.layout
|
63
64
|
login(:ant)
|
64
65
|
get 'edit', version_hash(:status_en, 0)
|
65
|
-
|
66
|
+
assert_match "form[@action='/nodes/#{nodes_zip(:status)}']", @response.body
|
66
67
|
get 'edit', version_hash(:lake_red_en)
|
67
|
-
|
68
|
+
assert_match "form[@action='/nodes/#{nodes_zip(:lake)}']", @response.body
|
68
69
|
end
|
69
70
|
|
70
71
|
def test_parse_assets
|
@@ -80,20 +81,20 @@ class VersionsControllerTest < Zena::Controller::TestCase
|
|
80
81
|
#footer { background:url('/projects/wiki/flower.jpg') }
|
81
82
|
END_CSS
|
82
83
|
|
83
|
-
assert node.update_attributes(:
|
84
|
+
assert node.update_attributes(:text => start.dup)
|
84
85
|
get 'edit', :node_id => node.zip, :id => 0, :parse_assets => 'true'
|
85
86
|
assert_response :success
|
86
|
-
|
87
|
+
node = assigns(:node)
|
87
88
|
|
88
89
|
res =<<-END_CSS
|
89
90
|
body { font-size:10px; }
|
90
91
|
#header { background:url('/en/image30.jpg?1144713600') }
|
91
92
|
#footer { background:url('/en/image31.jpg?1144713600') }
|
92
93
|
END_CSS
|
93
|
-
assert_equal res,
|
94
|
+
assert_equal res, node.text
|
94
95
|
get 'edit', :node_id => node.zip, :id => 0, :unparse_assets => 'true'
|
95
96
|
assert_response :success
|
96
|
-
|
97
|
-
assert_equal start,
|
97
|
+
node = assigns(:node)
|
98
|
+
assert_equal start, node.text
|
98
99
|
end
|
99
100
|
end
|
@@ -2,70 +2,147 @@ require 'test_helper'
|
|
2
2
|
|
3
3
|
class VirtualClassesControllerTest < Zena::Controller::TestCase
|
4
4
|
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
test "should update virtual class" do
|
49
|
-
put :update, :id => virtual_classes_id(:Letter), :virtual_class => { :name => 'Brief'}
|
50
|
-
brief = assigns(:virtual_class)
|
51
|
-
assert_redirected_to virtual_class_path(brief)
|
52
|
-
assert_equal 'Brief', brief.name
|
53
|
-
assert_equal "NNB", brief.kpath
|
54
|
-
end
|
55
|
-
|
56
|
-
test "should destroy virtual class" do
|
57
|
-
assert_difference('VirtualClass.count', -1) do
|
58
|
-
delete :destroy, :id => virtual_classes_id(:Letter)
|
59
|
-
end
|
60
|
-
assert_redirected_to virtual_classes_path
|
61
|
-
end
|
62
|
-
|
63
|
-
context 'importing virtual class definitions' do
|
64
|
-
should 'create virtual_classes' do
|
65
|
-
assert_difference('VirtualClass.count', 3) do
|
66
|
-
post :import, :attachment => uploaded_fixture('vclasses.yml', 'text/yaml')
|
5
|
+
context 'A logged in user' do
|
6
|
+
|
7
|
+
context 'that is not an admin' do
|
8
|
+
setup do
|
9
|
+
login(:tiger)
|
10
|
+
end
|
11
|
+
|
12
|
+
context 'accessing index' do
|
13
|
+
subject do
|
14
|
+
{:action => :index}
|
15
|
+
end
|
16
|
+
|
17
|
+
should 'not be allowed' do
|
18
|
+
get_subject
|
19
|
+
assert_response :missing
|
20
|
+
end
|
21
|
+
end # accessing index
|
22
|
+
end # that is not an admin
|
23
|
+
|
24
|
+
context 'that is an admin' do
|
25
|
+
setup do
|
26
|
+
login(:lion)
|
27
|
+
end
|
28
|
+
|
29
|
+
context 'accessing index' do
|
30
|
+
subject do
|
31
|
+
{:action => :index}
|
32
|
+
end
|
33
|
+
|
34
|
+
should 'succeed' do
|
35
|
+
get_subject
|
36
|
+
assert_response :success
|
37
|
+
end
|
38
|
+
|
39
|
+
should 'display list of virtual classes' do
|
40
|
+
get_subject
|
41
|
+
assert assigns(:virtual_classes)
|
42
|
+
end
|
43
|
+
end # accessing index
|
44
|
+
|
45
|
+
should 'access new' do
|
46
|
+
get :new
|
47
|
+
assert_response :success
|
67
48
|
end
|
68
|
-
|
69
|
-
|
70
|
-
|
49
|
+
|
50
|
+
context 'creating a virtual class' do
|
51
|
+
subject do
|
52
|
+
{:action => :create, :virtual_class => { :name => 'Xkcd', :superclass => 'Section', :create_group_id => groups_id(:public) }}
|
53
|
+
end
|
54
|
+
|
55
|
+
should 'create a new VirtualClass' do
|
56
|
+
assert_difference('VirtualClass.count', 1) do
|
57
|
+
post_subject
|
58
|
+
end
|
59
|
+
end
|
60
|
+
|
61
|
+
should 'set name, superclass and kpath' do
|
62
|
+
post_subject
|
63
|
+
vclass = assigns(:virtual_class)
|
64
|
+
assert_equal 'Xkcd', vclass.name
|
65
|
+
assert_equal Section, vclass.superclass
|
66
|
+
assert_equal 'NPSX', vclass.kpath
|
67
|
+
end
|
68
|
+
|
69
|
+
should 'redirect to show' do
|
70
|
+
post_subject
|
71
|
+
assert_redirected_to virtual_class_path(assigns(:virtual_class))
|
72
|
+
end
|
73
|
+
|
74
|
+
end # creating a virtual class
|
75
|
+
|
76
|
+
context 'displaying a virtual class' do
|
77
|
+
subject do
|
78
|
+
{:action => :show, :id => roles_id(:Letter)}
|
79
|
+
end
|
80
|
+
|
81
|
+
should 'succeed' do
|
82
|
+
get_subject
|
83
|
+
assert_response :success
|
84
|
+
end
|
85
|
+
end # displaying a virtual class
|
86
|
+
|
87
|
+
context 'editing a virtual class' do
|
88
|
+
subject do
|
89
|
+
{:action => :edit, :id => roles_id(:Letter)}
|
90
|
+
end
|
91
|
+
|
92
|
+
should 'succeed' do
|
93
|
+
get_subject
|
94
|
+
assert_response :success
|
95
|
+
end
|
96
|
+
end # editing a virtual class
|
97
|
+
|
98
|
+
context 'updating a virtual class' do
|
99
|
+
subject do
|
100
|
+
{:action => :update, :id => roles_id(:Letter), :virtual_class => { :name => 'Life'}}
|
101
|
+
end
|
102
|
+
|
103
|
+
should 'redirect to show' do
|
104
|
+
put_subject
|
105
|
+
assert_redirected_to virtual_class_path(assigns(:virtual_class))
|
106
|
+
end
|
107
|
+
|
108
|
+
should 'save name and kpath' do
|
109
|
+
put_subject
|
110
|
+
vclass = assigns(:virtual_class)
|
111
|
+
assert_equal 'Life', vclass.name
|
112
|
+
assert_equal 'NNL', vclass.kpath
|
113
|
+
end
|
114
|
+
|
115
|
+
# TODO: What happens to properties for a class if kpath changes ?
|
116
|
+
end # updating a virtual class
|
117
|
+
|
118
|
+
context 'destroying a virtual class' do
|
119
|
+
subject do
|
120
|
+
{:action => :destroy, :id => roles_id(:Letter)}
|
121
|
+
end
|
122
|
+
|
123
|
+
should 'destroy' do
|
124
|
+
assert_difference('VirtualClass.count', -1) do
|
125
|
+
delete_subject
|
126
|
+
end
|
127
|
+
end
|
128
|
+
|
129
|
+
should 'redirect to index' do
|
130
|
+
delete_subject
|
131
|
+
assert_redirected_to virtual_classes_path
|
132
|
+
end
|
133
|
+
end # destroying a virtual class
|
134
|
+
|
135
|
+
context 'importing virtual class definitions' do
|
136
|
+
subject do
|
137
|
+
{:action => :import, :attachment => uploaded_fixture('vclasses.yml', 'text/yaml')}
|
138
|
+
end
|
139
|
+
|
140
|
+
should 'create virtual classes' do
|
141
|
+
assert_difference('VirtualClass.count', 3) do
|
142
|
+
post_subject
|
143
|
+
end
|
144
|
+
end
|
145
|
+
end # importing virtual class definitions
|
146
|
+
end # that is an admin
|
147
|
+
end # A logged in user
|
71
148
|
end
|
@@ -1,33 +1,41 @@
|
|
1
1
|
require "#{File.dirname(__FILE__)}/../test_helper"
|
2
2
|
|
3
3
|
class MultipleHostsTest < ActionController::IntegrationTest
|
4
|
-
|
5
|
-
|
4
|
+
# Maybe we can remove all these includes...
|
5
|
+
include Zena::Use::Fixtures
|
6
|
+
include Zena::Use::TestHelper
|
7
|
+
include Zena::Acts::Secure
|
8
|
+
include ::Authlogic::TestCase
|
9
|
+
|
10
|
+
def nodes(site, fixture)
|
11
|
+
$_test_site = site.to_s
|
12
|
+
super(fixture)
|
13
|
+
end
|
6
14
|
|
7
15
|
def test_visitor_host
|
8
16
|
anon.get_node(:wiki)
|
9
17
|
assert_equal 200, anon.status
|
10
|
-
assert_equal 'test.host',
|
18
|
+
assert_equal 'test.host', visitor.site.host
|
11
19
|
anon.get_node(:ocean, :host => 'ocean.host')
|
12
|
-
assert_equal 'ocean.host',
|
13
|
-
Node.connection.execute "UPDATE nodes set zip = 11114 where id = #{nodes(:
|
14
|
-
Node.connection.execute "UPDATE nodes set zip = 11114 where id = #{nodes(:
|
15
|
-
anon.get "http://ocean.host/en/
|
16
|
-
assert_equal nodes(:
|
17
|
-
anon.get "http://test.host/en/
|
18
|
-
assert_equal nodes(:
|
20
|
+
assert_equal 'ocean.host', visitor.site.host
|
21
|
+
Node.connection.execute "UPDATE nodes set zip = 11114 where id = #{nodes(:ocean, :whale)[:id]}" # whale
|
22
|
+
Node.connection.execute "UPDATE nodes set zip = 11114 where id = #{nodes(:zena, :tiger)[:id]}" # tiger
|
23
|
+
anon.get "http://ocean.host/en/basecontact11114.html" # zip 11114 ==> whale
|
24
|
+
assert_equal nodes(:ocean, :whale)[:id], anon.assigns(:node)[:id]
|
25
|
+
anon.get "http://test.host/en/basecontact11114.html" # zip 11114 ==> tiger
|
26
|
+
assert_equal nodes(:zena, :tiger)[:id], anon.assigns(:node)[:id]
|
19
27
|
end
|
20
28
|
|
21
29
|
def test_visitor_anon
|
22
30
|
anon.get_node(:status)
|
23
|
-
assert_kind_of User,
|
24
|
-
assert_equal users(:anon).id,
|
31
|
+
assert_kind_of User, visitor
|
32
|
+
assert_equal users(:anon).id, visitor.id
|
25
33
|
anon.get_node(:ocean, :host=>'ocean.host')
|
26
|
-
assert_equal users(:incognito).id,
|
34
|
+
assert_equal users(:incognito).id, visitor.id
|
27
35
|
end
|
28
36
|
|
29
37
|
def test_cache
|
30
|
-
status_zip = nodes(:
|
38
|
+
status_zip = nodes(:zena, :status).zip
|
31
39
|
without_files('/test.host/public') do
|
32
40
|
with_caching do
|
33
41
|
path = "/en/projects/cleanWater/page#{status_zip}.html"
|
@@ -36,13 +44,13 @@ class MultipleHostsTest < ActionController::IntegrationTest
|
|
36
44
|
anon.get "http://test.host#{path}"
|
37
45
|
assert_equal 200, anon.status
|
38
46
|
assert File.exist?(filepath), "Cache file created"
|
39
|
-
node = nodes(:
|
47
|
+
node = nodes(:zena, :status)
|
40
48
|
assert_equal 1, CachedPage.count(:conditions => "path like '%page#{status_zip}%'")
|
41
|
-
assert_not_equal 0, Zena::Db.
|
49
|
+
assert_not_equal 0, Zena::Db.fetch_attribute("SELECT COUNT(*) as count_all FROM cached_pages_nodes WHERE node_id = #{node[:id]}").to_i
|
42
50
|
node.visitor = Thread.current[:visitor]
|
43
51
|
node.sweep_cache
|
44
52
|
assert_equal 0, CachedPage.count(:conditions => "path like '%page#{status_zip}%'")
|
45
|
-
assert_equal 0, Zena::Db.
|
53
|
+
assert_equal 0, Zena::Db.fetch_attribute("SELECT COUNT(*) as count_all FROM cached_pages_nodes WHERE node_id = #{node[:id]}").to_i
|
46
54
|
assert !File.exist?(filepath)
|
47
55
|
end
|
48
56
|
end
|
@@ -50,9 +58,9 @@ class MultipleHostsTest < ActionController::IntegrationTest
|
|
50
58
|
|
51
59
|
def test_index
|
52
60
|
anon.get 'http://test.host/en'
|
53
|
-
assert_equal nodes(:
|
61
|
+
assert_equal nodes(:zena, :zena)[:id], anon.assigns(:node)[:id]
|
54
62
|
anon.get 'http://ocean.host/en'
|
55
|
-
assert_equal nodes(:
|
63
|
+
assert_equal nodes(:ocean, :ocean)[:id], anon.assigns(:node)[:id]
|
56
64
|
end
|
57
65
|
|
58
66
|
private
|
@@ -65,7 +73,7 @@ class MultipleHostsTest < ActionController::IntegrationTest
|
|
65
73
|
|
66
74
|
@site = Site.find_by_host(host)
|
67
75
|
|
68
|
-
@node = nodes(
|
76
|
+
@node = nodes(@site.name, node_sym)
|
69
77
|
|
70
78
|
if @node[:id] == @site.root_id
|
71
79
|
name = []
|