wagn 1.13.0 → 1.14.0.pre1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Guardfile +3 -2
- data/VERSION +1 -1
- data/app/controllers/card_controller.rb +33 -38
- data/config/routes.rb +2 -2
- data/config/version.txt +1 -1
- data/db/bootstrap/card_actions.yml +3543 -0
- data/db/bootstrap/card_acts.yml +7 -0
- data/db/bootstrap/card_changes.yml +9150 -0
- data/db/bootstrap/card_references.yml +666 -344
- data/db/bootstrap/cards.yml +3256 -1702
- data/db/migrate/20140822073704_create_new_revision_tables.rb +43 -0
- data/db/migrate/20141001105348_move_revisions_to_actions.rb +62 -0
- data/db/migrate_cards/20130411191151_renaming_for_menu.rb +42 -45
- data/db/migrate_cards/20130411211600_delete_old_related_tab_cards.rb +13 -16
- data/db/migrate_cards/20130419215612_import_help_text.rb +7 -10
- data/db/migrate_cards/20130823192433_add_style_cards.rb +77 -81
- data/db/migrate_cards/20130910183318_move_styles_to_content.rb +4 -7
- data/db/migrate_cards/20130920214038_jsonize_tinymce.rb +9 -12
- data/db/migrate_cards/20130920291703_update_stylesheets.rb +10 -13
- data/db/migrate_cards/20130927191728_account_events.rb +15 -18
- data/db/migrate_cards/20131016172445_common_css_patch.rb +5 -8
- data/db/migrate_cards/20140110193325_reset_account_request_type.rb +4 -7
- data/db/migrate_cards/20140307231621_user_data_to_cards.rb +50 -53
- data/db/migrate_cards/20140317035504_account_requests_to_signups.rb +39 -42
- data/db/migrate_cards/20140512155840_add_script_cards.rb +56 -59
- data/db/migrate_cards/20140629222005_add_email_cards.rb +168 -0
- data/db/migrate_cards/20140725180118_config_card_updates.rb +4 -7
- data/db/migrate_cards/data/mailer/follower_notification_email.html +9 -0
- data/db/migrate_cards/data/mailer/follower_notification_email.txt +11 -0
- data/db/migrate_cards/data/mailer/mail_config.json +22 -0
- data/db/migrate_cards/data/mailer/password_reset_email.html +10 -0
- data/db/migrate_cards/data/mailer/password_reset_email.txt +11 -0
- data/db/migrate_cards/data/mailer/signup_alert_email.html +7 -0
- data/db/migrate_cards/data/mailer/signup_alert_email.txt +5 -0
- data/db/migrate_cards/data/mailer/verification_email.html +9 -0
- data/db/migrate_cards/data/mailer/verification_email.txt +8 -0
- data/db/schema.rb +31 -1
- data/features/conflict.feature +39 -0
- data/features/flexmail.feature +54 -54
- data/features/notifications.feature +4 -2
- data/features/reset_password.feature +1 -1
- data/features/step_definitions/wagn_steps.rb +20 -2
- data/features/step_definitions/window_steps.rb +23 -0
- data/features/support/env.rb +1 -0
- data/features/update_includers.feature +16 -10
- data/features/watch.feature +2 -2
- data/lib/card.rb +11 -10
- data/lib/card/act.rb +63 -0
- data/lib/card/action.rb +194 -0
- data/lib/card/change.rb +29 -0
- data/lib/card/content.rb +1 -1
- data/lib/card/diff.rb +229 -276
- data/lib/card/env.rb +4 -3
- data/lib/card/format.rb +2 -5
- data/lib/card/generators/card_migration/USAGE +15 -3
- data/lib/card/generators/card_migration/card_migration_generator.rb +22 -2
- data/lib/card/generators/card_migration/templates/card_migration.erb +4 -5
- data/lib/card/generators/format/USAGE +2 -2
- data/lib/card/generators/format/format_generator.rb +2 -2
- data/lib/card/generators/set/USAGE +2 -2
- data/lib/card/mailer.rb +21 -100
- data/lib/card/name.rb +4 -3
- data/lib/card/query.rb +2 -2
- data/lib/card/query/card_spec.rb +20 -30
- data/lib/card/query/value_spec.rb +2 -3
- data/lib/card/set.rb +3 -0
- data/lib/wagn/all.rb +6 -0
- data/lib/wagn/application.rb +16 -6
- data/lib/wagn/commands.rb +87 -27
- data/lib/wagn/config/environments/development.rb +17 -0
- data/lib/wagn/config/environments/test.rb +14 -1
- data/lib/wagn/config/initializers/airbrake.rb +1 -1
- data/lib/wagn/generators/wagn/templates/Gemfile +27 -9
- data/lib/wagn/generators/wagn/templates/config/application.rb +12 -3
- data/lib/wagn/generators/wagn/templates/simplecov +5 -0
- data/lib/wagn/generators/wagn/templates/spec/spec_helper.rb +1 -0
- data/lib/wagn/generators/wagn/wagn_generator.rb +75 -45
- data/lib/wagn/location.rb +9 -0
- data/lib/wagn/migration.rb +96 -0
- data/lib/wagn/mods_spec_helper.rb +16 -8
- data/lib/wagn/simplecov_helper.rb +61 -0
- data/lib/wagn/{wagn_spec_helper.rb → spec_helper.rb} +11 -3
- data/lib/wagn/tasks/test.rake +1 -1
- data/lib/wagn/tasks/wagn.rake +100 -34
- data/lib/wagn/version.rb +7 -2
- data/mod/{core → 01_core}/chunk/include.rb +0 -0
- data/mod/{core → 01_core}/chunk/link.rb +0 -0
- data/mod/{core → 01_core}/chunk/literal.rb +0 -0
- data/mod/{core → 01_core}/chunk/reference.rb +15 -3
- data/mod/{core → 01_core}/chunk/uri.rb +0 -0
- data/mod/{core → 01_core}/format/data_format.rb +0 -0
- data/mod/{core → 01_core}/format/html_format.rb +5 -2
- data/mod/{core → 01_core}/format/text_format.rb +0 -0
- data/mod/{core → 01_core}/layout/blank.html +0 -0
- data/mod/{core → 01_core}/layout/default.html +0 -0
- data/mod/{core → 01_core}/layout/noside.html +0 -0
- data/mod/{core → 01_core}/layout/pre.html +0 -0
- data/mod/{core → 01_core}/layout/simple.html +0 -0
- data/mod/{core → 01_core}/set/all/active_card.rb +0 -0
- data/mod/{core → 01_core}/set/all/collection.rb +33 -5
- data/mod/01_core/set/all/content.rb +144 -0
- data/mod/01_core/set/all/erb.rb +11 -0
- data/mod/{core → 01_core}/set/all/fetch.rb +8 -1
- data/mod/01_core/set/all/haml.rb +7 -0
- data/mod/{core → 01_core}/set/all/initialize.rb +4 -2
- data/mod/{core → 01_core}/set/all/name.rb +2 -3
- data/mod/01_core/set/all/notify.rb +215 -0
- data/mod/{core → 01_core}/set/all/pattern.rb +0 -0
- data/mod/{core → 01_core}/set/all/permissions.rb +1 -1
- data/mod/{core → 01_core}/set/all/phases.rb +24 -8
- data/mod/{core → 01_core}/set/all/references.rb +2 -2
- data/mod/{core → 01_core}/set/all/rules.rb +2 -2
- data/mod/{core → 01_core}/set/all/states.rb +1 -1
- data/mod/{core → 01_core}/set/all/templating.rb +4 -4
- data/mod/{core → 01_core}/set/all/tracked_attributes.rb +15 -64
- data/mod/{core → 01_core}/set/all/trash.rb +6 -5
- data/mod/{core → 01_core}/set/all/type.rb +0 -0
- data/mod/{core → 01_core}/set/all/utils.rb +1 -1
- data/mod/{core → 01_core}/set_pattern/01_all.rb +0 -0
- data/mod/{core → 01_core}/set_pattern/02_all_plus.rb +0 -0
- data/mod/{core → 01_core}/set_pattern/03_type.rb +0 -0
- data/mod/{core → 01_core}/set_pattern/04_star.rb +0 -0
- data/mod/{core → 01_core}/set_pattern/05_rstar.rb +0 -0
- data/mod/{core → 01_core}/set_pattern/06_right.rb +0 -0
- data/mod/{core → 01_core}/set_pattern/07_type_plus_right.rb +0 -0
- data/mod/{core → 01_core}/set_pattern/08_self.rb +0 -0
- data/mod/01_core/spec/chunk/literal_spec.rb +14 -0
- data/{spec/mod/core → mod/01_core/spec}/chunk/uri_spec.rb +3 -3
- data/{spec/mod/core → mod/01_core/spec}/format/data_format_spec.rb +0 -0
- data/{spec/mod/core → mod/01_core/spec}/format/html_format_spec.rb +9 -8
- data/{spec/mod/core → mod/01_core/spec}/format/text_format_spec.rb +0 -0
- data/{spec/mod/core → mod/01_core/spec}/set/all/active_card_spec.rb +0 -0
- data/mod/01_core/spec/set/all/attribute_tracking_spec.rb +21 -0
- data/mod/01_core/spec/set/all/collection_spec.rb +65 -0
- data/mod/01_core/spec/set/all/content_spec.rb +15 -0
- data/{spec/mod/core → mod/01_core/spec}/set/all/fetch_spec.rb +70 -68
- data/{spec/mod/core → mod/01_core/spec}/set/all/initialize_spec.rb +12 -12
- data/{spec/mod/core → mod/01_core/spec}/set/all/name_spec.rb +7 -7
- data/mod/01_core/spec/set/all/notify_spec.rb +199 -0
- data/{spec/mod/core → mod/01_core/spec}/set/all/pattern_spec.rb +16 -16
- data/{spec/mod/core → mod/01_core/spec}/set/all/permissions_spec.rb +62 -62
- data/{spec/mod/core → mod/01_core/spec}/set/all/phases_spec.rb +0 -0
- data/{spec/mod/core → mod/01_core/spec}/set/all/references_spec.rb +1 -1
- data/{spec/mod/core → mod/01_core/spec}/set/all/rules2_spec.rb +57 -57
- data/mod/01_core/spec/set/all/rules_spec.rb +81 -0
- data/{spec/mod/core → mod/01_core/spec}/set/all/states_spec.rb +0 -0
- data/{spec/mod/core → mod/01_core/spec}/set/all/templating_spec.rb +16 -12
- data/{spec/mod/core → mod/01_core/spec}/set/all/tracked_attributes_spec.rb +24 -22
- data/{spec/mod/core → mod/01_core/spec}/set/all/trash_spec.rb +2 -2
- data/{spec/mod/core → mod/01_core/spec}/set/all/type_spec.rb +13 -13
- data/{spec/mod/core → mod/01_core/spec}/set/all/utils_spec.rb +0 -0
- data/mod/{core → 02_basic_types}/set/type/plain_text.rb +0 -0
- data/mod/{standard → 02_basic_types}/set/type/pointer.rb +21 -8
- data/{spec/mod/standard/set/type → mod/02_basic_types/spec/set}/plain_text_spec.rb +0 -0
- data/{spec/mod/standard/set/type → mod/02_basic_types/spec/set}/pointer_spec.rb +22 -9
- data/mod/{standard → 03_machines}/lib/card/machine.rb +3 -2
- data/mod/{standard → 03_machines}/lib/card/machine_input.rb +1 -1
- data/mod/{standard → 03_machines}/lib/javascript/html5shiv-printshiv.js +0 -0
- data/mod/{standard → 03_machines}/lib/javascript/jquery-ui.js +0 -0
- data/mod/{standard → 03_machines}/lib/javascript/jquery.autosize.js +0 -0
- data/mod/{standard → 03_machines}/lib/javascript/jquery.fileupload.js +0 -0
- data/mod/{standard → 03_machines}/lib/javascript/jquery.iframe-transport.js +0 -0
- data/mod/{standard → 03_machines}/lib/javascript/jquery.js +0 -0
- data/mod/{standard → 03_machines}/lib/javascript/jquery.ui.autocomplete.html.js +0 -0
- data/mod/{standard → 03_machines}/lib/javascript/jquery_ujs.js +0 -0
- data/mod/{standard → 03_machines}/lib/javascript/jquerymobile.js +0 -0
- data/mod/{standard → 03_machines}/lib/javascript/tinymce.js +0 -0
- data/mod/{standard → 03_machines}/lib/javascript/wagn.js.coffee +17 -9
- data/mod/{standard → 03_machines}/lib/javascript/wagn_menu.js +0 -0
- data/mod/{standard → 03_machines}/lib/javascript/wagn_mod.js.coffee +1 -1
- data/mod/{standard → 03_machines}/lib/stylesheets/functional.scss +1 -1
- data/mod/{standard → 03_machines}/lib/stylesheets/jquery-ui-smoothness.css +0 -0
- data/mod/{standard → 03_machines}/lib/stylesheets/standard.scss +126 -21
- data/mod/{standard → 03_machines}/set/right/machine_output.rb +3 -2
- data/mod/{standard → 03_machines}/set/self/script_card_menu.rb +1 -1
- data/mod/{standard → 03_machines}/set/self/script_html5shiv_printshiv.rb +1 -1
- data/mod/{standard → 03_machines}/set/self/script_jquery.rb +1 -1
- data/mod/{standard → 03_machines}/set/self/script_jquery_helper.rb +1 -1
- data/mod/{standard → 03_machines}/set/self/script_slot.rb +1 -1
- data/mod/{standard → 03_machines}/set/self/script_tinymce.rb +1 -1
- data/mod/{standard → 03_machines}/set/self/style_functional.rb +1 -1
- data/mod/{standard → 03_machines}/set/self/style_jquery_ui_smoothness.rb +1 -1
- data/mod/{standard → 03_machines}/set/self/style_standard.rb +1 -1
- data/mod/{standard → 03_machines}/set/type/coffee_script.rb +0 -0
- data/mod/{standard → 03_machines}/set/type/css.rb +0 -0
- data/mod/{standard → 03_machines}/set/type/java_script.rb +0 -0
- data/mod/{standard → 03_machines}/set/type/scss.rb +0 -0
- data/mod/{standard → 03_machines}/set/type/skin.rb +0 -0
- data/{spec/mod/standard → mod/03_machines/spec}/lib/machine_input_spec.rb +0 -0
- data/{spec/mod/standard → mod/03_machines/spec}/lib/machine_spec.rb +4 -4
- data/{spec/mod/standard → mod/03_machines/spec}/set/right/machine_output_spec.rb +0 -0
- data/{spec/mod/standard → mod/03_machines/spec}/set/self/style_functional_spec.rb +0 -0
- data/{spec/mod/standard → mod/03_machines/spec}/set/self/style_jquery_ui_smoothness_spec.rb +0 -0
- data/{spec/mod/standard → mod/03_machines/spec}/set/self/style_standard_spec.rb +0 -0
- data/{spec/mod/standard → mod/03_machines/spec}/set/type/coffeescript_spec.rb +0 -0
- data/{spec/mod/standard → mod/03_machines/spec}/set/type/css_spec.rb +0 -0
- data/{spec/mod/standard → mod/03_machines/spec}/set/type/javascript_spec.rb +0 -0
- data/{spec/mod/standard → mod/03_machines/spec}/set/type/scss_spec.rb +1 -1
- data/{spec/mod/standard → mod/03_machines/spec}/set/type/skin_spec.rb +22 -0
- data/mod/04_settings/lib/card/setting.rb +57 -0
- data/mod/{core/set/right/structure.rb → 04_settings/set/right/add_help.rb} +0 -2
- data/mod/{standard → 04_settings}/set/right/comment.rb +0 -1
- data/mod/{standard → 04_settings}/set/right/create.rb +0 -1
- data/mod/04_settings/set/right/default.rb +3 -0
- data/mod/{standard → 04_settings}/set/right/delete.rb +2 -0
- data/mod/04_settings/set/right/help.rb +3 -0
- data/mod/{standard → 04_settings}/set/right/read.rb +0 -0
- data/mod/{standard → 04_settings}/set/right/script.rb +0 -0
- data/mod/04_settings/set/right/structure.rb +4 -0
- data/mod/{standard → 04_settings}/set/right/style.rb +0 -0
- data/mod/{standard → 04_settings}/set/right/update.rb +0 -0
- data/mod/04_settings/set/self/accountable.rb +2 -0
- data/mod/04_settings/set/self/add_help.rb +2 -0
- data/mod/04_settings/set/self/autoname.rb +2 -0
- data/mod/04_settings/set/self/captcha.rb +2 -0
- data/mod/04_settings/set/self/comment.rb +2 -0
- data/mod/04_settings/set/self/create.rb +2 -0
- data/mod/04_settings/set/self/default.rb +2 -0
- data/mod/04_settings/set/self/delete.rb +2 -0
- data/mod/04_settings/set/self/help.rb +2 -0
- data/mod/04_settings/set/self/input.rb +2 -0
- data/mod/04_settings/set/self/layout.rb +2 -0
- data/mod/04_settings/set/self/on_create.rb +2 -0
- data/mod/04_settings/set/self/on_delete.rb +2 -0
- data/mod/04_settings/set/self/on_update.rb +2 -0
- data/mod/04_settings/set/self/options.rb +2 -0
- data/mod/04_settings/set/self/options_label.rb +2 -0
- data/mod/04_settings/set/self/read.rb +2 -0
- data/mod/04_settings/set/self/script.rb +2 -0
- data/mod/04_settings/set/self/structure.rb +2 -0
- data/mod/04_settings/set/self/style.rb +2 -0
- data/mod/04_settings/set/self/table_of_contents.rb +2 -0
- data/mod/04_settings/set/self/thanks.rb +2 -0
- data/mod/04_settings/set/self/update.rb +2 -0
- data/mod/{standard → 04_settings}/set/type/setting.rb +8 -14
- data/{spec/mod/standard → mod/04_settings/spec}/set/right/add_help_spec.rb +0 -0
- data/{spec/mod/standard → mod/04_settings/spec}/set/right/comment_spec.rb +5 -5
- data/{spec/mod/standard → mod/04_settings/spec}/set/right/create_spec.rb +0 -0
- data/{spec/mod/standard → mod/04_settings/spec}/set/right/default_spec.rb +0 -0
- data/{spec/mod/standard → mod/04_settings/spec}/set/right/delete_spec.rb +0 -0
- data/{spec/mod/standard → mod/04_settings/spec}/set/right/help_spec.rb +0 -0
- data/{spec/mod/standard → mod/04_settings/spec}/set/right/read_spec.rb +0 -0
- data/{spec/mod/standard → mod/04_settings/spec}/set/right/script_spec.rb +0 -0
- data/{spec/mod/standard → mod/04_settings/spec}/set/right/structure_spec.rb +4 -2
- data/{spec/mod/standard → mod/04_settings/spec}/set/right/style_spec.rb +1 -1
- data/{spec/mod/standard → mod/04_settings/spec}/set/right/update_spec.rb +0 -0
- data/{spec/mod/standard → mod/04_settings/spec}/set/type/setting_spec.rb +0 -0
- data/mod/{standard → 05_standard}/file/103/icon-6566.ico +0 -0
- data/mod/{standard → 05_standard}/file/103/large-6566.ico +0 -0
- data/mod/{standard → 05_standard}/file/103/medium-6566.ico +0 -0
- data/mod/{standard → 05_standard}/file/103/original-6566.ico +0 -0
- data/mod/{standard → 05_standard}/file/103/small-6566.ico +0 -0
- data/mod/{standard → 05_standard}/file/79/icon-6556.png +0 -0
- data/mod/{standard → 05_standard}/file/79/large-6556.png +0 -0
- data/mod/{standard → 05_standard}/file/79/medium-6556.png +0 -0
- data/mod/{standard → 05_standard}/file/79/original-6556.png +0 -0
- data/mod/{standard → 05_standard}/file/79/small-6556.png +0 -0
- data/mod/{standard → 05_standard}/file/790/icon-6419.png +0 -0
- data/mod/{standard → 05_standard}/file/790/large-6419.png +0 -0
- data/mod/{standard → 05_standard}/file/790/medium-6419.png +0 -0
- data/mod/{standard → 05_standard}/file/790/original-6419.png +0 -0
- data/mod/{standard → 05_standard}/file/790/small-6419.png +0 -0
- data/mod/{standard → 05_standard}/format/css_format.rb +0 -0
- data/mod/{standard → 05_standard}/format/csv_format.rb +0 -0
- data/mod/{standard → 05_standard}/format/file_format.rb +0 -0
- data/mod/{standard → 05_standard}/format/js_format.rb +0 -0
- data/mod/{standard → 05_standard}/format/json_format.rb +0 -0
- data/mod/{standard → 05_standard}/format/rss_format.rb +0 -0
- data/mod/{standard → 05_standard}/format/xml_format.rb +0 -0
- data/mod/{standard → 05_standard}/set/all/account.rb +0 -0
- data/mod/{standard → 05_standard}/set/all/all_css.rb +0 -0
- data/mod/{standard → 05_standard}/set/all/all_csv.rb +1 -1
- data/mod/05_standard/set/all/all_js.rb +7 -0
- data/mod/{standard → 05_standard}/set/all/attach.rb +33 -33
- data/mod/{standard → 05_standard}/set/all/base.rb +0 -0
- data/mod/{standard → 05_standard}/set/all/comment.rb +0 -0
- data/mod/{standard → 05_standard}/set/all/event_viz.rb +0 -0
- data/mod/{standard → 05_standard}/set/all/file.rb +0 -0
- data/mod/05_standard/set/all/follow.rb +51 -0
- data/mod/05_standard/set/all/history.rb +294 -0
- data/mod/{standard → 05_standard}/set/all/json.rb +2 -1
- data/mod/05_standard/set/all/observer.rb +27 -0
- data/mod/{standard → 05_standard}/set/all/rich_html.rb +21 -28
- data/mod/{standard → 05_standard}/set/all/rss.rb +0 -0
- data/mod/{standard → 05_standard}/set/all/text.rb +0 -0
- data/mod/{standard → 05_standard}/set/right/account.rb +53 -7
- data/mod/{standard → 05_standard}/set/right/email.rb +0 -1
- data/mod/{standard → 05_standard}/set/right/password.rb +1 -1
- data/mod/{standard → 05_standard}/set/right/salt.rb +0 -0
- data/mod/{standard → 05_standard}/set/right/stats.rb +1 -1
- data/mod/{standard → 05_standard}/set/right/status.rb +0 -0
- data/mod/{standard → 05_standard}/set/right/token.rb +0 -0
- data/mod/{standard → 05_standard}/set/right/when_created.rb +0 -0
- data/mod/{standard → 05_standard}/set/right/when_last_edited.rb +0 -0
- data/mod/{standard → 05_standard}/set/rstar/rules.rb +8 -7
- data/mod/{standard → 05_standard}/set/self/account_links.rb +0 -0
- data/mod/{standard → 05_standard}/set/self/alerts.rb +0 -0
- data/mod/{standard → 05_standard}/set/self/all.rb +1 -1
- data/mod/{standard → 05_standard}/set/self/foot.rb +0 -0
- data/mod/{standard → 05_standard}/set/self/head.rb +21 -6
- data/mod/{standard → 05_standard}/set/self/navbox.rb +0 -0
- data/mod/{standard → 05_standard}/set/self/now.rb +0 -0
- data/mod/{standard → 05_standard}/set/self/recent.rb +0 -0
- data/mod/{standard → 05_standard}/set/self/search.rb +0 -0
- data/mod/{standard → 05_standard}/set/self/signin.rb +1 -1
- data/mod/{standard → 05_standard}/set/self/stats.rb +2 -2
- data/mod/{standard → 05_standard}/set/self/version.rb +0 -0
- data/mod/{standard → 05_standard}/set/type/basic.rb +0 -0
- data/mod/{standard → 05_standard}/set/type/cardtype.rb +4 -6
- data/mod/{standard → 05_standard}/set/type/date.rb +0 -0
- data/mod/{standard → 05_standard}/set/type/file.rb +0 -0
- data/mod/{standard → 05_standard}/set/type/html.rb +0 -0
- data/mod/{standard → 05_standard}/set/type/image.rb +7 -6
- data/mod/{standard → 05_standard}/set/type/layout_type.rb +0 -0
- data/mod/{standard → 05_standard}/set/type/number.rb +0 -0
- data/mod/{standard → 05_standard}/set/type/phrase.rb +0 -0
- data/mod/{standard → 05_standard}/set/type/search_type.rb +6 -3
- data/mod/{standard → 05_standard}/set/type/set.rb +16 -9
- data/mod/{standard → 05_standard}/set/type/signup.rb +16 -17
- data/mod/{standard → 05_standard}/set/type/toggle.rb +0 -0
- data/mod/{standard → 05_standard}/set/type/user.rb +10 -11
- data/{spec/mod/standard → mod/05_standard/spec}/chunk/include_spec.rb +39 -39
- data/mod/05_standard/spec/chunk/link_spec.rb +61 -0
- data/{spec/mod/standard → mod/05_standard/spec}/format/css_format_spec.rb +0 -0
- data/{spec/mod/standard → mod/05_standard/spec}/format/csv_format_spec.rb +0 -0
- data/{spec/mod/standard → mod/05_standard/spec}/format/email_html_format_spec.rb +0 -0
- data/{spec/mod/standard → mod/05_standard/spec}/format/file_format_spec.rb +0 -0
- data/{spec/mod/standard → mod/05_standard/spec}/format/js_format_spec.rb +0 -0
- data/{spec/mod/standard → mod/05_standard/spec}/format/json_format_spec.rb +0 -0
- data/{spec/mod/standard → mod/05_standard/spec}/format/rss_format_spec.rb +0 -0
- data/{spec/mod/standard → mod/05_standard/spec}/format/xml_format_spec.rb +0 -0
- data/{spec/mod/standard → mod/05_standard/spec}/set/all/account_spec.rb +16 -16
- data/{spec/mod/standard → mod/05_standard/spec}/set/all/all_css_spec.rb +1 -1
- data/{spec/mod/standard → mod/05_standard/spec}/set/all/all_csv_spec.rb +1 -1
- data/{spec/mod/standard → mod/05_standard/spec}/set/all/attach_spec.rb +1 -1
- data/{spec/mod/standard → mod/05_standard/spec}/set/all/base_spec.rb +10 -10
- data/{spec/mod/standard → mod/05_standard/spec}/set/all/comment_spec.rb +0 -0
- data/mod/05_standard/spec/set/all/email_html_spec.rb +15 -0
- data/{spec/mod/standard → mod/05_standard/spec}/set/all/event_viz_spec.rb +1 -1
- data/{spec/mod/standard → mod/05_standard/spec}/set/all/file_spec.rb +0 -0
- data/mod/05_standard/spec/set/all/follow_spec.rb +83 -0
- data/mod/05_standard/spec/set/all/history_spec.rb +161 -0
- data/{spec/mod/standard → mod/05_standard/spec}/set/all/json_spec.rb +4 -4
- data/mod/05_standard/spec/set/all/observer_spec.rb +74 -0
- data/{spec/mod/standard → mod/05_standard/spec}/set/all/rich_html_spec.rb +14 -14
- data/{spec/mod/standard → mod/05_standard/spec}/set/all/rss_spec.rb +1 -1
- data/{spec/mod/standard → mod/05_standard/spec}/set/all/text_spec.rb +0 -0
- data/mod/05_standard/spec/set/right/account_spec.rb +162 -0
- data/{spec/mod/standard → mod/05_standard/spec}/set/right/email_spec.rb +7 -7
- data/{spec/mod/standard → mod/05_standard/spec}/set/right/password_spec.rb +7 -7
- data/{spec/mod/standard → mod/05_standard/spec}/set/right/salt_spec.rb +0 -0
- data/{spec/mod/standard → mod/05_standard/spec}/set/right/stats_spec.rb +0 -0
- data/{spec/mod/standard → mod/05_standard/spec}/set/right/status_spec.rb +0 -0
- data/{spec/mod/standard → mod/05_standard/spec}/set/right/token_spec.rb +0 -0
- data/{spec/mod/standard → mod/05_standard/spec}/set/right/when_created_spec.rb +1 -1
- data/{spec/mod/standard → mod/05_standard/spec}/set/right/when_last_edited_spec.rb +1 -1
- data/{spec/mod/standard → mod/05_standard/spec}/set/rstar/rules_spec.rb +4 -4
- data/{spec/mod/standard → mod/05_standard/spec}/set/self/account_links_spec.rb +0 -0
- data/{spec/mod/standard → mod/05_standard/spec}/set/self/alerts_spec.rb +0 -0
- data/{spec/mod/standard → mod/05_standard/spec}/set/self/all_spec.rb +7 -6
- data/{spec/mod/standard → mod/05_standard/spec}/set/self/foot_spec.rb +0 -0
- data/{spec/mod/standard → mod/05_standard/spec}/set/self/head_spec.rb +0 -0
- data/{spec/mod/standard → mod/05_standard/spec}/set/self/navbox_spec.rb +0 -0
- data/{spec/mod/standard → mod/05_standard/spec}/set/self/now_spec.rb +1 -1
- data/{spec/mod/standard → mod/05_standard/spec}/set/self/recent_spec.rb +0 -0
- data/{spec/mod/standard → mod/05_standard/spec}/set/self/search_spec.rb +0 -0
- data/{spec/mod/standard → mod/05_standard/spec}/set/self/signin_spec.rb +12 -12
- data/{spec/mod/standard → mod/05_standard/spec}/set/self/stats_spec.rb +0 -0
- data/{spec/mod/standard → mod/05_standard/spec}/set/self/version_spec.rb +1 -1
- data/{spec/mod/standard → mod/05_standard/spec}/set/type/basic_spec.rb +0 -0
- data/{spec/mod/standard → mod/05_standard/spec}/set/type/cardtype_spec.rb +0 -0
- data/{spec/mod/standard → mod/05_standard/spec}/set/type/date_spec.rb +0 -0
- data/mod/05_standard/spec/set/type/email_template_spec.rb +130 -0
- data/{spec/mod/standard → mod/05_standard/spec}/set/type/file_spec.rb +0 -0
- data/{spec/mod/standard → mod/05_standard/spec}/set/type/html_spec.rb +3 -3
- data/{spec/mod/standard → mod/05_standard/spec}/set/type/image_spec.rb +1 -1
- data/{spec/mod/standard → mod/05_standard/spec}/set/type/layout_type_spec.rb +1 -1
- data/{spec/mod/standard → mod/05_standard/spec}/set/type/number_spec.rb +0 -0
- data/{spec/mod/standard → mod/05_standard/spec}/set/type/phrase_spec.rb +0 -0
- data/mod/05_standard/spec/set/type/search_type_spec.rb +27 -0
- data/mod/05_standard/spec/set/type/set_spec.rb +26 -0
- data/mod/05_standard/spec/set/type/signup_spec.rb +209 -0
- data/{spec/mod/standard → mod/05_standard/spec}/set/type/toggle_spec.rb +2 -2
- data/{spec/mod/standard → mod/05_standard/spec}/set/type/user_spec.rb +0 -0
- data/mod/{standard → 06_email}/format/email_html_format.rb +0 -0
- data/mod/06_email/format/email_text_format.rb +7 -0
- data/mod/06_email/set/all/email_html.rb +9 -0
- data/mod/{standard/set/all/email_html.rb → 06_email/set/all/email_text.rb} +2 -1
- data/mod/06_email/set/right/bcc.rb +31 -0
- data/mod/06_email/set/right/cc.rb +2 -0
- data/mod/06_email/set/right/from.rb +2 -0
- data/mod/06_email/set/right/html_message.rb +3 -0
- data/mod/06_email/set/right/to.rb +2 -0
- data/mod/06_email/set/type/email_template.rb +99 -0
- data/spec/controllers/card_controller_spec.rb +34 -46
- data/spec/lib/card/action_spec.rb +14 -0
- data/spec/lib/card/chunk_spec.rb +3 -3
- data/spec/lib/card/codename_spec.rb +5 -5
- data/spec/lib/card/content_spec.rb +25 -25
- data/spec/lib/card/diff_spec.rb +107 -107
- data/spec/lib/card/format_spec.rb +11 -11
- data/spec/lib/card/loader_spec.rb +35 -29
- data/spec/lib/card/name_spec.rb +82 -82
- data/spec/lib/card/query_spec.rb +83 -82
- data/spec/lib/card/reference_spec.rb +30 -30
- data/spec/lib/card/set_pattern_spec.rb +1 -1
- data/spec/lib/card/set_spec.rb +86 -82
- data/spec/lib/wagn/cache_spec.rb +24 -24
- data/spec/mailers/mailer_spec.rb +41 -30
- data/spec/models/card/cardtype_spec.rb +19 -19
- data/spec/models/card/create_spec.rb +14 -14
- data/spec/models/card/trash_spec.rb +37 -36
- data/spec/models/card/type_transition_spec.rb +13 -13
- data/spec/models/card/validation_spec.rb +6 -6
- data/spec/models/card_spec.rb +40 -39
- data/spec/spec_helper.rb +37 -11
- data/test/fixtures/card_actions.yml +4726 -0
- data/test/fixtures/card_acts.yml +589 -0
- data/test/fixtures/card_changes.yml +12644 -0
- data/test/fixtures/card_references.yml +976 -591
- data/test/fixtures/cards.yml +4544 -2781
- data/test/seed.rb +14 -13
- data/wagn.gemspec +4 -0
- metadata +404 -403
- data/db/bootstrap/card_revisions.yml +0 -3379
- data/lib/card/flexmail.rb +0 -53
- data/lib/card/mailer/change_notice.html.erb +0 -32
- data/lib/card/mailer/confirmation_email.html.erb +0 -12
- data/lib/card/mailer/flexmail.html.erb +0 -6
- data/lib/card/mailer/password_reset.html.erb +0 -9
- data/lib/card/mailer/signup_alert.html.erb +0 -14
- data/lib/card/revision.rb +0 -47
- data/lib/wagn/migration_helper.rb +0 -34
- data/mod/core/set/all/attribute_tracking.rb +0 -85
- data/mod/core/set/all/content.rb +0 -94
- data/mod/standard/set/all/flexmail.rb +0 -3
- data/mod/standard/set/all/follow.rb +0 -119
- data/mod/standard/set/all/history.rb +0 -107
- data/mod/standard/set/right/add_help.rb +0 -3
- data/mod/standard/set/right/default.rb +0 -3
- data/mod/standard/set/right/help.rb +0 -3
- data/spec/lib/card/flexmail_spec.rb +0 -209
- data/spec/lib/card/revision_spec.rb +0 -30
- data/spec/mod/core/chunk/literal_spec.rb +0 -14
- data/spec/mod/core/set/all/attribute_tracking_spec.rb +0 -21
- data/spec/mod/core/set/all/collection_spec.rb +0 -45
- data/spec/mod/core/set/all/content_spec.rb +0 -14
- data/spec/mod/core/set/all/rules_spec.rb +0 -98
- data/spec/mod/standard/chunk/link_spec.rb +0 -59
- data/spec/mod/standard/set/all/email_html_spec.rb +0 -13
- data/spec/mod/standard/set/all/flexmail_spec.rb +0 -5
- data/spec/mod/standard/set/all/follow_spec.rb +0 -95
- data/spec/mod/standard/set/all/history_spec.rb +0 -10
- data/spec/mod/standard/set/right/account_spec.rb +0 -90
- data/spec/mod/standard/set/type/search_type_spec.rb +0 -27
- data/spec/mod/standard/set/type/set_spec.rb +0 -26
- data/spec/mod/standard/set/type/signup_spec.rb +0 -169
- data/test/fixtures/card_revisions.yml +0 -4560
data/lib/card/flexmail.rb
DELETED
@@ -1,53 +0,0 @@
|
|
1
|
-
# -*- encoding : utf-8 -*-
|
2
|
-
|
3
|
-
class Card
|
4
|
-
class Flexmail
|
5
|
-
|
6
|
-
class << self
|
7
|
-
|
8
|
-
def configs_for card
|
9
|
-
email_config_cardnames(card).map do |email_config|
|
10
|
-
config = {}
|
11
|
-
|
12
|
-
[:to, :from, :cc, :bcc, :attach].each do |field|
|
13
|
-
config[field] = ( fld_card=Card["#{email_config}+*#{field}"] ).nil? ? '' :
|
14
|
-
# configuration can be anything visible to configurer
|
15
|
-
Auth.as( fld_card.updater ) do
|
16
|
-
list = fld_card.extended_list card
|
17
|
-
field == :attach ? list : list * ','
|
18
|
-
end
|
19
|
-
end
|
20
|
-
|
21
|
-
[:subject, :message].each do |field|
|
22
|
-
config[field] = ( fld_card=Card["#{email_config}+*#{field}"] ).nil? ? '' :
|
23
|
-
Auth.as( fld_card.updater ) do
|
24
|
-
fld_card.contextual_content card, :format=>'email_html'
|
25
|
-
end
|
26
|
-
end
|
27
|
-
|
28
|
-
config[:subject] = strip_html(config[:subject]).strip
|
29
|
-
config
|
30
|
-
end
|
31
|
-
end
|
32
|
-
|
33
|
-
def email_config_cardnames card
|
34
|
-
#warn "card is #{card.inspect}"
|
35
|
-
event_card = card.rule_card :send
|
36
|
-
return [] unless event_card
|
37
|
-
Auth.as_bot { event_card.item_names }
|
38
|
-
end
|
39
|
-
|
40
|
-
def mail_for card
|
41
|
-
configs_for(card).map do |config|
|
42
|
-
Card::Mailer.flexmail config
|
43
|
-
end.compact.each(&:deliver)
|
44
|
-
end
|
45
|
-
|
46
|
-
def strip_html string
|
47
|
-
string.gsub(/<\/?[^>]*>/, "")
|
48
|
-
end
|
49
|
-
|
50
|
-
end
|
51
|
-
|
52
|
-
end
|
53
|
-
end
|
@@ -1,32 +0,0 @@
|
|
1
|
-
<!DOCTYPE html>
|
2
|
-
<html>
|
3
|
-
<body>
|
4
|
-
|
5
|
-
<p>
|
6
|
-
<a href="<%= @card_url %>"><%= @card.name %></a>
|
7
|
-
was just
|
8
|
-
<%- if @action=='edited' -%>
|
9
|
-
<a href="<%= @change_url %>"><%= @action %></a>
|
10
|
-
<%- else -%>
|
11
|
-
<%= @action %>
|
12
|
-
<%- end -%>
|
13
|
-
by <a href="<%= @updater_url %>"><%= @updater %></a>
|
14
|
-
</p>
|
15
|
-
|
16
|
-
<%- if @subedits.present? -%> <%#ENGLISH%>
|
17
|
-
<p>This update included the following changes:</p>
|
18
|
-
<ul>
|
19
|
-
<%- @subedits.each do |name, action| -%>
|
20
|
-
<li><%= action %> <%= name %></li>
|
21
|
-
<%- end -%>
|
22
|
-
</ul>
|
23
|
-
<%- end -%>
|
24
|
-
|
25
|
-
<p>See the card: <%= @card_url %></p>
|
26
|
-
|
27
|
-
<p>
|
28
|
-
You received this email because you're following "<%= @watched %>". <br/>
|
29
|
-
<a href="<%= @unwatch_url %>">Unfollow</a> to stop receiving these emails.
|
30
|
-
</p>
|
31
|
-
</body>
|
32
|
-
</html>
|
@@ -1,12 +0,0 @@
|
|
1
|
-
<!DOCTYPE html>
|
2
|
-
<html>
|
3
|
-
<body style="text-align:center">
|
4
|
-
<h1>Thank you for signing up with <%= @site %></h1>
|
5
|
-
<%- if @token %>
|
6
|
-
<div>Please <a href="<%= @link %>">follow this link</a> to verify this email address and activate your account.</div>
|
7
|
-
<div>(link will remain valid for <%= @expiry / 1.day %> days)</div>
|
8
|
-
<%- else %>
|
9
|
-
<div>You will receive further notification when your account is approved</div>
|
10
|
-
<%- end %>
|
11
|
-
</body>
|
12
|
-
</html>
|
@@ -1,9 +0,0 @@
|
|
1
|
-
<!DOCTYPE html>
|
2
|
-
<html>
|
3
|
-
<body style="text-align:center">
|
4
|
-
<h1>Password Reset <%= @site %></h1>
|
5
|
-
<div>Someone (you, we hope) asked to reset your password</div>
|
6
|
-
<div>Please <a href="<%= @link %>">follow this link</a> to verify this email address and reset your account details.</div>
|
7
|
-
<div>(link will remain valid for <%= @expiry / 1.day %> days)</div>
|
8
|
-
</body>
|
9
|
-
</html>
|
@@ -1,14 +0,0 @@
|
|
1
|
-
<!DOCTYPE html>
|
2
|
-
<html>
|
3
|
-
<body>
|
4
|
-
<p>
|
5
|
-
<%= @name %></a> (<%= @email %>)
|
6
|
-
has <a href="<%= @requests_url %>">requested an account</a>
|
7
|
-
on <%= @site %>.
|
8
|
-
</p>
|
9
|
-
|
10
|
-
<p>See <a href="<%= @request_url %>"><%= @name %>'s request</a>.</p>
|
11
|
-
|
12
|
-
<p><em>-- the machines running <%= @site %></em></p>
|
13
|
-
</body>
|
14
|
-
</html>
|
data/lib/card/revision.rb
DELETED
@@ -1,47 +0,0 @@
|
|
1
|
-
# -*- encoding : utf-8 -*-
|
2
|
-
class Card
|
3
|
-
class Revision < ActiveRecord::Base
|
4
|
-
before_save :set_stamper
|
5
|
-
|
6
|
-
class << self
|
7
|
-
def cache
|
8
|
-
Wagn::Cache[Card::Revision]
|
9
|
-
end
|
10
|
-
|
11
|
-
def delete_old
|
12
|
-
where( Card.where( :current_revision_id=>arel_table[:id] ).exists.not ).delete_all
|
13
|
-
end
|
14
|
-
|
15
|
-
def delete_cardless
|
16
|
-
where( Card.where( :id=>arel_table[:card_id] ).exists.not ).delete_all
|
17
|
-
end
|
18
|
-
end
|
19
|
-
|
20
|
-
def set_stamper
|
21
|
-
self.creator_id = Auth.current_id
|
22
|
-
end
|
23
|
-
|
24
|
-
def creator
|
25
|
-
Card[ creator_id ]
|
26
|
-
end
|
27
|
-
|
28
|
-
def card
|
29
|
-
Card[ card_id ]
|
30
|
-
end
|
31
|
-
|
32
|
-
def title #ENGLISH
|
33
|
-
current_id = card.current_revision_id
|
34
|
-
if id == current_id
|
35
|
-
'Current Revision'
|
36
|
-
elsif id > current_id
|
37
|
-
'AutoSave'
|
38
|
-
else
|
39
|
-
card.revisions.each_with_index do |rev, index|
|
40
|
-
return "Revision ##{index + 1}" if rev.id == id
|
41
|
-
end
|
42
|
-
'[Revisions Missing]'
|
43
|
-
end
|
44
|
-
end
|
45
|
-
|
46
|
-
end
|
47
|
-
end
|
@@ -1,34 +0,0 @@
|
|
1
|
-
# -*- encoding : utf-8 -*-
|
2
|
-
|
3
|
-
module Wagn::MigrationHelper
|
4
|
-
def self.card_migration_paths
|
5
|
-
Wagn.paths['db/migrate_cards'].to_a
|
6
|
-
end
|
7
|
-
|
8
|
-
def self.schema_mode type
|
9
|
-
new_suffix = type.to_s =~ /card/ ? '_cards' : ''
|
10
|
-
original_suffix = ActiveRecord::Base.table_name_suffix
|
11
|
-
ActiveRecord::Base.table_name_suffix = new_suffix
|
12
|
-
yield
|
13
|
-
ActiveRecord::Base.table_name_suffix = original_suffix
|
14
|
-
end
|
15
|
-
|
16
|
-
def contentedly &block
|
17
|
-
Wagn::Cache.reset_global
|
18
|
-
Wagn::MigrationHelper.schema_mode '' do
|
19
|
-
Card::Auth.as_bot do
|
20
|
-
ActiveRecord::Base.transaction do
|
21
|
-
begin
|
22
|
-
yield
|
23
|
-
ensure
|
24
|
-
Wagn::Cache.reset_global
|
25
|
-
end
|
26
|
-
end
|
27
|
-
end
|
28
|
-
end
|
29
|
-
end
|
30
|
-
|
31
|
-
def down
|
32
|
-
raise ActiveRecord::IrreversibleMigration
|
33
|
-
end
|
34
|
-
end
|
@@ -1,85 +0,0 @@
|
|
1
|
-
|
2
|
-
class Updates
|
3
|
-
include Enumerable
|
4
|
-
|
5
|
-
def initialize(base)
|
6
|
-
@base, @updates, @orig = base, {}, {}
|
7
|
-
end
|
8
|
-
|
9
|
-
def add(attribute, new_value)
|
10
|
-
@updates[attribute.to_s] = new_value
|
11
|
-
end
|
12
|
-
|
13
|
-
def keys
|
14
|
-
@updates.keys
|
15
|
-
end
|
16
|
-
|
17
|
-
def each
|
18
|
-
@updates.each { |attr| yield attr }
|
19
|
-
end
|
20
|
-
|
21
|
-
def each_pair
|
22
|
-
@updates.each_pair { |attr,value| yield attr, value }
|
23
|
-
end
|
24
|
-
|
25
|
-
def clear(*attr_names)
|
26
|
-
if attr_names.empty?
|
27
|
-
@updates = {}
|
28
|
-
else
|
29
|
-
attr_names.each { |attr| @updates.delete(attr.to_s) }
|
30
|
-
end
|
31
|
-
end
|
32
|
-
|
33
|
-
def for?(attr)
|
34
|
-
@updates.has_key?(attr.to_s)
|
35
|
-
end
|
36
|
-
|
37
|
-
def for(attr)
|
38
|
-
@updates[attr.to_s]
|
39
|
-
end
|
40
|
-
alias :[] :for
|
41
|
-
end
|
42
|
-
|
43
|
-
module ClassMethods
|
44
|
-
# Important! Tracking should be declared *after* associations
|
45
|
-
def tracks(*fields)
|
46
|
-
class_eval do
|
47
|
-
def updates
|
48
|
-
@updates ||= Updates.new(self)
|
49
|
-
end
|
50
|
-
end
|
51
|
-
|
52
|
-
fields.each do |field|
|
53
|
-
unless self.method_defined? field
|
54
|
-
access = "read_attribute('#{field}')"
|
55
|
-
if cache_attribute?(field.to_s)
|
56
|
-
access = "@attributes_cache['#{field}'] ||= #{access}"
|
57
|
-
end
|
58
|
-
class_eval "def #{field}; r=(#{access};) end"
|
59
|
-
end
|
60
|
-
|
61
|
-
unless self.method_defined? "#{field}="
|
62
|
-
class_eval code=%{
|
63
|
-
def #{field}=(value)
|
64
|
-
write_attribute '#{field}', value
|
65
|
-
end
|
66
|
-
}
|
67
|
-
end
|
68
|
-
|
69
|
-
class_eval (code = %{
|
70
|
-
def #{field}_with_tracking=(val)
|
71
|
-
return if (!self.new_record? && self.#{field} == val)
|
72
|
-
updates.add :#{field}, val
|
73
|
-
end
|
74
|
-
alias_method_chain :#{field}=, :tracking
|
75
|
-
|
76
|
-
def #{field}_with_tracking
|
77
|
-
r=updates.for?(:#{field}) ? updates.for(:#{field}) : #{field}_without_tracking
|
78
|
-
end
|
79
|
-
alias_method_chain :#{field}, :tracking
|
80
|
-
})
|
81
|
-
end
|
82
|
-
|
83
|
-
end
|
84
|
-
end
|
85
|
-
|
data/mod/core/set/all/content.rb
DELETED
@@ -1,94 +0,0 @@
|
|
1
|
-
::Card.error_codes[:conflict] = [:conflict, 409]
|
2
|
-
|
3
|
-
def content
|
4
|
-
if !new_card?
|
5
|
-
current_revision.content
|
6
|
-
elsif template && template.content.present?
|
7
|
-
template.content
|
8
|
-
end
|
9
|
-
end
|
10
|
-
|
11
|
-
def raw_content
|
12
|
-
structure ? template.content : content
|
13
|
-
end
|
14
|
-
|
15
|
-
def chunk_list #override to customize by set
|
16
|
-
:default
|
17
|
-
end
|
18
|
-
|
19
|
-
def selected_revision_id
|
20
|
-
@selected_revision_id || current_revision_id || 0
|
21
|
-
end
|
22
|
-
|
23
|
-
def current_revision
|
24
|
-
#return current_revision || Card::Revision.new
|
25
|
-
if @cached_revision and @cached_revision.id==current_revision_id
|
26
|
-
elsif ( Card::Revision.cache &&
|
27
|
-
@cached_revision=Card::Revision.cache.read("#{cardname.safe_key}-content") and
|
28
|
-
@cached_revision.id==current_revision_id )
|
29
|
-
else
|
30
|
-
rev = current_revision_id ? Card::Revision.find(current_revision_id) : Card::Revision.new()
|
31
|
-
@cached_revision = Card::Revision.cache ?
|
32
|
-
Card::Revision.cache.write("#{cardname.safe_key}-content", rev) : rev
|
33
|
-
end
|
34
|
-
@cached_revision
|
35
|
-
end
|
36
|
-
|
37
|
-
def previous_revision revision_id
|
38
|
-
if revision_id
|
39
|
-
rev_index = revisions.find_index do |rev|
|
40
|
-
rev.id == revision_id
|
41
|
-
end
|
42
|
-
revisions[rev_index - 1] if rev_index.to_i != 0
|
43
|
-
end
|
44
|
-
end
|
45
|
-
|
46
|
-
def revised_at
|
47
|
-
(current_revision && current_revision.created_at) || Time.now
|
48
|
-
end
|
49
|
-
|
50
|
-
def creator
|
51
|
-
Card[ creator_id ]
|
52
|
-
end
|
53
|
-
|
54
|
-
def updater
|
55
|
-
Card[ updater_id ]
|
56
|
-
end
|
57
|
-
|
58
|
-
def drafts
|
59
|
-
revisions.find(:all, :conditions=>["id > ?", current_revision_id])
|
60
|
-
end
|
61
|
-
|
62
|
-
def save_draft( content )
|
63
|
-
clear_drafts
|
64
|
-
revisions.create :content=>content
|
65
|
-
end
|
66
|
-
|
67
|
-
def clear_drafts # yuck!
|
68
|
-
connection.execute %{delete from card_revisions where card_id=#{id} and id > #{current_revision_id} }
|
69
|
-
end
|
70
|
-
|
71
|
-
def clean_html?
|
72
|
-
true
|
73
|
-
end
|
74
|
-
|
75
|
-
|
76
|
-
event :set_default_content, :on=>:create, :before=>:approve do
|
77
|
-
if !updates.for?(:content)
|
78
|
-
self.content = content
|
79
|
-
end
|
80
|
-
end
|
81
|
-
|
82
|
-
event :protect_structured_content, :before=>:approve, :on=>:update do
|
83
|
-
if updates.for?(:content) && structure
|
84
|
-
errors.add :content, "can't change; structured by #{template.name}"
|
85
|
-
end
|
86
|
-
end
|
87
|
-
|
88
|
-
|
89
|
-
event :detect_conflict, :before=>:approve, :on=>:update do
|
90
|
-
if current_revision_id_changed?# && current_revision_id.to_i != current_revision_id_was.to_i
|
91
|
-
@current_revision_id = current_revision_id_was
|
92
|
-
errors.add :conflict, "changes not based on latest revision"
|
93
|
-
end
|
94
|
-
end
|
@@ -1,119 +0,0 @@
|
|
1
|
-
format :html do
|
2
|
-
|
3
|
-
watch_perms = lambda { |r| Auth.signed_in? && !r.card.new_card? }
|
4
|
-
view :watch, :tags=>[:unknown_ok, :no_wrap_comments], :denial=>:blank, :perms=>watch_perms do |args|
|
5
|
-
|
6
|
-
wrap args do
|
7
|
-
if card.watching_type?
|
8
|
-
watching_type_cards
|
9
|
-
else
|
10
|
-
link_args = if card.watching?
|
11
|
-
["following", :off, "stop sending emails about changes to #{card.cardname}", { :hover_content=> 'unfollow' } ]
|
12
|
-
else
|
13
|
-
["follow", :on, "send emails about changes to #{card.cardname}" ]
|
14
|
-
end
|
15
|
-
watch_link *link_args
|
16
|
-
end
|
17
|
-
end
|
18
|
-
end
|
19
|
-
|
20
|
-
def watching_type_cards
|
21
|
-
%{<div class="faint">(following)</div>} #yuck
|
22
|
-
end
|
23
|
-
|
24
|
-
def watch_link text, toggle, title, extra={}
|
25
|
-
link_to "#{text}", path(:action=>:watch, :toggle=>toggle),
|
26
|
-
{:class=>"watch-toggle watch-toggle-#{toggle} slotter", :title=>title, :remote=>true, :method=>'post'}.merge(extra)
|
27
|
-
end
|
28
|
-
|
29
|
-
end
|
30
|
-
|
31
|
-
|
32
|
-
event :record_followers, :before=>:store, :on=>:delete do
|
33
|
-
# find before, because in case of deleted cards all the data is gone!
|
34
|
-
|
35
|
-
@trunk_watcher_watched_pairs = trunk_watcher_watched_pairs
|
36
|
-
@watcher_watched_pairs = watcher_watched_pairs
|
37
|
-
end
|
38
|
-
|
39
|
-
event :notify_followers, :after=>:extend do
|
40
|
-
begin
|
41
|
-
return false if Card.record_timestamps==false
|
42
|
-
# userstamps and timestamps are turned off in cases like updating read_rules that are automated and
|
43
|
-
# generally not of enough interest to warrant notification
|
44
|
-
|
45
|
-
action = "#{@action}d"
|
46
|
-
|
47
|
-
@trunk_watcher_watched_pairs ||= trunk_watcher_watched_pairs
|
48
|
-
@watcher_watched_pairs ||= watcher_watched_pairs
|
49
|
-
|
50
|
-
@watcher_watched_pairs.reject do |p|
|
51
|
-
@trunk_watcher_watched_pairs.map(&:first).include? p.first
|
52
|
-
end.each do |watcher, watched|
|
53
|
-
watcher and
|
54
|
-
mail = Mailer.change_notice( watcher, self, action, watched.to_s, nested_notifications ) and
|
55
|
-
mail.deliver
|
56
|
-
end
|
57
|
-
|
58
|
-
if @supercard
|
59
|
-
@supercard.nested_notifications ||= []
|
60
|
-
@supercard.nested_notifications << [ name, action ]
|
61
|
-
else
|
62
|
-
@trunk_watcher_watched_pairs.each do |watcher, watched|
|
63
|
-
next if watcher.nil?
|
64
|
-
Mailer.change_notice( watcher, self.left, 'updated', watched.to_s, [[name, action]], self ).send_if :deliver
|
65
|
-
end
|
66
|
-
end
|
67
|
-
rescue =>e #this error handling should apply to all extend callback exceptions
|
68
|
-
Airbrake.notify e if Airbrake.configuration.api_key
|
69
|
-
Rails.logger.info "\nController exception: #{e.message}"
|
70
|
-
Rails.logger.debug "BT: #{e.backtrace*"\n"}"
|
71
|
-
end
|
72
|
-
end
|
73
|
-
|
74
|
-
attr_accessor :nested_notifications
|
75
|
-
|
76
|
-
def trunk_watcher_watched_pairs
|
77
|
-
# do the watchers lookup before the includer test since it's faster.
|
78
|
-
if cardname.junction?
|
79
|
-
tcard = Card[tname=cardname.trunk_name]
|
80
|
-
tcard and pairs = tcard.watcher_watched_pairs
|
81
|
-
#fixme - includers not working on structured cards, so this is commented for now
|
82
|
-
return pairs if !pairs.nil? and includers.map(&:key).member?(tname.key)
|
83
|
-
end
|
84
|
-
[]
|
85
|
-
end
|
86
|
-
|
87
|
-
def watching_type?; watcher_pairs(false, :type).member? Auth.current_id end
|
88
|
-
def watching?; watcher_pairs(false). member? Auth.current_id end
|
89
|
-
|
90
|
-
def watchers
|
91
|
-
watcher_watched_pairs false
|
92
|
-
end
|
93
|
-
|
94
|
-
def watcher_watched_pairs pairs=true
|
95
|
-
watcher_pairs pairs, :name, whash = {}
|
96
|
-
watcher_pairs pairs, :type, whash
|
97
|
-
end
|
98
|
-
|
99
|
-
def watcher_pairs pairs=true, kind=:name, hash={}
|
100
|
-
#warn "wp #{inspect} P:#{pairs}, k:#{kind}, uid:#{Auth.current_id} #{hash.inspect}, OI:#{hash.object_id}"
|
101
|
-
|
102
|
-
wname, rc = (kind == :type) ?
|
103
|
-
[ self.type_name, self.type_card.fetch(:trait=>:watchers) ] :
|
104
|
-
[ self.cardname, fetch(:trait=>:watchers) ]
|
105
|
-
|
106
|
-
!rc.nil? and hash = rc.item_cards.inject( hash ) { |h, watcher| h[watcher.id] ||= wname; h }
|
107
|
-
|
108
|
-
if hash.any?
|
109
|
-
#warn "wp #{pairs}, #{kind}, #{hash.inspect}"
|
110
|
-
if pairs
|
111
|
-
hash.each.reject {|i,wname| i == Auth.current_id }.map {|i,wname| [ i, wname ] }
|
112
|
-
else
|
113
|
-
hash.keys
|
114
|
-
end
|
115
|
-
|
116
|
-
else []
|
117
|
-
end
|
118
|
-
#warn "wp r:#{r}"; r
|
119
|
-
end
|