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
data/lib/zena/use/search.rb
CHANGED
@@ -3,50 +3,108 @@ module Zena
|
|
3
3
|
module Search
|
4
4
|
module NodeClassMethods
|
5
5
|
# Return a hash to do a fulltext query.
|
6
|
-
def match_query(query,
|
7
|
-
node =
|
6
|
+
def match_query(query, options = {})
|
7
|
+
node = options.delete(:node)
|
8
8
|
if query == '.' && node
|
9
|
-
return
|
9
|
+
return options.merge(
|
10
10
|
:conditions => ["parent_id = ?",node[:id]],
|
11
|
-
:order => '
|
11
|
+
:order => 'node_name ASC' )
|
12
12
|
elsif !query.blank?
|
13
13
|
if Zena::Db.adapter == 'mysql' && RAILS_ENV != 'test'
|
14
|
-
match = sanitize_sql(["MATCH (vs.
|
15
|
-
select = sanitize_sql(["nodes.*, MATCH (vs.
|
14
|
+
match = sanitize_sql(["MATCH (vs.idx_text_high,vs.idx_text_medium,vs.idx_text_low) AGAINST (?) OR nodes.node_name LIKE ?", query, "#{options[:name_query] || query.url_name}%"])
|
15
|
+
select = sanitize_sql(["nodes.*, MATCH (vs.idx_text_high,vs.idx_text_medium,vs.idx_text_low) AGAINST (?) + (5 * (nodes.node_name LIKE ?)) AS score", query, "#{query}%"])
|
16
16
|
else
|
17
|
-
match = sanitize_sql(["nodes.
|
17
|
+
match = sanitize_sql(["nodes.node_name LIKE ?", "#{query}%"])
|
18
18
|
select = "nodes.*, #{match} AS score"
|
19
19
|
end
|
20
20
|
|
21
|
-
|
21
|
+
case Zena::Db.adapter
|
22
|
+
when 'postgresql'
|
23
|
+
select = "DISTINCT ON (nodes.zip, score) #{select}"
|
24
|
+
group = nil
|
25
|
+
else
|
26
|
+
group = 'nodes.id'
|
27
|
+
end
|
28
|
+
|
29
|
+
return options.merge(
|
22
30
|
:select => select,
|
23
31
|
:joins => "INNER JOIN versions AS vs ON vs.node_id = nodes.id AND vs.status >= #{Zena::Status[:pub]}",
|
24
32
|
:conditions => match,
|
25
|
-
:group =>
|
33
|
+
:group => group,
|
26
34
|
:order => "score DESC, zip ASC")
|
27
35
|
else
|
28
36
|
# error
|
29
|
-
return
|
37
|
+
return options.merge(:conditions => '0')
|
30
38
|
end
|
31
39
|
end
|
32
40
|
|
33
|
-
def search_records(query,
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
Node.find(:all, match_query(query).merge(:offset => offset, :limit => limit))
|
41
|
+
def search_records(query, options = {})
|
42
|
+
if per_page = options.delete(:per_page)
|
43
|
+
page = options.delete(:page).to_i
|
44
|
+
page = 1 if page < 1
|
45
|
+
search_records(query, options.merge(:offset => (page - 1) * per_page, :limit => per_page))
|
39
46
|
else
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
search_records(query, :offset => (page - 1) * per_page, :limit => per_page)
|
47
|
+
# Removed pagination clause
|
48
|
+
if query.kind_of?(Hash)
|
49
|
+
search_index(query, options)
|
44
50
|
else
|
45
|
-
|
51
|
+
search_text(query, options)
|
46
52
|
end
|
47
53
|
end
|
48
54
|
end
|
55
|
+
|
56
|
+
# Execute an index search using query builder. Either provide a full query with 'qb' or 'key'='value' parameters.
|
57
|
+
def search_index(params, options = {})
|
58
|
+
query = ::QueryBuilder::Query.new(Node.query_compiler)
|
59
|
+
query.add_table(query.main_table)
|
60
|
+
filters = []
|
61
|
+
|
62
|
+
unless query = params[:qb]
|
63
|
+
query_args = []
|
64
|
+
|
65
|
+
params.each do |key, value|
|
66
|
+
query_args << "#{key} = #{Zena::Db.quote(value)}"
|
67
|
+
end
|
68
|
+
|
69
|
+
query = "nodes where #{query_args.join(' and ')} in site"
|
70
|
+
end
|
71
|
+
|
72
|
+
res = current_site.root_node.find(:all, query, :errors => true, :rubyless_helper => self)
|
73
|
+
|
74
|
+
if res.kind_of?(Exception)
|
75
|
+
raise ActiveRecord::StatementInvalid.new("Error parsing query #{query.inspect} (#{res.message})")
|
76
|
+
else
|
77
|
+
return res
|
78
|
+
end
|
79
|
+
end
|
80
|
+
|
81
|
+
# Execute a fulltext search using default fulltext support from the database (MyISAM on MySQL).
|
82
|
+
def search_text(query, options = {})
|
83
|
+
if offset = options[:offset]
|
84
|
+
limit = options[:limit] || 20
|
85
|
+
Node.find(:all, match_query(query).merge(:offset => offset, :limit => limit))
|
86
|
+
else
|
87
|
+
Node.find(:all, match_query(query, options))
|
88
|
+
end
|
89
|
+
end
|
49
90
|
end # NodeClassMethods
|
91
|
+
|
92
|
+
module ZafuMethods
|
93
|
+
include RubyLess
|
94
|
+
safe_method :search_results => {:class => [Node], :nil => true, :method => '@nodes'}
|
95
|
+
|
96
|
+
# def r_search_results
|
97
|
+
# pagination_key = 'page'
|
98
|
+
# set_context_var('paginate', 'key', pagination_key)
|
99
|
+
#
|
100
|
+
# node_count = get_var_name('paginate', 'nodes')
|
101
|
+
# page_count = get_var_name('paginate', 'count')
|
102
|
+
# curr_page = get_var_name('paginate', 'current')
|
103
|
+
# out "<% set_#{pagination_key}_count = (set_#{pagination_key}_nodes / @search_per_page).ceil; set_#{pagination_key} = [1,params[:page].to_i].max -%>"
|
104
|
+
# out "<% #{node_count} = @search_count; #{page_count} = (#{node_count} / @search_per_page).ceil; #{curr_page} = [1,params[:#{pagination_key}].to_i].max -%>"
|
105
|
+
# expand_if....
|
106
|
+
# end
|
107
|
+
end
|
50
108
|
end # Search
|
51
109
|
end # Use
|
52
110
|
end # Zena
|
data/lib/zena/use/test_helper.rb
CHANGED
@@ -1,4 +1,4 @@
|
|
1
|
-
require
|
1
|
+
require 'authlogic/test_case'
|
2
2
|
require 'hpricot'
|
3
3
|
|
4
4
|
module Zena
|
@@ -8,8 +8,8 @@ module Zena
|
|
8
8
|
|
9
9
|
# Set visitor for unit testing
|
10
10
|
def login(fixture)
|
11
|
-
user =
|
12
|
-
Thread.current[:visitor] = user
|
11
|
+
user = users(fixture)
|
12
|
+
Thread.current[:visitor] = user
|
13
13
|
user.ip = '10.0.0.44'
|
14
14
|
$_test_site = user.site.name
|
15
15
|
::I18n.locale = user.lang
|
@@ -22,12 +22,8 @@ module Zena
|
|
22
22
|
end
|
23
23
|
end
|
24
24
|
|
25
|
-
|
26
|
-
|
27
|
-
$_test_site = site_name
|
28
|
-
end
|
29
|
-
|
30
|
-
def set_date(node_syms, opts = {})
|
25
|
+
def set_date(node_syms, opts = {}, site = 'zena')
|
26
|
+
$_test_site = site
|
31
27
|
fld = opts.delete(:fld) || 'log_at'
|
32
28
|
if opts == {}
|
33
29
|
date = Time.now
|
@@ -145,6 +141,18 @@ module Zena
|
|
145
141
|
digest = Digest::SHA1.hexdigest(content_id.to_s)
|
146
142
|
"#{SITES_ROOT}/test.host/data/#{mode}/#{digest[0..0]}/#{digest[1..1]}/#{digest[2..2]}/#{fname}"
|
147
143
|
end
|
144
|
+
|
145
|
+
def execute_after_commit!
|
146
|
+
Node.connection.instance_eval do
|
147
|
+
# Simulate commit
|
148
|
+
if actions = @after_commit
|
149
|
+
@after_commit = nil
|
150
|
+
actions.each do |block|
|
151
|
+
block.call
|
152
|
+
end
|
153
|
+
end
|
154
|
+
end
|
155
|
+
end
|
148
156
|
end
|
149
157
|
end # Use
|
150
158
|
end # Zena
|
data/lib/zena/use/upload.rb
CHANGED
@@ -172,7 +172,7 @@ module Zena
|
|
172
172
|
TXT
|
173
173
|
else
|
174
174
|
attach_file_id, attach_url_id = "af#{@uuid}", "au#{@uuid}"
|
175
|
-
onchange = %Q{onchange="Zena.get_filename(this,'
|
175
|
+
onchange = %Q{onchange="Zena.get_filename(this,'node_title'); $('node_title').focus(); $('node_title').select();"}
|
176
176
|
<<-TXT
|
177
177
|
<div id='#{attach_file_id}' class='attach'><label for='attachment' onclick=\"['#{attach_file_id}', '#{attach_url_id}'].each(Element.toggle);\">#{_('file')} / <span class='off'>#{_('url')}</span></label>
|
178
178
|
<input style='line-height:1.5em;' id="attachment#{@uuid}" name="attachment" #{onchange} class='file' type="file" /></div>
|
data/lib/zena/use/urls.rb
CHANGED
@@ -11,40 +11,54 @@ module Zena
|
|
11
11
|
end
|
12
12
|
end
|
13
13
|
|
14
|
-
#
|
14
|
+
# We overwrite some url writers that might use Node so that they use
|
15
|
+
# zip instead of id.
|
16
|
+
%w{edit delete drop zafu}.each do |method|
|
17
|
+
class_eval %Q{
|
18
|
+
def #{method}_node_path(node, options={}) # def edit_node_path(node, options={})
|
19
|
+
if node.kind_of?(Node) # if node.kind_of?(Node)
|
20
|
+
super(node.zip, options) # super(node.zip, options)
|
21
|
+
else # else
|
22
|
+
super # super
|
23
|
+
end # end
|
24
|
+
end # end
|
25
|
+
}
|
26
|
+
end
|
27
|
+
|
28
|
+
# Path to remove a node link.
|
29
|
+
def unlink_node_path(node, options={})
|
30
|
+
return '#' unless node.can_write? && node.link_id
|
31
|
+
node_link_path(node.zip, node.link_id, options)
|
32
|
+
end
|
33
|
+
|
34
|
+
# Path for a node. Options can be :format, :host and :mode.
|
15
35
|
# ex '/en/document34_print.html'
|
16
36
|
def zen_path(node, options={})
|
17
37
|
|
18
38
|
return '#' unless node
|
19
39
|
|
20
40
|
if anchor = options.delete(:anchor)
|
21
|
-
|
22
|
-
anchor_value = node.safe_read($1)
|
23
|
-
elsif anchor == 'true'
|
24
|
-
anchor_value = "node#{node[:zip]}"
|
25
|
-
else
|
26
|
-
fixed = true
|
27
|
-
anchor_value = anchor
|
28
|
-
end
|
29
|
-
if anchor_in = options.delete(:anchor_in)
|
30
|
-
anchor_node = anchor_in.kind_of?(Node) ? anchor_in : (node.find(:first, [anchor_in]) || node)
|
31
|
-
return "#{zen_path(anchor_node, options)}##{anchor_value}"
|
32
|
-
elsif fixed
|
33
|
-
return "#{zen_path(node, options)}##{anchor_value}"
|
34
|
-
else
|
35
|
-
return "##{anchor_value}"
|
36
|
-
end
|
41
|
+
return "#{zen_path(node, options)}##{anchor}"
|
37
42
|
end
|
38
43
|
|
39
44
|
opts = options.dup
|
40
45
|
format = opts.delete(:format)
|
41
|
-
|
42
|
-
|
46
|
+
if format.blank?
|
47
|
+
format = 'html'
|
48
|
+
elsif format == 'data'
|
49
|
+
if node.kind_of?(Document)
|
50
|
+
format = node.ext
|
51
|
+
else
|
52
|
+
format = 'html'
|
53
|
+
end
|
54
|
+
end
|
55
|
+
|
56
|
+
pre = opts.delete(:prefix) || (visitor.is_anon? && opts.delete(:lang)) || prefix
|
43
57
|
mode = opts.delete(:mode)
|
44
58
|
host = opts.delete(:host)
|
45
59
|
abs_url_prefix = host ? "http://#{host}" : ''
|
46
60
|
|
47
|
-
if node.kind_of?(Document) && format == node.
|
61
|
+
if node.kind_of?(Document) && format == node.ext
|
48
62
|
if node.public? && !visitor.site.authentication?
|
49
63
|
# force the use of a cacheable path for the data, even when navigating in '/oo'
|
50
64
|
pre = node.version.lang
|
@@ -56,7 +70,7 @@ module Zena
|
|
56
70
|
end
|
57
71
|
|
58
72
|
|
59
|
-
if cachestamp_format?(format) && ((node.kind_of?(Document) && node.
|
73
|
+
if cachestamp_format?(format) && ((node.kind_of?(Document) && node.prop['ext'] == format) || asset)
|
60
74
|
opts[:cachestamp] = make_cachestamp(node, mode)
|
61
75
|
else
|
62
76
|
opts.delete(:cachestamp) # cachestamp
|
@@ -72,14 +86,13 @@ module Zena
|
|
72
86
|
(format == 'html' ? '' : ".#{format}")
|
73
87
|
else
|
74
88
|
"#{abs_url_prefix}/#{pre}/" +
|
75
|
-
(node.basepath != '' ? "#{node.basepath}/"
|
89
|
+
((node.basepath != '' && !node.basepath.nil? )? "#{node.basepath}/" : '') +
|
76
90
|
(node.klass.downcase ) +
|
77
91
|
(node[:zip].to_s ) +
|
78
92
|
(mode ? "_#{mode}" : '') +
|
79
93
|
(asset ? ".#{asset}" : '') +
|
80
94
|
".#{format}"
|
81
95
|
end
|
82
|
-
|
83
96
|
append_query_params(path, opts)
|
84
97
|
end
|
85
98
|
|
@@ -91,6 +104,7 @@ module Zena
|
|
91
104
|
list = opts.keys.map do |k|
|
92
105
|
if value = opts[k]
|
93
106
|
if value.respond_to?(:strftime)
|
107
|
+
# FIXME: I think this is not needed anymore (and removing time might not be a good idea).
|
94
108
|
"#{k}=#{value.strftime('%Y-%m-%d')}"
|
95
109
|
else
|
96
110
|
"#{k}=#{CGI.escape(opts[k].to_s)}"
|
@@ -99,9 +113,9 @@ module Zena
|
|
99
113
|
nil
|
100
114
|
end
|
101
115
|
end.compact
|
102
|
-
|
103
116
|
if cachestamp
|
104
|
-
path + "?#{cachestamp}" + (list.empty? ? '' : "&#{list.sort.join('&')}")
|
117
|
+
result = path + "?#{cachestamp}" + (list.empty? ? '' : "&#{list.sort.join('&')}")
|
118
|
+
result
|
105
119
|
else
|
106
120
|
path + (list.empty? ? '' : "?#{list.sort.join('&')}")
|
107
121
|
end
|
@@ -117,7 +131,7 @@ module Zena
|
|
117
131
|
# Return the path to a document's data
|
118
132
|
def data_path(node, opts={})
|
119
133
|
if node.kind_of?(Document)
|
120
|
-
zen_path(node, opts.merge(:format => node.
|
134
|
+
zen_path(node, opts.merge(:format => node.prop['ext']))
|
121
135
|
else
|
122
136
|
zen_path(node, opts)
|
123
137
|
end
|
@@ -171,12 +185,504 @@ module Zena
|
|
171
185
|
|
172
186
|
module ControllerMethods
|
173
187
|
include Common
|
174
|
-
end
|
188
|
+
end # ControllerMethods
|
175
189
|
|
176
190
|
module ViewMethods
|
177
191
|
include Common
|
178
|
-
|
192
|
+
include RubyLess
|
193
|
+
safe_method [:url, Node] => {:class => String, :method => 'zen_url'}
|
194
|
+
safe_method [:path, Node] => {:class => String, :method => 'zen_path'}
|
195
|
+
|
196
|
+
safe_method [:zen_path, Node, Hash] => {:class => String, :accept_nil => true}
|
197
|
+
safe_method [:zen_path, Node] => {:class => String, :accept_nil => true}
|
198
|
+
safe_method [:zen_path, String, Hash] => {:class => String, :accept_nil => true, :method => 'dummy_zen_path'}
|
199
|
+
safe_method [:zen_path, String] => {:class => String, :accept_nil => true, :method => 'dummy_zen_path'}
|
200
|
+
|
201
|
+
safe_method [:zafu_node_path, Node, Hash] => {:class => String, :accept_nil => true}
|
202
|
+
safe_method [:zafu_node_path, Node] => {:class => String, :accept_nil => true}
|
203
|
+
safe_method [:edit_node_path, Node, Hash] => {:class => String, :accept_nil => true}
|
204
|
+
safe_method [:edit_node_path, Node] => {:class => String, :accept_nil => true}
|
205
|
+
safe_method [:delete_node_path, Node, Hash] => {:class => String, :accept_nil => true}
|
206
|
+
safe_method [:delete_node_path, Node] => {:class => String, :accept_nil => true}
|
207
|
+
safe_method [:drop_node_path, Node, Hash] => {:class => String, :accept_nil => true}
|
208
|
+
safe_method [:drop_node_path, Node] => {:class => String, :accept_nil => true}
|
209
|
+
safe_method [:unlink_node_path, Node, Hash] => {:class => String, :accept_nil => true}
|
210
|
+
safe_method [:unlink_node_path, Node] => {:class => String, :accept_nil => true}
|
211
|
+
|
212
|
+
safe_method :start_id => {:class => Number, :method => 'start_node_zip'}
|
213
|
+
|
214
|
+
def dummy_zen_path(string, options = {})
|
215
|
+
if anchor = options.delete(:anchor)
|
216
|
+
"#{string}##{anchor}"
|
217
|
+
else
|
218
|
+
"#{string}"
|
219
|
+
end
|
220
|
+
end
|
221
|
+
end # ViewMethods
|
222
|
+
|
223
|
+
module ZafuMethods
|
224
|
+
include RubyLess
|
225
|
+
|
226
|
+
# private
|
227
|
+
safe_method :insert_dom_id => :insert_dom_id
|
228
|
+
|
229
|
+
|
230
|
+
# Add the dom_id inside a RubyLess built method (used with make_href and ajax).
|
231
|
+
#
|
232
|
+
def insert_dom_id(signature)
|
233
|
+
return nil if signature.size != 1
|
234
|
+
{:method => @insert_dom_id, :class => String}
|
235
|
+
end
|
236
|
+
|
237
|
+
# creates a link. Options are:
|
238
|
+
# :href (node, parent, project, root)
|
239
|
+
# :tattr (translated attribute used as text link)
|
240
|
+
# :attr (attribute used as text link)
|
241
|
+
# <r:link href='node'><r:trans attr='lang'/></r:link>
|
242
|
+
# <r:link href='node' tattr='lang'/>
|
243
|
+
# <r:link update='dom_id'/>
|
244
|
+
# <r:link page='next'/> <r:link page='previous'/> <r:link page='list'/>
|
245
|
+
def r_link
|
246
|
+
if @params[:page] && @params[:page] != '[page_page]' # lets users use 'page' as pagination key
|
247
|
+
pagination_links
|
248
|
+
else
|
249
|
+
make_link
|
250
|
+
end
|
251
|
+
end
|
252
|
+
|
253
|
+
# Insert a named anchor
|
254
|
+
def r_anchor
|
255
|
+
@params[:anchor] ||= 'true'
|
256
|
+
r_link
|
257
|
+
end
|
258
|
+
|
259
|
+
# Create a link tag.
|
260
|
+
#
|
261
|
+
# ==== Parameters (hash)
|
262
|
+
#
|
263
|
+
# * +:update+ - DOM_ID: produce an Ajax call that will update this part of the page (optional)
|
264
|
+
# * +:default_text+ - default text to use for the link if there are no 'text', 'eval' or 'attr' params
|
265
|
+
# * +:action+ - link action (edit, show, etc)
|
266
|
+
#
|
267
|
+
def make_link(options = {})
|
268
|
+
remote_target = (options[:update] || @params.delete(:update))
|
269
|
+
|
270
|
+
@markup.tag ||= 'a'
|
271
|
+
|
272
|
+
if @markup.tag == 'a'
|
273
|
+
markup = @markup
|
274
|
+
else
|
275
|
+
markup = Zafu::Markup.new('a')
|
276
|
+
end
|
277
|
+
|
278
|
+
steal_and_eval_html_params_for(markup, @params)
|
279
|
+
|
280
|
+
href = make_href(remote_target, options)
|
281
|
+
|
282
|
+
# This is to make sure live_id is set *inside* the <a> tag.
|
283
|
+
if @live_param
|
284
|
+
text = add_live_id(text_for_link, markup)
|
285
|
+
@live_param = nil
|
286
|
+
else
|
287
|
+
text = text_for_link(options[:default_text])
|
288
|
+
end
|
289
|
+
|
290
|
+
if remote_target
|
291
|
+
# ajax link (link_to_remote)
|
292
|
+
|
293
|
+
# Add href to non-ajax method.
|
294
|
+
markup.set_param(:href, "<%= #{make_href(nil, options.merge(:update => false))} %>")
|
295
|
+
|
296
|
+
|
297
|
+
# Use onclick with Ajax.
|
298
|
+
markup.set_dyn_param(:onclick, "new Ajax.Request(\"<%= #{href} %>\", {asynchronous:true, evalScripts:true, method:\"#{http_method_from_action(options[:action])}\"}); return false;")
|
299
|
+
else
|
300
|
+
markup.set_dyn_param(:href, "<%= #{href} %>")
|
301
|
+
end
|
302
|
+
|
303
|
+
markup.wrap(text)
|
304
|
+
=begin
|
305
|
+
query_params = options[:query_params] || {}
|
306
|
+
default_text = options[:default_text]
|
307
|
+
params = {}
|
308
|
+
(options[:params] || @params).each do |k,v|
|
309
|
+
next if v.nil?
|
310
|
+
params[k] = v
|
311
|
+
end
|
312
|
+
|
313
|
+
opts = {}
|
314
|
+
|
315
|
+
if href = params.delete(:href)
|
316
|
+
if lnode = get_context_var('set_var', value) && stored.klass <= Node
|
317
|
+
# using stored node
|
318
|
+
else
|
319
|
+
lnode, klass = build_finder(:first, href, {})
|
320
|
+
return unless lnode
|
321
|
+
return parser_error("invalid class (#{klass})") unless klass.ancestors.include?(Node)
|
322
|
+
end
|
323
|
+
else
|
324
|
+
# obj
|
325
|
+
if node_class == Version
|
326
|
+
lnode = "#{node}.node"
|
327
|
+
opts[:lang] = "#{node}.lang"
|
328
|
+
elsif node.will_be?(Node)
|
329
|
+
lnode = node
|
330
|
+
else
|
331
|
+
lnode = @context[:previous_node]
|
332
|
+
end
|
333
|
+
end
|
334
|
+
|
335
|
+
if fmt = params.delete(:format)
|
336
|
+
if fmt == 'data'
|
337
|
+
opts[:format] = "#{node}.ext"
|
338
|
+
else
|
339
|
+
opts[:format] = fmt.inspect
|
340
|
+
end
|
341
|
+
end
|
342
|
+
|
343
|
+
if mode = params.delete(:mode)
|
344
|
+
opts[:mode] = mode.inspect
|
345
|
+
end
|
346
|
+
|
347
|
+
if anchor = params.delete(:anchor)
|
348
|
+
opts[:anchor] = anchor.inspect
|
349
|
+
end
|
350
|
+
|
351
|
+
if anchor_in = params.delete(:in)
|
352
|
+
finder, klass = build_finder(:first, anchor_in, {})
|
353
|
+
return unless finder
|
354
|
+
return parser_error("invalid class (#{klass})") unless klass.ancestors.include?(Node)
|
355
|
+
opts[:anchor_in] = finder
|
356
|
+
end
|
357
|
+
|
358
|
+
if @html_tag && @html_tag != 'a'
|
359
|
+
# FIXME: can we remove this ?
|
360
|
+
# html attributes do not belong to anchor
|
361
|
+
pre_space = ''
|
362
|
+
html_params = {}
|
363
|
+
else
|
364
|
+
html_params = get_html_params(params.merge(@html_tag_params), :link)
|
365
|
+
pre_space = @space_before || ''
|
366
|
+
@html_tag_done = true
|
367
|
+
end
|
368
|
+
|
369
|
+
(params.keys - [:style, :class, :id, :rel, :name, :anchor, :attr, :tattr, :trans, :text]).each do |k|
|
370
|
+
next if k.to_s =~ /if_|set_|\A_/
|
371
|
+
query_params[k] = params[k]
|
372
|
+
end
|
373
|
+
|
374
|
+
# TODO: merge these two query_params cleanup things into something cleaner.
|
375
|
+
else
|
376
|
+
# direct link
|
377
|
+
query_params.each do |k,v|
|
378
|
+
if k == :date
|
379
|
+
if v == 'current_date'
|
380
|
+
query_params[k] = current_date
|
381
|
+
elsif v =~ /\A\d/
|
382
|
+
query_params[k] = v.inspect
|
383
|
+
elsif v =~ /\[/
|
384
|
+
attribute, static = parse_attributes_in_value(v.gsub('"',''), :erb => false)
|
385
|
+
query_params[k] = "\"#{attribute}\""
|
386
|
+
else
|
387
|
+
query_params[k] = node_attribute(v)
|
388
|
+
end
|
389
|
+
else
|
390
|
+
attribute, static = parse_attributes_in_value(v.gsub('"',''), :erb => false)
|
391
|
+
query_params[k] = "\"#{attribute}\""
|
392
|
+
end
|
393
|
+
end
|
394
|
+
|
395
|
+
query_params.merge!(opts)
|
396
|
+
|
397
|
+
opts_str = ''
|
398
|
+
query_params.keys.sort {|a,b| a.to_s <=> b.to_s }.each do |k|
|
399
|
+
opts_str << ",:#{k.to_s.gsub(/[^a-z_A-Z_]/,'')}=>#{query_params[k]}"
|
400
|
+
end
|
401
|
+
|
402
|
+
opts_str += ", :host => #{@context["exp_host"]}" if @context["exp_host"]
|
403
|
+
|
404
|
+
pre_space + "<a#{params_to_html(html_params)} href='<%= zen_path(#{lnode}#{opts_str}) %>'>#{text_for_link(default_text)}</a>"
|
405
|
+
end
|
406
|
+
=end
|
407
|
+
end
|
408
|
+
|
409
|
+
|
410
|
+
protected
|
411
|
+
|
412
|
+
# Get default anchor name
|
413
|
+
def get_anchor_name(anchor_name)
|
414
|
+
if anchor_name == 'true'
|
415
|
+
if node.will_be?(Node)
|
416
|
+
'node#{id}'
|
417
|
+
elsif node.will_be?(Version)
|
418
|
+
'version#{node.id}_#{id}'
|
419
|
+
else
|
420
|
+
anchor_name
|
421
|
+
# force compilation with Node context. Why ?
|
422
|
+
#node_bak = @context[:node]
|
423
|
+
#@context[:node] = node(Node)
|
424
|
+
# anchor_name = ::RubyLess.translate_string(anchor_name, self)
|
425
|
+
#@context[:node] = node_bak
|
426
|
+
end
|
427
|
+
else
|
428
|
+
anchor_name
|
429
|
+
end
|
430
|
+
end
|
431
|
+
|
432
|
+
private
|
433
|
+
|
434
|
+
# Build the 'href' part of a link.
|
435
|
+
#
|
436
|
+
# ==== Parameters
|
437
|
+
#
|
438
|
+
# * +:remote_target+ - a processing node to update
|
439
|
+
# * +:action+ - action to use ('edit', 'show'). Default is 'show'.
|
440
|
+
#
|
441
|
+
# ==== Examples
|
442
|
+
#
|
443
|
+
# Product.count_by_sql "SELECT COUNT(*) FROM sales s, customers c WHERE s.customer_id = c.id"
|
444
|
+
def make_href(remote_target = nil, opts = {})
|
445
|
+
anchor = @params[:anchor]
|
446
|
+
if anchor && !@params[:href]
|
447
|
+
# Link on same page
|
448
|
+
return ::RubyLess.translate_string("##{get_anchor_name(anchor)}", self)
|
449
|
+
end
|
450
|
+
|
451
|
+
# if opts[:action] == 'edit' && !remote_target
|
452
|
+
# method = 'edit_node_path'
|
453
|
+
# els
|
454
|
+
if %w{edit drop unlink}.include?(opts[:action])
|
455
|
+
method = "#{opts[:action]}_node_path"
|
456
|
+
elsif remote_target
|
457
|
+
method = 'zafu_node_path'
|
458
|
+
else
|
459
|
+
method = 'zen_path'
|
460
|
+
end
|
461
|
+
|
462
|
+
method_args = []
|
463
|
+
hash_params = []
|
464
|
+
|
465
|
+
# Select http verb.
|
466
|
+
unless remote_target
|
467
|
+
http_method = http_method_from_action(opts[:action])
|
468
|
+
if http_method != 'get'
|
469
|
+
hash_params << ":_method => '#{http_method}'"
|
470
|
+
end
|
471
|
+
end
|
472
|
+
|
473
|
+
if href = @params[:href]
|
474
|
+
method_args << href
|
475
|
+
elsif node.will_be?(Version)
|
476
|
+
method_args << "node"
|
477
|
+
hash_params << ":lang => this.lang"
|
478
|
+
elsif node.list_context?
|
479
|
+
method_args << '@node'
|
480
|
+
else
|
481
|
+
method_args << 'this'
|
482
|
+
end
|
483
|
+
|
484
|
+
insert_ajax_args(remote_target, hash_params, opts[:action]) if remote_target
|
485
|
+
|
486
|
+
(opts[:query_params] || @params).each do |key, value|
|
487
|
+
next if [:href, :eval, :text, :attr].include?(key)
|
488
|
+
if key == :anchor
|
489
|
+
value = get_anchor_name(value)
|
490
|
+
end
|
491
|
+
|
492
|
+
hash_params << "#{key.inspect} => %Q{#{value}}"
|
493
|
+
end
|
494
|
+
|
495
|
+
unless hash_params.empty?
|
496
|
+
method_args << hash_params.join(', ')
|
497
|
+
end
|
498
|
+
|
499
|
+
method = "#{method}(#{method_args.join(', ')})"
|
500
|
+
|
501
|
+
::RubyLess.translate(method, self)
|
502
|
+
end
|
503
|
+
|
504
|
+
def insert_ajax_args(target, hash_params, action)
|
505
|
+
hash_params << ":s => start_id"
|
506
|
+
hash_params << ":link_id => this.link_id" if @context[:has_link_id] && node.will_be?(Node)
|
507
|
+
if target.kind_of?(String)
|
508
|
+
# named target
|
509
|
+
return nil unless target = find_target(target)
|
510
|
+
end
|
511
|
+
|
512
|
+
case action
|
513
|
+
when 'edit'
|
514
|
+
# 'each' target in parent hierarchy
|
515
|
+
@insert_dom_id = %Q{"#{node.dom_id(:erb => false)}"}
|
516
|
+
hash_params << ":dom_id => insert_dom_id"
|
517
|
+
hash_params << ":t_url => %Q{#{form_url(node.dom_prefix)}}"
|
518
|
+
# To enable link edit fix the following line:
|
519
|
+
# hash_params << "'node[link_id]' => link_id"
|
520
|
+
when 'unlink', 'delete'
|
521
|
+
@insert_dom_id = %Q{"#{node.dom_id(:erb => false)}"}
|
522
|
+
hash_params << ":dom_id => insert_dom_id"
|
523
|
+
hash_params << ":t_url => %Q{#{template_url(target.name)}}"
|
524
|
+
else # drop
|
525
|
+
hash_params << ":dom_id => %Q{#{target.name}}" # target.node.dom_id
|
526
|
+
hash_params << ":t_url => %Q{#{template_url(target.name)}}"
|
527
|
+
end
|
528
|
+
|
529
|
+
# method = opts[:method] || :get
|
530
|
+
#
|
531
|
+
# html_params = opts[:html_params] || {}
|
532
|
+
# node_id = opts[:node_id] || self.node_id
|
533
|
+
#
|
534
|
+
# url = opts[:url] || "/#{base_class.to_s.pluralize.underscore}/\#{#{node_id}}#{method == :get ? '/zafu' : ''}"
|
535
|
+
# opts[:cond] ||= "#{node}.can_write?" if method != :get
|
536
|
+
#
|
537
|
+
# query_params = [opts[:query_params]].flatten.compact
|
538
|
+
#
|
539
|
+
# if method == :get
|
540
|
+
# if target
|
541
|
+
# query_params << "t_url=#{CGI.escape(target.template_url)}"
|
542
|
+
# query_params << "dom_id=#{target.dom_id}"
|
543
|
+
# else
|
544
|
+
# query_params << "dom_id=_page"
|
545
|
+
# end
|
546
|
+
# else
|
547
|
+
# query_params << "t_url=#{CGI.escape(template_url)}" if method != :delete
|
548
|
+
#
|
549
|
+
# query_params << "dom_id=#{dom_id}"
|
550
|
+
# if target != self
|
551
|
+
# if target
|
552
|
+
# query_params << "u_url=#{CGI.escape(target.template_url)}"
|
553
|
+
# query_params << "udom_id=#{target.dom_id}"
|
554
|
+
# else
|
555
|
+
# query_params << "udom_id=_page"
|
556
|
+
# end
|
557
|
+
# end
|
558
|
+
# end
|
559
|
+
#
|
560
|
+
# query_params << "node[v_status]=#{Zena::Status[:pub]}" if @params[:publish] # FIXME: this acts like publish = 'force'
|
561
|
+
# query_params << start_node_s_param(:string)
|
562
|
+
#
|
563
|
+
# res = ''
|
564
|
+
# res += "<% if #{opts[:cond]} -%>" if opts[:cond]
|
565
|
+
# res += "<%= tag_to_remote({:url => \"#{url}?#{query_params.join('&')}\", :method => #{method.inspect}}#{params_to_erb(html_params)}) %>"
|
566
|
+
# res += text_for_link(opts[:default_text])
|
567
|
+
# res += "</a>"
|
568
|
+
# if opts[:cond]
|
569
|
+
# if opts[:else] != :void
|
570
|
+
# res += "<% else -%>"
|
571
|
+
# res += text_for_link(opts[:default_text])
|
572
|
+
# end
|
573
|
+
# res += "<% end -%>"
|
574
|
+
# end
|
575
|
+
# res
|
576
|
+
end
|
577
|
+
|
578
|
+
# <r:link page='next'/> <r:link page='previous'/> <r:link page='list'/>
|
579
|
+
def pagination_links
|
580
|
+
|
581
|
+
return parser_error("not in pagination scope") unless pagination_key = get_context_var('paginate', 'key')
|
582
|
+
page_direction = @params[:page]
|
583
|
+
case page_direction
|
584
|
+
when 'previous', 'next'
|
585
|
+
current = get_context_var('paginate', 'current')
|
586
|
+
count = get_context_var('paginate', 'count')
|
587
|
+
prev_or_next = get_var_name('paginate', page_direction)
|
588
|
+
|
589
|
+
if page_direction == 'previous'
|
590
|
+
out "<% if #{prev_or_next} = (#{current} > 1 ? #{current} - 1 : nil) -%>"
|
591
|
+
else
|
592
|
+
out "<% if #{prev_or_next} = (#{count} - #{current} > 0 ? #{current} + 1 : nil) -%>"
|
593
|
+
end
|
594
|
+
|
595
|
+
# previous_page // next_page
|
596
|
+
set_context_var('set_var', "#{page_direction}_page", RubyLess::TypedString.new(prev_or_next, :class => Number, :nil => true))
|
597
|
+
|
598
|
+
#, :params => @params.merge(:page => nil))
|
599
|
+
out make_link(:default_text => "<%= #{prev_or_next} %>", :query_params => {pagination_key => "\#{#{page_direction}_page}"})
|
600
|
+
|
601
|
+
if descendant('else')
|
602
|
+
out expand_with(:in_if => true, :only => ['else', 'elsif'])
|
603
|
+
end
|
604
|
+
out "<% end -%>"
|
605
|
+
when 'list'
|
606
|
+
|
607
|
+
node_count = get_context_var('paginate', 'nodes')
|
608
|
+
page_count = get_context_var('paginate', 'count')
|
609
|
+
curr_page = get_context_var('paginate', 'current')
|
610
|
+
page_number = get_var_name('paginate', 'page')
|
611
|
+
page_join = get_var_name('paginate', 'join')
|
612
|
+
|
613
|
+
if @blocks == [] || (@blocks.size == 1 && !@blocks.first.kind_of?(String) && @blocks.first.method == 'else')
|
614
|
+
# We need to insert the default 'link' tag: <r:link href='@node' #{pagination_key}='#{this}' ... do='this'/>
|
615
|
+
link = {}
|
616
|
+
@params.each do |k,v|
|
617
|
+
next if [:tag, :page, :join, :page_count].include?(k)
|
618
|
+
# transfer params
|
619
|
+
link[k] = v
|
620
|
+
end
|
621
|
+
tag = @params[:tag]
|
622
|
+
|
623
|
+
link[:html_tag] = tag if tag
|
624
|
+
link[:href] = '@node'
|
625
|
+
link[:eval] = 'this'
|
626
|
+
link[pagination_key.to_sym] = '#{this}'
|
179
627
|
|
628
|
+
# <r:link href='@node' href='@node' p='#{this}' ... eval='this'/>
|
629
|
+
|
630
|
+
@blocks = [make(:void, :method => 'link', :params => link)]
|
631
|
+
# Clear cached descendants
|
632
|
+
remove_instance_variable(:@all_descendants)
|
633
|
+
end
|
634
|
+
|
635
|
+
if !descendant('else')
|
636
|
+
else_tag = {:method => 'else', :text => '<r:this/>'}
|
637
|
+
else_tag[:tag] = tag if tag
|
638
|
+
@blocks += [make(:void, else_tag)]
|
639
|
+
# Clear cached descendants
|
640
|
+
remove_instance_variable(:@all_descendants)
|
641
|
+
end
|
642
|
+
|
643
|
+
out "<% page_numbers(#{curr_page}, #{page_count}, #{(@params[:join] || ' ').inspect}, #{@params[:page_count] ? @params[:page_count].to_i : 'nil'}) do |#{page_number}, #{page_join}| %>"
|
644
|
+
out "<%= #{page_join} %>"
|
645
|
+
with_context(:node => node.move_to(page_number, Number)) do
|
646
|
+
out expand_if("#{page_number} != #{curr_page}")
|
647
|
+
end
|
648
|
+
out "<% end -%>"
|
649
|
+
else
|
650
|
+
parser_error("unkown option for 'page' #{@params[:page].inspect} should be ('previous', 'next' or 'list')")
|
651
|
+
end
|
652
|
+
end
|
653
|
+
|
654
|
+
def text_for_link(default = nil)
|
655
|
+
if dynamic_blocks?
|
656
|
+
expand_with
|
657
|
+
else
|
658
|
+
if method = get_attribute_or_eval(false)
|
659
|
+
method.literal || "<%= #{method} %>"
|
660
|
+
elsif default
|
661
|
+
default
|
662
|
+
elsif node.will_be?(Node)
|
663
|
+
"<%= #{node}.prop['title'] %>"
|
664
|
+
elsif node.will_be?(Version)
|
665
|
+
"<%= #{node}.node.prop['title'] %>"
|
666
|
+
elsif node.will_be?(Link)
|
667
|
+
"<%= #{node}.name %>"
|
668
|
+
else
|
669
|
+
_('edit')
|
670
|
+
end
|
671
|
+
end
|
672
|
+
end
|
673
|
+
|
674
|
+
# Return the HTTP verb to use for the given action.
|
675
|
+
def http_method_from_action(action)
|
676
|
+
case action
|
677
|
+
when 'delete', 'unlink'
|
678
|
+
'delete'
|
679
|
+
when 'drop'
|
680
|
+
'put'
|
681
|
+
else
|
682
|
+
'get'
|
683
|
+
end
|
684
|
+
end
|
685
|
+
end # ZafuMethods
|
180
686
|
end # Urls
|
181
687
|
end # Use
|
182
688
|
end # Zena
|