zena 1.0.0.beta3 → 1.0.0.rc1
Sign up to get free protection for your applications and to get access to all the features.
- data/History.txt +29 -0
- data/Rakefile +2 -0
- data/TODO_ZENA_1_0 +13 -23
- data/app/controllers/columns_controller.rb +1 -1
- data/app/controllers/comments_controller.rb +4 -3
- data/app/controllers/documents_controller.rb +8 -11
- data/app/controllers/nodes_controller.rb +39 -21
- data/app/controllers/users_controller.rb +8 -3
- data/app/controllers/versions_controller.rb +2 -2
- data/app/controllers/virtual_classes_controller.rb +17 -11
- data/app/helpers/documents_helper.rb +0 -3
- data/app/helpers/users_helper.rb +17 -0
- data/app/models/cache.rb +36 -31
- data/app/models/column.rb +48 -5
- data/app/models/comment.rb +14 -5
- data/app/models/data_entry.rb +2 -2
- data/app/models/document.rb +23 -33
- data/app/models/idx_nodes_datetime.rb +4 -0
- data/app/models/idx_nodes_float.rb +4 -0
- data/app/models/idx_project.rb +3 -0
- data/app/models/node.rb +372 -308
- data/app/models/page.rb +1 -31
- data/app/models/relation.rb +4 -4
- data/app/models/relation_proxy.rb +128 -17
- data/app/models/role.rb +27 -2
- data/app/models/site.rb +64 -56
- data/app/models/template.rb +11 -12
- data/app/models/text_document.rb +6 -7
- data/app/models/user.rb +95 -46
- data/app/models/version.rb +2 -2
- data/app/models/virtual_class.rb +418 -73
- data/app/views/columns/_form.html.erb +1 -1
- data/app/views/columns/_li.html.erb +1 -1
- data/app/views/comments/_form.rhtml +1 -1
- data/app/views/comments/_li.rhtml +1 -1
- data/app/views/comments/_li_simple.rhtml +1 -1
- data/app/views/groups/_form.rhtml +1 -1
- data/app/views/links/_li.rhtml +1 -1
- data/app/views/nodes/_groups.rhtml +1 -1
- data/app/views/nodes/_import_results.rhtml +1 -1
- data/app/views/nodes/_parent.rhtml +1 -1
- data/app/views/nodes/_results.rhtml +1 -1
- data/app/views/nodes/create.rjs +4 -2
- data/app/views/relations/_li.erb +2 -2
- data/app/views/templates/document_create_tabs/_file.rhtml +1 -1
- data/app/views/templates/document_create_tabs/_template.rhtml +2 -2
- data/app/views/templates/document_create_tabs/_text_document.rhtml +2 -2
- data/app/views/templates/edit_tabs/_help.rhtml +1 -1
- data/app/views/templates/edit_tabs/_title.rhtml +0 -3
- data/app/views/users/_form.rhtml +2 -6
- data/app/views/users/_li.rhtml +1 -3
- data/app/views/users/create.rjs +4 -4
- data/app/views/users/preferences.html.erb +1 -4
- data/app/views/versions/custom_tab.rhtml +5 -0
- data/app/views/virtual_classes/_form.erb +20 -10
- data/app/views/virtual_classes/_li.erb +21 -8
- data/app/views/zafu/default/Node-+search.zafu +1 -1
- data/app/views/zafu/default/Node.zafu +3 -3
- data/bricks/captcha/lib/bricks/captcha.rb +1 -1
- data/bricks/mongrel/zena/deploy.rb +14 -0
- data/bricks/{data2pdf → pdf}/.document +0 -0
- data/bricks/pdf/README +33 -0
- data/bricks/{data2pdf → pdf}/Rakefile +0 -0
- data/bricks/pdf/VERSION +1 -0
- data/bricks/pdf/lib/bricks/pdf.rb +110 -0
- data/bricks/pdf/lib/bricks/pdf/engine/prince.rb +38 -0
- data/bricks/pdf/lib/bricks/pdf/engine/xhtml2pdf.rb +9 -0
- data/bricks/pdf/lib/bricks/pdf/install.rb +121 -0
- data/bricks/pdf/test/engines/test_prince.rb +15 -0
- data/bricks/pdf/test/engines/test_xhtml2pdf.rb +15 -0
- data/bricks/{data2pdf → pdf}/test/fixtures/application.css +0 -0
- data/bricks/{data2pdf → pdf}/test/fixtures/contact.html +0 -0
- data/bricks/{data2pdf → pdf}/test/fixtures/pisa-default.css +0 -0
- data/bricks/{data2pdf → pdf}/test/fixtures/sheet1.css +0 -0
- data/bricks/{data2pdf → pdf}/test/fixtures/sheet2.css +0 -0
- data/bricks/{data2pdf → pdf}/test/fixtures/simple-html.html +0 -0
- data/bricks/{data2pdf → pdf}/test/fixtures/simple-text.txt +0 -0
- data/bricks/{data2pdf → pdf}/test/helper.rb +4 -5
- data/bricks/pdf/test/shoulda_macros/shoulda_pdf.rb +72 -0
- data/bricks/pdf/zena/init.rb +5 -0
- data/bricks/pdf/zena/tasks.rb +17 -0
- data/bricks/sphinx/lib/{use_sphinx.rb → bricks/sphinx.rb} +1 -1
- data/bricks/tags/zena/init.rb +2 -2
- data/bricks/tags/zena/test/zafu/tags.yml +4 -4
- data/bricks/zena/zena/migrate/01_base.rb +482 -0
- data/config/bricks.yml +22 -6
- data/config/gems.yml +8 -6
- data/db/20100628074512_zena0x_to1x.rb +6 -1
- data/db/fix/024_correct_vclass_kpath.rb +11 -0
- data/db/fix/025_move_tag_into_vclass.rb +13 -0
- data/db/{migrate → fix}/026_rename_templates.rb +0 -0
- data/db/{migrate → fix}/045_avoid_star_in_templates.rb +0 -0
- data/db/{migrate → fix}/046_fix_zazen_image_tag.rb +0 -0
- data/db/{migrate → fix}/047_change_default_link_id_to_zero.rb +1 -3
- data/db/{migrate → fix}/049_fix_publish_from_is_null.rb +0 -0
- data/db/{migrate → fix}/20090924141459_zafu_fix_sept09.rb +0 -0
- data/db/{migrate → fix}/20091013100351_rename_publish_group_to_drive_group.rb +1 -3
- data/db/{migrate → fix}/20091124161608_rebuild_fullpath.rb +0 -1
- data/db/{migrate → fix}/20100115134729_rebuild_fullpath_after_fix.rb +0 -0
- data/db/{migrate → fix}/20100526090140_renamed_contact_model_to_base_contact.rb +2 -4
- data/db/{migrate → fix/old_migrations}/001_create_base.rb +0 -1
- data/db/{migrate → fix/old_migrations}/002_add_time_zone_to_users.rb +0 -0
- data/db/{migrate → fix/old_migrations}/003_add_custom_base_flag.rb +0 -0
- data/db/{migrate → fix/old_migrations}/004_rename_template_skin.rb +0 -0
- data/db/{migrate → fix/old_migrations}/005_create_cached_pages.rb +0 -0
- data/db/{migrate → fix/old_migrations}/006_create_sites.rb +0 -0
- data/db/{migrate → fix/old_migrations}/007_replace_id_by_zip.rb +0 -0
- data/db/{migrate → fix/old_migrations}/008_user_status.rb +0 -0
- data/db/{migrate → fix/old_migrations}/009_fulltext.rb +0 -0
- data/db/fix/old_migrations/010_create_template_content.rb +17 -0
- data/db/{migrate → fix/old_migrations}/011_project_to_section.rb +0 -0
- data/db/{migrate → fix/old_migrations}/012_add_project_id.rb +0 -0
- data/db/{migrate → fix/old_migrations}/013_remove_defaults.rb +0 -0
- data/db/{migrate → fix/old_migrations}/014_add_sort_field.rb +0 -0
- data/db/{migrate → fix/old_migrations}/015_add_dyn_attributes.rb +0 -0
- data/db/{migrate → fix/old_migrations}/016_remove_translations.rb +0 -0
- data/db/{migrate → fix/old_migrations}/017_rename_authorize.rb +0 -0
- data/db/{migrate → fix/old_migrations}/018_add_auth_option.rb +0 -0
- data/db/{migrate → fix/old_migrations}/019_remove_user_status.rb +0 -0
- data/db/{migrate → fix/old_migrations}/020_create_participation.rb +0 -0
- data/db/{migrate → fix/old_migrations}/021_create_relations.rb +0 -0
- data/db/{migrate → fix/old_migrations}/022_create_virtual_classes.rb +0 -0
- data/db/{migrate → fix/old_migrations}/023_ip_on_anonymous_comment.rb +0 -0
- data/db/{migrate → fix/old_migrations}/027_add_country_to_contacts.rb +0 -0
- data/db/{migrate → fix/old_migrations}/028_change_size_of_conten_type_field.rb +0 -0
- data/db/{migrate → fix/old_migrations}/029_create_data_entries.rb +0 -0
- data/db/{migrate → fix/old_migrations}/030_redit_auto_publish_site_settings.rb +0 -0
- data/db/{migrate → fix/old_migrations}/031_create_iformats.rb +0 -0
- data/db/{migrate → fix/old_migrations}/032_caches_context_as_hash.rb +0 -0
- data/db/{migrate → fix/old_migrations}/033_documents_kpath_change.rb +0 -0
- data/db/{migrate → fix/old_migrations}/034_change_file_storage.rb +0 -0
- data/db/{migrate → fix/old_migrations}/035_add_status_to_link.rb +0 -0
- data/db/{migrate → fix/old_migrations}/036_add_flag_fields_on_nodes.rb +0 -0
- data/db/{migrate → fix/old_migrations}/037_add_auto_create_discussion_to_v_class.rb +0 -0
- data/db/{migrate → fix/old_migrations}/038_create_site_attributes.rb +0 -0
- data/db/{migrate → fix/old_migrations}/039_default_position.rb +0 -0
- data/db/{migrate → fix/old_migrations}/040_second_value_for_data_entry.rb +0 -0
- data/db/{migrate → fix/old_migrations}/041_add_attributes_to_v_class.rb +0 -0
- data/db/{migrate → fix/old_migrations}/042_fix_position_should_be_float.rb +0 -0
- data/db/{migrate → fix/old_migrations}/043_move_user_lang_into_participation.rb +0 -0
- data/db/{migrate → fix/old_migrations}/044_remove_monolingual_site_option.rb +0 -0
- data/db/{migrate → fix/old_migrations}/048_link_source_target_can_be_null.rb +0 -0
- data/db/{migrate → fix/old_migrations}/050_date_in_links.rb +0 -0
- data/db/{migrate → fix/old_migrations}/051_add_exif_tags_to_images.rb +0 -0
- data/db/{migrate → fix/old_migrations}/20090825201159_insert_zero_link.rb +0 -0
- data/db/{migrate → fix/old_migrations}/20090825201200_merge_bricks_migrations_with_std_migrations.rb +0 -0
- data/db/{migrate → fix/old_migrations}/20090927125912_allow_null_in_text_fields.rb +0 -0
- data/db/{migrate → fix/old_migrations}/20090928133440_no_more_private_nodes.rb +0 -0
- data/db/{migrate → fix/old_migrations}/20090928143754_version_status_change.rb +0 -0
- data/db/{migrate → fix/old_migrations}/20091001084025_change_status_values_for_comments.rb +0 -0
- data/db/{migrate → fix/old_migrations}/20091009084057_add_vhash_in_node.rb +0 -0
- data/db/{migrate → fix/old_migrations}/20091014130833_fix_template_title.rb +0 -0
- data/db/{migrate → fix/old_migrations}/20091014183726_merge_participation_into_users.rb +0 -0
- data/db/{migrate → fix/old_migrations}/20091018200734_add_popup_info_to_image_format.rb +0 -0
- data/db/{migrate → fix/old_migrations}/20091026161708_add_persistence_token.rb +0 -0
- data/db/{migrate → fix/old_migrations}/20091101184952_add_session_table.rb +0 -0
- data/db/{migrate → fix/old_migrations}/20091123175137_add_single_access_token.rb +0 -0
- data/db/{migrate → fix/old_migrations}/20100125062254_add_dynamo_to_version.rb +0 -0
- data/db/{migrate → fix/old_migrations}/20100201133242_remove_default_status_on_version.rb +0 -0
- data/db/{migrate → fix/old_migrations}/20100208194210_create_attachments.rb +0 -0
- data/db/{migrate → fix/old_migrations}/20100210112319_change_dynamo_to_property.rb +0 -0
- data/db/{migrate → fix/old_migrations}/20100320145726_transform_template_contents_into_index.rb +0 -0
- data/db/{migrate → fix/old_migrations}/20100328125634_change_skin_name_to_id.rb +0 -0
- data/db/{migrate → fix/old_migrations}/20100417061257_add_properties_to_sites.rb +0 -0
- data/db/{migrate → fix/old_migrations}/20100419163149_rename_name_to_node_name.rb +0 -0
- data/db/{migrate → fix/old_migrations}/20100422091606_change_v_class_table_into_roles.rb +0 -0
- data/db/{migrate → fix/old_migrations}/20100422094048_node_habtm_roles.rb +0 -0
- data/db/{migrate → fix/old_migrations}/20100422115935_create_columns.rb +0 -0
- data/db/{migrate → fix/old_migrations}/20100513181529_add_site_id_to_columns.rb +0 -0
- data/db/{migrate → fix/old_migrations}/20100519091711_add_index_definition_to_columns.rb +0 -0
- data/db/{migrate → fix/old_migrations}/20100519091940_create_idx_nodes_string.rb +0 -0
- data/db/{migrate → fix/old_migrations}/20100519232432_create_idx_nodes_ml_string.rb +0 -0
- data/db/{migrate → fix/old_migrations}/20100525113858_add_porperties_to_users.rb +0 -0
- data/db/{migrate → fix/old_migrations}/20100527130937_change_column_index_to_string.rb +0 -0
- data/db/{migrate → fix/old_migrations}/20100531135128_add_fulltext_builder_fields.rb +0 -0
- data/db/{migrate → fix/old_migrations}/20100915062903_add_api_group_id_to_site.rb +0 -0
- data/db/fix/old_migrations/20100923154807_remove_base_contact.rb +84 -0
- data/db/fix/old_migrations/20100926192223_remove_su_user.rb +8 -0
- data/db/fix/old_migrations/20100927141658_add_eval_attributes_to_v_class.rb +12 -0
- data/db/fix/old_migrations/20100928185257_add_obvious_idx.rb +52 -0
- data/db/fix/old_migrations/20100929143111_remove_node_name.rb +11 -0
- data/db/fix/old_migrations/20101006090454_store_properties_in_long_text.rb +9 -0
- data/db/fix/old_migrations/20101014185753_remove_user_prototype_id.rb +9 -0
- data/db/fix/old_migrations/20101101084318_create_scope_index.rb +35 -0
- data/db/fix/old_migrations/20101109074232_create_idx_nodes_tables.rb +65 -0
- data/db/fix/old_migrations/20101110184235_add_role_update_to_site.rb +9 -0
- data/db/fix/old_migrations/20101116103920_change_scope_index.rb +31 -0
- data/db/fix/old_migrations/20101123125822_add_integer_idx.rb +17 -0
- data/db/fix/old_migrations/20101130134522_add_index_field.rb +13 -0
- data/db/fix/old_migrations/20101213133816_add_group_to_relation.rb +9 -0
- data/db/init/base/help.fr.zml +1 -1
- data/db/init/base/skins/default.zml +0 -1
- data/db/init/base/skins/default/Node-+search.zafu +1 -1
- data/db/init/base/skins/default/Node-tree.zafu +3 -3
- data/db/init/base/skins/default/Node.zafu +3 -3
- data/lib/bricks/loader.rb +4 -1
- data/lib/bricks/requirements_validation.rb +11 -6
- data/lib/log_recorder/lib/log_recorder.rb +2 -2
- data/lib/tasks/zena.rake +25 -15
- data/lib/zena.rb +42 -9
- data/lib/zena/acts/enrollable.rb +81 -99
- data/lib/zena/acts/secure.rb +27 -23
- data/lib/zena/acts/secure_node.rb +10 -55
- data/lib/zena/acts/serializable.rb +9 -10
- data/lib/zena/app.rb +0 -2
- data/lib/zena/code_syntax.rb +1 -1
- data/lib/zena/controller/test_case.rb +0 -5
- data/lib/zena/core_ext/string.rb +48 -20
- data/lib/zena/db.rb +10 -442
- data/lib/zena/db_helper/abstract_db.rb +184 -0
- data/lib/zena/db_helper/mysql.rb +150 -0
- data/lib/zena/db_helper/postgresql.rb +79 -0
- data/lib/zena/db_helper/sqlite3.rb +135 -0
- data/lib/zena/deploy.rb +4 -1
- data/lib/zena/deploy/httpd.rhtml +3 -3
- data/lib/zena/deploy/vhost.rhtml +1 -1
- data/lib/zena/foxy_parser.rb +37 -18
- data/lib/zena/info.rb +3 -13
- data/lib/zena/migrator.rb +0 -1
- data/lib/zena/parser/zafu_rules.rb +9 -4
- data/lib/zena/parser/zazen_rules.rb +5 -5
- data/lib/zena/parser/zena_rules.rb +1 -1
- data/lib/zena/remote/interface.rb +1 -1
- data/lib/zena/site_worker.rb +3 -3
- data/lib/zena/test_controller.rb +10 -10
- data/lib/zena/use/action.rb +66 -6
- data/lib/zena/use/ajax.rb +39 -13
- data/lib/zena/use/ancestry.rb +210 -0
- data/lib/zena/use/authlogic.rb +30 -1
- data/lib/zena/use/calendar.rb +158 -0
- data/lib/zena/use/conditional.rb +3 -2
- data/lib/zena/use/context.rb +42 -12
- data/lib/zena/use/dates.rb +15 -14
- data/lib/zena/use/display.rb +54 -7
- data/lib/zena/use/error_rendering.rb +1 -0
- data/lib/zena/use/field_index.rb +20 -0
- data/lib/zena/use/fixtures.rb +12 -9
- data/lib/zena/use/forms.rb +230 -106
- data/lib/zena/use/fulltext.rb +28 -14
- data/lib/zena/use/html_tags.rb +1 -24
- data/lib/zena/use/i18n.rb +69 -14
- data/lib/zena/use/kpath.rb +60 -0
- data/lib/zena/use/ml_index.rb +6 -4
- data/lib/zena/use/node_context.rb +63 -0
- data/lib/zena/use/prop_eval.rb +90 -0
- data/lib/zena/use/query_builder.rb +159 -29
- data/lib/zena/use/query_comment.rb +1 -1
- data/lib/zena/use/query_node.rb +147 -56
- data/lib/zena/use/recursion.rb +2 -2
- data/lib/zena/use/relations.rb +31 -19
- data/lib/zena/use/rendering.rb +111 -121
- data/lib/zena/use/scope_index.rb +230 -0
- data/lib/zena/use/search.rb +7 -7
- data/lib/zena/use/urls.rb +87 -25
- data/lib/zena/use/version_hash.rb +113 -113
- data/lib/zena/use/workflow.rb +5 -1
- data/lib/zena/use/zafu_attributes.rb +11 -14
- data/lib/zena/use/zafu_eval.rb +1 -1
- data/lib/zena/use/zafu_safe_definitions.rb +91 -9
- data/lib/zena/use/zafu_templates.rb +146 -102
- data/lib/zena/use/zazen.rb +5 -4
- data/lib/zena/zafu_compiler.rb +1 -0
- data/locale/en/LC_MESSAGES/zena.mo +0 -0
- data/locale/en/zena.po +0 -1
- data/locale/fr/LC_MESSAGES/zena.mo +0 -0
- data/locale/fr/zena.mo +0 -0
- data/locale/fr/zena.po +4 -4
- data/misc/zena +35 -0
- data/misc/zena_init +41 -0
- data/public/images/ext/{basecontact.png → contact.png} +0 -0
- data/public/javascripts/zena.js +35 -7
- data/public/stylesheets/admin.css +5 -2
- data/public/stylesheets/default.css +2 -1
- data/public/stylesheets/popup.css +1 -1
- data/public/stylesheets/zena.css +2 -2
- data/test/custom_queries/complex.host.yml +12 -5
- data/test/fixtures/files/Node-test.zafu +3 -3
- data/test/fixtures/files/translations_fr.yml +4 -2
- data/test/functional/documents_controller_test.rb +31 -0
- data/test/functional/nodes_controller_commit_test.rb +1 -5
- data/test/functional/nodes_controller_test.rb +92 -12
- data/test/functional/user_sessions_controller_test.rb +2 -2
- data/test/functional/users_controller_test.rb +31 -29
- data/test/functional/versions_controller_test.rb +2 -2
- data/test/functional/virtual_classes_controller_test.rb +2 -2
- data/test/integration/multiple_hosts_test.rb +19 -8
- data/test/integration/navigation_test.rb +91 -12
- data/test/integration/query_node/basic.yml +40 -37
- data/test/integration/query_node/complex.yml +23 -18
- data/test/integration/query_node/dates.yml +3 -3
- data/test/integration/query_node/errors.yml +7 -1
- data/test/integration/query_node/filters.yml +41 -35
- data/test/integration/query_node/idx_fields.yml +11 -0
- data/test/integration/query_node/idx_key_value.yml +77 -0
- data/test/integration/query_node/idx_scope.yml +33 -0
- data/test/integration/query_node/relations.yml +13 -13
- data/test/integration/query_node_test.rb +6 -10
- data/test/integration/zafu_compiler/action.yml +19 -6
- data/test/integration/zafu_compiler/ajax.yml +111 -51
- data/test/integration/zafu_compiler/apphelper.yml +1 -1
- data/test/integration/zafu_compiler/asset.yml +1 -1
- data/test/integration/zafu_compiler/basic.yml +42 -52
- data/test/integration/zafu_compiler/calendar.yml +3 -3
- data/test/integration/zafu_compiler/complex.yml +16 -16
- data/test/integration/zafu_compiler/complex_ok.yml +2 -2
- data/test/integration/zafu_compiler/conditional.yml +42 -33
- data/test/integration/zafu_compiler/data.yml +3 -3
- data/test/integration/zafu_compiler/dates.yml +25 -10
- data/test/integration/zafu_compiler/display.yml +49 -12
- data/test/integration/zafu_compiler/errors.yml +26 -6
- data/test/integration/zafu_compiler/eval.yml +4 -4
- data/test/integration/zafu_compiler/forms.yml +89 -15
- data/test/integration/zafu_compiler/i18n.yml +23 -18
- data/test/integration/zafu_compiler/idx_scope.yml +7 -0
- data/test/integration/zafu_compiler/later.yml +10 -16
- data/test/integration/zafu_compiler/off/off.yml +2 -2
- data/test/integration/zafu_compiler/query.yml +207 -0
- data/test/integration/zafu_compiler/recursion.yml +2 -2
- data/test/integration/zafu_compiler/relations.yml +144 -168
- data/test/integration/zafu_compiler/roles.yml +86 -10
- data/test/integration/zafu_compiler/rubyless.yml +49 -6
- data/test/integration/zafu_compiler/safe_definitions.yml +35 -6
- data/test/integration/zafu_compiler/search.yml +1 -1
- data/test/integration/zafu_compiler/security.yml +37 -0
- data/test/integration/zafu_compiler/urls.yml +50 -40
- data/test/integration/zafu_compiler/user.yml +21 -6
- data/test/integration/zafu_compiler/version.yml +6 -6
- data/test/integration/zafu_compiler/zafu_attributes.yml +43 -34
- data/test/integration/zafu_compiler/zazen.yml +10 -10
- data/test/integration/zafu_compiler_test.rb +19 -13
- data/test/sites/complex/nodes.yml +0 -2
- data/test/sites/complex/roles.yml +9 -1
- data/test/sites/complex/sites.yml +0 -1
- data/test/sites/complex/users.yml +2 -5
- data/test/sites/ocean/nodes.yml +2 -5
- data/test/sites/ocean/roles.yml +8 -0
- data/test/sites/ocean/sites.yml +0 -1
- data/test/sites/ocean/users.yml +0 -13
- data/test/sites/zena/columns.yml +27 -5
- data/test/sites/zena/idx_projects.yml +5 -0
- data/test/sites/zena/nodes.yml +8 -32
- data/test/sites/zena/relations.yml +5 -0
- data/test/sites/zena/roles.yml +25 -3
- data/test/sites/zena/sites.yml +2 -2
- data/test/sites/zena/users.yml +1 -21
- data/test/sites/zena/versions.yml +35 -12
- data/test/test_helper.rb +7 -0
- data/test/unit/after_commit_test.rb +7 -7
- data/test/unit/cache_test.rb +32 -0
- data/test/unit/cached_page_test.rb +1 -1
- data/test/unit/column_test.rb +31 -7
- data/test/unit/comment_test.rb +2 -2
- data/test/unit/core_ext_test.rb +38 -7
- data/test/unit/document_test.rb +14 -42
- data/test/unit/node_test.rb +311 -324
- data/test/unit/note_test.rb +23 -31
- data/test/unit/page_test.rb +16 -58
- data/test/unit/project_test.rb +2 -2
- data/test/unit/relation_proxy_test.rb +148 -21
- data/test/unit/relation_test.rb +23 -3
- data/test/unit/remote_test.rb +15 -9
- data/test/unit/role_test.rb +9 -0
- data/test/unit/site_test.rb +49 -47
- data/test/unit/skin_test.rb +16 -0
- data/test/unit/template_test.rb +60 -69
- data/test/unit/text_document_test.rb +15 -14
- data/test/unit/user_test.rb +101 -41
- data/test/unit/version_test.rb +4 -4
- data/test/unit/virtual_class_test.rb +577 -36
- data/test/unit/workflow_test.rb +58 -21
- data/test/unit/zena/acts/enrollable_test.rb +36 -127
- data/test/unit/zena/acts/secure_test.rb +6 -22
- data/test/unit/zena/acts/serializable_test.rb +18 -0
- data/test/unit/zena/db_test.rb +14 -14
- data/test/unit/zena/parser/zafu.yml +5 -3
- data/test/unit/zena/use/ancestry_test.rb +198 -0
- data/test/unit/zena/use/calendar_test.rb +8 -8
- data/test/unit/zena/use/dates_test.rb +2 -0
- data/test/unit/zena/use/fulltext_test.rb +9 -1
- data/test/unit/zena/use/html_tags_test.rb +2 -16
- data/test/unit/zena/use/i18n_test.rb +2 -2
- data/test/unit/zena/use/kpath_test.rb +13 -0
- data/test/unit/zena/use/ml_index_test.rb +60 -12
- data/test/unit/zena/use/prop_eval_test.rb +170 -0
- data/test/unit/zena/use/query_node_test.rb +9 -2
- data/test/unit/zena/use/rendering_test.rb +98 -1
- data/test/unit/zena/use/scope_index_test.rb +464 -0
- data/test/unit/zena/use/urls_test.rb +23 -13
- data/test/unit/zena/use/version_hash_test.rb +2 -2
- data/test/unit/zena/use/zafu_template_test.rb +21 -8
- data/test/unit/zena/use/zazen_test.rb +47 -47
- data/zena.gemspec +177 -143
- metadata +222 -141
- data/app/models/base_contact.rb +0 -79
- data/app/models/book.rb +0 -242
- data/app/models/contact_content.rb +0 -70
- data/app/models/contact_version.rb +0 -40
- data/app/models/reference.rb +0 -18
- data/app/views/templates/edit_tabs/_basecontact.rhtml +0 -8
- data/bricks/data2pdf/README +0 -19
- data/bricks/data2pdf/VERSION +0 -1
- data/bricks/data2pdf/lib/data2pdf.rb +0 -60
- data/bricks/data2pdf/lib/engines/prince.rb +0 -39
- data/bricks/data2pdf/lib/engines/xhtml2pdf.rb +0 -41
- data/bricks/data2pdf/lib/install.rb +0 -111
- data/bricks/data2pdf/test/engines/test_prince.rb +0 -14
- data/bricks/data2pdf/test/engines/test_xhtml2pdf.rb +0 -14
- data/bricks/data2pdf/test/shoulda_macros/shoulda_data2pdf.rb +0 -91
- data/bricks/data2pdf/test/unit/test_rendering.rb +0 -37
- data/config/routes.rb +0 -3
- data/db/migrate/010_create_template_content.rb +0 -17
- data/db/migrate/024_correct_vclass_kpath.rb +0 -13
- data/db/migrate/025_move_tag_into_vclass.rb +0 -15
- data/lib/version_off.rb +0 -323
- data/lib/zena/use/node_name.rb +0 -94
- data/test/integration/query_node/properties.yml +0 -41
- data/test/unit/base_contact_test.rb +0 -242
- data/test/unit/node_name_test.rb +0 -137
File without changes
|
data/bricks/pdf/VERSION
ADDED
@@ -0,0 +1 @@
|
|
1
|
+
0.2.0
|
@@ -0,0 +1,110 @@
|
|
1
|
+
=begin rdoc
|
2
|
+
PDF is module to render file or IO streams (strings obviously) into pdf.
|
3
|
+
|
4
|
+
Examples:
|
5
|
+
|
6
|
+
Bricks::PDF.engine = 'Xhtml2pdf'
|
7
|
+
|
8
|
+
Bricks::PDF.render_file "myfile.html" => STDOUT (strings)
|
9
|
+
Bricks::PDF.render_file "myfile.html", "out.pdf" => out.pdf (file)
|
10
|
+
|
11
|
+
Bricks::PDF.render_string "This is text to render." => STDOUT (strings)
|
12
|
+
Bricks::PDF.render_string "This is text to render.", "out.pdf" => out.pdf (file)
|
13
|
+
=end
|
14
|
+
|
15
|
+
module Bricks
|
16
|
+
module PDF
|
17
|
+
extend self
|
18
|
+
# Wrapper around pdf engines
|
19
|
+
module Engine
|
20
|
+
end # Engine
|
21
|
+
|
22
|
+
class Error < Exception
|
23
|
+
end
|
24
|
+
|
25
|
+
# Raised when an argument is invalid
|
26
|
+
class ArgumentError < Error
|
27
|
+
end
|
28
|
+
|
29
|
+
# Raised when the pdf engine could not be loaded
|
30
|
+
class InvalidEngine < Error
|
31
|
+
end
|
32
|
+
|
33
|
+
def engine=(engine_name)
|
34
|
+
engine_module = Zena.resolve_const("Bricks::PDF::Engine::#{engine_name.to_s.capitalize}")
|
35
|
+
extend engine_module
|
36
|
+
rescue NameError
|
37
|
+
raise PDF::InvalidEngine, "Could not load pdf engine '#{engine_name}'."
|
38
|
+
end
|
39
|
+
|
40
|
+
def render(options)
|
41
|
+
res = nil
|
42
|
+
|
43
|
+
# TODO: redirect error messages...
|
44
|
+
IO.popen(command(options), 'w+') do |io|
|
45
|
+
|
46
|
+
if data = options[:data]
|
47
|
+
io.puts(data)
|
48
|
+
end
|
49
|
+
io.close_write
|
50
|
+
|
51
|
+
unless res = options[:output]
|
52
|
+
res = io.gets
|
53
|
+
end
|
54
|
+
end
|
55
|
+
|
56
|
+
res
|
57
|
+
end
|
58
|
+
|
59
|
+
module ControllerMethods
|
60
|
+
def render_to_pdf(opts)
|
61
|
+
# Get zafu template (compile if needed)
|
62
|
+
template_path = template_url(opts)
|
63
|
+
|
64
|
+
# Produce html
|
65
|
+
data = render_to_string(:file => template_path, :layout=>false)
|
66
|
+
|
67
|
+
target_file = Tempfile.new('trg').path + '.pdf'
|
68
|
+
|
69
|
+
data = Bricks::PDF.render(get_render_auth_params.merge(
|
70
|
+
:data => data,
|
71
|
+
:output => target_file
|
72
|
+
))
|
73
|
+
|
74
|
+
if File.exist?(target_file)
|
75
|
+
data = nil
|
76
|
+
|
77
|
+
File.open(target_file, 'rb') do |f|
|
78
|
+
data = f.read
|
79
|
+
end
|
80
|
+
|
81
|
+
FileUtils.rm(target_file)
|
82
|
+
{
|
83
|
+
:type => 'application/pdf',
|
84
|
+
:disposition => params['disposition'] || 'inline',
|
85
|
+
# Compile html to pdf
|
86
|
+
:data => data
|
87
|
+
}
|
88
|
+
else
|
89
|
+
# did not work
|
90
|
+
query_string = request.query_string
|
91
|
+
if query_string == ''
|
92
|
+
debug_url = "#{request.path}?debug"
|
93
|
+
else
|
94
|
+
debug_url = "#{request.path}?#{query_string}&debug"
|
95
|
+
end
|
96
|
+
|
97
|
+
{
|
98
|
+
:type => 'text/html',
|
99
|
+
# Compile html to pdf
|
100
|
+
:disposition => 'inline',
|
101
|
+
:data => "Could not render pdf file... <a href='#{debug_url}'>debug</a>"
|
102
|
+
}
|
103
|
+
end
|
104
|
+
end
|
105
|
+
end # ControllerMethods
|
106
|
+
|
107
|
+
module ZafuMethods
|
108
|
+
end # ZafuMethods
|
109
|
+
end # PDF
|
110
|
+
end # Bricks
|
@@ -0,0 +1,38 @@
|
|
1
|
+
module Bricks
|
2
|
+
module PDF
|
3
|
+
module Engine
|
4
|
+
module Prince
|
5
|
+
def command(opts)
|
6
|
+
cmd = ['prince']
|
7
|
+
{
|
8
|
+
:http_user => '--http-user=',
|
9
|
+
:http_password => '--http-password=',
|
10
|
+
:baseurl => '--baseurl='
|
11
|
+
}.each do |key, cmd_key|
|
12
|
+
cmd << "#{cmd_key}#{opts[key]}"
|
13
|
+
end
|
14
|
+
|
15
|
+
# FIXME: find a way to redirect errors on screen instead of main log.
|
16
|
+
cmd << "--log=#{Zena.log_path}"
|
17
|
+
|
18
|
+
if file = opts[:input]
|
19
|
+
cmd << file
|
20
|
+
else
|
21
|
+
cmd << "-"
|
22
|
+
end
|
23
|
+
|
24
|
+
if file = opts[:output]
|
25
|
+
cmd << "-o #{file}"
|
26
|
+
else
|
27
|
+
cmd << "-o -"
|
28
|
+
end
|
29
|
+
|
30
|
+
cmd.join(' ')
|
31
|
+
end
|
32
|
+
end # Prince
|
33
|
+
end # Engine
|
34
|
+
end # PDF
|
35
|
+
end # Bricks
|
36
|
+
|
37
|
+
|
38
|
+
|
@@ -0,0 +1,121 @@
|
|
1
|
+
require 'open-uri'
|
2
|
+
require 'digest/md5'
|
3
|
+
require 'digest/sha1'
|
4
|
+
require 'fileutils'
|
5
|
+
require 'tempfile'
|
6
|
+
|
7
|
+
# begin
|
8
|
+
# cmd = 'which python'
|
9
|
+
# unless system cmd
|
10
|
+
# puts 'FATAL: python 2.6.1+ must be installed'
|
11
|
+
# exit
|
12
|
+
# end
|
13
|
+
# end
|
14
|
+
|
15
|
+
module Bricks
|
16
|
+
module PDF
|
17
|
+
class Install
|
18
|
+
|
19
|
+
# Utility to install library necessary to PDF on unix like machine.
|
20
|
+
#
|
21
|
+
# To install xhtml2pdf and his dependencies, see PDF::xhtml2pdf in zena/tasks.rb
|
22
|
+
|
23
|
+
include FileUtils::Verbose
|
24
|
+
|
25
|
+
attr_reader :url, :file, :md5, :sha1, :force
|
26
|
+
|
27
|
+
def self.from_url url, opts={}
|
28
|
+
tmpf = Tempfile.new('PDF').path
|
29
|
+
install_dir = "#{tmpf}_d"
|
30
|
+
FileUtils.mkpath(install_dir)
|
31
|
+
in_dir(install_dir) do
|
32
|
+
puts "INFO: start installation of #{url}"
|
33
|
+
self.new url, opts do |install|
|
34
|
+
install.download
|
35
|
+
install.checksum if install.do_checksum?
|
36
|
+
install.deflate
|
37
|
+
install.setup
|
38
|
+
end
|
39
|
+
puts "INFO: end installation of #{url}"
|
40
|
+
end
|
41
|
+
ensure
|
42
|
+
FileUtils.rm(tmpf)
|
43
|
+
FileUtils.rmtree(install_dir)
|
44
|
+
end
|
45
|
+
|
46
|
+
def self.in_dir(path)
|
47
|
+
old_dir = ENV['PWD']
|
48
|
+
Dir.chdir(path)
|
49
|
+
yield
|
50
|
+
ensure
|
51
|
+
Dir.chdir(old_dir)
|
52
|
+
end
|
53
|
+
|
54
|
+
|
55
|
+
def initialize url, opts={}
|
56
|
+
@url = url
|
57
|
+
@file = url.split('/').last
|
58
|
+
@md5 = opts.delete :md5
|
59
|
+
@sha1 = opts.delete :sha1
|
60
|
+
@force = opts.delete :forc
|
61
|
+
yield self if block_given?
|
62
|
+
end
|
63
|
+
|
64
|
+
def download
|
65
|
+
open file, 'w' do |io|
|
66
|
+
io.write open(url).read
|
67
|
+
end
|
68
|
+
puts "INFO: #{file} downloaded" if downloaded?
|
69
|
+
end
|
70
|
+
|
71
|
+
def checksum
|
72
|
+
integrity = if md5
|
73
|
+
@digest = Digest::MD5.hexdigest(File.read file)
|
74
|
+
@digest == md5
|
75
|
+
elsif sha1
|
76
|
+
@digest = Digest::SHA1.hexdigest(File.read file)
|
77
|
+
@digest == sha1
|
78
|
+
end
|
79
|
+
|
80
|
+
unless integrity || force
|
81
|
+
puts "WARN: Invalid checksum #{@digest} for #{file}"
|
82
|
+
exit
|
83
|
+
else
|
84
|
+
true
|
85
|
+
end
|
86
|
+
end
|
87
|
+
|
88
|
+
def deflate
|
89
|
+
cmd = "nice -n 15 tar xvfz #{file}"
|
90
|
+
success = system cmd
|
91
|
+
puts "INFO: #{file} deflated" if success && $?.exited?
|
92
|
+
end
|
93
|
+
|
94
|
+
def setup
|
95
|
+
cd "./#{folder}" do
|
96
|
+
cmd = "sudo nice -n 15 python setup.py install"
|
97
|
+
success = system cmd
|
98
|
+
end
|
99
|
+
end
|
100
|
+
|
101
|
+
def folder
|
102
|
+
@file.gsub('.tar','').gsub('.gz','').gsub('.zip','')
|
103
|
+
end
|
104
|
+
|
105
|
+
def downloaded?
|
106
|
+
true if File.stat(file).size?
|
107
|
+
end
|
108
|
+
|
109
|
+
def do_checksum?
|
110
|
+
md5 || sha1
|
111
|
+
end
|
112
|
+
|
113
|
+
end # Install
|
114
|
+
end # PDF
|
115
|
+
end # Bricks
|
116
|
+
|
117
|
+
|
118
|
+
|
119
|
+
|
120
|
+
|
121
|
+
|
@@ -0,0 +1,15 @@
|
|
1
|
+
require 'helper'
|
2
|
+
require 'bricks/pdf/engine/prince'
|
3
|
+
|
4
|
+
class TestPrince < Test::Unit::TestCase
|
5
|
+
context 'With a Prince based PDF engine' do
|
6
|
+
subject do
|
7
|
+
Module.new do
|
8
|
+
extend Bricks::PDF
|
9
|
+
extend Bricks::PDF::Engine::Prince
|
10
|
+
end
|
11
|
+
end
|
12
|
+
|
13
|
+
should_behave_as_pdf_engine
|
14
|
+
end # With a Prince based PDF engine
|
15
|
+
end
|
@@ -0,0 +1,15 @@
|
|
1
|
+
require 'helper'
|
2
|
+
require 'bricks/pdf/engine/xhtml2pdf'
|
3
|
+
|
4
|
+
class TestXhtml2pdf < Test::Unit::TestCase
|
5
|
+
context 'With a Prince based PDF engine' do
|
6
|
+
subject do
|
7
|
+
Module.new do
|
8
|
+
extend Bricks::PDF
|
9
|
+
extend Bricks::PDF::Engine::Xhtml2pdf
|
10
|
+
end
|
11
|
+
end
|
12
|
+
|
13
|
+
should_behave_as_pdf_engine
|
14
|
+
end # With a Xhtml2pdf based PDF engine
|
15
|
+
end
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
@@ -4,11 +4,10 @@ require 'shoulda'
|
|
4
4
|
require 'mocha'
|
5
5
|
require 'active_support'
|
6
6
|
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
require '
|
11
|
-
require 'shoulda_data2pdf'
|
7
|
+
#$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..'))
|
8
|
+
#$LOAD_PATH.unshift(File.dirname(__FILE__))
|
9
|
+
require 'bricks/pdf'
|
10
|
+
require 'shoulda_macros/shoulda_pdf'
|
12
11
|
|
13
12
|
class Test::Unit::TestCase
|
14
13
|
|
@@ -0,0 +1,72 @@
|
|
1
|
+
class Test::Unit::TestCase
|
2
|
+
|
3
|
+
def setup
|
4
|
+
@dir = File.dirname(__FILE__)
|
5
|
+
end
|
6
|
+
|
7
|
+
def contact_html
|
8
|
+
File.join(@dir, '..', 'fixtures', 'contact.html')
|
9
|
+
end
|
10
|
+
|
11
|
+
def contact_pdf
|
12
|
+
File.join(@dir, '..', 'fixtures', 'contact.pdf')
|
13
|
+
end
|
14
|
+
|
15
|
+
|
16
|
+
def self.should_behave_as_pdf_engine
|
17
|
+
|
18
|
+
context 'Rendering from file' do
|
19
|
+
setup do
|
20
|
+
@dir = File.dirname(__FILE__)
|
21
|
+
end
|
22
|
+
|
23
|
+
should 'create a pdf file if the destination is a file' do
|
24
|
+
assert_exist contact_pdf do
|
25
|
+
subject.render(:input => contact_html, :output => contact_pdf)
|
26
|
+
end
|
27
|
+
end
|
28
|
+
|
29
|
+
should 'fill STDOUT if no destination is specified' do
|
30
|
+
assert_match %r{^%PDF}, subject.render(:input => contact_html)
|
31
|
+
end
|
32
|
+
end
|
33
|
+
|
34
|
+
|
35
|
+
context 'Rendering from STDIN' do
|
36
|
+
should 'create pdf file if destination is a file' do
|
37
|
+
assert_exist contact_pdf do
|
38
|
+
subject.render(:data => '<html>Hello World</html>', :output => contact_pdf)
|
39
|
+
end
|
40
|
+
end
|
41
|
+
|
42
|
+
should 'fill STDOUT if no destination is specified' do
|
43
|
+
assert_match %r{^%PDF}, subject.render(:data => '<html>Hello World</html>')
|
44
|
+
end
|
45
|
+
end
|
46
|
+
|
47
|
+
context 'Rendering with http auth' do
|
48
|
+
setup do
|
49
|
+
@login = 'ABCDLOGINABCD'
|
50
|
+
@password = '7787PASSWORD8'
|
51
|
+
end
|
52
|
+
|
53
|
+
should 'include http user in command' do
|
54
|
+
assert_match %r{#{@login}}, subject.command(:http_user => @login, :http_password => @password)
|
55
|
+
end
|
56
|
+
|
57
|
+
should 'include http password in command' do
|
58
|
+
assert_match %r{#{@password}}, subject.command(:http_user => @login, :http_password => @password)
|
59
|
+
end
|
60
|
+
end
|
61
|
+
|
62
|
+
context 'Rendering with baseurl' do
|
63
|
+
setup do
|
64
|
+
@baseurl = 'http://localhost:7999'
|
65
|
+
end
|
66
|
+
|
67
|
+
should 'include baseurl in command' do
|
68
|
+
assert_match %r{#{@baseurl}}, subject.command(:baseurl => @baseurl)
|
69
|
+
end
|
70
|
+
end
|
71
|
+
end # should_behave_as_pdf_engine
|
72
|
+
end # Test::Unit::TestCase
|
@@ -0,0 +1,17 @@
|
|
1
|
+
namespace :pdf do
|
2
|
+
desc "Install binary for xhtml2pdf library"
|
3
|
+
task :xhtml2pdf => :environment do
|
4
|
+
install = Bricks::PDF::Install
|
5
|
+
install.from_url "http://pypi.python.org/packages/source/p/pisa/pisa-3.0.33.tar.gz", :md5 => 'e2040b12211303d065bc4ae2470d2700'
|
6
|
+
|
7
|
+
install.from_url "http://www.reportlab.com/ftp/reportlab-2.5.tar.gz"
|
8
|
+
|
9
|
+
install.from_url 'http://html5lib.googlecode.com/files/html5lib-0.11.1.zip', :sha1=>'157506319e40f5d973c128e5e2b826cd1bee471e'
|
10
|
+
|
11
|
+
install.from_url 'http://effbot.org/downloads/Imaging-1.1.7.tar.gz'
|
12
|
+
|
13
|
+
install.from_url 'http://pybrary.net/pyPdf/pyPdf-1.12.tar.gz'
|
14
|
+
|
15
|
+
puts "\n==========================================\nBricks::PDF dependencies installation done"
|
16
|
+
end
|
17
|
+
end
|