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/zafu/action.rb
DELETED
@@ -1,285 +0,0 @@
|
|
1
|
-
module Zafu
|
2
|
-
module Action
|
3
|
-
# swap an attribute
|
4
|
-
# TODO: test
|
5
|
-
def r_swap
|
6
|
-
if upd = @params[:update]
|
7
|
-
if upd == '_page'
|
8
|
-
block = nil
|
9
|
-
elsif block = find_target(upd)
|
10
|
-
# ok
|
11
|
-
if ancestor('block') || ancestor('each')
|
12
|
-
upd_both = '&upd_both=true'
|
13
|
-
else
|
14
|
-
upd_both = ''
|
15
|
-
end
|
16
|
-
else
|
17
|
-
return
|
18
|
-
end
|
19
|
-
elsif ancestor('block') || ancestor('each')
|
20
|
-
# ancestor: ok
|
21
|
-
block = self
|
22
|
-
elsif parent && block = parent.descendant('block')
|
23
|
-
# sibling: ok
|
24
|
-
upd_both = ''
|
25
|
-
else
|
26
|
-
return parser_error("missing 'block' in same parent")
|
27
|
-
end
|
28
|
-
|
29
|
-
states = ((@params[:states] || 'todo, done') + ' ').split(',').map(&:strip)
|
30
|
-
|
31
|
-
query_params = "node[#{@params[:attr]}]=\#{#{states.inspect}[ ((#{states.inspect}.index(#{node_attribute(@params[:attr])}.to_s) || 0)+1) % #{states.size}]}#{upd_both}"
|
32
|
-
out link_to_update(block, :query_params => query_params, :method => :put, :html_params => get_html_params(@params, :link))
|
33
|
-
end
|
34
|
-
|
35
|
-
def r_edit
|
36
|
-
if @context[:dom_prefix]
|
37
|
-
# ajax
|
38
|
-
if @context[:in_form]
|
39
|
-
# cancel button
|
40
|
-
@context[:form_cancel] || ''
|
41
|
-
else
|
42
|
-
# edit button
|
43
|
-
|
44
|
-
# TODO: show 'reply' instead of 'edit' in comments if visitor != author
|
45
|
-
out link_to_update(self, :default_text => _('edit'), :url => "\#{edit_#{base_class.to_s.underscore}_path(#{node_id})}", :html_params => get_html_params(@params, :link), :method => :get, :cond => "#{node}.can_write?", :else => :void)
|
46
|
-
end
|
47
|
-
else
|
48
|
-
# FIXME: we could link to some html page to edit the item.
|
49
|
-
""
|
50
|
-
end
|
51
|
-
end
|
52
|
-
|
53
|
-
alias r_cancel r_edit
|
54
|
-
|
55
|
-
# TODO: test
|
56
|
-
def r_add
|
57
|
-
return parser_error("should not be called from within 'each'") if parent.method == 'each'
|
58
|
-
return '' if @context[:make_form]
|
59
|
-
|
60
|
-
# why is node = @node (which we need) but we are supposed to have Comments ?
|
61
|
-
# FIXME: during rewrite, replace 'node' by 'node(klass = node_class)' so the ugly lines below would be
|
62
|
-
# if node_kind_of?(Comment)
|
63
|
-
# out "<% if #{node(Node)}.can_comment? -%>"
|
64
|
-
# Refs #198.
|
65
|
-
if node_kind_of?(Comment)
|
66
|
-
out "<% if #{node}.can_comment? -%>"
|
67
|
-
else
|
68
|
-
out "<% if #{node}.can_write? -%>"
|
69
|
-
end
|
70
|
-
|
71
|
-
unless descendant('add_btn')
|
72
|
-
# add a descendant between self and blocks.
|
73
|
-
blocks = @blocks.dup
|
74
|
-
@blocks = []
|
75
|
-
add_btn = make(:void, :method=>'add_btn', :params=>@params.dup, :text=>'')
|
76
|
-
add_btn.blocks = blocks
|
77
|
-
remove_instance_variable(:@all_descendants)
|
78
|
-
end
|
79
|
-
|
80
|
-
if @context[:form] && @context[:dom_prefix]
|
81
|
-
# ajax add
|
82
|
-
|
83
|
-
@html_tag_params.merge!(:id => "#{erb_dom_id}_add")
|
84
|
-
@html_tag_params[:class] ||= 'btn_add'
|
85
|
-
if @params[:focus]
|
86
|
-
focus = "$(\"#{erb_dom_id}_#{@params[:focus]}\").focus();"
|
87
|
-
else
|
88
|
-
focus = "$(\"#{erb_dom_id}_form_t\").focusFirstElement();"
|
89
|
-
end
|
90
|
-
|
91
|
-
out render_html_tag("#{expand_with(:onclick=>"[\"#{erb_dom_id}_add\", \"#{erb_dom_id}_form\"].each(Element.toggle);#{focus}return false;")}")
|
92
|
-
|
93
|
-
if node_kind_of?(Node)
|
94
|
-
# FIXME: BUG if we set <r:form klass='Post'/> the user cannot select class with menu...
|
95
|
-
klass = @context[:klass] || 'Node'
|
96
|
-
# FIXME: inspect '@context[:form]' to see if it contains v_klass ?
|
97
|
-
out "<% if #{var}_new = secure(Node) { Node.new_from_class(#{klass.inspect}) } -%>"
|
98
|
-
else
|
99
|
-
out "<% if #{var}_new = #{node_class}.new -%>"
|
100
|
-
end
|
101
|
-
|
102
|
-
if @context[:form].method == 'form'
|
103
|
-
out expand_block(@context[:form], :in_add => true, :no_ignore => ['form'], :add=>self, :node => "#{var}_new", :parent_node => node, :klass => klass, :publish_after_save => auto_publish_param)
|
104
|
-
else
|
105
|
-
# build form from 'each'
|
106
|
-
out expand_block(@context[:form], :in_add => true, :no_ignore => ['form'], :add=>self, :make_form => true, :node => "#{var}_new", :parent_node => node, :klass => klass, :publish_after_save => auto_publish_param)
|
107
|
-
end
|
108
|
-
out "<% end -%>"
|
109
|
-
else
|
110
|
-
# no ajax
|
111
|
-
@html_tag_params[:class] ||= 'btn_add' if @html_tag
|
112
|
-
out render_html_tag(expand_with)
|
113
|
-
end
|
114
|
-
out "<% end -%>"
|
115
|
-
@html_tag_done = true
|
116
|
-
end
|
117
|
-
|
118
|
-
def r_add_btn
|
119
|
-
if @params[:text]
|
120
|
-
text = @params[:text]
|
121
|
-
text = "<div>#{text}</div>" unless @html_tag
|
122
|
-
elsif @params[:trans]
|
123
|
-
text = _(@params[:trans])
|
124
|
-
text = "<div>#{text}</div>" unless @html_tag
|
125
|
-
elsif @blocks != []
|
126
|
-
text = expand_with
|
127
|
-
else
|
128
|
-
text = node_class == Comment ? _("btn_add_comment") : _("btn_add")
|
129
|
-
end
|
130
|
-
|
131
|
-
out "<a href='#' onclick='#{@context[:onclick]}'>#{text}</a>"
|
132
|
-
end
|
133
|
-
|
134
|
-
# Show html to add open a popup window to add a document.
|
135
|
-
# TODO: inline ajax for upload ?
|
136
|
-
def r_add_document
|
137
|
-
return parser_error("only works with nodes (not with #{node_class})") unless node_kind_of?(Node)
|
138
|
-
@html_tag_params[:class] ||= 'btn_add'
|
139
|
-
res = "<a href='/documents/new?parent_id=#{erb_node_id}' onclick='uploader=window.open(\"/documents/new?parent_id=#{erb_node_id}\", \"upload\", \"width=400,height=300\");return false;'>#{_('btn_add_doc')}</a>"
|
140
|
-
"<% if #{node}.can_write? -%>#{render_html_tag(res)}<% end -%>"
|
141
|
-
end
|
142
|
-
|
143
|
-
#if RAILS_ENV == 'test'
|
144
|
-
# def r_test
|
145
|
-
# inspect
|
146
|
-
# end
|
147
|
-
#end
|
148
|
-
|
149
|
-
def r_drop
|
150
|
-
if parent.method == 'each' && @method == parent.single_child_method
|
151
|
-
parent.add_html_class('drop')
|
152
|
-
else
|
153
|
-
@html_tag_params[:class] ||= 'drop'
|
154
|
-
end
|
155
|
-
r_block
|
156
|
-
end
|
157
|
-
|
158
|
-
def drop_javascript
|
159
|
-
hover = @params[:hover]
|
160
|
-
change = @params[:change]
|
161
|
-
|
162
|
-
if role = @params[:set] || @params[:add]
|
163
|
-
query_params = ["node[#{role}_id]=[id]"]
|
164
|
-
else
|
165
|
-
query_params = []
|
166
|
-
# set='icon_for=[id], v_status='50', v_title='[v_title]'
|
167
|
-
@params.each do |k, v|
|
168
|
-
next if [:hover, :change, :done].include?(k)
|
169
|
-
value, static = parse_attributes_in_value(v, :erb => false, :skip_node_attributes => true)
|
170
|
-
key = change == 'params' ? "params[#{k}]" : "node[#{k}]"
|
171
|
-
query_params << "#{key}=#{CGI.escape(value)}"
|
172
|
-
end
|
173
|
-
return parser_error("missing parameters to set values") if query_params == []
|
174
|
-
end
|
175
|
-
|
176
|
-
query_params << "change=#{change}" if change == 'receiver'
|
177
|
-
query_params << "t_url=#{CGI.escape(template_url)}"
|
178
|
-
query_params << "dom_id=#{erb_dom_id}"
|
179
|
-
query_params << start_node_s_param(:erb)
|
180
|
-
query_params << "done=#{CGI.escape(@params[:done])}" if @params[:done]
|
181
|
-
|
182
|
-
"<script type='text/javascript'>
|
183
|
-
//<![CDATA[
|
184
|
-
Droppables.add('#{erb_dom_id}', {hoverclass:'#{hover || 'drop_hover'}', onDrop:function(element){new Ajax.Request('/nodes/#{erb_node_id}/drop?#{query_params.join('&')}', {asynchronous:true, evalScripts:true, method:'put', parameters:'drop=' + encodeURIComponent(element.id)})}})
|
185
|
-
//]]>
|
186
|
-
</script>"
|
187
|
-
end
|
188
|
-
|
189
|
-
def r_draggable
|
190
|
-
new_dom_scope
|
191
|
-
@html_tag ||= 'div'
|
192
|
-
case @params[:revert]
|
193
|
-
when 'move'
|
194
|
-
revert_effect = 'Element.move'
|
195
|
-
when 'remove'
|
196
|
-
revert_effect = 'Element.remove'
|
197
|
-
else
|
198
|
-
revert_effect = 'Element.move'
|
199
|
-
end
|
200
|
-
|
201
|
-
res, drag_handle = set_drag_handle_and_id(expand_with, @params, :id => erb_dom_id)
|
202
|
-
|
203
|
-
out render_html_tag(res)
|
204
|
-
|
205
|
-
if drag_handle
|
206
|
-
out "<script type='text/javascript'>\n//<![CDATA[\n
|
207
|
-
new Draggable('#{erb_dom_id}', {ghosting:true, revert:true, revertEffect:#{revert_effect}, handle:$('#{erb_dom_id}').select('.#{drag_handle}')[0]});\n//]]>\n</script>"
|
208
|
-
else
|
209
|
-
out "<script type='text/javascript'>\n//<![CDATA[\nZena.draggable('#{erb_dom_id}',0,true,true,#{revert_effect})\n//]]>\n</script>"
|
210
|
-
end
|
211
|
-
end
|
212
|
-
|
213
|
-
def r_unlink
|
214
|
-
return "" if @context[:make_form]
|
215
|
-
opts = {}
|
216
|
-
|
217
|
-
if upd = @params[:update]
|
218
|
-
if upd == '_page'
|
219
|
-
target = nil
|
220
|
-
elsif target = find_target(upd)
|
221
|
-
# ok
|
222
|
-
else
|
223
|
-
return
|
224
|
-
end
|
225
|
-
elsif target = ancestor('block')
|
226
|
-
# ok
|
227
|
-
else
|
228
|
-
target = self
|
229
|
-
end
|
230
|
-
|
231
|
-
if node_kind_of?(Node)
|
232
|
-
opts[:cond] = "#{node}.can_write? && #{node}.link_id"
|
233
|
-
opts[:url] = "/nodes/\#{#{node_id}}/links/\#{#{node}.link_id}"
|
234
|
-
elsif node_kind_of?(Link)
|
235
|
-
opts[:url] = "/nodes/\#{#{node}.this_zip}/links/\#{#{node}.zip}"
|
236
|
-
end
|
237
|
-
|
238
|
-
opts[:method] = :delete
|
239
|
-
opts[:default_text] = _('btn_tiny_del')
|
240
|
-
opts[:html_params] = get_html_params({:class => 'unlink'}.merge(@params), :link)
|
241
|
-
|
242
|
-
out link_to_update(target, opts)
|
243
|
-
|
244
|
-
#tag_to_remote
|
245
|
-
#"<%= tag_to_remote({:url => node_path(#{node_id}) + \"#{opts[:method] != :put ? '/zafu' : ''}?#{action.join('&')}\", :method => #{opts[:method].inspect}}) %>"
|
246
|
-
# out "<a class='#{@params[:class] || 'unlink'}' href='/nodes/#{erb_node_id}/links/<%= #{node}.link_id %>?#{action}' onclick=\"new Ajax.Request('/nodes/#{erb_node_id}/links/<%= #{node}.link_id %>?#{action}', {asynchronous:true, evalScripts:true, method:'delete'}); return false;\">"
|
247
|
-
# if !@blocks.empty?
|
248
|
-
# inner = expand_with
|
249
|
-
# else
|
250
|
-
# inner = _('btn_tiny_del')
|
251
|
-
# end
|
252
|
-
# out "#{inner}</a><% else -%>#{inner}<% end -%>"
|
253
|
-
#elsif node_kind_of?(DataEntry)
|
254
|
-
# text = get_text_for_erb
|
255
|
-
# if text.blank?
|
256
|
-
# text = _('btn_tiny_del')
|
257
|
-
# end
|
258
|
-
# out "<%= link_to_remote(#{text.inspect}, {:url => \"/data_entries/\#{#{node}[:id]}?dom_id=#{dom_id}#{upd_url}\", :method => :delete}, :class=>#{(@params[:class] || 'unlink').inspect}) %>"
|
259
|
-
#end
|
260
|
-
end
|
261
|
-
|
262
|
-
protected
|
263
|
-
def auto_publish_param(in_string = false)
|
264
|
-
if in_string
|
265
|
-
['true','force'].include?(@params[:publish]) ? "&publish=#{@params[:publish]}" : ''
|
266
|
-
else
|
267
|
-
@params[:publish]
|
268
|
-
end
|
269
|
-
end
|
270
|
-
|
271
|
-
# Returns true if a form/edit needs to keep track of link_id (l_status or l_comment used).
|
272
|
-
def need_link_id
|
273
|
-
if (input_fields = (descendants('input') + descendants('select'))) != []
|
274
|
-
input_fields.each do |f|
|
275
|
-
return true if f.params[:name] =~ /\Al_/
|
276
|
-
end
|
277
|
-
elsif (show_fields = descendants('show')) != []
|
278
|
-
show_fields.each do |f|
|
279
|
-
return true if f.params[:attr] =~ /\Al_/
|
280
|
-
end
|
281
|
-
end
|
282
|
-
return false
|
283
|
-
end
|
284
|
-
end # Action
|
285
|
-
end # Zafu
|
@@ -1,167 +0,0 @@
|
|
1
|
-
# Elements here should be moved to the core zafu parser
|
2
|
-
module Zafu
|
3
|
-
module Core
|
4
|
-
module MoveToParser
|
5
|
-
def before_render
|
6
|
-
return unless super
|
7
|
-
|
8
|
-
@var = nil # reset var counter
|
9
|
-
|
10
|
-
if key = @params[:store]
|
11
|
-
set_stored(Node, key, node)
|
12
|
-
end
|
13
|
-
|
14
|
-
if key = @params[:store_date]
|
15
|
-
set_stored(Date, key, current_date)
|
16
|
-
end
|
17
|
-
if @method != 'link'
|
18
|
-
@anchor_param = @params[:anchor]
|
19
|
-
end
|
20
|
-
|
21
|
-
true
|
22
|
-
end
|
23
|
-
|
24
|
-
|
25
|
-
def after_render(text)
|
26
|
-
if @anchor_param
|
27
|
-
@params[:anchor] = @anchor_param # set back in case of double rendering so it is computed again
|
28
|
-
r_anchor + super
|
29
|
-
else
|
30
|
-
super
|
31
|
-
end
|
32
|
-
end
|
33
|
-
|
34
|
-
# Our special version of r_expand_with tag with "set_" parsing.
|
35
|
-
def r_expand_with
|
36
|
-
hash = {}
|
37
|
-
@params.each do |k,v|
|
38
|
-
if k.to_s =~ /^set_(.+)$/
|
39
|
-
# TODO: DRY with render_html_tag
|
40
|
-
k = $1
|
41
|
-
value, static = parse_attributes_in_value(v, :erb => false)
|
42
|
-
hash["exp_#{k}"] = static ? value.inspect : "\"#{value}\""
|
43
|
-
else
|
44
|
-
hash["exp_#{k}"] = v.inspect
|
45
|
-
end
|
46
|
-
end
|
47
|
-
@params = {}
|
48
|
-
expand_with(hash)
|
49
|
-
end
|
50
|
-
|
51
|
-
def expand_with(acontext={})
|
52
|
-
# set variables
|
53
|
-
context = nil
|
54
|
-
pre = ''
|
55
|
-
@blocks.each do |block|
|
56
|
-
next if block.kind_of?(String) || block.method != 'set'
|
57
|
-
@context[:vars] ||= []
|
58
|
-
context ||= @context.merge(acontext).merge(:set => true)
|
59
|
-
pre << expand_block(block, context)
|
60
|
-
@context[:vars] << block.params[:var]
|
61
|
-
end
|
62
|
-
|
63
|
-
pre + super
|
64
|
-
end
|
65
|
-
|
66
|
-
def do_method(sym)
|
67
|
-
method = sym
|
68
|
-
pre, post = '', ''
|
69
|
-
|
70
|
-
# do we need recursion ?
|
71
|
-
inc = descendant('include')
|
72
|
-
if inc && inc.params[:part] == @name
|
73
|
-
@context["#{@name}_method".to_sym] = method_name = template_url[1..-1].gsub(/[\/-]/,'_')
|
74
|
-
pre << "<% def #{method_name}(depth, node, list); return '' if depth > #{inc.params[:depth] ? [inc.params[:depth].to_i,30].min : 5}; _erbout = '' -%>"
|
75
|
-
post << "<% _erbout; end -%><%= #{method_name}(0,#{node},#{list || "[#{node}]"}) %>"
|
76
|
-
@context[:node] = 'node'
|
77
|
-
@context[:list] = 'list'
|
78
|
-
end
|
79
|
-
|
80
|
-
if @context[:make_form]
|
81
|
-
res = case method
|
82
|
-
when :r_title
|
83
|
-
make_input(:name => 'v_title')
|
84
|
-
when :r_link
|
85
|
-
make_input(:name => (@params[:attr] || 'v_title'))
|
86
|
-
when :r_show
|
87
|
-
make_input(:name => (@params[:attr] || @params[:tattr]), :date => @params[:date])
|
88
|
-
when :r_text
|
89
|
-
make_textarea(:name => 'v_text')
|
90
|
-
when :r_summary
|
91
|
-
make_textarea(:name => 'v_summary')
|
92
|
-
when :r_zazen
|
93
|
-
make_textarea(:name => @params[:attr])
|
94
|
-
else
|
95
|
-
if node_kind_of?(DataEntry) && @method.to_s =~ /node_/
|
96
|
-
# select node_id
|
97
|
-
"<%= select_id('#{base_class.to_s.underscore}', '#{@method}_id') %>"
|
98
|
-
end
|
99
|
-
end
|
100
|
-
res = "<#{@html_tag || 'div'} class='zazen'>#{res}</#{@html_tag || 'div'}>" if [:r_summary, :r_text].include?(sym)
|
101
|
-
end
|
102
|
-
|
103
|
-
|
104
|
-
res ||= super(method)
|
105
|
-
"#{pre}#{res}#{post}"
|
106
|
-
end
|
107
|
-
|
108
|
-
# recursion
|
109
|
-
def r_include
|
110
|
-
return '' if @context[:saved_template]
|
111
|
-
return super if @params[:template] || !@params[:part]
|
112
|
-
part = @params[:part].gsub(/[^a-zA-Z_]/,'')
|
113
|
-
method_name = @context["#{part}_method".to_sym]
|
114
|
-
return parser_error("no parent named '#{part}'") unless method_name
|
115
|
-
"<%= #{method_name}(depth+1,#{node},#{list}) %>"
|
116
|
-
end
|
117
|
-
|
118
|
-
# Find a block to update on the page
|
119
|
-
def find_target(name)
|
120
|
-
# find dom_id / template_url
|
121
|
-
target = nil
|
122
|
-
root.descendants('block').each do |b|
|
123
|
-
if b.name == name
|
124
|
-
target = b
|
125
|
-
break
|
126
|
-
end
|
127
|
-
end
|
128
|
-
out parser_error("could not find a block named '#{name}'") if target.nil?
|
129
|
-
target
|
130
|
-
end
|
131
|
-
|
132
|
-
def context
|
133
|
-
return @context if @context
|
134
|
-
# not rendered yet, find first parent with context
|
135
|
-
@context = parent ? parent.context : {}
|
136
|
-
end
|
137
|
-
|
138
|
-
# Block visibility of descendance with 'do_list'.
|
139
|
-
def public_descendants
|
140
|
-
all = super
|
141
|
-
if ['context', 'each', 'block'].include?(self.method)
|
142
|
-
# do not propagate 'form',etc up
|
143
|
-
all.reject do |k,v|
|
144
|
-
['form','unlink'].include?(k)
|
145
|
-
end
|
146
|
-
elsif ['if', 'case'].include?(self.method)
|
147
|
-
all.reject do |k,v|
|
148
|
-
['else', 'elsif', 'when'].include?(k)
|
149
|
-
end
|
150
|
-
else
|
151
|
-
all
|
152
|
-
end
|
153
|
-
end
|
154
|
-
|
155
|
-
def single_child_method
|
156
|
-
return @single_child_method if defined?(@single_child_method)
|
157
|
-
@single_child_method = if @blocks.size == 1
|
158
|
-
single_child = @blocks[0]
|
159
|
-
return nil if single_child.kind_of?(String)
|
160
|
-
single_child.html_tag ? nil : single_child.method
|
161
|
-
else
|
162
|
-
nil
|
163
|
-
end
|
164
|
-
end
|
165
|
-
end # MoveToParser
|
166
|
-
end # Core
|
167
|
-
end # Zafu
|