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
@@ -0,0 +1,184 @@
|
|
1
|
+
module Zena
|
2
|
+
module DbHelper
|
3
|
+
module AbstractDb
|
4
|
+
def add_column(*args)
|
5
|
+
connection.add_column(*args)
|
6
|
+
end
|
7
|
+
|
8
|
+
def change_column(*args)
|
9
|
+
connection.change_column(*args)
|
10
|
+
end
|
11
|
+
|
12
|
+
# Set a single attribute directly in the database.
|
13
|
+
def set_attribute(obj, key, value)
|
14
|
+
obj.send("#{key}=", value)
|
15
|
+
execute "UPDATE #{obj.class.table_name} SET #{key}=#{quote(value)} WHERE id=#{obj[:id]}"
|
16
|
+
obj.send(:changed_attributes).delete(key.to_s)
|
17
|
+
end
|
18
|
+
|
19
|
+
# Quote value in SQL.
|
20
|
+
def quote(value)
|
21
|
+
connection.quote(value)
|
22
|
+
end
|
23
|
+
|
24
|
+
# Case insensitive find.
|
25
|
+
def insensitive_find(klass, count, attributes)
|
26
|
+
klass.find(count, :conditions => attributes)
|
27
|
+
end
|
28
|
+
|
29
|
+
def quote_date(date)
|
30
|
+
if date.kind_of?(Time)
|
31
|
+
"'#{date.strftime('%Y-%m-%d %H:%M:%S')}'"
|
32
|
+
else
|
33
|
+
"''"
|
34
|
+
end
|
35
|
+
end
|
36
|
+
|
37
|
+
def adapter
|
38
|
+
self.class.to_s.downcase
|
39
|
+
end
|
40
|
+
|
41
|
+
def execute(*args)
|
42
|
+
connection.execute(*args)
|
43
|
+
end
|
44
|
+
|
45
|
+
def update(*args)
|
46
|
+
connection.update(*args)
|
47
|
+
end
|
48
|
+
|
49
|
+
def connection
|
50
|
+
ActiveRecord::Base.connection
|
51
|
+
end
|
52
|
+
|
53
|
+
def quote_column_name(column_name)
|
54
|
+
connection.quote_column_name(column_name)
|
55
|
+
end
|
56
|
+
|
57
|
+
def table_options
|
58
|
+
''
|
59
|
+
end
|
60
|
+
|
61
|
+
def update_value(name, opts)
|
62
|
+
raise Exception.new("Database Adapter #{adapter.inspect} not supported yet (you can probably fix this).")
|
63
|
+
end
|
64
|
+
|
65
|
+
def change_engine(table, engine)
|
66
|
+
# do nothing
|
67
|
+
end
|
68
|
+
|
69
|
+
def add_unique_key(table, keys)
|
70
|
+
raise Exception.new("Database Adapter #{adapter.inspect} not supported yet (you can probably fix this).")
|
71
|
+
end
|
72
|
+
|
73
|
+
# 'DELETE' depending on a two table query.
|
74
|
+
def delete(table, opts)
|
75
|
+
raise Exception.new("Database Adapter #{adapter.inspect} not supported yet (you can probably fix this).")
|
76
|
+
end
|
77
|
+
|
78
|
+
# Insert a list of values (multicolumn insert). The values should be properly escaped before
|
79
|
+
# being passed to this method.
|
80
|
+
def insert_many(table, columns, values)
|
81
|
+
values = values.compact.uniq.map do |list|
|
82
|
+
list.map {|e| quote(e)}
|
83
|
+
end
|
84
|
+
|
85
|
+
columns = columns.map{|c| quote_column_name(c)}.join(',')
|
86
|
+
|
87
|
+
values = values.map {|value| "(#{value.join(',')})"}.join(', ')
|
88
|
+
execute "INSERT INTO #{table} (#{columns}) VALUES #{values}"
|
89
|
+
end
|
90
|
+
|
91
|
+
# Fetch a single row of raw data from db
|
92
|
+
def fetch_attribute(sql)
|
93
|
+
raise Exception.new("Database Adapter #{adapter.inspect} not supported yet (you can probably fix this).")
|
94
|
+
end
|
95
|
+
|
96
|
+
def fetch_ids(sql, attr_name='id')
|
97
|
+
connection.select_all(sql, "#{name} Load").map! do |record|
|
98
|
+
record[attr_name].to_i
|
99
|
+
end
|
100
|
+
end
|
101
|
+
|
102
|
+
def fetch_attributes(attributes, table_name, sql)
|
103
|
+
sql = "SELECT #{attributes.map{|a| connection.quote_column_name(a)}.join(',')} FROM #{table_name} WHERE #{sql}"
|
104
|
+
connection.select_all(sql)
|
105
|
+
end
|
106
|
+
|
107
|
+
def select_all(sql_or_array)
|
108
|
+
if sql_or_array.kind_of?(String)
|
109
|
+
connection.select_all(sql_or_array)
|
110
|
+
else
|
111
|
+
connection.select_all(Node.send(:sanitize_sql, sql_or_array))
|
112
|
+
end
|
113
|
+
end
|
114
|
+
|
115
|
+
def next_zip(site_id)
|
116
|
+
raise Exception.new("Database Adapter #{adapter.inspect} not supported yet (you can probably fix this).")
|
117
|
+
end
|
118
|
+
|
119
|
+
# Return a string matching the SQLiss function.
|
120
|
+
def sql_function(function, key)
|
121
|
+
raise Exception.new("Database Adapter #{adapter.inspect} does not support function #{function.inspect}.")
|
122
|
+
end
|
123
|
+
|
124
|
+
# This is used by zafu and it's a mess.
|
125
|
+
# ref_date can be a string ('2005-05-03') or ruby ('Time.now'). It should not come uncleaned from evil web.
|
126
|
+
def date_condition(date_cond, field, ref_date)
|
127
|
+
raise Exception.new("Database Adapter #{adapter.inspect} not supported yet (you can probably fix this).")
|
128
|
+
end # date_condition
|
129
|
+
|
130
|
+
# Insert a dummy (empty) link to use when mixing queries (QueryNode) with links and without.
|
131
|
+
def insert_dummy_ids
|
132
|
+
tables = []
|
133
|
+
connection.tables.each do |table|
|
134
|
+
if table =~ /^idx_/ || table == 'links'
|
135
|
+
if table =~ /^idx_nodes/
|
136
|
+
next if fetch_attribute("SELECT node_id FROM #{table} WHERE node_id = 0")
|
137
|
+
else
|
138
|
+
next if fetch_attribute("SELECT id FROM #{table} WHERE id = 0")
|
139
|
+
end
|
140
|
+
|
141
|
+
# index table
|
142
|
+
klass = Class.new(ActiveRecord::Base) do
|
143
|
+
set_table_name table
|
144
|
+
end
|
145
|
+
|
146
|
+
dummy_hash = {}
|
147
|
+
klass.columns.each do |col|
|
148
|
+
if !col.null
|
149
|
+
if col.name =~ /_id$/
|
150
|
+
dummy_hash[col.name] = 0
|
151
|
+
elsif col.name != 'id'
|
152
|
+
dummy_hash[col.name] = ''
|
153
|
+
end
|
154
|
+
end
|
155
|
+
end
|
156
|
+
|
157
|
+
if dummy = klass.create(dummy_hash)
|
158
|
+
tables << table
|
159
|
+
if klass.column_names.include?('id')
|
160
|
+
connection.execute "UPDATE #{table} SET id = 0 WHERE id = #{dummy.id}"
|
161
|
+
end
|
162
|
+
else
|
163
|
+
raise "Could not create dummy record for table #{table}"
|
164
|
+
end
|
165
|
+
else
|
166
|
+
next
|
167
|
+
end
|
168
|
+
end
|
169
|
+
|
170
|
+
tables
|
171
|
+
end
|
172
|
+
|
173
|
+
# Fixes #98
|
174
|
+
def prepare_connection_for_timezone
|
175
|
+
# do nothing by default ?
|
176
|
+
end
|
177
|
+
|
178
|
+
# Return true if we can load models because the database has the basic tables.
|
179
|
+
def migrated_once?
|
180
|
+
connection.tables.include?('nodes')
|
181
|
+
end
|
182
|
+
end # AbstractDb
|
183
|
+
end # DbHelper
|
184
|
+
end # Zena
|
@@ -0,0 +1,150 @@
|
|
1
|
+
module Zena
|
2
|
+
module DbHelper
|
3
|
+
# Singleton to help with database queries.
|
4
|
+
class Mysql
|
5
|
+
NOW = 'now()'
|
6
|
+
TRUE = '1'
|
7
|
+
TRUE_RESULT = '1'
|
8
|
+
FALSE = '0'
|
9
|
+
|
10
|
+
class << self
|
11
|
+
# Singleton inheritence
|
12
|
+
include Zena::DbHelper::AbstractDb
|
13
|
+
|
14
|
+
def add_column(table, column_name, type, opts={})
|
15
|
+
# Force the use of :longtext instead of :text
|
16
|
+
if type == :text
|
17
|
+
execute "ALTER TABLE #{table} ADD COLUMN #{column_name} LONGTEXT"
|
18
|
+
else
|
19
|
+
super
|
20
|
+
end
|
21
|
+
end
|
22
|
+
|
23
|
+
def change_column(table, column_name, type, opts={})
|
24
|
+
if type == :text
|
25
|
+
execute "ALTER TABLE #{table} CHANGE COLUMN #{column_name} #{column_name} LONGTEXT"
|
26
|
+
else
|
27
|
+
super
|
28
|
+
end
|
29
|
+
end
|
30
|
+
|
31
|
+
def quote_date(date)
|
32
|
+
if date.kind_of?(Time)
|
33
|
+
date.strftime('%Y%m%d%H%M%S')
|
34
|
+
else
|
35
|
+
"''"
|
36
|
+
end
|
37
|
+
end
|
38
|
+
|
39
|
+
def table_options
|
40
|
+
'type=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci'
|
41
|
+
end
|
42
|
+
|
43
|
+
def update_value(name, opts)
|
44
|
+
tbl1, fld1 = name.split('.')
|
45
|
+
tbl2, fld2 = opts[:from].split('.')
|
46
|
+
execute "UPDATE #{tbl1},#{tbl2} SET #{tbl1}.#{fld1}=#{tbl2}.#{fld2} WHERE #{opts[:where]}"
|
47
|
+
end
|
48
|
+
|
49
|
+
def change_engine(table, engine)
|
50
|
+
execute "ALTER TABLE #{table} ENGINE = #{engine}"
|
51
|
+
end
|
52
|
+
|
53
|
+
def add_unique_key(table, keys)
|
54
|
+
execute "ALTER IGNORE TABLE #{table} ADD UNIQUE KEY(#{keys.join(', ')})"
|
55
|
+
end
|
56
|
+
|
57
|
+
# 'DELETE' depending on a two table query.
|
58
|
+
def delete(table, opts)
|
59
|
+
tbl1, tbl2 = opts[:from]
|
60
|
+
fld1, fld2 = opts[:fields]
|
61
|
+
execute "DELETE #{table} FROM #{opts[:from].join(',')} WHERE #{tbl1}.#{fld1} = #{tbl2}.#{fld2} AND #{opts[:where]}"
|
62
|
+
end
|
63
|
+
|
64
|
+
# Fetch a single row of raw data from db
|
65
|
+
def fetch_attribute(sql)
|
66
|
+
res = execute(sql).fetch_row
|
67
|
+
res ? res.first : nil
|
68
|
+
end
|
69
|
+
|
70
|
+
def next_zip(site_id)
|
71
|
+
res = update "UPDATE zips SET zip=@zip:=zip+1 WHERE site_id = '#{site_id}'"
|
72
|
+
if res == 0
|
73
|
+
# error
|
74
|
+
raise Zena::BadConfiguration, "no zip entry for (#{site_id})"
|
75
|
+
end
|
76
|
+
rows = execute "SELECT @zip"
|
77
|
+
rows.fetch_row[0].to_i
|
78
|
+
end
|
79
|
+
|
80
|
+
# Return a string matching the SQLiss function.
|
81
|
+
def sql_function(function, key)
|
82
|
+
return key unless function
|
83
|
+
case function
|
84
|
+
when 'year'
|
85
|
+
"year(#{key})"
|
86
|
+
when 'month'
|
87
|
+
"date_format(#{key},'%Y-%m')"
|
88
|
+
when 'week'
|
89
|
+
"date_format(#{key},'%Y-%v')"
|
90
|
+
when 'day'
|
91
|
+
"DATE(#{key})"
|
92
|
+
when 'random'
|
93
|
+
'RAND()'
|
94
|
+
else
|
95
|
+
super
|
96
|
+
end
|
97
|
+
end
|
98
|
+
|
99
|
+
# This is used by zafu and it's a mess.
|
100
|
+
# ref_date can be a string ('2005-05-03') or ruby ('Time.now'). It should not come uncleaned from evil web.
|
101
|
+
def date_condition(date_cond, field, ref_date)
|
102
|
+
case date_cond
|
103
|
+
when 'today', 'current', 'same'
|
104
|
+
"DATE(#{field}) = DATE(#{ref_date})"
|
105
|
+
when 'week'
|
106
|
+
"date_format(#{ref_date},'%Y-%v') = date_format(#{field}, '%Y-%v')"
|
107
|
+
when 'month'
|
108
|
+
"date_format(#{ref_date},'%Y-%m') = date_format(#{field}, '%Y-%m')"
|
109
|
+
when 'year'
|
110
|
+
"date_format(#{ref_date},'%Y') = date_format(#{field}, '%Y')"
|
111
|
+
when 'upcoming'
|
112
|
+
"#{field} >= #{ref_date}"
|
113
|
+
else
|
114
|
+
# '2008-01-31 23:50' + INTERVAL 1 hour
|
115
|
+
if date_cond =~ /^(\+|-|)\s*(\d+)\s*(second|minute|hour|day|week|month|year)/
|
116
|
+
count = $2.to_i
|
117
|
+
if $1 == ''
|
118
|
+
# +/-
|
119
|
+
"#{field} > #{ref_date} - INTERVAL #{count} #{$3.upcase} AND #{field} < #{ref_date} + INTERVAL #{count} #{$3.upcase}"
|
120
|
+
elsif $1 == '+'
|
121
|
+
# x upcoming days
|
122
|
+
"#{field} > #{ref_date} AND #{field} < #{ref_date} + INTERVAL #{count} #{$3.upcase}"
|
123
|
+
else
|
124
|
+
# x days in the past
|
125
|
+
"#{field} < #{ref_date} AND #{field} > #{ref_date} - INTERVAL #{count} #{$3.upcase}"
|
126
|
+
end
|
127
|
+
else
|
128
|
+
# bad date_cond
|
129
|
+
nil
|
130
|
+
end
|
131
|
+
end
|
132
|
+
end # date_condition
|
133
|
+
|
134
|
+
def prepare_connection_for_timezone
|
135
|
+
# Fixes timezone to "+0:0"
|
136
|
+
raise "prepare_connection_for_timezone executed too late, connection already active." if Class.new(ActiveRecord::Base).connected?
|
137
|
+
|
138
|
+
ActiveRecord::ConnectionAdapters::MysqlAdapter.class_eval do
|
139
|
+
def configure_connection_with_timezone
|
140
|
+
configure_connection_without_timezone
|
141
|
+
tz = ActiveRecord::Base.default_timezone == :utc ? "+0:0" : "SYSTEM"
|
142
|
+
execute("SET time_zone = '#{tz}'")
|
143
|
+
end
|
144
|
+
alias_method_chain :configure_connection, :timezone
|
145
|
+
end
|
146
|
+
end
|
147
|
+
end # class << self
|
148
|
+
end # Mysql
|
149
|
+
end # DbHelper
|
150
|
+
end # Zena
|
@@ -0,0 +1,79 @@
|
|
1
|
+
module Zena
|
2
|
+
module DbHelper
|
3
|
+
# Singleton to help with database queries.
|
4
|
+
class Postgresql
|
5
|
+
NOW = 'now()'
|
6
|
+
TRUE = 'true'
|
7
|
+
TRUE_RESULT = 't'
|
8
|
+
FALSE = 'false'
|
9
|
+
|
10
|
+
class << self
|
11
|
+
# Singleton inheritence
|
12
|
+
include Zena::DbHelper::AbstractDb
|
13
|
+
def insensitive_find(klass, count, attributes)
|
14
|
+
cond = [[]]
|
15
|
+
attributes.each do |attribute, value|
|
16
|
+
cond[0] << (value.kind_of?(String) ? "#{attribute} ILIKE ?" : "#{attribute} = ?")
|
17
|
+
cond << value
|
18
|
+
end
|
19
|
+
cond[0] = cond[0].join(' AND ')
|
20
|
+
klass.find(count, :conditions => cond)
|
21
|
+
end
|
22
|
+
|
23
|
+
def update_value(name, opts)
|
24
|
+
tbl1, fld1 = name.split('.')
|
25
|
+
tbl2, fld2 = opts[:from].split('.')
|
26
|
+
execute "UPDATE #{tbl1} SET #{fld1}=#{tbl2}.#{fld2} FROM #{tbl2} WHERE #{opts[:where]}"
|
27
|
+
end
|
28
|
+
|
29
|
+
def add_unique_key(table, keys)
|
30
|
+
execute "ALTER TABLE #{table} ADD CONSTRAINT #{keys.join('_')} UNIQUE (#{keys.join(', ')})"
|
31
|
+
end
|
32
|
+
|
33
|
+
# 'DELETE' depending on a two table query.
|
34
|
+
def delete(table, opts)
|
35
|
+
tbl1, tbl2 = opts[:from]
|
36
|
+
fld1, fld2 = opts[:fields]
|
37
|
+
using = opts[:from].reject {|t| t == table}
|
38
|
+
execute "DELETE FROM #{table} USING #{using.join(', ')} WHERE #{tbl1}.#{fld1} = #{tbl2}.#{fld2} AND #{opts[:where]}"
|
39
|
+
end
|
40
|
+
|
41
|
+
# Fetch a single row of raw data from db
|
42
|
+
def fetch_attribute(sql)
|
43
|
+
res = connection.select_rows(sql)
|
44
|
+
res.empty? ? nil : res.first.first
|
45
|
+
end
|
46
|
+
|
47
|
+
def next_zip(site_id)
|
48
|
+
res = execute("UPDATE zips SET zip=zip+1 WHERE site_id = #{site_id} RETURNING zip").first
|
49
|
+
if res.nil?
|
50
|
+
# error
|
51
|
+
raise Zena::BadConfiguration, "no zip entry for (#{site_id})"
|
52
|
+
end
|
53
|
+
res['zip'].to_i
|
54
|
+
end
|
55
|
+
|
56
|
+
# Return a string matching the SQLiss function.
|
57
|
+
def sql_function(function, key)
|
58
|
+
return key unless function
|
59
|
+
# TODO
|
60
|
+
super
|
61
|
+
end
|
62
|
+
|
63
|
+
def prepare_connection_for_timezone
|
64
|
+
# Fixes timezone to "+0:0"
|
65
|
+
raise "prepare_connection_for_timezone executed too late, connection already active." if Class.new(ActiveRecord::Base).connected?
|
66
|
+
|
67
|
+
ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.class_eval do
|
68
|
+
def configure_connection_with_timezone
|
69
|
+
configure_connection_without_timezone
|
70
|
+
tz = ActiveRecord::Base.default_timezone == :utc ? "UTC" : "SYSTEM"
|
71
|
+
execute("SET TIMEZONE = '#{tz}'")
|
72
|
+
end
|
73
|
+
alias_method_chain :configure_connection, :timezone
|
74
|
+
end
|
75
|
+
end
|
76
|
+
end # class << self
|
77
|
+
end # Postgresql
|
78
|
+
end # DbHelper
|
79
|
+
end # Zena
|
@@ -0,0 +1,135 @@
|
|
1
|
+
module Zena
|
2
|
+
module DbHelper
|
3
|
+
class Sqlite3
|
4
|
+
NOW = "datetime('now')"
|
5
|
+
TRUE = '1'
|
6
|
+
TRUE_RESULT = 't'
|
7
|
+
FALSE = '0'
|
8
|
+
|
9
|
+
class << self
|
10
|
+
# Singleton inheritence
|
11
|
+
include Zena::DbHelper::AbstractDb
|
12
|
+
def insensitive_find(klass, count, attributes)
|
13
|
+
cond = [[]]
|
14
|
+
attributes.each do |attribute, value|
|
15
|
+
if value.kind_of?(String)
|
16
|
+
cond[0] << "lower(#{attribute}) = ?"
|
17
|
+
cond << value.downcase
|
18
|
+
else
|
19
|
+
cond[0] << "#{attribute} = ?"
|
20
|
+
cond << value
|
21
|
+
end
|
22
|
+
end
|
23
|
+
cond[0] = cond[0].join(' AND ')
|
24
|
+
klass.find(count, :conditions => cond)
|
25
|
+
end
|
26
|
+
|
27
|
+
def update_value(name, opts)
|
28
|
+
tbl1, fld1 = name.split('.')
|
29
|
+
tbl2, fld2 = opts[:from].split('.')
|
30
|
+
execute "UPDATE #{tbl1} SET #{fld1} = (SELECT #{fld2} FROM #{tbl2} WHERE #{opts[:where]})"
|
31
|
+
end
|
32
|
+
|
33
|
+
def add_unique_key(table, keys)
|
34
|
+
execute "CREATE UNIQUE INDEX IF NOT EXISTS #{([table] + keys).join('_').gsub(/[^\w]/,'')} ON #{table} (#{keys.join(', ')})"
|
35
|
+
end
|
36
|
+
|
37
|
+
# 'DELETE' depending on a two table query.
|
38
|
+
def delete(table, opts)
|
39
|
+
tbl1, tbl2 = opts[:from]
|
40
|
+
fld1, fld2 = opts[:fields]
|
41
|
+
execute "DELETE FROM #{table} WHERE #{fld1} = (SELECT #{fld2} FROM #{tbl2} WHERE #{opts[:where]})"
|
42
|
+
end
|
43
|
+
|
44
|
+
# Insert a list of values (multicolumn insert). The values should be properly escaped before
|
45
|
+
# being passed to this method.
|
46
|
+
def insert_many(table, columns, values)
|
47
|
+
values = values.compact.uniq.map do |list|
|
48
|
+
list.map {|e| quote(e)}
|
49
|
+
end
|
50
|
+
|
51
|
+
columns = columns.map{|c| quote_column_name(c)}.join(',')
|
52
|
+
|
53
|
+
pre_query = "INSERT INTO #{table} (#{columns}) VALUES "
|
54
|
+
values.each do |value|
|
55
|
+
execute pre_query + "(#{value.join(',')})"
|
56
|
+
end
|
57
|
+
end
|
58
|
+
|
59
|
+
# Fetch a single row of raw data from db
|
60
|
+
def fetch_attribute(sql)
|
61
|
+
res = execute(sql)
|
62
|
+
res.empty? ? nil : res.first[0]
|
63
|
+
end
|
64
|
+
|
65
|
+
def next_zip(site_id)
|
66
|
+
# FIXME: is there a way to make this thread safe and atomic (like it is with mysql) ?
|
67
|
+
res = update "UPDATE zips SET zip=zip+1 WHERE site_id = '#{site_id}'"
|
68
|
+
if res == 0
|
69
|
+
# error
|
70
|
+
raise Zena::BadConfiguration, "no zip entry for (#{site_id})"
|
71
|
+
end
|
72
|
+
fetch_attribute("SELECT zip FROM zips WHERE site_id = '#{site_id}'").to_i
|
73
|
+
end
|
74
|
+
|
75
|
+
# Return a string matching the SQLiss function.
|
76
|
+
def sql_function(function, key)
|
77
|
+
return key unless function
|
78
|
+
case function
|
79
|
+
when 'year'
|
80
|
+
# we multiply by '1' to force a cast to INTEGER so that comparaison against
|
81
|
+
# numbers works.
|
82
|
+
"strftime('%Y', #{key})*1"
|
83
|
+
when 'month'
|
84
|
+
"strftime('%Y-%m', #{key})"
|
85
|
+
when 'week'
|
86
|
+
"strftime('%Y-%W', #{key})"
|
87
|
+
when 'day'
|
88
|
+
"DATE(#{key})"
|
89
|
+
when 'random'
|
90
|
+
'random()'
|
91
|
+
else
|
92
|
+
super
|
93
|
+
end
|
94
|
+
end
|
95
|
+
|
96
|
+
# This is used by zafu and it's a mess.
|
97
|
+
# ref_date can be a string ('2005-05-03') or ruby ('Time.now'). It should not come uncleaned from evil web.
|
98
|
+
def date_condition(date_cond, field, ref_date)
|
99
|
+
case date_cond
|
100
|
+
when 'today', 'current', 'same'
|
101
|
+
"DATE(#{field}) = DATE(#{ref_date})"
|
102
|
+
when 'week'
|
103
|
+
"strftime('%Y-%W', #{ref_date}) = strftime('%Y-%W', #{field})"
|
104
|
+
when 'month'
|
105
|
+
"strftime('%Y-%m', #{ref_date}) = strftime('%Y-%m', #{field})"
|
106
|
+
when 'year'
|
107
|
+
# we multiply by '1' to force a cast to INTEGER so that comparaison against
|
108
|
+
# numbers works.
|
109
|
+
"strftime('%Y', #{ref_date}) = strftime('%Y', #{field})"
|
110
|
+
when 'upcoming'
|
111
|
+
"#{field} >= #{ref_date}"
|
112
|
+
else
|
113
|
+
# date('2008-01-31 23:50','+1 hour')
|
114
|
+
if date_cond =~ /^(\+|-|)\s*(\d+)\s*(second|minute|hour|day|week|month|year)/
|
115
|
+
count = $2.to_i
|
116
|
+
if $1 == ''
|
117
|
+
# +/-
|
118
|
+
"#{field} > DATE(#{ref_date}, '-#{count} #{$3.upcase}') AND #{field} < DATE(#{ref_date}, '+#{count} #{$3.upcase}')"
|
119
|
+
elsif $1 == '+'
|
120
|
+
# x upcoming days
|
121
|
+
"#{field} > #{ref_date} AND #{field} < DATE(#{ref_date}, '+#{count} #{$3.upcase}')"
|
122
|
+
else
|
123
|
+
# x days in the past
|
124
|
+
"#{field} < #{ref_date} AND #{field} > DATE(#{ref_date}, '-#{count} #{$3.upcase}')"
|
125
|
+
end
|
126
|
+
else
|
127
|
+
# bad date_cond
|
128
|
+
nil
|
129
|
+
end
|
130
|
+
end
|
131
|
+
end # date_condition
|
132
|
+
end # class << self
|
133
|
+
end # Sqlite3
|
134
|
+
end # DbHelper
|
135
|
+
end # Zena
|