card 1.101.0 → 1.101.5
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/VERSION +1 -1
- data/config/i18n-tasks.yml +0 -5
- data/config/initializers/01_core_extensions/array.rb +2 -1
- data/config/initializers/01_core_extensions/hash.rb +1 -0
- data/config/initializers/01_core_extensions/object.rb +15 -11
- data/config/initializers/02_patches/active_job.rb +1 -1
- data/config/initializers/02_patches/active_record.rb +2 -4
- data/config/initializers/02_patches/better_errors.rb +1 -3
- data/config/initializers/02_patches/kaminari.rb +2 -2
- data/config/initializers/deck_config.rb +1 -1
- data/config/initializers/inflections.rb +1 -0
- data/config/initializers/internationalization.rb +23 -21
- data/config/initializers/mime_types.rb +1 -0
- data/config/initializers/notification.rb +1 -0
- data/config/initializers/patches.rb +6 -5
- data/config/locales/en.yml +137 -525
- data/db/migrate/20110511221913_require_earlier_migrations.rb +1 -0
- data/db/migrate/20121111025347_require_1_10_migrations.rb +1 -0
- data/db/migrate/20121118114000_split_link_type.rb +1 -0
- data/db/migrate/20121118115000_update_link_type.rb +1 -0
- data/db/migrate/20130106052640_table_cleanup.rb +2 -2
- data/db/migrate/20130109015336_trunk_left.rb +1 -0
- data/db/migrate/20130411210957_update_codenames.rb +1 -0
- data/db/migrate/20140822073704_create_new_revision_tables.rb +1 -0
- data/db/migrate/20141001105348_move_revisions_to_actions.rb +9 -3
- data/db/migrate/20141216053032_better_index_names.rb +9 -6
- data/db/migrate/20170908114442_create_delayed_jobs.rb +1 -1
- data/db/migrate/20170908114452_increase_text_size_for_delayed_jobs.rb +1 -1
- data/db/migrate/20180514152037_add_card_virtuals_table.rb +1 -1
- data/db/migrate_core_cards/20120611203506_rails_inflection_updates.rb +3 -2
- data/db/migrate_core_cards/20130411191151_renaming_for_menu.rb +9 -9
- data/db/migrate_core_cards/20130419215612_import_help_text.rb +3 -2
- data/db/migrate_core_cards/20130823192433_add_style_cards.rb +5 -5
- data/db/migrate_core_cards/20130910183318_move_styles_to_content.rb +3 -2
- data/db/migrate_core_cards/20130920291703_update_stylesheets.rb +2 -4
- data/db/migrate_core_cards/20131016172445_common_css_patch.rb +1 -3
- data/db/migrate_core_cards/20140110193325_reset_account_request_type.rb +1 -3
- data/db/migrate_core_cards/20140307231621_user_data_to_cards.rb +12 -8
- data/db/migrate_core_cards/20140317035504_account_requests_to_signups.rb +2 -4
- data/db/migrate_core_cards/20140512155840_add_script_cards.rb +16 -9
- data/db/migrate_core_cards/20140629222005_add_email_cards.rb +19 -11
- data/db/migrate_core_cards/20140725180118_config_card_updates.rb +1 -1
- data/db/migrate_core_cards/20141115034214_config_descriptions_etc.rb +1 -1
- data/db/migrate_core_cards/20141119001955_make_symlinks_relative.rb +1 -1
- data/db/migrate_core_cards/20141204061304_watchers_to_following.rb +2 -0
- data/db/migrate_core_cards/20141216155251_add_more_following_cards.rb +4 -2
- data/db/migrate_core_cards/20150202143810_import_bootstrap_layout.rb +2 -2
- data/db/migrate_core_cards/20150220134731_following_to_follow_rule.rb +3 -4
- data/db/migrate_core_cards/20150317162412_bootstrap_themes.rb +8 -4
- data/db/migrate_core_cards/20150326205655_bootswatch_themes.rb +14 -7
- data/db/migrate_core_cards/20150429090551_search_card_context.rb +6 -4
- data/db/migrate_core_cards/20150508212032_menu_compatibility.rb +4 -2
- data/db/migrate_core_cards/20150510031118_fix_skin_codenames.rb +2 -1
- data/db/migrate_core_cards/20150601133433_add_recent_setting_session_card.rb +3 -3
- data/db/migrate_core_cards/20150610171702_add_debugger_session_card.rb +2 -1
- data/db/migrate_core_cards/20150610180019_add_recaptcha_key_and_admin_info_cards.rb +4 -3
- data/db/migrate_core_cards/20150724123438_update_file_and_image_cards.rb +6 -2
- data/db/migrate_core_cards/20150807205221_create_references_for_search_cards.rb +1 -1
- data/db/migrate_core_cards/20150824135418_update_file_history.rb +2 -0
- data/db/migrate_core_cards/20160804112510_reorganize_scripts.rb +1 -1
- data/db/migrate_core_cards/20160811115836_rename_stats_to_admin.rb +1 -0
- data/db/migrate_core_cards/20160914132636_fix_mod_files.rb +2 -0
- data/db/migrate_core_cards/20161102202156_tweak_recaptcha_setting_cards.rb +6 -6
- data/db/migrate_core_cards/20161103154836_update_keys.rb +2 -1
- data/db/migrate_core_cards/20170209132834_email_test_context.rb +2 -0
- data/db/migrate_core_cards/20170314175313_add_notification_event_card.rb +3 -3
- data/db/migrate_core_cards/20170515101262_add_advanced_edit_cards.rb +1 -1
- data/db/migrate_core_cards/20170608200649_add_input_options_codename.rb +1 -1
- data/db/migrate_core_cards/20180712042655_head_rule.rb +3 -4
- data/db/migrate_core_cards/20180905061537_migrate_layouts.rb +4 -4
- data/db/migrate_core_cards/20181120200937_update_layout.rb +1 -1
- data/db/migrate_core_cards/20190320091257_upgrade_recaptcha_to_v3.rb +7 -7
- data/db/migrate_core_cards/20190424100531_update_credit_image.rb +1 -0
- data/db/migrate_core_cards/20190502130029_add_shark_and_help_desk_role.rb +15 -14
- data/db/migrate_core_cards/20190503122739_update_pristine_data.rb +1 -1
- data/db/migrate_core_cards/20190625153616_pointer_overhaul.rb +9 -5
- data/db/migrate_core_cards/20190718140126_add_guides.rb +3 -3
- data/db/migrate_core_cards/20190822093633_move_help_text_to_code.rb +1 -2
- data/db/migrate_core_cards/20190823220018_cleanup_for_decko_1_0.rb +1 -1
- data/db/migrate_core_cards/20190829093961_cardtype_grouping.rb +7 -7
- data/db/migrate_core_cards/20190902193208_input_type.rb +1 -3
- data/db/migrate_core_cards/20190909104250_add_cardtype_input_types.rb +2 -2
- data/db/migrate_core_cards/20191028135243_add_link_editor_to_tiny_mce_config.rb +1 -0
- data/db/migrate_core_cards/20191115160748_history_cleanup.rb +0 -1
- data/db/migrate_core_cards/20191118145629_codename_fixes.rb +1 -2
- data/db/migrate_core_cards/20200821231558_add_nest_list_type.rb +1 -1
- data/db/migrate_core_cards/data/decko_logo.svg +1 -59
- data/db/seed/new/card_actions.yml +2153 -2145
- data/db/seed/new/card_acts.yml +3 -3
- data/db/seed/new/card_references.yml +900 -858
- data/db/seed/new/cards.yml +4869 -4848
- data/db/seed/new/schema_migrations_deck_cards.yml +2 -0
- data/db/seed/test/fixtures/card_actions.yml +3563 -3547
- data/db/seed/test/fixtures/card_acts.yml +675 -675
- data/db/seed/test/fixtures/card_changes.yml +103 -103
- data/db/seed/test/fixtures/card_references.yml +2165 -2123
- data/db/seed/test/fixtures/cards.yml +7862 -7751
- data/db/seed/test/fixtures/rails.gif +0 -0
- data/db/seed/test/fixtures/schema_migrations_deck_cards.yml +2 -0
- data/db/test_seed.rb +33 -34
- data/lib/card.rb +18 -1
- data/lib/card/auth.rb +5 -2
- data/lib/card/auth/current.rb +39 -100
- data/lib/card/auth/proxy.rb +36 -16
- data/lib/card/auth/token.rb +8 -2
- data/lib/card/cache.rb +2 -1
- data/lib/card/cache/all.rb +88 -0
- data/lib/card/cache/card_class.rb +44 -0
- data/lib/card/cache/persistent.rb +3 -34
- data/lib/card/cache/persistent_class.rb +28 -0
- data/lib/card/codename.rb +3 -4
- data/lib/card/content.rb +20 -10
- data/lib/card/content/all.rb +59 -0
- data/lib/card/content/chunk.rb +1 -1
- data/lib/card/content/clean.rb +4 -3
- data/lib/card/content/diff.rb +3 -2
- data/lib/card/content/diff/l_c_s/processor.rb +1 -1
- data/lib/card/content/diff/result.rb +41 -29
- data/lib/card/content/parser.rb +2 -2
- data/lib/card/content/truncate.rb +6 -6
- data/lib/card/director.rb +1 -1
- data/lib/card/director/act_direction.rb +4 -0
- data/lib/card/director/all.rb +61 -0
- data/lib/card/director/card_class.rb +18 -0
- data/lib/card/director/card_methods.rb +1 -0
- data/lib/card/director/event_delay.rb +4 -6
- data/lib/card/director/phases.rb +0 -1
- data/lib/card/director/run.rb +2 -0
- data/lib/card/director/stages.rb +3 -2
- data/lib/card/dirty.rb +13 -3
- data/lib/card/env.rb +2 -2
- data/lib/card/env/location.rb +4 -3
- data/lib/card/env/success.rb +46 -103
- data/lib/card/env/success/target.rb +73 -0
- data/lib/card/error.rb +1 -2
- data/lib/card/fetch.rb +7 -4
- data/lib/card/fetch/all.rb +33 -0
- data/lib/card/fetch/card_class.rb +155 -0
- data/lib/card/fetch/results.rb +9 -0
- data/lib/card/fetch/retrieve.rb +2 -0
- data/lib/card/fetch/store.rb +1 -0
- data/lib/card/format.rb +1 -2
- data/lib/card/format/content.rb +1 -3
- data/lib/card/format/error.rb +8 -4
- data/lib/card/format/method_delegation.rb +10 -2
- data/lib/card/format/nest.rb +3 -2
- data/lib/card/format/nest/fetch.rb +3 -2
- data/lib/card/format/nesting/mode.rb +1 -1
- data/lib/card/format/nesting/subformat.rb +2 -1
- data/lib/card/format/render.rb +2 -2
- data/lib/card/format/wrapper.rb +1 -1
- data/lib/card/lexicon.rb +5 -4
- data/lib/card/mark.rb +17 -15
- data/lib/card/model/save_helper.rb +18 -184
- data/lib/card/model/save_helper/save_arguments.rb +94 -0
- data/lib/card/model/save_helper/save_helper_helper.rb +93 -0
- data/lib/card/name.rb +10 -9
- data/lib/card/name/all.rb +136 -0
- data/lib/card/name/all/descendants.rb +48 -0
- data/lib/card/name/all/parts.rb +67 -0
- data/lib/card/name/card_class.rb +28 -0
- data/lib/card/name/fields_and_traits.rb +4 -2
- data/lib/card/name/name_variants.rb +0 -1
- data/lib/card/query.rb +24 -19
- data/lib/card/query/card_query/interpretation.rb +3 -2
- data/lib/card/query/card_query/match_attributes.rb +2 -1
- data/lib/card/query/card_query/normalization.rb +1 -0
- data/lib/card/query/card_query/reference_attributes.rb +1 -1
- data/lib/card/query/card_query/sorting.rb +12 -4
- data/lib/card/query/join.rb +1 -1
- data/lib/card/query/sql_statement.rb +1 -1
- data/lib/card/query/value/match_value.rb +1 -0
- data/lib/card/reference/all.rb +136 -0
- data/lib/card/rule/all.rb +76 -0
- data/lib/card/rule/cache.rb +2 -0
- data/lib/card/set/advanced_api.rb +8 -4
- data/lib/card/set/event.rb +2 -2
- data/lib/card/set/event/all.rb +101 -0
- data/lib/card/set/event/delayed_event.rb +6 -6
- data/lib/card/set/event/options.rb +14 -5
- data/lib/card/set/event/skip_and_trigger.rb +89 -0
- data/lib/card/set/format.rb +16 -9
- data/lib/card/set/format/abstract_format/view_definition.rb +1 -0
- data/lib/card/set/format/abstract_format/view_opts.rb +1 -0
- data/lib/card/set/i18n_scope.rb +18 -13
- data/lib/card/set/inheritance.rb +8 -6
- data/lib/card/set/loader.rb +24 -13
- data/lib/card/set/pattern/all.rb +63 -0
- data/lib/card/set/pattern/base.rb +4 -74
- data/lib/card/set/pattern/class_methods.rb +75 -0
- data/lib/card/set/required_field.rb +4 -1
- data/lib/card/set/trait.rb +11 -8
- data/lib/card/setting.rb +13 -12
- data/lib/card/subcards.rb +3 -4
- data/lib/card/subcards/add.rb +3 -24
- data/lib/card/subcards/all.rb +103 -0
- data/lib/card/subcards/args.rb +42 -0
- data/lib/card/tasks/card/file_card_creator/abstract_file_card/ruby_file.rb +1 -1
- data/lib/card/tasks/card/file_card_creator/output_helper.rb +17 -14
- data/lib/card/tasks/card/migrate.rake +2 -2
- data/lib/card/view/cache.rb +6 -8
- data/lib/card/view/cache/cache_action.rb +1 -2
- data/lib/card/view/cache/stub.rb +1 -1
- data/lib/card/view/options.rb +5 -4
- data/lib/card/view/permission.rb +15 -3
- data/lib/cardio.rb +10 -67
- data/lib/cardio/defaults.yml +70 -0
- data/lib/cardio/migration.rb +2 -2
- data/lib/cardio/migration/deck_structure.rb +2 -4
- data/lib/cardio/migration/import.rb +3 -3
- data/lib/cardio/migration/import/import_data.rb +1 -0
- data/lib/cardio/mod.rb +1 -0
- data/lib/cardio/mod/dirs.rb +2 -2
- data/lib/cardio/mod/load_strategy.rb +2 -4
- data/lib/cardio/mod/loader/set_loader.rb +2 -1
- data/lib/cardio/mod/loader/set_pattern_loader.rb +0 -1
- data/lib/cardio/mod/module_template.rb +1 -0
- data/lib/cardio/modfiles.rb +2 -4
- data/lib/cardio/schema.rb +2 -4
- data/lib/cardio/utils.rb +9 -0
- data/lib/generators/card/format/format_generator.rb +1 -1
- data/lib/generators/card/migration/migration_generator.rb +2 -1
- data/lib/generators/card/mod/mod_generator.rb +3 -2
- data/lib/generators/card/set/set_generator.rb +3 -3
- data/lib/generators/card/template/template_generator.rb +1 -1
- data/mod/admin/set/self/admin.rb +6 -3
- data/mod/admin/set/self/admin_info.rb +3 -8
- data/mod/admin/set/self/trash.rb +3 -2
- data/mod/admin/spec/set/self/admin_spec.rb +4 -4
- data/mod/core/set/all/abort.rb +5 -5
- data/mod/core/set/all/assign_attributes.rb +12 -28
- data/mod/core/set/all/autoname.rb +17 -0
- data/mod/core/set/all/codename.rb +3 -2
- data/mod/core/set/all/collection.rb +4 -6
- data/mod/core/set/all/content.rb +55 -99
- data/mod/core/set/all/contextual_content.rb +2 -4
- data/mod/core/set/all/initialize.rb +9 -9
- data/mod/core/set/all/name_events.rb +78 -58
- data/mod/core/set/all/reference_events.rb +69 -0
- data/mod/core/set/all/states.rb +5 -5
- data/mod/core/set/all/subcards.rb +1 -101
- data/mod/core/set/all/trash.rb +16 -14
- data/mod/core/set/all/type.rb +11 -11
- data/mod/core/set/all/utils.rb +4 -1
- data/mod/{settings → core}/set/right/autoname.rb +0 -0
- data/mod/{settings → core}/set/self/autoname.rb +0 -0
- data/mod/core/set/type/cardtype.rb +28 -0
- data/mod/core/set_pattern/06_rule.rb +1 -1
- data/mod/core/spec/set/all/assign_attributes_spec.rb +10 -9
- data/mod/core/spec/set/all/{rules2_spec.rb → clean_me_spec.rb} +19 -4
- data/mod/core/spec/set/all/collection_spec.rb +1 -1
- data/mod/core/spec/set/all/export_spec.rb +1 -0
- data/mod/core/spec/set/all/initialize_spec.rb +11 -11
- data/mod/core/spec/set/all/name_events_spec.rb +204 -0
- data/mod/{standard → core}/spec/set/type/cardtype_spec.rb +3 -24
- data/mod/standard/file/logo/image-original.svg +1 -59
- metadata +50 -61
- data/config/initializers/uuid_state_file.rb +0 -3
- data/lib/card/mod_inflector.rb +0 -16
- data/mod/Modfile +0 -4
- data/mod/core/set/all/actify.rb +0 -68
- data/mod/core/set/all/cache.rb +0 -109
- data/mod/core/set/all/event_conditions.rb +0 -172
- data/mod/core/set/all/fetch.rb +0 -122
- data/mod/core/set/all/fetch_helper.rb +0 -35
- data/mod/core/set/all/i18n.rb +0 -11
- data/mod/core/set/all/name.rb +0 -229
- data/mod/core/set/all/pattern.rb +0 -54
- data/mod/core/set/all/references.rb +0 -191
- data/mod/core/set/all/rename.rb +0 -33
- data/mod/core/set/all/rules.rb +0 -81
- data/mod/core/spec/set/all/actify_spec.rb +0 -58
- data/mod/core/spec/set/all/content_spec.rb +0 -15
- data/mod/core/spec/set/all/event_conditions_spec.rb +0 -217
- data/mod/core/spec/set/all/fetch_helper_spec.rb +0 -65
- data/mod/core/spec/set/all/fetch_spec.rb +0 -338
- data/mod/core/spec/set/all/i18n_spec.rb +0 -17
- data/mod/core/spec/set/all/name_spec.rb +0 -11
- data/mod/core/spec/set/all/pattern_spec.rb +0 -101
- data/mod/core/spec/set/all/permissions/reader_rules_spec.rb +0 -166
- data/mod/core/spec/set/all/references_spec.rb +0 -62
- data/mod/core/spec/set/all/rename_spec.rb +0 -189
- data/mod/core/spec/set/all/rules_spec.rb +0 -100
- data/mod/core/spec/set/all/subcards_spec.rb +0 -102
- data/mod/standard/set/all/rich_html/html_views/info.rb +0 -84
- data/mod/standard/set/type/cardtype.rb +0 -119
data/lib/card/auth/token.rb
CHANGED
@@ -25,14 +25,20 @@ class Card
|
|
25
25
|
def decode token
|
26
26
|
decoded = JWT.decode(token, SECRET_KEY)[0]
|
27
27
|
HashWithIndifferentAccess.new decoded
|
28
|
-
rescue JWT::DecodeError =>
|
29
|
-
|
28
|
+
rescue JWT::DecodeError => e
|
29
|
+
e.message
|
30
30
|
end
|
31
31
|
|
32
32
|
def expiration
|
33
33
|
Card.config.token_expiry.from_now.to_i
|
34
34
|
end
|
35
35
|
end
|
36
|
+
|
37
|
+
# set the current user based on token
|
38
|
+
def signin_with_token token
|
39
|
+
payload = Token.validate! token
|
40
|
+
signin payload[:anonymous] ? Card::AnonymousID : payload[:user_id]
|
41
|
+
end
|
36
42
|
end
|
37
43
|
end
|
38
44
|
end
|
data/lib/card/cache.rb
CHANGED
@@ -53,6 +53,7 @@ class Card
|
|
53
53
|
# on the persistent caches.
|
54
54
|
def renew
|
55
55
|
return if no_renewal
|
56
|
+
|
56
57
|
renew_persistent
|
57
58
|
cache_by_class.each_value do |cache|
|
58
59
|
cache.soft.reset
|
@@ -175,7 +176,7 @@ class Card
|
|
175
176
|
# test for the existence of the key in either cache
|
176
177
|
# @return [true/false]
|
177
178
|
def exist? key
|
178
|
-
@soft.exist?(key) ||
|
179
|
+
@soft.exist?(key) || @hard&.exist?(key)
|
179
180
|
end
|
180
181
|
end
|
181
182
|
end
|
@@ -0,0 +1,88 @@
|
|
1
|
+
class Card
|
2
|
+
class Cache
|
3
|
+
# cache-related instance methods available to all Cards
|
4
|
+
module All
|
5
|
+
def expire cache_type=nil
|
6
|
+
return unless (cache_class = cache_class_from_type cache_type)
|
7
|
+
|
8
|
+
expire_views
|
9
|
+
expire_names cache_class
|
10
|
+
expire_id cache_class
|
11
|
+
end
|
12
|
+
|
13
|
+
def view_cache_clean?
|
14
|
+
!db_content_changed?
|
15
|
+
end
|
16
|
+
|
17
|
+
def ensure_view_cache_key cache_key
|
18
|
+
return if view_cache_keys.include? cache_key
|
19
|
+
|
20
|
+
view_cache_keys << cache_key
|
21
|
+
hard_write_view_cache_keys
|
22
|
+
end
|
23
|
+
|
24
|
+
private
|
25
|
+
|
26
|
+
def hard_read_view_cache_keys key_root=key
|
27
|
+
Card.cache.hard&.read_attribute key_root, :view_cache_keys
|
28
|
+
end
|
29
|
+
|
30
|
+
def hard_write_view_cache_keys
|
31
|
+
# puts "WRITE VIEW CACHE KEYS (#{name}): #{view_cache_keys}"
|
32
|
+
Card.cache.hard&.write_attribute key, :view_cache_keys, view_cache_keys
|
33
|
+
end
|
34
|
+
|
35
|
+
def cache_class_from_type cache_type
|
36
|
+
cache_type ? Card.cache.send(cache_type) : Card.cache
|
37
|
+
end
|
38
|
+
|
39
|
+
def view_cache_keys
|
40
|
+
@view_cache_keys ||= hard_read_view_cache_keys(key) || []
|
41
|
+
end
|
42
|
+
|
43
|
+
def expire_names cache
|
44
|
+
each_key_version do |key_version|
|
45
|
+
expire_name key_version, cache
|
46
|
+
end
|
47
|
+
end
|
48
|
+
|
49
|
+
def expire_name name_version, cache
|
50
|
+
return unless name_version.present?
|
51
|
+
|
52
|
+
key_version = name_version.to_name.key
|
53
|
+
return unless key_version.present?
|
54
|
+
|
55
|
+
cache.delete key_version
|
56
|
+
end
|
57
|
+
|
58
|
+
def expire_views
|
59
|
+
each_key_version do |key|
|
60
|
+
# puts "EXPIRE VIEW CACHE (#{name}): #{view_cache_keys}"
|
61
|
+
view_keys = hard_read_view_cache_keys key
|
62
|
+
next unless view_keys.present?
|
63
|
+
|
64
|
+
expire_view_cache_keys view_keys
|
65
|
+
end
|
66
|
+
@view_cache_keys = []
|
67
|
+
end
|
68
|
+
|
69
|
+
def expire_id cache
|
70
|
+
return unless id.present?
|
71
|
+
|
72
|
+
cache.delete "~#{id}"
|
73
|
+
end
|
74
|
+
|
75
|
+
def expire_view_cache_keys view_keys
|
76
|
+
Array.wrap(view_keys).each do |view_key|
|
77
|
+
Card::View.cache.delete view_key
|
78
|
+
end
|
79
|
+
end
|
80
|
+
|
81
|
+
def each_key_version
|
82
|
+
[name, name_before_act].uniq.compact.each do |name_version|
|
83
|
+
yield name_version.to_name.key
|
84
|
+
end
|
85
|
+
end
|
86
|
+
end
|
87
|
+
end
|
88
|
+
end
|
@@ -0,0 +1,44 @@
|
|
1
|
+
class Card
|
2
|
+
class Cache
|
3
|
+
# cache-related class methods
|
4
|
+
module CardClass
|
5
|
+
def retrieve_from_cache cache_key, local_only=false
|
6
|
+
return unless cache
|
7
|
+
|
8
|
+
local_only ? cache.soft.read(cache_key) : cache.read(cache_key)
|
9
|
+
end
|
10
|
+
|
11
|
+
def retrieve_from_cache_by_id id, local_only=false
|
12
|
+
key = Card::Lexicon.name(id)&.key
|
13
|
+
return unless key.present?
|
14
|
+
|
15
|
+
retrieve_from_cache key, local_only if key
|
16
|
+
end
|
17
|
+
|
18
|
+
def retrieve_from_cache_by_key key, local_only=false
|
19
|
+
retrieve_from_cache key, local_only
|
20
|
+
end
|
21
|
+
|
22
|
+
def write_to_cache card, local_only=false
|
23
|
+
if local_only
|
24
|
+
write_to_soft_cache card
|
25
|
+
elsif cache
|
26
|
+
cache.write card.key, card
|
27
|
+
end
|
28
|
+
end
|
29
|
+
|
30
|
+
def write_to_soft_cache card
|
31
|
+
return unless cache
|
32
|
+
|
33
|
+
cache.soft.write card.key, card
|
34
|
+
end
|
35
|
+
|
36
|
+
def expire name
|
37
|
+
key = name.to_name.key
|
38
|
+
return unless (card = Card.cache.read key)
|
39
|
+
|
40
|
+
card.expire
|
41
|
+
end
|
42
|
+
end
|
43
|
+
end
|
44
|
+
end
|
@@ -15,40 +15,9 @@ class Card
|
|
15
15
|
# re-included after retrieval from the persistent cache.
|
16
16
|
#
|
17
17
|
class Persistent
|
18
|
-
|
19
|
-
|
20
|
-
class << self
|
21
|
-
# name of current database; used here to insure that different databases
|
22
|
-
# are cached separately
|
23
|
-
# TODO: find better home for this method
|
24
|
-
def database_name
|
25
|
-
@database_name ||= (cfg = Cardio.config) &&
|
26
|
-
(dbcfg = cfg.database_configuration) &&
|
27
|
-
dbcfg[Rails.env]["database"]
|
28
|
-
end
|
29
|
-
|
30
|
-
def stamp
|
31
|
-
@stamp ||= Cardio.cache.fetch(stamp_key) { new_stamp }
|
32
|
-
end
|
33
|
-
|
34
|
-
# stamp generator
|
35
|
-
def new_stamp
|
36
|
-
Time.now.to_i.to_s(36) + rand(999).to_s(36)
|
37
|
-
end
|
18
|
+
extend PersistentClass
|
38
19
|
|
39
|
-
|
40
|
-
"#{database_name}-stamp"
|
41
|
-
end
|
42
|
-
|
43
|
-
def renew
|
44
|
-
@stamp = nil
|
45
|
-
end
|
46
|
-
|
47
|
-
def reset
|
48
|
-
@stamp = new_stamp
|
49
|
-
Cardio.cache.write stamp_key, @stamp
|
50
|
-
end
|
51
|
-
end
|
20
|
+
attr_accessor :prefix
|
52
21
|
|
53
22
|
# @param opts [Hash]
|
54
23
|
# @option opts [Rails::Cache] :store
|
@@ -58,7 +27,7 @@ class Card
|
|
58
27
|
@store = opts[:store]
|
59
28
|
@klass = opts[:class]
|
60
29
|
@class_key = @klass.to_s.to_name.key
|
61
|
-
@database = opts[:database] ||
|
30
|
+
@database = opts[:database] || Cardio.database_name
|
62
31
|
end
|
63
32
|
|
64
33
|
# renew insures you're using the most current cache version by
|
@@ -0,0 +1,28 @@
|
|
1
|
+
class Card
|
2
|
+
class Cache
|
3
|
+
# class methods for Card::Cache::Persistent
|
4
|
+
module PersistentClass
|
5
|
+
def stamp
|
6
|
+
@stamp ||= Cardio.cache.fetch(stamp_key) { new_stamp }
|
7
|
+
end
|
8
|
+
|
9
|
+
# stamp generator
|
10
|
+
def new_stamp
|
11
|
+
Time.now.to_i.to_s(36) + rand(999).to_s(36)
|
12
|
+
end
|
13
|
+
|
14
|
+
def stamp_key
|
15
|
+
"#{Cardio.database_name}-stamp"
|
16
|
+
end
|
17
|
+
|
18
|
+
def renew
|
19
|
+
@stamp = nil
|
20
|
+
end
|
21
|
+
|
22
|
+
def reset
|
23
|
+
@stamp = new_stamp
|
24
|
+
Cardio.cache.write stamp_key, @stamp
|
25
|
+
end
|
26
|
+
end
|
27
|
+
end
|
28
|
+
end
|
data/lib/card/codename.rb
CHANGED
@@ -137,14 +137,13 @@ class Card
|
|
137
137
|
end
|
138
138
|
|
139
139
|
def unknown_codename! mark
|
140
|
-
raise Card::Error::CodenameNotFound,
|
141
|
-
|
142
|
-
codename: mark)
|
140
|
+
raise Card::Error::CodenameNotFound,
|
141
|
+
Cardio.t(:lib_exception_unknown_codename, codename: mark)
|
143
142
|
end
|
144
143
|
|
145
144
|
def id_constant codename, id=nil
|
146
145
|
id ||= id! codename
|
147
|
-
Card.const_get_or_set(codename.to_s.camelize
|
146
|
+
Card.const_get_or_set("#{codename.to_s.camelize}ID") { id }
|
148
147
|
end
|
149
148
|
end
|
150
149
|
|
data/lib/card/content.rb
CHANGED
@@ -36,9 +36,10 @@ class Card
|
|
36
36
|
end
|
37
37
|
|
38
38
|
# Find all chunks of a given type
|
39
|
-
# @param chunk_type [Chunk Class]
|
39
|
+
# @param chunk_type [Chunk Class or Symbol]
|
40
40
|
# @return [Array of Chunk instances]
|
41
|
-
def find_chunks chunk_type
|
41
|
+
def find_chunks chunk_type=nil
|
42
|
+
chunk_type = interpret_chunk_type chunk_type
|
42
43
|
each_chunk.select { |chunk| chunk.is_a?(chunk_type) }
|
43
44
|
end
|
44
45
|
|
@@ -98,16 +99,12 @@ class Card
|
|
98
99
|
"<#{__getobj__.class}:#{card}:#{self}>"
|
99
100
|
end
|
100
101
|
|
101
|
-
def without_nests
|
102
|
-
without_chunks Chunk::Nest
|
103
|
-
yield content
|
104
|
-
end
|
102
|
+
def without_nests &block
|
103
|
+
without_chunks Chunk::Nest, &block
|
105
104
|
end
|
106
105
|
|
107
|
-
def without_references
|
108
|
-
without_chunks Chunk::Nest, Chunk::Link
|
109
|
-
yield content
|
110
|
-
end
|
106
|
+
def without_references &block
|
107
|
+
without_chunks Chunk::Nest, Chunk::Link, &block
|
111
108
|
end
|
112
109
|
|
113
110
|
def without_chunks *chunk_classes
|
@@ -119,6 +116,19 @@ class Card
|
|
119
116
|
|
120
117
|
private
|
121
118
|
|
119
|
+
def interpret_chunk_type chunk_type
|
120
|
+
case chunk_type
|
121
|
+
when nil
|
122
|
+
Chunk
|
123
|
+
when Symbol, String
|
124
|
+
Chunk.const_get chunk_type
|
125
|
+
when Class
|
126
|
+
chunk_type
|
127
|
+
else
|
128
|
+
raise ArgumentError, "unknown chunk type: #{chunk_type}"
|
129
|
+
end
|
130
|
+
end
|
131
|
+
|
122
132
|
def stash_chunks chunk_classes
|
123
133
|
chunks = []
|
124
134
|
each_chunk do |chunk|
|
@@ -0,0 +1,59 @@
|
|
1
|
+
class Card
|
2
|
+
class Content
|
3
|
+
# content-related methods for cards
|
4
|
+
module All
|
5
|
+
def content
|
6
|
+
structured_content || standard_content
|
7
|
+
end
|
8
|
+
alias_method :raw_content, :content # DEPRECATED!
|
9
|
+
|
10
|
+
def content= value
|
11
|
+
self.db_content = standardize_content(value)
|
12
|
+
end
|
13
|
+
|
14
|
+
def content?
|
15
|
+
content.present?
|
16
|
+
end
|
17
|
+
|
18
|
+
def standard_content
|
19
|
+
db_content || (new_card? && template.db_content)
|
20
|
+
end
|
21
|
+
|
22
|
+
def standardize_content value
|
23
|
+
value.is_a?(Array) ? value.join("\n") : value
|
24
|
+
end
|
25
|
+
|
26
|
+
def structured_content
|
27
|
+
structure && template.db_content
|
28
|
+
end
|
29
|
+
|
30
|
+
def refresh_content
|
31
|
+
self.content = Card.find(id)&.db_content
|
32
|
+
end
|
33
|
+
|
34
|
+
def save_content_draft _content
|
35
|
+
clear_drafts
|
36
|
+
end
|
37
|
+
|
38
|
+
def clear_drafts
|
39
|
+
drafts.created_by(Card::Auth.current_id).each(&:delete)
|
40
|
+
end
|
41
|
+
|
42
|
+
def last_draft_content
|
43
|
+
drafts.last.card_changes.last.value
|
44
|
+
end
|
45
|
+
|
46
|
+
def blank_content?
|
47
|
+
content.blank? || content.strip.blank?
|
48
|
+
end
|
49
|
+
|
50
|
+
def nests?
|
51
|
+
content_object.has_chunk? Content::Chunk::Nest
|
52
|
+
end
|
53
|
+
|
54
|
+
def content_object
|
55
|
+
Card::Content.new content, self
|
56
|
+
end
|
57
|
+
end
|
58
|
+
end
|
59
|
+
end
|
data/lib/card/content/chunk.rb
CHANGED
data/lib/card/content/clean.rb
CHANGED
@@ -46,7 +46,7 @@ class Card
|
|
46
46
|
# $LAST_MATCH_INFO is nil if string is a SafeBuffer
|
47
47
|
string.to_str.gsub(%r{<(/*)(\w+)([^>]*)>}) do |_raw|
|
48
48
|
clean_tag $LAST_MATCH_INFO, ok_tags
|
49
|
-
end.gsub(
|
49
|
+
end.gsub(/<!--.*?-->/, "")
|
50
50
|
end
|
51
51
|
|
52
52
|
def clean_spaces string
|
@@ -56,6 +56,7 @@ class Card
|
|
56
56
|
def clean_tag match, ok_tags
|
57
57
|
tag = match[2].downcase
|
58
58
|
return " " unless (ok_attrs = ok_tags[tag])
|
59
|
+
|
59
60
|
"<#{match[1]}#{html_attribs tag, match[3], ok_attrs}>"
|
60
61
|
end
|
61
62
|
|
@@ -70,7 +71,7 @@ class Card
|
|
70
71
|
return ['"', nil] unless all_attributes =~ /\b#{attrib}\s*=\s*(?=(.))/i
|
71
72
|
|
72
73
|
q = '"'
|
73
|
-
rest_value =
|
74
|
+
rest_value = Regexp.last_match.post_match
|
74
75
|
if (idx = %w[' "].index Regexp.last_match(1))
|
75
76
|
q = Regexp.last_match(1)
|
76
77
|
end
|
@@ -79,7 +80,7 @@ class Card
|
|
79
80
|
[q, rest_value]
|
80
81
|
end
|
81
82
|
|
82
|
-
# NOTE allows classes beginning with "w-" (deprecated)
|
83
|
+
# NOTE: allows classes beginning with "w-" (deprecated)
|
83
84
|
def process_attribute_match rest_value, reg_exp, attrib
|
84
85
|
return rest_value unless (match = rest_value.match reg_exp)
|
85
86
|
|
data/lib/card/content/diff.rb
CHANGED
@@ -22,6 +22,7 @@ class Card
|
|
22
22
|
end
|
23
23
|
|
24
24
|
attr_reader :result
|
25
|
+
|
25
26
|
delegate :summary, :complete, :summary_omits_content?, to: :result
|
26
27
|
|
27
28
|
# diff options
|
@@ -41,11 +42,11 @@ class Card
|
|
41
42
|
end
|
42
43
|
|
43
44
|
def red?
|
44
|
-
@result.dels_cnt
|
45
|
+
@result.dels_cnt.positive?
|
45
46
|
end
|
46
47
|
|
47
48
|
def green?
|
48
|
-
@result.adds_cnt
|
49
|
+
@result.adds_cnt.positive?
|
49
50
|
end
|
50
51
|
|
51
52
|
private
|