card 1.16.6 → 1.16.7

Sign up to get free protection for your applications and to get access to all the features.
Files changed (440) hide show
  1. checksums.yaml +4 -4
  2. data/.yardoc/checksums +234 -49
  3. data/.yardoc/object_types +0 -0
  4. data/.yardoc/objects/root.dat +0 -0
  5. data/VERSION +1 -1
  6. data/config/initializers/mime_types.rb +3 -3
  7. data/config/initializers/notification.rb +1 -1
  8. data/db/migrate/20121118115000_update_link_type.rb +8 -8
  9. data/db/migrate/20130411210957_update_codenames.rb +2 -2
  10. data/db/migrate/20140822073704_create_new_revision_tables.rb +12 -13
  11. data/db/migrate/20141001105348_move_revisions_to_actions.rb +16 -16
  12. data/db/migrate/20141121172918_rename_card_migration_table.rb +4 -4
  13. data/db/migrate_core_cards/20130419215612_import_help_text.rb +3 -3
  14. data/db/migrate_core_cards/20130823192433_add_style_cards.rb +45 -47
  15. data/db/migrate_core_cards/20130910183318_move_styles_to_content.rb +1 -1
  16. data/db/migrate_core_cards/20130920214038_jsonize_tinymce.rb +3 -3
  17. data/db/migrate_core_cards/20130920291703_update_stylesheets.rb +3 -3
  18. data/db/migrate_core_cards/20130927191728_account_events.rb +6 -6
  19. data/db/migrate_core_cards/20131016172445_common_css_patch.rb +1 -1
  20. data/db/migrate_core_cards/20140110193325_reset_account_request_type.rb +1 -1
  21. data/db/migrate_core_cards/20140307231621_user_data_to_cards.rb +19 -19
  22. data/db/migrate_core_cards/20140317035504_account_requests_to_signups.rb +11 -12
  23. data/db/migrate_core_cards/20140512155840_add_script_cards.rb +35 -36
  24. data/db/migrate_core_cards/20140629222005_add_email_cards.rb +55 -55
  25. data/db/migrate_core_cards/20140725180118_config_card_updates.rb +1 -1
  26. data/db/migrate_core_cards/20141111083921_delete_machine_output.rb +2 -2
  27. data/db/migrate_core_cards/20141115034214_config_descriptions_etc.rb +3 -3
  28. data/db/migrate_core_cards/20141120120605_fix_notification_html_message.rb +2 -2
  29. data/db/migrate_core_cards/20141204061304_watchers_to_following.rb +8 -8
  30. data/db/migrate_core_cards/20141208162106_add_ace_script.rb +2 -2
  31. data/db/migrate_core_cards/20141216155251_add_more_following_cards.rb +16 -16
  32. data/db/migrate_core_cards/20141230204340_uri_codename.rb +1 -1
  33. data/db/migrate_core_cards/20150202143810_import_bootstrap_layout.rb +19 -19
  34. data/db/migrate_core_cards/20150220134731_following_to_follow_rule.rb +3 -3
  35. data/db/migrate_core_cards/20150317162412_bootstrap_themes.rb +15 -15
  36. data/db/migrate_core_cards/20150326205655_bootswatch_themes.rb +11 -11
  37. data/db/migrate_core_cards/20150331135745_new_card_menu.rb +1 -1
  38. data/db/migrate_core_cards/20150429090551_search_card_context.rb +1 -1
  39. data/db/migrate_core_cards/20150508212032_menu_compatibility.rb +3 -3
  40. data/db/migrate_core_cards/20150510031118_fix_skin_images.rb +1 -1
  41. data/db/migrate_core_cards/20150528084659_add_session_cardtype.rb +4 -4
  42. data/db/migrate_core_cards/20150601133433_add_recent_setting_session_card.rb +5 -5
  43. data/db/migrate_core_cards/20150605115802_add_performance_log_card.rb +1 -1
  44. data/db/migrate_core_cards/20150610171702_add_debugger_session_card.rb +2 -2
  45. data/db/migrate_core_cards/20150611203506_rails_inflection_updates.rb +5 -5
  46. data/db/migrate_core_cards/20150627205133_fix_script_bootstrap_card_type.rb +1 -1
  47. data/db/migrate_core_cards/20150702130543_remove_edit_toolbar_pinned.rb +1 -1
  48. data/db/migrate_core_cards/20150724123438_update_file_and_image_cards.rb +5 -5
  49. data/db/migrate_core_cards/20150807205221_create_references_for_search_cards.rb +1 -1
  50. data/db/migrate_core_cards/20150824135418_update_file_history.rb +3 -3
  51. data/db/migrate_core_cards/20150903130006_attachment_upload_cards.rb +2 -2
  52. data/db/migrate_core_cards/20150910085603_remove_performance_log_card.rb +1 -1
  53. data/lib/card.rb +4 -4
  54. data/lib/card/active_record_ext.rb +8 -8
  55. data/lib/card/auth.rb +6 -6
  56. data/lib/card/cache.rb +1 -1
  57. data/lib/card/chunk.rb +1 -1
  58. data/lib/card/content.rb +1 -1
  59. data/lib/card/diff.rb +10 -10
  60. data/lib/card/env.rb +1 -1
  61. data/lib/card/format.rb +12 -12
  62. data/lib/card/loader.rb +1 -1
  63. data/lib/card/migration.rb +1 -1
  64. data/lib/card/name.rb +4 -4
  65. data/lib/card/query.rb +255 -61
  66. data/lib/card/query/attributes.rb +310 -0
  67. data/lib/card/query/clause.rb +12 -15
  68. data/lib/card/query/join.rb +73 -0
  69. data/lib/card/query/reference.rb +51 -0
  70. data/lib/card/query/sql_statement.rb +228 -0
  71. data/lib/card/query/value.rb +66 -0
  72. data/lib/card/reference.rb +6 -6
  73. data/lib/card/set.rb +12 -12
  74. data/lib/card/set_pattern.rb +9 -9
  75. data/lib/card/spec_helper.rb +5 -5
  76. data/lib/card/success.rb +1 -1
  77. data/lib/cardio.rb +7 -7
  78. data/lib/generators/card/format/format_generator.rb +3 -3
  79. data/lib/generators/card/migration/migration_generator.rb +5 -5
  80. data/lib/generators/card/set/set_generator.rb +4 -4
  81. data/mod/01_core/chunk/include.rb +4 -4
  82. data/mod/01_core/chunk/link.rb +5 -5
  83. data/mod/01_core/chunk/literal.rb +2 -2
  84. data/mod/01_core/chunk/query_reference.rb +8 -8
  85. data/mod/01_core/chunk/uri.rb +18 -18
  86. data/mod/01_core/format/html_format.rb +4 -4
  87. data/mod/01_core/set/all/active_card.rb +2 -2
  88. data/mod/01_core/set/all/collection.rb +21 -26
  89. data/mod/01_core/set/all/content.rb +2 -2
  90. data/mod/01_core/set/all/fetch.rb +6 -6
  91. data/mod/01_core/set/all/initialize.rb +4 -4
  92. data/mod/01_core/set/all/location_history.rb +2 -2
  93. data/mod/01_core/set/all/name.rb +14 -14
  94. data/mod/01_core/set/all/pattern.rb +1 -1
  95. data/mod/01_core/set/all/permissions.rb +12 -12
  96. data/mod/01_core/set/all/phases.rb +29 -12
  97. data/mod/01_core/set/all/references.rb +14 -14
  98. data/mod/01_core/set/all/rules.rb +8 -8
  99. data/mod/01_core/set/all/templating.rb +10 -9
  100. data/mod/01_core/set/all/tracked_attributes.rb +7 -7
  101. data/mod/01_core/set/all/trash.rb +6 -6
  102. data/mod/01_core/set/all/type.rb +7 -7
  103. data/mod/01_core/set/all/utils.rb +4 -4
  104. data/mod/01_core/set/all/view_cache.rb +1 -1
  105. data/mod/01_core/set_pattern/02_all_plus.rb +2 -2
  106. data/mod/01_core/set_pattern/03_type.rb +1 -1
  107. data/mod/01_core/set_pattern/04_star.rb +1 -1
  108. data/mod/01_core/set_pattern/05_rstar.rb +2 -2
  109. data/mod/01_core/set_pattern/06_right.rb +4 -4
  110. data/mod/01_core/set_pattern/07_type_plus_right.rb +4 -4
  111. data/mod/01_core/set_pattern/08_self.rb +1 -1
  112. data/mod/01_core/spec/chunk/uri_spec.rb +73 -73
  113. data/mod/01_core/spec/format/html_format_spec.rb +5 -5
  114. data/mod/01_core/spec/set/all/attribute_tracking_spec.rb +1 -1
  115. data/mod/01_core/spec/set/all/collection_spec.rb +22 -22
  116. data/mod/01_core/spec/set/all/content_spec.rb +1 -1
  117. data/mod/01_core/spec/set/all/fetch_spec.rb +24 -24
  118. data/mod/01_core/spec/set/all/initialize_spec.rb +9 -9
  119. data/mod/01_core/spec/set/all/name_spec.rb +8 -8
  120. data/mod/01_core/spec/set/all/pattern_spec.rb +10 -10
  121. data/mod/01_core/spec/set/all/permissions_spec.rb +45 -45
  122. data/mod/01_core/spec/set/all/references_spec.rb +1 -1
  123. data/mod/01_core/spec/set/all/rules2_spec.rb +15 -15
  124. data/mod/01_core/spec/set/all/rules_spec.rb +37 -37
  125. data/mod/01_core/spec/set/all/templating_spec.rb +21 -21
  126. data/mod/01_core/spec/set/all/tracked_attributes_spec.rb +55 -55
  127. data/mod/01_core/spec/set/all/trash_spec.rb +4 -4
  128. data/mod/01_core/spec/set/all/type_spec.rb +15 -15
  129. data/mod/01_history/lib/card/act.rb +2 -2
  130. data/mod/01_history/lib/card/action.rb +22 -22
  131. data/mod/01_history/lib/card/change.rb +1 -1
  132. data/mod/01_history/set/all/actions.rb +2 -2
  133. data/mod/01_history/set/all/content_history.rb +4 -4
  134. data/mod/01_history/set/all/history.rb +46 -46
  135. data/mod/02_basic_types/set/all/all_css.rb +10 -10
  136. data/mod/02_basic_types/set/all/all_csv.rb +7 -7
  137. data/mod/02_basic_types/set/all/base.rb +25 -25
  138. data/mod/02_basic_types/set/all/json.rb +16 -16
  139. data/mod/02_basic_types/set/all/rss.rb +7 -7
  140. data/mod/02_basic_types/set/type/html.rb +2 -2
  141. data/mod/02_basic_types/set/type/plain_text.rb +1 -1
  142. data/mod/02_basic_types/set/type/pointer.rb +39 -31
  143. data/mod/02_basic_types/spec/set/all/all_css_spec.rb +1 -1
  144. data/mod/02_basic_types/spec/set/all/all_csv_spec.rb +1 -1
  145. data/mod/02_basic_types/spec/set/all/base_spec.rb +18 -18
  146. data/mod/02_basic_types/spec/set/all/json_spec.rb +4 -4
  147. data/mod/02_basic_types/spec/set/all/rss_spec.rb +8 -2
  148. data/mod/02_basic_types/spec/set/type/plain_text_spec.rb +1 -1
  149. data/mod/02_basic_types/spec/set/type/pointer_spec.rb +54 -44
  150. data/mod/03_machines/lib/card/machine.rb +46 -29
  151. data/mod/03_machines/lib/card/machine_input.rb +34 -10
  152. data/mod/03_machines/set/type/coffee_script.rb +3 -3
  153. data/mod/03_machines/set/type/css.rb +8 -8
  154. data/mod/03_machines/set/type/java_script.rb +4 -4
  155. data/mod/03_machines/set/type/scss.rb +2 -2
  156. data/mod/03_machines/set/type/skin.rb +1 -1
  157. data/mod/03_machines/spec/lib/shared_machine_examples.rb +27 -27
  158. data/mod/03_machines/spec/lib/shared_machine_input_examples.rb +8 -8
  159. data/mod/03_machines/spec/set/type/coffeescript_spec.rb +6 -6
  160. data/mod/03_machines/spec/set/type/css_spec.rb +9 -9
  161. data/mod/03_machines/spec/set/type/javascript_spec.rb +6 -6
  162. data/mod/03_machines/spec/set/type/scss_spec.rb +5 -5
  163. data/mod/03_machines/spec/set/type/skin_spec.rb +25 -25
  164. data/mod/04_settings/lib/card/setting.rb +11 -11
  165. data/mod/04_settings/set/abstract/permission.rb +9 -9
  166. data/mod/04_settings/set/right/script.rb +1 -1
  167. data/mod/04_settings/set/right/structure.rb +0 -5
  168. data/mod/04_settings/set/right/style.rb +2 -2
  169. data/mod/04_settings/set/self/accountable.rb +1 -1
  170. data/mod/04_settings/set/self/add_help.rb +1 -1
  171. data/mod/04_settings/set/self/autoname.rb +1 -1
  172. data/mod/04_settings/set/self/captcha.rb +1 -1
  173. data/mod/04_settings/set/self/create.rb +1 -1
  174. data/mod/04_settings/set/self/default.rb +1 -1
  175. data/mod/04_settings/set/self/delete.rb +1 -1
  176. data/mod/04_settings/set/self/help.rb +1 -1
  177. data/mod/04_settings/set/self/input.rb +1 -1
  178. data/mod/04_settings/set/self/layout.rb +1 -1
  179. data/mod/04_settings/set/self/on_create.rb +1 -1
  180. data/mod/04_settings/set/self/on_delete.rb +1 -1
  181. data/mod/04_settings/set/self/on_update.rb +1 -1
  182. data/mod/04_settings/set/self/options.rb +1 -1
  183. data/mod/04_settings/set/self/options_label.rb +1 -1
  184. data/mod/04_settings/set/self/read.rb +1 -1
  185. data/mod/04_settings/set/self/script.rb +1 -1
  186. data/mod/04_settings/set/self/structure.rb +1 -1
  187. data/mod/04_settings/set/self/style.rb +1 -1
  188. data/mod/04_settings/set/self/table_of_contents.rb +1 -1
  189. data/mod/04_settings/set/self/thanks.rb +1 -1
  190. data/mod/04_settings/set/self/update.rb +1 -1
  191. data/mod/04_settings/set/type/setting.rb +14 -14
  192. data/mod/04_settings/spec/set/right/comment_spec.rb +5 -5
  193. data/mod/04_settings/spec/set/right/create_spec.rb +1 -1
  194. data/mod/04_settings/spec/set/right/script_spec.rb +5 -5
  195. data/mod/04_settings/spec/set/right/structure_spec.rb +4 -2
  196. data/mod/04_settings/spec/set/right/style_spec.rb +7 -7
  197. data/mod/04_settings/spec/set/type/setting_spec.rb +2 -2
  198. data/mod/05_email/lib/card/follow_option.rb +24 -24
  199. data/mod/05_email/set/all/follow.rb +24 -16
  200. data/mod/05_email/set/all/notify.rb +25 -23
  201. data/mod/05_email/set/all/observer.rb +5 -5
  202. data/mod/05_email/set/right/bcc.rb +8 -8
  203. data/mod/05_email/set/right/follow.rb +44 -17
  204. data/mod/05_email/set/right/follow_fields.rb +1 -1
  205. data/mod/05_email/set/right/following.rb +49 -40
  206. data/mod/05_email/set/self/always.rb +2 -2
  207. data/mod/05_email/set/self/created.rb +1 -1
  208. data/mod/05_email/set/self/edited.rb +4 -4
  209. data/mod/05_email/set/self/follow.rb +1 -1
  210. data/mod/05_email/set/self/follow_defaults.rb +9 -9
  211. data/mod/05_email/set/self/never.rb +1 -1
  212. data/mod/05_email/set/type/email_template.rb +9 -9
  213. data/mod/05_email/set/type_plus_right/user/follow.rb +16 -16
  214. data/mod/05_email/spec/set/all/follow_spec.rb +10 -10
  215. data/mod/05_email/spec/set/all/notify_spec.rb +82 -82
  216. data/mod/05_email/spec/set/all/observer_spec.rb +16 -16
  217. data/mod/05_email/spec/set/right/followers_spec.rb +6 -6
  218. data/mod/05_email/spec/set/self/follow_defaults_spec.rb +2 -2
  219. data/mod/05_standard/lib/carrier_wave/cardmount.rb +5 -5
  220. data/mod/05_standard/lib/image_uploader.rb +8 -8
  221. data/mod/05_standard/set/abstract/attachment.rb +18 -18
  222. data/mod/05_standard/set/all/account.rb +5 -5
  223. data/mod/05_standard/set/all/comment.rb +7 -7
  224. data/mod/05_standard/set/all/error.rb +25 -25
  225. data/mod/05_standard/set/all/event_viz.rb +1 -1
  226. data/mod/05_standard/set/all/links.rb +9 -9
  227. data/mod/05_standard/set/all/rich_html/content.rb +34 -34
  228. data/mod/05_standard/set/all/rich_html/editing.rb +35 -35
  229. data/mod/05_standard/set/all/rich_html/form.rb +20 -20
  230. data/mod/05_standard/set/all/rich_html/header.rb +8 -8
  231. data/mod/05_standard/set/all/rich_html/menu.rb +33 -33
  232. data/mod/05_standard/set/all/rich_html/modal.rb +16 -16
  233. data/mod/05_standard/set/all/rich_html/toolbar.rb +63 -63
  234. data/mod/05_standard/set/all/rich_html/wrapper.rb +8 -8
  235. data/mod/05_standard/set/right/account.rb +27 -27
  236. data/mod/05_standard/set/right/email.rb +5 -5
  237. data/mod/05_standard/set/right/password.rb +5 -5
  238. data/mod/05_standard/set/rstar/rules.rb +52 -52
  239. data/mod/05_standard/set/self/account_links.rb +27 -27
  240. data/mod/05_standard/set/self/all.rb +1 -1
  241. data/mod/05_standard/set/self/head.rb +5 -5
  242. data/mod/05_standard/set/self/navbox.rb +11 -11
  243. data/mod/05_standard/set/self/recent.rb +2 -2
  244. data/mod/05_standard/set/self/search.rb +13 -13
  245. data/mod/05_standard/set/self/signin.rb +19 -19
  246. data/mod/05_standard/set/self/stats.rb +2 -2
  247. data/mod/05_standard/set/type/basic.rb +1 -1
  248. data/mod/05_standard/set/type/cardtype.rb +5 -5
  249. data/mod/05_standard/set/type/date.rb +1 -1
  250. data/mod/05_standard/set/type/file.rb +7 -7
  251. data/mod/05_standard/set/type/image.rb +8 -8
  252. data/mod/05_standard/set/type/number.rb +2 -2
  253. data/mod/05_standard/set/type/phrase.rb +1 -1
  254. data/mod/05_standard/set/type/search_type.rb +27 -21
  255. data/mod/05_standard/set/type/session.rb +2 -2
  256. data/mod/05_standard/set/type/set.rb +37 -37
  257. data/mod/05_standard/set/type/signup.rb +25 -25
  258. data/mod/05_standard/set/type/uri.rb +1 -1
  259. data/mod/05_standard/set/type/user.rb +21 -21
  260. data/mod/05_standard/spec/chunk/include_spec.rb +16 -16
  261. data/mod/05_standard/spec/chunk/link_spec.rb +18 -18
  262. data/mod/05_standard/spec/chunk/query_reference_spec.rb +1 -1
  263. data/mod/05_standard/spec/set/all/account_spec.rb +7 -7
  264. data/mod/05_standard/spec/set/all/email_html_spec.rb +3 -3
  265. data/mod/05_standard/spec/set/all/history_spec.rb +14 -14
  266. data/mod/05_standard/spec/set/all/rich_html/editing_spec.rb +1 -1
  267. data/mod/05_standard/spec/set/all/rich_html/form_spec.rb +2 -2
  268. data/mod/05_standard/spec/set/right/account_spec.rb +9 -9
  269. data/mod/05_standard/spec/set/right/email_spec.rb +8 -8
  270. data/mod/05_standard/spec/set/right/password_spec.rb +9 -9
  271. data/mod/05_standard/spec/set/right/stats_spec.rb +1 -1
  272. data/mod/05_standard/spec/set/right/when_created_spec.rb +1 -1
  273. data/mod/05_standard/spec/set/right/when_last_edited_spec.rb +1 -1
  274. data/mod/05_standard/spec/set/rstar/rules_spec.rb +2 -2
  275. data/mod/05_standard/spec/set/self/account_links_spec.rb +2 -2
  276. data/mod/05_standard/spec/set/self/all_spec.rb +8 -11
  277. data/mod/05_standard/spec/set/self/head_spec.rb +1 -1
  278. data/mod/05_standard/spec/set/self/navbox_spec.rb +1 -1
  279. data/mod/05_standard/spec/set/self/now_spec.rb +1 -1
  280. data/mod/05_standard/spec/set/self/stats_spec.rb +1 -1
  281. data/mod/05_standard/spec/set/self/version_spec.rb +1 -1
  282. data/mod/05_standard/spec/set/type/email_template_spec.rb +25 -25
  283. data/mod/05_standard/spec/set/type/file_spec.rb +4 -4
  284. data/mod/05_standard/spec/set/type/html_spec.rb +3 -3
  285. data/mod/05_standard/spec/set/type/image_spec.rb +6 -6
  286. data/mod/05_standard/spec/set/type/layout_type_spec.rb +1 -1
  287. data/mod/05_standard/spec/set/type/search_type_spec.rb +10 -10
  288. data/mod/05_standard/spec/set/type/signup_spec.rb +11 -11
  289. data/mod/05_standard/spec/set/type/toggle_spec.rb +2 -2
  290. data/mod/05_standard/spec/set/type/uri_spec.rb +9 -9
  291. data/mod/06_bootstrap/set/all/bootstrap/helper.rb +10 -10
  292. data/mod/06_bootstrap/set/all/bootstrap/wrapper.rb +4 -4
  293. data/mod/06_bootstrap/set/all/rich_bootstrap.rb +1 -1
  294. data/spec/lib/card/action_spec.rb +2 -2
  295. data/spec/lib/card/cache_spec.rb +7 -7
  296. data/spec/lib/card/content_spec.rb +31 -37
  297. data/spec/lib/card/diff_spec.rb +56 -56
  298. data/spec/lib/card/format_spec.rb +11 -11
  299. data/spec/lib/card/query_spec.rb +382 -265
  300. data/spec/lib/card/reference_spec.rb +133 -140
  301. data/spec/lib/card/set_pattern_spec.rb +10 -9
  302. data/spec/lib/card/set_spec.rb +11 -11
  303. data/spec/lib/card/success_spec.rb +16 -8
  304. data/spec/mailers/mailer_spec.rb +5 -5
  305. data/spec/models/card/cardtype_spec.rb +20 -20
  306. data/spec/models/card/create_spec.rb +6 -6
  307. data/spec/models/card/trash_spec.rb +20 -20
  308. data/spec/models/card/type_transition_spec.rb +3 -3
  309. data/spec/models/card/validation_spec.rb +5 -5
  310. data/spec/models/card_spec.rb +24 -24
  311. data/spec/spec_helper.rb +5 -5
  312. data/tmpsets/set/mod001-01_core/all/active_card.rb +2 -2
  313. data/tmpsets/set/mod001-01_core/all/collection.rb +23 -26
  314. data/tmpsets/set/mod001-01_core/all/content.rb +2 -2
  315. data/tmpsets/set/mod001-01_core/all/fetch.rb +6 -6
  316. data/tmpsets/set/mod001-01_core/all/initialize.rb +8 -4
  317. data/tmpsets/set/mod001-01_core/all/name.rb +14 -14
  318. data/tmpsets/set/mod001-01_core/all/pattern.rb +1 -1
  319. data/tmpsets/set/mod001-01_core/all/permissions.rb +12 -12
  320. data/tmpsets/set/mod001-01_core/all/phases.rb +31 -13
  321. data/tmpsets/set/mod001-01_core/all/references.rb +14 -14
  322. data/tmpsets/set/mod001-01_core/all/rules.rb +8 -10
  323. data/tmpsets/set/mod001-01_core/all/templating.rb +10 -9
  324. data/tmpsets/set/mod001-01_core/all/tracked_attributes.rb +7 -7
  325. data/tmpsets/set/mod001-01_core/all/trash.rb +9 -8
  326. data/tmpsets/set/mod001-01_core/all/type.rb +7 -7
  327. data/tmpsets/set/mod001-01_core/all/utils.rb +16 -4
  328. data/tmpsets/set/mod001-01_core/all/view_cache.rb +1 -1
  329. data/tmpsets/set/mod002-01_history/all/actions.rb +2 -2
  330. data/tmpsets/set/mod002-01_history/all/content_history.rb +11 -7
  331. data/tmpsets/set/mod002-01_history/all/history.rb +46 -46
  332. data/tmpsets/set/mod003-02_basic_types/all/all_css.rb +10 -10
  333. data/tmpsets/set/mod003-02_basic_types/all/all_csv.rb +7 -7
  334. data/tmpsets/set/mod003-02_basic_types/all/base.rb +25 -25
  335. data/tmpsets/set/mod003-02_basic_types/all/json.rb +16 -16
  336. data/tmpsets/set/mod003-02_basic_types/all/rss.rb +7 -7
  337. data/tmpsets/set/mod003-02_basic_types/type/html.rb +2 -2
  338. data/tmpsets/set/mod003-02_basic_types/type/plain_text.rb +1 -1
  339. data/tmpsets/set/mod003-02_basic_types/type/pointer.rb +38 -31
  340. data/tmpsets/set/mod004-03_machines/right/machine_output.rb +4 -0
  341. data/tmpsets/set/mod004-03_machines/type/coffee_script.rb +3 -3
  342. data/tmpsets/set/mod004-03_machines/type/css.rb +8 -8
  343. data/tmpsets/set/mod004-03_machines/type/java_script.rb +4 -4
  344. data/tmpsets/set/mod004-03_machines/type/scss.rb +2 -2
  345. data/tmpsets/set/mod004-03_machines/type/skin.rb +1 -1
  346. data/tmpsets/set/mod005-04_settings/abstract/permission.rb +9 -9
  347. data/tmpsets/set/mod005-04_settings/right/script.rb +1 -1
  348. data/tmpsets/set/mod005-04_settings/right/structure.rb +0 -5
  349. data/tmpsets/set/mod005-04_settings/right/style.rb +2 -2
  350. data/tmpsets/set/mod005-04_settings/self/accountable.rb +1 -1
  351. data/tmpsets/set/mod005-04_settings/self/add_help.rb +1 -1
  352. data/tmpsets/set/mod005-04_settings/self/autoname.rb +1 -1
  353. data/tmpsets/set/mod005-04_settings/self/captcha.rb +1 -1
  354. data/tmpsets/set/mod005-04_settings/self/create.rb +1 -1
  355. data/tmpsets/set/mod005-04_settings/self/default.rb +1 -1
  356. data/tmpsets/set/mod005-04_settings/self/delete.rb +1 -1
  357. data/tmpsets/set/mod005-04_settings/self/help.rb +1 -1
  358. data/tmpsets/set/mod005-04_settings/self/input.rb +1 -1
  359. data/tmpsets/set/mod005-04_settings/self/layout.rb +1 -1
  360. data/tmpsets/set/mod005-04_settings/self/on_create.rb +1 -1
  361. data/tmpsets/set/mod005-04_settings/self/on_delete.rb +1 -1
  362. data/tmpsets/set/mod005-04_settings/self/on_update.rb +1 -1
  363. data/tmpsets/set/mod005-04_settings/self/options.rb +1 -1
  364. data/tmpsets/set/mod005-04_settings/self/options_label.rb +1 -1
  365. data/tmpsets/set/mod005-04_settings/self/read.rb +1 -1
  366. data/tmpsets/set/mod005-04_settings/self/script.rb +1 -1
  367. data/tmpsets/set/mod005-04_settings/self/structure.rb +1 -1
  368. data/tmpsets/set/mod005-04_settings/self/style.rb +1 -1
  369. data/tmpsets/set/mod005-04_settings/self/table_of_contents.rb +1 -1
  370. data/tmpsets/set/mod005-04_settings/self/thanks.rb +1 -1
  371. data/tmpsets/set/mod005-04_settings/self/update.rb +1 -1
  372. data/tmpsets/set/mod005-04_settings/type/setting.rb +14 -14
  373. data/tmpsets/set/mod006-05_email/all/follow.rb +24 -16
  374. data/tmpsets/set/mod006-05_email/all/notify.rb +25 -23
  375. data/tmpsets/set/mod006-05_email/all/observer.rb +8 -8
  376. data/tmpsets/set/mod006-05_email/right/bcc.rb +8 -8
  377. data/tmpsets/set/mod006-05_email/right/follow.rb +44 -17
  378. data/tmpsets/set/mod006-05_email/right/follow_fields.rb +1 -1
  379. data/tmpsets/set/mod006-05_email/right/following.rb +49 -40
  380. data/tmpsets/set/mod006-05_email/self/always.rb +2 -2
  381. data/tmpsets/set/mod006-05_email/self/created.rb +1 -1
  382. data/tmpsets/set/mod006-05_email/self/edited.rb +4 -4
  383. data/tmpsets/set/mod006-05_email/self/follow.rb +1 -1
  384. data/tmpsets/set/mod006-05_email/self/follow_defaults.rb +9 -9
  385. data/tmpsets/set/mod006-05_email/self/never.rb +1 -1
  386. data/tmpsets/set/mod006-05_email/type/email_template.rb +9 -9
  387. data/tmpsets/set/mod006-05_email/type_plus_right/user/follow.rb +17 -17
  388. data/tmpsets/set/mod007-05_standard/abstract/attachment.rb +98 -46
  389. data/tmpsets/set/mod007-05_standard/all/account.rb +5 -5
  390. data/tmpsets/set/mod007-05_standard/all/comment.rb +7 -7
  391. data/tmpsets/set/mod007-05_standard/all/error.rb +26 -26
  392. data/tmpsets/set/mod007-05_standard/all/event_viz.rb +1 -1
  393. data/tmpsets/set/mod007-05_standard/all/links.rb +10 -9
  394. data/tmpsets/set/mod007-05_standard/all/rich_html/content.rb +34 -34
  395. data/tmpsets/set/mod007-05_standard/all/rich_html/editing.rb +35 -35
  396. data/tmpsets/set/mod007-05_standard/all/rich_html/form.rb +20 -20
  397. data/tmpsets/set/mod007-05_standard/all/rich_html/header.rb +8 -8
  398. data/tmpsets/set/mod007-05_standard/all/rich_html/menu.rb +33 -33
  399. data/tmpsets/set/mod007-05_standard/all/rich_html/modal.rb +16 -16
  400. data/tmpsets/set/mod007-05_standard/all/rich_html/toolbar.rb +63 -63
  401. data/tmpsets/set/mod007-05_standard/all/rich_html/wrapper.rb +8 -8
  402. data/tmpsets/set/mod007-05_standard/right/account.rb +27 -27
  403. data/tmpsets/set/mod007-05_standard/right/email.rb +5 -5
  404. data/tmpsets/set/mod007-05_standard/right/password.rb +5 -5
  405. data/tmpsets/set/mod007-05_standard/rstar/rules.rb +52 -52
  406. data/tmpsets/set/mod007-05_standard/self/account_links.rb +27 -27
  407. data/tmpsets/set/mod007-05_standard/self/all.rb +1 -1
  408. data/tmpsets/set/mod007-05_standard/self/head.rb +5 -5
  409. data/tmpsets/set/mod007-05_standard/self/navbox.rb +11 -11
  410. data/tmpsets/set/mod007-05_standard/self/recent.rb +2 -2
  411. data/tmpsets/set/mod007-05_standard/self/search.rb +13 -13
  412. data/tmpsets/set/mod007-05_standard/self/signin.rb +19 -19
  413. data/tmpsets/set/mod007-05_standard/self/stats.rb +2 -2
  414. data/tmpsets/set/mod007-05_standard/type/basic.rb +1 -1
  415. data/tmpsets/set/mod007-05_standard/type/cardtype.rb +5 -5
  416. data/tmpsets/set/mod007-05_standard/type/date.rb +1 -1
  417. data/tmpsets/set/mod007-05_standard/type/file.rb +23 -8
  418. data/tmpsets/set/mod007-05_standard/type/image.rb +10 -8
  419. data/tmpsets/set/mod007-05_standard/type/number.rb +2 -2
  420. data/tmpsets/set/mod007-05_standard/type/phrase.rb +1 -1
  421. data/tmpsets/set/mod007-05_standard/type/search_type.rb +21 -19
  422. data/tmpsets/set/mod007-05_standard/type/session.rb +2 -2
  423. data/tmpsets/set/mod007-05_standard/type/set.rb +37 -37
  424. data/tmpsets/set/mod007-05_standard/type/signup.rb +25 -25
  425. data/tmpsets/set/mod007-05_standard/type/uri.rb +1 -1
  426. data/tmpsets/set/mod007-05_standard/type/user.rb +21 -21
  427. data/tmpsets/set/mod008-06_bootstrap/all/bootstrap/helper.rb +10 -10
  428. data/tmpsets/set/mod008-06_bootstrap/all/bootstrap/wrapper.rb +4 -4
  429. data/tmpsets/set/mod008-06_bootstrap/all/rich_bootstrap.rb +1 -1
  430. data/tmpsets/set_pattern/101-all_plus.rb +2 -2
  431. data/tmpsets/set_pattern/102-type.rb +1 -1
  432. data/tmpsets/set_pattern/103-star.rb +1 -1
  433. data/tmpsets/set_pattern/104-rstar.rb +2 -2
  434. data/tmpsets/set_pattern/105-right.rb +4 -4
  435. data/tmpsets/set_pattern/106-type_plus_right.rb +4 -4
  436. data/tmpsets/set_pattern/107-self.rb +1 -1
  437. metadata +7 -5
  438. data/lib/card/query/card_clause.rb +0 -528
  439. data/lib/card/query/ref_clause.rb +0 -47
  440. data/lib/card/query/value_clause.rb +0 -65
@@ -2,35 +2,35 @@
2
2
 
3
3
  class AddEmailCards < Card::CoreMigration
4
4
  def up
5
-
5
+
6
6
  # change notification rules
7
7
  %w( create update delete ).each do |action|
8
- Card.create! :name => "*on #{action}", :type_code=>:setting, :codename=>"on_#{action}"
9
- Card.create! :name => "*on #{action}+*right+*help", :content=>"Configures email to be sent when card is #{action}d."
10
- Card.create! :name => "*on #{action}+*right+*default", :type_code=>:pointer
8
+ Card.create! name: "*on #{action}", type_code: :setting, codename: "on_#{action}"
9
+ Card.create! name: "*on #{action}+*right+*help", content: "Configures email to be sent when card is #{action}d."
10
+ Card.create! name: "*on #{action}+*right+*default", type_code: :pointer
11
11
  end
12
-
12
+
13
13
  # change email address list fields to pointers
14
14
  [:to, :from, :cc, :bcc].each do |field|
15
- set = Card[field].fetch(:trait=>:right, :new=>{})
16
- default_rule = set.fetch(:trait=>:default, :new=>{})
15
+ set = Card[field].fetch(trait: :right, new: {})
16
+ default_rule = set.fetch(trait: :default, new: {})
17
17
  default_rule.type_id = Card::PointerID
18
18
  default_rule.save!
19
-
20
- Card.search( :right=>{:codename=>field.to_s} ).each do |field_card|
21
- field_card.update_attributes! :type_id => Card::PointerID
19
+
20
+ Card.search( right: {codename: field.to_s} ).each do |field_card|
21
+ field_card.update_attributes! type_id: Card::PointerID
22
22
  end
23
-
24
- options_rule = set.fetch(:trait=>:options, :new=>{ :type_code=>:search_type })
23
+
24
+ options_rule = set.fetch(trait: :options, new: { type_code: :search_type })
25
25
  options_rule.type_id = Card::SearchTypeID
26
26
  options_rule.content = %( { "right_plus":{"codename":"account"} } )
27
27
  options_rule.save!
28
28
  end
29
-
30
-
29
+
30
+
31
31
  # create new cardtype for email templates
32
- Card.create! :name=>"Email template", :codename=>:email_template, :type_id=>Card::CardtypeID
33
- Card.create! :name=>"Email template+*type+*structure", :content=>%(
32
+ Card.create! name: "Email template", codename: :email_template, type_id: Card::CardtypeID
33
+ Card.create! name: "Email template+*type+*structure", content: %(
34
34
  {{+#{Card[:from].name} | labeled | link}}
35
35
  {{+#{Card[:to ].name} | labeled | link}}
36
36
  {{+#{Card[:cc ].name} | labeled | link}}
@@ -40,95 +40,95 @@ class AddEmailCards < Card::CoreMigration
40
40
  {{+*text message | titled}}
41
41
  {{+*attach | titled}}
42
42
  )
43
-
44
- c = Card.fetch '*message', :new=>{ }
43
+
44
+ c = Card.fetch '*message', new: { }
45
45
  c.name = '*html message'
46
46
  c.codename = 'html_message'
47
47
  c.save!
48
-
49
- Card.create! :name=>'*text message', :codename=>'text_message'
50
- Card.create! :name=>"*text message+*right+*default", :type_code=>:plain_text
51
-
52
-
48
+
49
+ Card.create! name: '*text message', codename: 'text_message'
50
+ Card.create! name: "*text message+*right+*default", type_code: :plain_text
51
+
52
+
53
53
  Card::Cache.reset_global
54
-
55
-
54
+
55
+
56
56
  # create system email cards
57
57
  dir = File.join data_path, 'mailer'
58
58
  json = File.read( File.join( dir, 'mail_config.json' ) )
59
59
  data = JSON.parse(json)
60
60
  data.each do |mail|
61
61
  mail = mail.symbolize_keys!
62
- Card.create! :name=> mail[:name], :codename=>mail[:codename], :type_id=>Card::EmailTemplateID
63
- Card.create! :name=>"#{mail[:name]}+*html message", :content=>File.read( File.join( dir, "#{mail[:codename]}.html" ))
64
- Card.create! :name=>"#{mail[:name]}+*text message", :content=>File.read( File.join( dir, "#{mail[:codename]}.txt" ))
65
- Card.create! :name=>"#{mail[:name]}+*subject", :content=>mail[:subject]
62
+ Card.create! name: mail[:name], codename: mail[:codename], type_id: Card::EmailTemplateID
63
+ Card.create! name: "#{mail[:name]}+*html message", content: File.read( File.join( dir, "#{mail[:codename]}.html" ))
64
+ Card.create! name: "#{mail[:name]}+*text message", content: File.read( File.join( dir, "#{mail[:codename]}.txt" ))
65
+ Card.create! name: "#{mail[:name]}+*subject", content: mail[:subject]
66
66
  end
67
-
68
-
67
+
68
+
69
69
  # move old hard-coded signup alert email handling to new card-based on_create handling
70
70
  Card.create!(
71
- :name=>( [:signup, :type, :on_create].map { |code| Card[code].name } * '+'),
72
- :type_id=>Card::PointerID, :content=>"[[signup alert email]]"
71
+ name: ( [:signup, :type, :on_create].map { |code| Card[code].name } * '+'),
72
+ type_id: Card::PointerID, content: "[[signup alert email]]"
73
73
  )
74
74
  if request_card = Card[:request]
75
75
  [:to, :from].each do |field|
76
- if old_card = request_card.fetch(:trait=>field) and !old_card.content.blank?
77
- Card.create! :name=>"signup alert email+#{Card[field].name}", :content=>old_card.content
76
+ if old_card = request_card.fetch(trait: field) && !old_card.content.blank?
77
+ Card.create! name: "signup alert email+#{Card[field].name}", content: old_card.content
78
78
  end
79
79
  end
80
80
  request_card.codename = nil
81
81
  request_card.delete!
82
82
  end
83
-
83
+
84
84
  # update *from settings
85
-
86
- signup_alert_from = Card["signup alert email"].fetch(:trait=>:from, :new=>{})
85
+
86
+ signup_alert_from = Card["signup alert email"].fetch(trait: :from, new: {})
87
87
  if signup_alert_from.content.blank?
88
88
  signup_alert_from.content = '_user'
89
89
  signup_alert_from.save!
90
90
  end
91
-
91
+
92
92
  wagn_bot = Card[:wagn_bot].account.email.present? ? Card[:wagn_bot].name : nil
93
93
  token_emails_from = Card.setting( '*invite+*from' ) || wagn_bot || '_user'
94
94
  [ 'verification email', 'password reset email'].each do |token_email_template_name|
95
- Card.create! :name=>"#{token_email_template_name}+#{Card[:from].name}", :content=>token_emails_from
95
+ Card.create! name: "#{token_email_template_name}+#{Card[:from].name}", content: token_emails_from
96
96
  end
97
-
97
+
98
98
  if invite_card = Card[:invite]
99
99
  invite_card.codename = nil
100
100
  invite_card.delete!
101
101
  end
102
-
103
-
102
+
103
+
104
104
  # migrate old flexmail cards
105
105
 
106
106
  if email_config_card = Card['email_config']
107
- Card.search(
108
- :left=>{ :type_id=>Card::SetID },
109
- :right=>'email_config',
110
- :referred_to_by=>{ :right=>{:codename=>'send'} }
107
+ Card.search(
108
+ left: { type_id: Card::SetID },
109
+ right: 'email_config',
110
+ referred_to_by: { right: {codename: 'send'} }
111
111
  ).each do |card|
112
112
  set_name = card.cardname.left
113
113
  card.name = "#{ set_name.gsub('*','' ).gsub('+', '_') }_email_template"
114
114
  card.type = 'Email Template'
115
115
  card.save!
116
- Card.create! :name=>"#{set_name}+*on create", :content=>card.name
116
+ Card.create! name: "#{set_name}+*on create", content: card.name
117
117
  end
118
-
118
+
119
119
  email_config_card.delete!
120
120
  end
121
-
122
-
121
+
122
+
123
123
  # the new following rule
124
- Card.create! :name => '*following', :type_code=>:pointer, :codename=>'following'
124
+ Card.create! name: '*following', type_code: :pointer, codename: 'following'
125
125
 
126
126
  if send = Card[:send]
127
- send.update_attributes :codename=>nil
127
+ send.update_attributes codename: nil
128
128
  send.delete!
129
129
  end
130
-
131
-
130
+
131
+
132
132
  end
133
133
  end
134
134
 
@@ -4,6 +4,6 @@ class ConfigCardUpdates < Card::CoreMigration
4
4
  def up
5
5
  raw_json = File.read( data_path '1.13_config_text.json' )
6
6
  json = JSON.parse raw_json
7
- Card.merge_list json["card"]["value"], :output_file=>"tmp/unmerged_config_text.json"
7
+ Card.merge_list json["card"]["value"], output_file: "tmp/unmerged_config_text.json"
8
8
  end
9
9
  end
@@ -2,8 +2,8 @@
2
2
 
3
3
  class DeleteMachineOutput < Card::CoreMigration
4
4
  def up
5
- Card.search( :right => { :codename => 'machine_output' } ).each do |card|
5
+ Card.search( right: { codename: 'machine_output' } ).each do |card|
6
6
  card.delete!
7
- end
7
+ end
8
8
  end
9
9
  end
@@ -4,10 +4,10 @@ class ConfigDescriptionsEtc < Card::CoreMigration
4
4
  def up
5
5
  raw_json = File.read( data_path '1.14_config_descriptions_etc.json' )
6
6
  json = JSON.parse raw_json
7
- Card.merge_list json["card"]["value"], :output_file=>"tmp/unmerged_config_text.json"
8
-
7
+ Card.merge_list json["card"]["value"], output_file: "tmp/unmerged_config_text.json"
8
+
9
9
  # fix missing +*from card
10
- c = Card.fetch "follower notification email+#{Card[:from].name}", :new=>{}
10
+ c = Card.fetch "follower notification email+#{Card[:from].name}", new: {}
11
11
  c.content = Card[:wagn_bot].name
12
12
  c.save!
13
13
  end
@@ -4,7 +4,7 @@ class FixNotificationHtmlMessage < Card::CoreMigration
4
4
  def up
5
5
  codename = :follower_notification_email
6
6
  dir = File.join data_path, 'mailer'
7
- html_message = Card[codename].fetch :trait=>'html_message'
8
- html_message.update_attributes! :content=>File.read( File.join( dir, "#{codename}.html" ))
7
+ html_message = Card[codename].fetch trait: 'html_message'
8
+ html_message.update_attributes! content: File.read( File.join( dir, "#{codename}.html" ))
9
9
  end
10
10
  end
@@ -2,13 +2,13 @@
2
2
 
3
3
  class WatchersToFollowing < Card::CoreMigration
4
4
  def up
5
-
6
- follower_hash = Hash.new { |h, v| h[v] = [] }
5
+
6
+ follower_hash = Hash.new { |h, v| h[v] = [] }
7
7
 
8
8
  #NOTE: this migration must find cards in the trash, because the original (1.14.0) migration attempt
9
9
  # did not successfully migration to the +*following card but did successfully delete +*watchers cards.
10
10
  # Therefore cards migrated using 1.14.0 or 1.14.1 will not have the correct migrations
11
-
11
+
12
12
  if watcher_card = Card.find_by_key('*watcher')
13
13
  Card.find_by_sql("select * from cards where right_id = #{watcher_card.id}").each do |card|
14
14
  card.include_set_modules
@@ -19,18 +19,18 @@ class WatchersToFollowing < Card::CoreMigration
19
19
  end
20
20
  end
21
21
  end
22
-
22
+
23
23
  follower_hash.each do |user, items|
24
24
  if card=Card.fetch(user) and card.account
25
- following = card.fetch :trait=>'following', :new=>{:type_code=>:pointer}
25
+ following = card.fetch trait: 'following', new: {type_code: :pointer}
26
26
  items.each { |item| following.add_item item }
27
27
  following.save!
28
28
  end
29
- end
29
+ end
30
30
  end
31
-
31
+
32
32
  if watchers = Card[:watchers]
33
- watchers.update_attributes :codename=>nil
33
+ watchers.update_attributes codename: nil
34
34
  watchers.delete!
35
35
  end
36
36
 
@@ -2,9 +2,9 @@
2
2
 
3
3
  class AddAceScript < Card::CoreMigration
4
4
  def up
5
- Card[:all].fetch(:trait=>:script).add_item! "script: ace"
5
+ Card[:all].fetch(trait: :script).add_item! "script: ace"
6
6
 
7
- Card.create! :name=>"script: ace",:codename=>"script_ace",:type=>"JavaScript"
7
+ Card.create! name: "script: ace",codename: "script_ace",type: "JavaScript"
8
8
 
9
9
  end
10
10
  end
@@ -2,23 +2,23 @@
2
2
 
3
3
  class AddMoreFollowingCards < Card::CoreMigration
4
4
  def up
5
- Card.create! :name => "*follow", :codename=>"follow", :type_code=>:setting
6
- Card.create! :name => '*follow+*right+*default', :type_code=>:pointer
7
- Card.create! :name => '*follow+*right+*input', :type_code=>:pointer, :content=>"[[radio]]"
8
- Card.create! :name => '*follow+*right+*help', :content=>'Get notified about changes', :type_code=>:phrase
9
-
10
- Card.create! :name => "*followers", :codename=>"followers"
11
- Card.create! :name => "*follow fields", :codename=>"follow_fields", :type_code=>:setting
12
- Card.create! :name => "*follow fields+*right+*help", :content=>""
13
- Card.create! :name => "*follow fields+*right+*default", :type_code=>:pointer
14
- Card.create! :name => "*all+*follow fields", :content=>"[[*include]]", :type_code=>:pointer
15
-
5
+ Card.create! name: "*follow", codename: "follow", type_code: :setting
6
+ Card.create! name: '*follow+*right+*default', type_code: :pointer
7
+ Card.create! name: '*follow+*right+*input', type_code: :pointer, content: "[[radio]]"
8
+ Card.create! name: '*follow+*right+*help', content: 'Get notified about changes', type_code: :phrase
9
+
10
+ Card.create! name: "*followers", codename: "followers"
11
+ Card.create! name: "*follow fields", codename: "follow_fields", type_code: :setting
12
+ Card.create! name: "*follow fields+*right+*help", content: ""
13
+ Card.create! name: "*follow fields+*right+*default", type_code: :pointer
14
+ Card.create! name: "*all+*follow fields", content: "[[*include]]", type_code: :pointer
15
+
16
16
  # follow options
17
- Card.create! :name => "*always", :codename=>"always"
18
- Card.create! :name => "*never", :codename=>"never"
19
-
17
+ Card.create! name: "*always", codename: "always"
18
+ Card.create! name: "*never", codename: "never"
19
+
20
20
  # default follow rule
21
- Card.create! :name=>'*follow defaults', :codename=>'follow_defaults', :type_code=>:pointer
22
- Card.create! :name => "*all+*all+*follow", :type_code=>:pointer, :content=>'[[*never]]'
21
+ Card.create! name: '*follow defaults', codename: 'follow_defaults', type_code: :pointer
22
+ Card.create! name: "*all+*all+*follow", type_code: :pointer, content: '[[*never]]'
23
23
  end
24
24
  end
@@ -6,7 +6,7 @@ class UriCodename < Card::CoreMigration
6
6
  cardname = 'URI'
7
7
  codename = cardname.to_name.key
8
8
  okname = Card::Migration.find_unused_name(cardname)
9
- Card.create! :type_id=>Card::CardtypeID, :name=>okname, :codename=>codename
9
+ Card.create! type_id: Card::CardtypeID, name: okname, codename: codename
10
10
  puts "Name #{cardname} was taken, used #{okname}" if okname != cardname
11
11
  end
12
12
  end
@@ -9,24 +9,24 @@ class ImportBootstrapLayout < Card::CoreMigration
9
9
  layout.save!
10
10
  end
11
11
 
12
- import_json "bootstrap_layout.json"#, :pristine=>true, :output_file=>nil
12
+ import_json "bootstrap_layout.json"#, pristine: true, output_file: nil
13
13
  if layout && layout.pristine? &&
14
14
  all = Card[:all]
15
- layout_rule_card = all.fetch :trait=>:layout
16
- style_rule_card = all.fetch :trait=>:style
15
+ layout_rule_card = all.fetch trait: :layout
16
+ style_rule_card = all.fetch trait: :style
17
17
  if layout_rule_card.pristine? && style_rule_card.pristine?
18
- layout_rule_card.update_attributes! :content=> '[[Default Layout]]'
18
+ layout_rule_card.update_attributes! content: '[[Default Layout]]'
19
19
  if style_rule_card.item_names.first == 'customized classic skin'
20
- Card.create! :name=>'customized bootstrap skin', :type=>'Skin',
21
- :content=>"[[classic bootstrap skin]]\n[[*css]]"
22
- style_rule_card.update_attributes! :content=> '[[customized bootstrap skin]]'
20
+ Card.create! name: 'customized bootstrap skin', type: 'Skin',
21
+ content: "[[classic bootstrap skin]]\n[[*css]]"
22
+ style_rule_card.update_attributes! content: '[[customized bootstrap skin]]'
23
23
  else
24
- style_rule_card.update_attributes! :content=> '[[classic bootstrap skin]]'
24
+ style_rule_card.update_attributes! content: '[[classic bootstrap skin]]'
25
25
  end
26
26
  end
27
27
  end
28
28
 
29
- Card.create! :name=>"*header+*self+*read", :content=>'[[Anyone]]'
29
+ Card.create! name: "*header+*self+*read", content: '[[Anyone]]'
30
30
 
31
31
  # merge "style: functional" and "style: standard" into "style: cards"
32
32
  old_func = Card[:style_functional]
@@ -41,27 +41,27 @@ class ImportBootstrapLayout < Card::CoreMigration
41
41
 
42
42
 
43
43
  # these are hard-coded
44
- Card.create! :name=>'theme: bootstrap_default', :type_code=>:css, :codename=>'theme_bootstrap_default'
45
- Card.create! :name=>'style: bootstrap', :type_code=>:css, :codename=>'bootstrap_css'
46
- Card.create! :name=>'style: bootstrap cards', :type_code=>:css, :codename=>'bootstrap_cards'
44
+ Card.create! name: 'theme: bootstrap_default', type_code: :css, codename: 'theme_bootstrap_default'
45
+ Card.create! name: 'style: bootstrap', type_code: :css, codename: 'bootstrap_css'
46
+ Card.create! name: 'style: bootstrap cards', type_code: :css, codename: 'bootstrap_cards'
47
47
 
48
- Card.create! :name=>'style: bootstrap compatible', :type_code=>:scss, :codename=>'style_bootstrap_compatible'
49
- Card.create! :name=>'script: bootstrap', :type_code=>:js, :codename=>'bootstrap_js'
48
+ Card.create! name: 'style: bootstrap compatible', type_code: :scss, codename: 'style_bootstrap_compatible'
49
+ Card.create! name: 'script: bootstrap', type_code: :js, codename: 'bootstrap_js'
50
50
 
51
51
  # add new setting: *default html view
52
- Card.create! :name=>'*default html view', :type_code=>:setting, :codename=>'default_html_view'
53
- Card.create! :name=>'*default html view+*right+*default', :type_code=>:phrase
52
+ Card.create! name: '*default html view', type_code: :setting, codename: 'default_html_view'
53
+ Card.create! name: '*default html view+*right+*default', type_code: :phrase
54
54
 
55
55
  # retain old behavior (default view was content, now titled)
56
- Card.create! :name=>'*all+*default html view', :content=>'content'
56
+ Card.create! name: '*all+*default html view', content: 'content'
57
57
 
58
58
  # update layouts to have explicit views in inclusions
59
- Card.search( :type_id=>Card::LayoutTypeID ) do |lcard|
59
+ Card.search( type_id: Card::LayoutTypeID ) do |lcard|
60
60
  lcontent = Card::Content.new lcard.content, lcard
61
61
  lcontent.find_chunks( Card::Chunk::Include ).each do |nest|
62
62
  nest.explicit_view = (nest.options[:inc_name]=='_main' ? 'open' : 'core')
63
63
  end
64
- lcard.update_attributes! :content=>lcontent.to_s
64
+ lcard.update_attributes! content: lcontent.to_s
65
65
  end
66
66
 
67
67
  Card::Cache.reset_global
@@ -2,14 +2,14 @@
2
2
 
3
3
  class FollowingToFollowRule < Card::CoreMigration
4
4
  def up
5
- Card.search(:right=>{:codename=>'following'}, :left=>{:type=>'user'}).each do |following_card|
5
+ Card.search(right: {codename: 'following'}, left: {type: 'user'}).each do |following_card|
6
6
  user_name = following_card.cardname.left
7
7
  following_card.item_names.each do |followed_set_name|
8
- set_card = Card.fetch(followed_set_name, :new=>{})
8
+ set_card = Card.fetch(followed_set_name, new: {})
9
9
  if (set_card.type_code != :set)
10
10
  set_card = set_card.default_follow_set_card
11
11
  end
12
- rule = Card.fetch set_card.follow_rule_name(user_name), :new=>{:type=>'pointer'}
12
+ rule = Card.fetch set_card.follow_rule_name(user_name), new: {type: 'pointer'}
13
13
  rule.content = "[[*always]]"
14
14
  rule.save!
15
15
  end
@@ -2,36 +2,36 @@
2
2
 
3
3
  class BootstrapThemes < Card::CoreMigration
4
4
  def up
5
- Card.create! :name=>'themeless bootstrap skin', :type_code=>:skin, :content=> "[[style: bootstrap]]\n[[style: jquery-ui-smoothness]]\n[[style: cards]]\n[[style: right sidebar]]\n[[style: bootstrap cards]]"
5
+ Card.create! name: 'themeless bootstrap skin', type_code: :skin, content: "[[style: bootstrap]]\n[[style: jquery-ui-smoothness]]\n[[style: cards]]\n[[style: right sidebar]]\n[[style: bootstrap cards]]"
6
6
  %w{cerulean cosmo cyborg darkly flatly journal lumen paper readable sandstone simplex slate spacelab superhero united yeti }.each do |theme|
7
- Card.create! :name=>"theme: #{theme}", :type_code=>:css, :codename=>"theme_#{theme}"
8
- Card.create! :name=>"#{theme} skin", :type_code=>:skin, :codename=>"#{theme}_skin", :content=>"[[themeless bootstrap skin]]\n[[theme: #{theme}]]"
7
+ Card.create! name: "theme: #{theme}", type_code: :css, codename: "theme_#{theme}"
8
+ Card.create! name: "#{theme} skin", type_code: :skin, codename: "#{theme}_skin", content: "[[themeless bootstrap skin]]\n[[theme: #{theme}]]"
9
9
  end
10
-
10
+
11
11
  if credit_card = Card['*credit']
12
12
  credit_card.codename = 'credit'
13
13
  credit_card.save!
14
14
  end
15
-
16
- style_right = Card[:style].fetch :trait=>:right, :new=>{}
17
-
18
- style_right_options = style_right.fetch :trait=>:options, :new=>{}
15
+
16
+ style_right = Card[:style].fetch trait: :right, new: {}
17
+
18
+ style_right_options = style_right.fetch trait: :options, new: {}
19
19
  style_right_options.content = %[{"type":"Skin","sort":"name"}]
20
20
  style_right_options.save!
21
-
22
- style_right_input = style_right.fetch :trait=>:input, :new=>{}
21
+
22
+ style_right_input = style_right.fetch trait: :input, new: {}
23
23
  style_right_input.content = 'radio'
24
24
  style_right_input.save!
25
-
26
- style_right_option_label = style_right.fetch :trait=>:options_label, :new=>{}
25
+
26
+ style_right_option_label = style_right.fetch trait: :options_label, new: {}
27
27
  style_right_option_label.content = 'Image'
28
28
  style_right_option_label.save!
29
-
29
+
30
30
  import_json 'skin_images.json'
31
-
31
+
32
32
  if sidebar_card = Card['*sidebar']
33
33
  new_content = sidebar_card.content.gsub( /(\*(logo|credit))\|content/, '\1|content_panel' )
34
- sidebar_card.update_attributes! :content => new_content
34
+ sidebar_card.update_attributes! content: new_content
35
35
  end
36
36
  end
37
37
  end