card 1.101.0 → 1.101.5

Sign up to get free protection for your applications and to get access to all the features.
Files changed (287) hide show
  1. checksums.yaml +4 -4
  2. data/VERSION +1 -1
  3. data/config/i18n-tasks.yml +0 -5
  4. data/config/initializers/01_core_extensions/array.rb +2 -1
  5. data/config/initializers/01_core_extensions/hash.rb +1 -0
  6. data/config/initializers/01_core_extensions/object.rb +15 -11
  7. data/config/initializers/02_patches/active_job.rb +1 -1
  8. data/config/initializers/02_patches/active_record.rb +2 -4
  9. data/config/initializers/02_patches/better_errors.rb +1 -3
  10. data/config/initializers/02_patches/kaminari.rb +2 -2
  11. data/config/initializers/deck_config.rb +1 -1
  12. data/config/initializers/inflections.rb +1 -0
  13. data/config/initializers/internationalization.rb +23 -21
  14. data/config/initializers/mime_types.rb +1 -0
  15. data/config/initializers/notification.rb +1 -0
  16. data/config/initializers/patches.rb +6 -5
  17. data/config/locales/en.yml +137 -525
  18. data/db/migrate/20110511221913_require_earlier_migrations.rb +1 -0
  19. data/db/migrate/20121111025347_require_1_10_migrations.rb +1 -0
  20. data/db/migrate/20121118114000_split_link_type.rb +1 -0
  21. data/db/migrate/20121118115000_update_link_type.rb +1 -0
  22. data/db/migrate/20130106052640_table_cleanup.rb +2 -2
  23. data/db/migrate/20130109015336_trunk_left.rb +1 -0
  24. data/db/migrate/20130411210957_update_codenames.rb +1 -0
  25. data/db/migrate/20140822073704_create_new_revision_tables.rb +1 -0
  26. data/db/migrate/20141001105348_move_revisions_to_actions.rb +9 -3
  27. data/db/migrate/20141216053032_better_index_names.rb +9 -6
  28. data/db/migrate/20170908114442_create_delayed_jobs.rb +1 -1
  29. data/db/migrate/20170908114452_increase_text_size_for_delayed_jobs.rb +1 -1
  30. data/db/migrate/20180514152037_add_card_virtuals_table.rb +1 -1
  31. data/db/migrate_core_cards/20120611203506_rails_inflection_updates.rb +3 -2
  32. data/db/migrate_core_cards/20130411191151_renaming_for_menu.rb +9 -9
  33. data/db/migrate_core_cards/20130419215612_import_help_text.rb +3 -2
  34. data/db/migrate_core_cards/20130823192433_add_style_cards.rb +5 -5
  35. data/db/migrate_core_cards/20130910183318_move_styles_to_content.rb +3 -2
  36. data/db/migrate_core_cards/20130920291703_update_stylesheets.rb +2 -4
  37. data/db/migrate_core_cards/20131016172445_common_css_patch.rb +1 -3
  38. data/db/migrate_core_cards/20140110193325_reset_account_request_type.rb +1 -3
  39. data/db/migrate_core_cards/20140307231621_user_data_to_cards.rb +12 -8
  40. data/db/migrate_core_cards/20140317035504_account_requests_to_signups.rb +2 -4
  41. data/db/migrate_core_cards/20140512155840_add_script_cards.rb +16 -9
  42. data/db/migrate_core_cards/20140629222005_add_email_cards.rb +19 -11
  43. data/db/migrate_core_cards/20140725180118_config_card_updates.rb +1 -1
  44. data/db/migrate_core_cards/20141115034214_config_descriptions_etc.rb +1 -1
  45. data/db/migrate_core_cards/20141119001955_make_symlinks_relative.rb +1 -1
  46. data/db/migrate_core_cards/20141204061304_watchers_to_following.rb +2 -0
  47. data/db/migrate_core_cards/20141216155251_add_more_following_cards.rb +4 -2
  48. data/db/migrate_core_cards/20150202143810_import_bootstrap_layout.rb +2 -2
  49. data/db/migrate_core_cards/20150220134731_following_to_follow_rule.rb +3 -4
  50. data/db/migrate_core_cards/20150317162412_bootstrap_themes.rb +8 -4
  51. data/db/migrate_core_cards/20150326205655_bootswatch_themes.rb +14 -7
  52. data/db/migrate_core_cards/20150429090551_search_card_context.rb +6 -4
  53. data/db/migrate_core_cards/20150508212032_menu_compatibility.rb +4 -2
  54. data/db/migrate_core_cards/20150510031118_fix_skin_codenames.rb +2 -1
  55. data/db/migrate_core_cards/20150601133433_add_recent_setting_session_card.rb +3 -3
  56. data/db/migrate_core_cards/20150610171702_add_debugger_session_card.rb +2 -1
  57. data/db/migrate_core_cards/20150610180019_add_recaptcha_key_and_admin_info_cards.rb +4 -3
  58. data/db/migrate_core_cards/20150724123438_update_file_and_image_cards.rb +6 -2
  59. data/db/migrate_core_cards/20150807205221_create_references_for_search_cards.rb +1 -1
  60. data/db/migrate_core_cards/20150824135418_update_file_history.rb +2 -0
  61. data/db/migrate_core_cards/20160804112510_reorganize_scripts.rb +1 -1
  62. data/db/migrate_core_cards/20160811115836_rename_stats_to_admin.rb +1 -0
  63. data/db/migrate_core_cards/20160914132636_fix_mod_files.rb +2 -0
  64. data/db/migrate_core_cards/20161102202156_tweak_recaptcha_setting_cards.rb +6 -6
  65. data/db/migrate_core_cards/20161103154836_update_keys.rb +2 -1
  66. data/db/migrate_core_cards/20170209132834_email_test_context.rb +2 -0
  67. data/db/migrate_core_cards/20170314175313_add_notification_event_card.rb +3 -3
  68. data/db/migrate_core_cards/20170515101262_add_advanced_edit_cards.rb +1 -1
  69. data/db/migrate_core_cards/20170608200649_add_input_options_codename.rb +1 -1
  70. data/db/migrate_core_cards/20180712042655_head_rule.rb +3 -4
  71. data/db/migrate_core_cards/20180905061537_migrate_layouts.rb +4 -4
  72. data/db/migrate_core_cards/20181120200937_update_layout.rb +1 -1
  73. data/db/migrate_core_cards/20190320091257_upgrade_recaptcha_to_v3.rb +7 -7
  74. data/db/migrate_core_cards/20190424100531_update_credit_image.rb +1 -0
  75. data/db/migrate_core_cards/20190502130029_add_shark_and_help_desk_role.rb +15 -14
  76. data/db/migrate_core_cards/20190503122739_update_pristine_data.rb +1 -1
  77. data/db/migrate_core_cards/20190625153616_pointer_overhaul.rb +9 -5
  78. data/db/migrate_core_cards/20190718140126_add_guides.rb +3 -3
  79. data/db/migrate_core_cards/20190822093633_move_help_text_to_code.rb +1 -2
  80. data/db/migrate_core_cards/20190823220018_cleanup_for_decko_1_0.rb +1 -1
  81. data/db/migrate_core_cards/20190829093961_cardtype_grouping.rb +7 -7
  82. data/db/migrate_core_cards/20190902193208_input_type.rb +1 -3
  83. data/db/migrate_core_cards/20190909104250_add_cardtype_input_types.rb +2 -2
  84. data/db/migrate_core_cards/20191028135243_add_link_editor_to_tiny_mce_config.rb +1 -0
  85. data/db/migrate_core_cards/20191115160748_history_cleanup.rb +0 -1
  86. data/db/migrate_core_cards/20191118145629_codename_fixes.rb +1 -2
  87. data/db/migrate_core_cards/20200821231558_add_nest_list_type.rb +1 -1
  88. data/db/migrate_core_cards/data/decko_logo.svg +1 -59
  89. data/db/seed/new/card_actions.yml +2153 -2145
  90. data/db/seed/new/card_acts.yml +3 -3
  91. data/db/seed/new/card_references.yml +900 -858
  92. data/db/seed/new/cards.yml +4869 -4848
  93. data/db/seed/new/schema_migrations_deck_cards.yml +2 -0
  94. data/db/seed/test/fixtures/card_actions.yml +3563 -3547
  95. data/db/seed/test/fixtures/card_acts.yml +675 -675
  96. data/db/seed/test/fixtures/card_changes.yml +103 -103
  97. data/db/seed/test/fixtures/card_references.yml +2165 -2123
  98. data/db/seed/test/fixtures/cards.yml +7862 -7751
  99. data/db/seed/test/fixtures/rails.gif +0 -0
  100. data/db/seed/test/fixtures/schema_migrations_deck_cards.yml +2 -0
  101. data/db/test_seed.rb +33 -34
  102. data/lib/card.rb +18 -1
  103. data/lib/card/auth.rb +5 -2
  104. data/lib/card/auth/current.rb +39 -100
  105. data/lib/card/auth/proxy.rb +36 -16
  106. data/lib/card/auth/token.rb +8 -2
  107. data/lib/card/cache.rb +2 -1
  108. data/lib/card/cache/all.rb +88 -0
  109. data/lib/card/cache/card_class.rb +44 -0
  110. data/lib/card/cache/persistent.rb +3 -34
  111. data/lib/card/cache/persistent_class.rb +28 -0
  112. data/lib/card/codename.rb +3 -4
  113. data/lib/card/content.rb +20 -10
  114. data/lib/card/content/all.rb +59 -0
  115. data/lib/card/content/chunk.rb +1 -1
  116. data/lib/card/content/clean.rb +4 -3
  117. data/lib/card/content/diff.rb +3 -2
  118. data/lib/card/content/diff/l_c_s/processor.rb +1 -1
  119. data/lib/card/content/diff/result.rb +41 -29
  120. data/lib/card/content/parser.rb +2 -2
  121. data/lib/card/content/truncate.rb +6 -6
  122. data/lib/card/director.rb +1 -1
  123. data/lib/card/director/act_direction.rb +4 -0
  124. data/lib/card/director/all.rb +61 -0
  125. data/lib/card/director/card_class.rb +18 -0
  126. data/lib/card/director/card_methods.rb +1 -0
  127. data/lib/card/director/event_delay.rb +4 -6
  128. data/lib/card/director/phases.rb +0 -1
  129. data/lib/card/director/run.rb +2 -0
  130. data/lib/card/director/stages.rb +3 -2
  131. data/lib/card/dirty.rb +13 -3
  132. data/lib/card/env.rb +2 -2
  133. data/lib/card/env/location.rb +4 -3
  134. data/lib/card/env/success.rb +46 -103
  135. data/lib/card/env/success/target.rb +73 -0
  136. data/lib/card/error.rb +1 -2
  137. data/lib/card/fetch.rb +7 -4
  138. data/lib/card/fetch/all.rb +33 -0
  139. data/lib/card/fetch/card_class.rb +155 -0
  140. data/lib/card/fetch/results.rb +9 -0
  141. data/lib/card/fetch/retrieve.rb +2 -0
  142. data/lib/card/fetch/store.rb +1 -0
  143. data/lib/card/format.rb +1 -2
  144. data/lib/card/format/content.rb +1 -3
  145. data/lib/card/format/error.rb +8 -4
  146. data/lib/card/format/method_delegation.rb +10 -2
  147. data/lib/card/format/nest.rb +3 -2
  148. data/lib/card/format/nest/fetch.rb +3 -2
  149. data/lib/card/format/nesting/mode.rb +1 -1
  150. data/lib/card/format/nesting/subformat.rb +2 -1
  151. data/lib/card/format/render.rb +2 -2
  152. data/lib/card/format/wrapper.rb +1 -1
  153. data/lib/card/lexicon.rb +5 -4
  154. data/lib/card/mark.rb +17 -15
  155. data/lib/card/model/save_helper.rb +18 -184
  156. data/lib/card/model/save_helper/save_arguments.rb +94 -0
  157. data/lib/card/model/save_helper/save_helper_helper.rb +93 -0
  158. data/lib/card/name.rb +10 -9
  159. data/lib/card/name/all.rb +136 -0
  160. data/lib/card/name/all/descendants.rb +48 -0
  161. data/lib/card/name/all/parts.rb +67 -0
  162. data/lib/card/name/card_class.rb +28 -0
  163. data/lib/card/name/fields_and_traits.rb +4 -2
  164. data/lib/card/name/name_variants.rb +0 -1
  165. data/lib/card/query.rb +24 -19
  166. data/lib/card/query/card_query/interpretation.rb +3 -2
  167. data/lib/card/query/card_query/match_attributes.rb +2 -1
  168. data/lib/card/query/card_query/normalization.rb +1 -0
  169. data/lib/card/query/card_query/reference_attributes.rb +1 -1
  170. data/lib/card/query/card_query/sorting.rb +12 -4
  171. data/lib/card/query/join.rb +1 -1
  172. data/lib/card/query/sql_statement.rb +1 -1
  173. data/lib/card/query/value/match_value.rb +1 -0
  174. data/lib/card/reference/all.rb +136 -0
  175. data/lib/card/rule/all.rb +76 -0
  176. data/lib/card/rule/cache.rb +2 -0
  177. data/lib/card/set/advanced_api.rb +8 -4
  178. data/lib/card/set/event.rb +2 -2
  179. data/lib/card/set/event/all.rb +101 -0
  180. data/lib/card/set/event/delayed_event.rb +6 -6
  181. data/lib/card/set/event/options.rb +14 -5
  182. data/lib/card/set/event/skip_and_trigger.rb +89 -0
  183. data/lib/card/set/format.rb +16 -9
  184. data/lib/card/set/format/abstract_format/view_definition.rb +1 -0
  185. data/lib/card/set/format/abstract_format/view_opts.rb +1 -0
  186. data/lib/card/set/i18n_scope.rb +18 -13
  187. data/lib/card/set/inheritance.rb +8 -6
  188. data/lib/card/set/loader.rb +24 -13
  189. data/lib/card/set/pattern/all.rb +63 -0
  190. data/lib/card/set/pattern/base.rb +4 -74
  191. data/lib/card/set/pattern/class_methods.rb +75 -0
  192. data/lib/card/set/required_field.rb +4 -1
  193. data/lib/card/set/trait.rb +11 -8
  194. data/lib/card/setting.rb +13 -12
  195. data/lib/card/subcards.rb +3 -4
  196. data/lib/card/subcards/add.rb +3 -24
  197. data/lib/card/subcards/all.rb +103 -0
  198. data/lib/card/subcards/args.rb +42 -0
  199. data/lib/card/tasks/card/file_card_creator/abstract_file_card/ruby_file.rb +1 -1
  200. data/lib/card/tasks/card/file_card_creator/output_helper.rb +17 -14
  201. data/lib/card/tasks/card/migrate.rake +2 -2
  202. data/lib/card/view/cache.rb +6 -8
  203. data/lib/card/view/cache/cache_action.rb +1 -2
  204. data/lib/card/view/cache/stub.rb +1 -1
  205. data/lib/card/view/options.rb +5 -4
  206. data/lib/card/view/permission.rb +15 -3
  207. data/lib/cardio.rb +10 -67
  208. data/lib/cardio/defaults.yml +70 -0
  209. data/lib/cardio/migration.rb +2 -2
  210. data/lib/cardio/migration/deck_structure.rb +2 -4
  211. data/lib/cardio/migration/import.rb +3 -3
  212. data/lib/cardio/migration/import/import_data.rb +1 -0
  213. data/lib/cardio/mod.rb +1 -0
  214. data/lib/cardio/mod/dirs.rb +2 -2
  215. data/lib/cardio/mod/load_strategy.rb +2 -4
  216. data/lib/cardio/mod/loader/set_loader.rb +2 -1
  217. data/lib/cardio/mod/loader/set_pattern_loader.rb +0 -1
  218. data/lib/cardio/mod/module_template.rb +1 -0
  219. data/lib/cardio/modfiles.rb +2 -4
  220. data/lib/cardio/schema.rb +2 -4
  221. data/lib/cardio/utils.rb +9 -0
  222. data/lib/generators/card/format/format_generator.rb +1 -1
  223. data/lib/generators/card/migration/migration_generator.rb +2 -1
  224. data/lib/generators/card/mod/mod_generator.rb +3 -2
  225. data/lib/generators/card/set/set_generator.rb +3 -3
  226. data/lib/generators/card/template/template_generator.rb +1 -1
  227. data/mod/admin/set/self/admin.rb +6 -3
  228. data/mod/admin/set/self/admin_info.rb +3 -8
  229. data/mod/admin/set/self/trash.rb +3 -2
  230. data/mod/admin/spec/set/self/admin_spec.rb +4 -4
  231. data/mod/core/set/all/abort.rb +5 -5
  232. data/mod/core/set/all/assign_attributes.rb +12 -28
  233. data/mod/core/set/all/autoname.rb +17 -0
  234. data/mod/core/set/all/codename.rb +3 -2
  235. data/mod/core/set/all/collection.rb +4 -6
  236. data/mod/core/set/all/content.rb +55 -99
  237. data/mod/core/set/all/contextual_content.rb +2 -4
  238. data/mod/core/set/all/initialize.rb +9 -9
  239. data/mod/core/set/all/name_events.rb +78 -58
  240. data/mod/core/set/all/reference_events.rb +69 -0
  241. data/mod/core/set/all/states.rb +5 -5
  242. data/mod/core/set/all/subcards.rb +1 -101
  243. data/mod/core/set/all/trash.rb +16 -14
  244. data/mod/core/set/all/type.rb +11 -11
  245. data/mod/core/set/all/utils.rb +4 -1
  246. data/mod/{settings → core}/set/right/autoname.rb +0 -0
  247. data/mod/{settings → core}/set/self/autoname.rb +0 -0
  248. data/mod/core/set/type/cardtype.rb +28 -0
  249. data/mod/core/set_pattern/06_rule.rb +1 -1
  250. data/mod/core/spec/set/all/assign_attributes_spec.rb +10 -9
  251. data/mod/core/spec/set/all/{rules2_spec.rb → clean_me_spec.rb} +19 -4
  252. data/mod/core/spec/set/all/collection_spec.rb +1 -1
  253. data/mod/core/spec/set/all/export_spec.rb +1 -0
  254. data/mod/core/spec/set/all/initialize_spec.rb +11 -11
  255. data/mod/core/spec/set/all/name_events_spec.rb +204 -0
  256. data/mod/{standard → core}/spec/set/type/cardtype_spec.rb +3 -24
  257. data/mod/standard/file/logo/image-original.svg +1 -59
  258. metadata +50 -61
  259. data/config/initializers/uuid_state_file.rb +0 -3
  260. data/lib/card/mod_inflector.rb +0 -16
  261. data/mod/Modfile +0 -4
  262. data/mod/core/set/all/actify.rb +0 -68
  263. data/mod/core/set/all/cache.rb +0 -109
  264. data/mod/core/set/all/event_conditions.rb +0 -172
  265. data/mod/core/set/all/fetch.rb +0 -122
  266. data/mod/core/set/all/fetch_helper.rb +0 -35
  267. data/mod/core/set/all/i18n.rb +0 -11
  268. data/mod/core/set/all/name.rb +0 -229
  269. data/mod/core/set/all/pattern.rb +0 -54
  270. data/mod/core/set/all/references.rb +0 -191
  271. data/mod/core/set/all/rename.rb +0 -33
  272. data/mod/core/set/all/rules.rb +0 -81
  273. data/mod/core/spec/set/all/actify_spec.rb +0 -58
  274. data/mod/core/spec/set/all/content_spec.rb +0 -15
  275. data/mod/core/spec/set/all/event_conditions_spec.rb +0 -217
  276. data/mod/core/spec/set/all/fetch_helper_spec.rb +0 -65
  277. data/mod/core/spec/set/all/fetch_spec.rb +0 -338
  278. data/mod/core/spec/set/all/i18n_spec.rb +0 -17
  279. data/mod/core/spec/set/all/name_spec.rb +0 -11
  280. data/mod/core/spec/set/all/pattern_spec.rb +0 -101
  281. data/mod/core/spec/set/all/permissions/reader_rules_spec.rb +0 -166
  282. data/mod/core/spec/set/all/references_spec.rb +0 -62
  283. data/mod/core/spec/set/all/rename_spec.rb +0 -189
  284. data/mod/core/spec/set/all/rules_spec.rb +0 -100
  285. data/mod/core/spec/set/all/subcards_spec.rb +0 -102
  286. data/mod/standard/set/all/rich_html/html_views/info.rb +0 -84
  287. data/mod/standard/set/type/cardtype.rb +0 -119
@@ -0,0 +1,94 @@
1
+ class Card
2
+ module Model
3
+ module SaveHelper
4
+ # private helper methods for public SaveHelper api
5
+ module SaveArguments
6
+ private
7
+
8
+ # @return args
9
+ def standardize_args name_or_args, content_or_args=nil, _ignore=nil
10
+ if name_or_args.is_a?(Hash)
11
+ name_or_args
12
+ else
13
+ add_name name_or_args, content_or_args || {}
14
+ end
15
+ end
16
+
17
+ def standardize_ensure_args name_or_args, content_or_args
18
+ name = name_or_args.is_a?(Hash) ? name_or_args[:name] : name_or_args
19
+ args = if name_or_args.is_a?(Hash)
20
+ name_or_args
21
+ else
22
+ hashify content_or_args, :content
23
+ end
24
+ [name, args]
25
+ end
26
+
27
+ def standardize_update_args name_or_args, content_or_args
28
+ return name_or_args if name_or_args.is_a?(Hash)
29
+
30
+ hashify content_or_args, :content
31
+ end
32
+
33
+ def hashify value_or_hash, key
34
+ if value_or_hash.is_a?(Hash)
35
+ value_or_hash
36
+ elsif value_or_hash.nil?
37
+ {}
38
+ else
39
+ { key => value_or_hash }
40
+ end
41
+ end
42
+
43
+ def create_args name_or_args, content_or_args=nil
44
+ args = standardize_args name_or_args, content_or_args
45
+ resolve_name_conflict args
46
+ args
47
+ end
48
+
49
+ def name_from_args name_or_args
50
+ name_or_args.is_a?(Hash) ? name_or_args[:name] : name_or_args
51
+ end
52
+
53
+ def resolve_name_conflict args
54
+ rename = args.delete :rename_if_conflict
55
+ return unless args[:name] && rename
56
+
57
+ args[:name] = Card.uniquify_name args[:name], rename
58
+ end
59
+
60
+ def ensure_attributes card, args
61
+ subcards = card.extract_subcard_args! args.symbolize_keys!
62
+ update_args = changing_args card, args
63
+
64
+ return if update_args.empty? && subcards.empty?
65
+
66
+ # FIXME: use ensure_attributes for subcards
67
+ card.update! update_args.merge(subcards: subcards, skip: :validate_renaming)
68
+ end
69
+
70
+ def changing_args card, args
71
+ args.select do |key, value|
72
+ case key.to_s
73
+ when /^\+/
74
+ changing_field_arg key, value
75
+ when "name"
76
+ card.name.to_s != value
77
+ else
78
+ standard_changing_arg card, key, value
79
+ end
80
+ end
81
+ end
82
+
83
+ def changing_field_arg key, value
84
+ subfields[key] = value
85
+ false
86
+ end
87
+
88
+ def standard_changing_arg card, key, value
89
+ card.send(key) != value unless value.is_a? ::File
90
+ end
91
+ end
92
+ end
93
+ end
94
+ end
@@ -0,0 +1,93 @@
1
+ class Card
2
+ module Model
3
+ module SaveHelper
4
+ # private helper methods for public SaveHelper api
5
+ module SaveHelperHelper
6
+ CARDTYPE_METHOD_REGEXP = /^(?<method_name>create|ensure)_(?<type>.+?)(?:_card)?$/
7
+
8
+ private
9
+
10
+ def codename_from_name name
11
+ name.downcase.tr(" ", "_").tr(":*", "")
12
+ end
13
+
14
+ def delete_code_card? name
15
+ return false if name.is_a?(Symbol) && !Codename.exist?(name)
16
+
17
+ Card.exist? name
18
+ end
19
+
20
+ def add_coderule_item name, prefix, type_id, to
21
+ codename = "#{prefix}_#{name.tr(' ', '_').underscore}"
22
+ name = "#{prefix}: #{name}"
23
+
24
+ ensure_card name, type_id: type_id, codename: codename
25
+ Card[to].add_item! name
26
+ end
27
+
28
+ def method_missing method, *args
29
+ method_name, cardtype_card = extract_cardtype_from_method_name method
30
+ return super unless method_name
31
+
32
+ sargs = standardize_args(*args)
33
+ send "#{method_name}_card", sargs.merge(type_id: cardtype_card.id)
34
+ end
35
+
36
+ def respond_to_missing? method, _include_private=false
37
+ extract_cardtype_from_method_name(method) || super
38
+ end
39
+
40
+ def extract_cardtype_from_method_name method
41
+ return unless (match = method.match CARDTYPE_METHOD_REGEXP)
42
+
43
+ cardtype_card = cardtype_card_from_string match[:type]
44
+
45
+ return unless cardtype_card&.type_id == CardtypeID || cardtype_card&.id == SetID
46
+
47
+ [match[:method_name], cardtype_card]
48
+ end
49
+
50
+ def cardtype_card_from_string type
51
+ Card::Codename[type.to_sym] ? Card[type.to_sym] : Card[type]
52
+ end
53
+
54
+ def ensure_card_simplified name, args
55
+ ensure_card_update(name, args) || Card.create!(add_name(name, args))
56
+ end
57
+
58
+ def ensure_card_update name, args
59
+ card = Card[name]
60
+ return unless card
61
+
62
+ ensure_attributes card, args
63
+ card
64
+ rescue Card::Error::CodenameNotFound => _e
65
+ false
66
+ end
67
+
68
+ def validate_setting setting
69
+ return if Codename.exist?(setting) && Card.fetch_type_id(setting) == SettingID
70
+
71
+ raise ArgumentError, "not a valid setting: #{setting}"
72
+ end
73
+
74
+ def normalize_trait_rule_args setting, value
75
+ return value if value.is_a? Hash
76
+
77
+ if Card.fetch_type_id([setting, :right, :default]) == PointerID
78
+ value = Array(value).to_pointer_content
79
+ end
80
+ { content: value }
81
+ end
82
+
83
+ def add_name name, content_or_args
84
+ if content_or_args.is_a?(Hash)
85
+ content_or_args.reverse_merge name: name
86
+ else
87
+ { content: content_or_args, name: name }
88
+ end
89
+ end
90
+ end
91
+ end
92
+ end
93
+ end
data/lib/card/name.rb CHANGED
@@ -41,8 +41,8 @@ class Card
41
41
 
42
42
  if !validated_parts && str.include?(joint)
43
43
  compose Cardname.split_parts(str)
44
- elsif (id = Card.id_from_string(str)) # handles ~ and :
45
- Card.fetch_name(id) { Card.bad_mark(str) }
44
+ elsif (id = Card.id_from_string str) # handles ~[id] and :[codename]
45
+ Card.name_from_id_from_string id, str
46
46
  else
47
47
  super str
48
48
  end
@@ -50,17 +50,18 @@ class Card
50
50
 
51
51
  # interprets symbols/integers as codenames/ids
52
52
  def smart_compose parts
53
- name_parts = parts.flatten.map { |part| self[part] }
54
- new name_parts.join(joint), true
53
+ new_from_parts(parts) { |part| self[part] }
55
54
  end
56
55
 
57
56
  def compose parts
58
- name_parts = parts.flatten.map { |part| new part }
59
- new name_parts.join(joint), true
57
+ new_from_parts(parts) { |part| new part }
60
58
  end
61
59
 
62
- def url_key_to_standard key
63
- key.to_s.tr "_", " "
60
+ private
61
+
62
+ def new_from_parts parts, &block
63
+ name_parts = parts.flatten.map(&block)
64
+ new name_parts.join(joint), true
64
65
  end
65
66
  end
66
67
 
@@ -73,7 +74,7 @@ class Card
73
74
  end
74
75
 
75
76
  def code
76
- Card::Codename[Card.fetch_id self]
77
+ Card::Codename[card_id]
77
78
  end
78
79
 
79
80
  def setting?
@@ -0,0 +1,136 @@
1
+ class Card
2
+ class Name
3
+ # methods connecting Card to Card::Name
4
+ module All
5
+ include Parts
6
+ include Descendants
7
+
8
+ # TODO: use delegations and include more name functions
9
+ delegate :simple?, :compound?, :junction?, to: :name
10
+
11
+ def name
12
+ @name ||= left_id ? Lexicon.lex_to_name([left_id, right_id]) : super.to_name
13
+ end
14
+
15
+ def key
16
+ @key ||= left_id ? name.key : super
17
+ end
18
+
19
+ def name= newname
20
+ @name = superize_name newname.to_name
21
+ self.key = @name.key
22
+ update_subcard_names @name
23
+ write_attribute :name, (@name.simple? ? @name.s : nil)
24
+ assign_side_ids
25
+ @name
26
+ end
27
+
28
+ def [] *args
29
+ case args[0]
30
+ when Integer, Range
31
+ fetch_name = Array.wrap(name.parts[args[0]]).compact.join Name.joint
32
+ Card.fetch(fetch_name, args[1] || {}) unless simple?
33
+ else
34
+ super
35
+ end
36
+ end
37
+
38
+ def lex
39
+ simple? ? name : [left_id, right_id]
40
+ end
41
+
42
+ def autoname name
43
+ if Card.exists?(name) || Director.include?(name)
44
+ autoname name.next
45
+ else
46
+ name
47
+ end
48
+ end
49
+
50
+ def update_superleft cardname
51
+ @superleft = @supercard if cardname.field_of? @supercard.name
52
+ end
53
+
54
+ def update_subcard_names new_name, name_to_replace=nil
55
+ return unless @subcards
56
+
57
+ subcards.each do |subcard|
58
+ update_subcard_name subcard, new_name, name_to_replace if subcard.new?
59
+ end
60
+ end
61
+
62
+ def key= newkey
63
+ return if newkey == key
64
+
65
+ update_cache_key key do
66
+ write_attribute :key, (name.simple? ? newkey : nil)
67
+ @key = newkey
68
+ end
69
+ clean_patterns
70
+ @key
71
+ end
72
+
73
+ def field tag, opts={}
74
+ Card.fetch name.field(tag), opts
75
+ end
76
+
77
+ private
78
+
79
+ def assign_side_ids
80
+ if name.simple?
81
+ self.left_id = self.right_id = nil
82
+ else
83
+ assign_side_id :left_id=, :left_name
84
+ assign_side_id :right_id=, :right_name
85
+ end
86
+ end
87
+
88
+ # assigns left_id and right_id based on names.
89
+ # if side card is new, id is temporarily stored as -1
90
+ def assign_side_id side_id_equals, side_name
91
+ side_id = Lexicon.id(name.send(side_name)) || -1
92
+ send side_id_equals, side_id
93
+ end
94
+
95
+ def superize_name cardname
96
+ return cardname unless @supercard
97
+
98
+ @supercard.subcards.rename key, cardname.key
99
+ update_superleft cardname
100
+ @supercard.name.relative? ? cardname : cardname.absolute_name(@supercard.name)
101
+ end
102
+
103
+ def clean_patterns
104
+ return unless patterns?
105
+
106
+ reset_patterns
107
+ patterns
108
+ end
109
+
110
+ def update_cache_key oldkey
111
+ yield
112
+ was_in_cache = Card.cache.soft.delete oldkey
113
+ Card.write_to_soft_cache self if was_in_cache
114
+ end
115
+
116
+ def update_subcard_name subcard, new_name, name_to_replace
117
+ name_to_replace ||= name_to_replace_for_subcard subcard, new_name
118
+ subcard.name = subcard.name.swap name_to_replace, new_name.s
119
+ # following needed? shouldn't #name= trigger this?
120
+ subcard.update_subcard_names new_name, name
121
+ end
122
+
123
+ def name_to_replace_for_subcard subcard, new_name
124
+ # if subcard has a relative name like +C
125
+ # and self is a subcard as well that changed from +B to A+B then
126
+ # +C should change to A+B+C. #replace doesn't work in this case
127
+ # because the old name +B is not a part of +C
128
+ if subcard.name.starts_with_joint? && new_name.parts.first.present?
129
+ "".to_name
130
+ else
131
+ name
132
+ end
133
+ end
134
+ end
135
+ end
136
+ end
@@ -0,0 +1,48 @@
1
+ class Card
2
+ class Name
3
+ module All
4
+ # Card methods for finding name children, eg A+B is a child of A and B
5
+ module Descendants
6
+ # NOTE: for all these helpers, method returns *all* fields/children/descendants.
7
+ # (Not just those current user has permission to read.)
8
+
9
+ def fields
10
+ field_ids.map { |id| Card[id] }
11
+ end
12
+
13
+ def field_names
14
+ field_ids.map { |id| Card::Name[id] }
15
+ end
16
+
17
+ def field_ids
18
+ child_ids :left
19
+ end
20
+
21
+ def each_child &block
22
+ return unless id
23
+
24
+ Card.where(
25
+ "(left_id = #{id} or right_id = #{id}) and trash is false"
26
+ ).each(&block)
27
+ end
28
+
29
+ # eg, A+B is a child of A and B
30
+ def child_ids side=nil
31
+ return [] unless id
32
+
33
+ side ||= name.simple? ? :part : :left_id
34
+ Auth.as_bot do
35
+ Card.search({ side => id, return: :id, limit: 0 }, "children of #{name}")
36
+ end
37
+ end
38
+
39
+ def each_descendant &block
40
+ each_child do |child|
41
+ yield child
42
+ child.each_descendant(&block)
43
+ end
44
+ end
45
+ end
46
+ end
47
+ end
48
+ end
@@ -0,0 +1,67 @@
1
+ class Card
2
+ class Name
3
+ module All
4
+ # Card methods for handling name parts, eg A and B are both parts of A+B
5
+ module Parts
6
+ def left *args
7
+ case
8
+ when simple? then nil
9
+ when superleft then superleft
10
+ when name_is_changing? && name.to_name.trunk_name == name_before_act.to_name
11
+ nil # prevent recursion when, eg, renaming A+B to A+B+C
12
+ else
13
+ Card.fetch name.left, *args
14
+ end
15
+ end
16
+
17
+ def left_or_new args={}
18
+ left(args) || Card.new(args.merge(name: name.left))
19
+ end
20
+
21
+ def right *args
22
+ Card.fetch(name.right, *args) unless simple?
23
+ end
24
+
25
+ def trunk *args
26
+ simple? ? self : left(*args)
27
+ end
28
+
29
+ def tag *args
30
+ simple? ? self : Card.fetch(name.right, *args)
31
+ end
32
+
33
+ def right_id= cardish
34
+ write_card_or_id :right_id, cardish
35
+ end
36
+
37
+ def left_id= cardish
38
+ write_card_or_id :left_id, cardish
39
+ end
40
+
41
+ private
42
+
43
+ def write_card_or_id attribute, cardish
44
+ when_id_exists(cardish) { |id| write_attribute attribute, id }
45
+ end
46
+
47
+ def when_id_exists cardish, &block
48
+ if (card_id = Card.id cardish)
49
+ yield card_id
50
+ elsif cardish.is_a? Card
51
+ with_id_after_store cardish, &block
52
+ else
53
+ yield cardish # eg nil
54
+ end
55
+ end
56
+
57
+ # subcards are usually saved after super cards;
58
+ # after_store forces it to save the subcard first
59
+ # and callback afterwards
60
+ def with_id_after_store subcard
61
+ add_subcard subcard
62
+ subcard.director.after_store { |card| yield card.id }
63
+ end
64
+ end
65
+ end
66
+ end
67
+ end