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
@@ -18,7 +18,7 @@ format :html do
18
18
  if @slot_view == :open && toolbar_pinned?
19
19
  args[:optional_toolbar] ||= :show
20
20
  end
21
- if show_view?(:toolbar,args.merge(:default_visibility=>:hide)) && card.type_code != :basic
21
+ if show_view?(:toolbar,args.merge(default_visibility: :hide)) && card.type_code != :basic
22
22
  args[:optional_type_info] ||= :show
23
23
  end
24
24
  end
@@ -38,14 +38,14 @@ format :html do
38
38
  verb, adjective, direction = ( args[:toggle_mode] == :close ? %w{ open open expand } : %w{ close closed collapse-down } )
39
39
 
40
40
  link_to glyphicon(direction),
41
- path( :view=>adjective ),
42
- :remote => true,
43
- :title => "#{verb} #{card.name}",
44
- :class => "#{verb}-icon toggler slotter nodblclick"
41
+ path( view: adjective ),
42
+ remote: true,
43
+ title: "#{verb} #{card.name}",
44
+ class: "#{verb}-icon toggler slotter nodblclick"
45
45
  end
46
46
 
47
47
  view :link_list do |args|
48
- content_tag :ul, :class=>args[:class] do
48
+ content_tag :ul, class: args[:class] do
49
49
  item_links(args).map do |al|
50
50
  content_tag :li, raw(al)
51
51
  end.join "\n"
@@ -53,11 +53,11 @@ format :html do
53
53
  end
54
54
 
55
55
  view :navbar_right do |args|
56
- render_link_list args.merge(:class=>"nav navbar-nav navbar-right")
56
+ render_link_list args.merge(class: "nav navbar-nav navbar-right")
57
57
  end
58
58
 
59
59
  view :navbar_left do |args|
60
- render_link_list args.merge(:class=>"nav navbar-nav navbar-left")
60
+ render_link_list args.merge(class: "nav navbar-nav navbar-left")
61
61
  end
62
62
 
63
63
  def show_follow?
@@ -1,45 +1,45 @@
1
1
  format :html do
2
- view :menu, :denial=>:blank, :tags=>:unknown_ok do |args|
2
+ view :menu, denial: :blank, tags: :unknown_ok do |args|
3
3
  return _render_template_closer if args[:menu_hack] == :template_closer
4
4
  return '' if card.unknown?
5
- wrap_with :div, :class=>'menu-slot nodblclick' do
5
+ wrap_with :div, class: 'menu-slot nodblclick' do
6
6
  [
7
7
  _optional_render(:horizontal_menu, args, :hide),
8
8
  _render_menu_link(args),
9
- _render_modal_slot(args.merge(:modal_id=>card.cardname.safe_key))
9
+ _render_modal_slot(args.merge(modal_id: card.cardname.safe_key))
10
10
  ]
11
11
  end
12
12
  end
13
13
 
14
14
  view :menu_link do |args|
15
- path_opts = {:slot => {:home_view=>args[:home_view]}}
15
+ path_opts = {slot: {home_view: args[:home_view]}}
16
16
  path_opts[:is_main] = true if main?
17
- css_class = if show_view?(:horizontal_menu,args.merge(:default_visibility=>:hide, :optional=>true))
17
+ css_class = if show_view?(:horizontal_menu,args.merge(default_visibility: :hide, optional: true))
18
18
  'visible-xs'
19
19
  else
20
20
  'show-on-hover'
21
21
  end
22
- wrap_with :div, :class=>"vertical-card-menu card-menu #{css_class}" do
23
- content_tag :div, :class=>'btn-group slotter card-slot pull-right' do
24
- view_link(glyphicon(args[:menu_icon]), :vertical_menu, :path_opts=>path_opts).html_safe
22
+ wrap_with :div, class: "vertical-card-menu card-menu #{css_class}" do
23
+ content_tag :div, class: 'btn-group slotter card-slot pull-right' do
24
+ view_link(glyphicon(args[:menu_icon]), :vertical_menu, path_opts: path_opts).html_safe
25
25
  end
26
26
  end
27
27
  end
28
28
 
29
- view :vertical_menu, :tags=>:unknown_ok do |args|
29
+ view :vertical_menu, tags: :unknown_ok do |args|
30
30
  items = menu_item_list(args).map {|item| "<li class='#{args[:item_class]}'>#{item}</li>"}.join "\n"
31
- wrap_with :ul, :class=>'btn-group pull-right slotter' do
31
+ wrap_with :ul, class: 'btn-group pull-right slotter' do
32
32
  [
33
33
  content_tag( :span, "<a href='#'>#{ glyphicon args[:menu_icon] }</a>".html_safe,
34
- :class=>'open-menu dropdown-toggle', 'data-toggle'=>'dropdown', 'aria-expanded'=>'false'),
35
- content_tag( :ul, items.html_safe, :class=>'dropdown-menu', :role=>'menu'),
34
+ class: 'open-menu dropdown-toggle', 'data-toggle'=>'dropdown', 'aria-expanded'=>'false'),
35
+ content_tag( :ul, items.html_safe, class: 'dropdown-menu', role: 'menu'),
36
36
  ]
37
37
  end
38
38
  end
39
39
 
40
40
  view :horizontal_menu do |args|
41
- content_tag :div, :class=>'btn-group slotter pull-right card-menu horizontal-card-menu hidden-xs' do
42
- menu_item_list(args.merge(:html_args=>{:class=>'btn btn-default'})).join("\n").html_safe
41
+ content_tag :div, class: 'btn-group slotter pull-right card-menu horizontal-card-menu hidden-xs' do
42
+ menu_item_list(args.merge(html_args: {class: 'btn btn-default'})).join("\n").html_safe
43
43
  end
44
44
  end
45
45
 
@@ -47,7 +47,7 @@ format :html do
47
47
  menu_items = []
48
48
  menu_items << menu_edit_link(args) if args[:show_menu_item][:edit]
49
49
  menu_items << menu_discuss_link(args) if args[:show_menu_item][:discuss]
50
- menu_items << _render_follow_link(args.merge(:icon=>true)) if args[:show_menu_item][:follow]
50
+ menu_items << _render_follow_link(args.merge(icon: true)) if args[:show_menu_item][:follow]
51
51
  menu_items << menu_page_link(args) if args[:show_menu_item][:page]
52
52
  menu_items << menu_rules_link(args) if args[:show_menu_item][:rules]
53
53
  menu_items << menu_account_link(args) if args[:show_menu_item][:account]
@@ -56,31 +56,31 @@ format :html do
56
56
  end
57
57
 
58
58
  def menu_edit_link args
59
- path_opts = { :view=>:edit }
59
+ path_opts = { view: :edit }
60
60
  menu_item('edit', 'edit', path_opts, args[:html_args] )
61
61
  end
62
62
 
63
63
  def menu_discuss_link args
64
- menu_item('discuss', 'comment', { :related=>Card[:discussion].key }, args[:html_args])
64
+ menu_item('discuss', 'comment', { related: Card[:discussion].key }, args[:html_args])
65
65
  end
66
66
 
67
67
  def menu_page_link args
68
- menu_item('page', 'new-window', {:card=>card}, args[:html_args])
68
+ menu_item('page', 'new-window', {card: card}, args[:html_args])
69
69
  end
70
70
 
71
71
  def menu_rules_link args
72
- menu_item('rules', 'wrench', {:view=>:options}, args[:html_args])
72
+ menu_item('rules', 'wrench', {view: :options}, args[:html_args])
73
73
  end
74
74
 
75
75
  def menu_account_link args
76
- path_opts = { :related=>{:name=>'+*account',:view=>:edit} }
76
+ path_opts = { related: {name: '+*account',view: :edit} }
77
77
  menu_item('account', 'user', path_opts, args[:html_args])
78
78
  end
79
79
 
80
80
  def menu_more_link args
81
81
  path_opts = {
82
- :view=>args[:home_view] || :open,
83
- :slot=>{:show=>:toolbar}
82
+ view: args[:home_view] || :open,
83
+ slot: {show: :toolbar}
84
84
  }
85
85
  menu_item('', 'option-horizontal', path_opts, args[:html_args])
86
86
  end
@@ -98,30 +98,30 @@ format :html do
98
98
 
99
99
  def default_vertical_menu_args args
100
100
  default_menu_link_args args
101
- args.merge! :show_menu_item=>show_menu_items
101
+ args.merge! show_menu_item: show_menu_items
102
102
  end
103
103
 
104
104
  def default_horizontal_menu_args args
105
- args.merge! :show_menu_item=>show_menu_items
105
+ args.merge! show_menu_item: show_menu_items
106
106
  end
107
107
 
108
108
  def show_menu_items
109
- disc_tagname = Card.fetch(:discussion, :skip_modules=>true).cardname
109
+ disc_tagname = Card.fetch(:discussion, skip_modules: true).cardname
110
110
  disc_card = unless card.new_card? or card.junction? && card.cardname.tag_name.key == disc_tagname.key
111
- Card.fetch "#{card.name}+#{disc_tagname}", :skip_virtual=>true, :skip_modules=>true, :new=>{}
111
+ Card.fetch "#{card.name}+#{disc_tagname}", skip_virtual: true, skip_modules: true, new: {}
112
112
  end
113
113
 
114
114
  res = {
115
- :discuss => disc_card && disc_card.ok?( disc_card.new_card? ? :comment : :read ),
116
- :page => card.name.present? && !main?,
117
- :rules => card.virtual?
115
+ discuss: disc_card && disc_card.ok?( disc_card.new_card? ? :comment : :read ),
116
+ page: card.name.present? && !main?,
117
+ rules: card.virtual?
118
118
  }
119
119
  if card.real?
120
120
  res.merge!(
121
- :edit => card.ok?(:update) || structure_editable?,
122
- :account => card.account && card.ok?(:update),
123
- :follow => show_follow?,
124
- :more => true
121
+ edit: card.ok?(:update) || structure_editable?,
122
+ account: card.account && card.ok?(:update),
123
+ follow: show_follow?,
124
+ more: true
125
125
  )
126
126
  end
127
127
  res
@@ -5,7 +5,7 @@ format :html do
5
5
 
6
6
  view :modal_link do |args|
7
7
  path_opts = args[:path_opts] || {}
8
- path_opts.merge!(:layout=>:modal)
8
+ path_opts.merge!(layout: :modal)
9
9
  html_args = args[:html_args] || {}
10
10
  #html_args.merge!('data-target'=>"#modal-#{card.cardname.safe_key}#{args[:modal_slot_id_postfix]}",
11
11
  html_args.merge!('data-target'=>"#modal-main-slot",
@@ -14,12 +14,12 @@ format :html do
14
14
  end
15
15
 
16
16
  view :modal_slot do |args|
17
- #wrap_with(:div, :class=>'modal fade', :role=>'dialog', :id=>"modal-#{card.cardname.safe_key}#{args[:modal_slot_id_postfix]}") do
17
+ #wrap_with(:div, class: 'modal fade', role: 'dialog', id: "modal-#{card.cardname.safe_key}#{args[:modal_slot_id_postfix]}") do
18
18
  id = "modal-"
19
19
  id += (args[:modal_id] || 'main-slot')
20
- wrap_with(:div, :class=>'modal fade', :role=>'dialog', :id=>id) do
21
- wrap_with(:div, :class=>'modal-dialog') do
22
- content_tag :div, :class=>'modal-content' do
20
+ wrap_with(:div, class: 'modal fade', role: 'dialog', id: id) do
21
+ wrap_with(:div, class: 'modal-dialog') do
22
+ content_tag :div, class: 'modal-content' do
23
23
  ''
24
24
  end
25
25
  end
@@ -27,25 +27,25 @@ format :html do
27
27
  end
28
28
 
29
29
 
30
- view :modal_menu, :tags=>:unknown_ok do |args|
30
+ view :modal_menu, tags: :unknown_ok do |args|
31
31
  popout_params = {}
32
32
  popout_params[:view] = params[:view] if params[:view]
33
33
  # we probably want to pass on a lot more params than just view, but not all of them
34
34
  # (eg we don't want layout, id, controller...)
35
- wrap_with :div, :class=>'modal-menu' do
35
+ wrap_with :div, class: 'modal-menu' do
36
36
  [
37
- link_to( glyphicon('remove'), '', :class=>'close-modal pull-right close', 'data-dismiss'=>'modal'),
38
- link_to( glyphicon('new-window'), popout_params, :class=>'pop-out-modal pull-right close ' )
37
+ link_to( glyphicon('remove'), '', class: 'close-modal pull-right close', 'data-dismiss'=>'modal'),
38
+ link_to( glyphicon('new-window'), popout_params, class: 'pop-out-modal pull-right close ' )
39
39
  ]
40
40
  end
41
41
  end
42
42
 
43
- view :modal_footer, :tags=>:unknown_ok do |args|
43
+ view :modal_footer, tags: :unknown_ok do |args|
44
44
  args[:buttons] || ''
45
45
  end
46
46
 
47
47
  def default_modal_footer_args args
48
- args[:buttons] ||= button_tag 'Close', :class=>'btn-xs close-modal pull-right', 'data-dismiss'=>'modal'
48
+ args[:buttons] ||= button_tag 'Close', class: 'btn-xs close-modal pull-right', 'data-dismiss'=>'modal'
49
49
  end
50
50
 
51
51
  =begin
@@ -62,9 +62,9 @@ format :html do
62
62
  # use modal_content for ajax calls to fill a modal_slot with content
63
63
  view :modal_content do |args|
64
64
  output [
65
- wrap_with( :div, _render_modal_header(args), :class=>'modal-header' ),
66
- wrap_with( :div, _render_modal_body(args), :class=>'modal-body' ),
67
- wrap_with( :div, _render_modal_footer(args), :class=>'modal-footer' ),
65
+ wrap_with( :div, _render_modal_header(args), class: 'modal-header' ),
66
+ wrap_with( :div, _render_modal_body(args), class: 'modal-body' ),
67
+ wrap_with( :div, _render_modal_footer(args), class: 'modal-footer' ),
68
68
  ]
69
69
  end
70
70
 
@@ -81,11 +81,11 @@ format :html do
81
81
  end
82
82
 
83
83
  view :modal_title do |args|
84
- "<h4>#{_render_title args.merge(:title_class=>'modal-title')}</h4>"
84
+ "<h4>#{_render_title args.merge(title_class: 'modal-title')}</h4>"
85
85
  end
86
86
 
87
87
  view :modal do |args|
88
- _render_modal_slot args.merge(:optional_modal_content=>:show)
88
+ _render_modal_slot args.merge(optional_modal_content: :show)
89
89
  end
90
90
  =end
91
91
 
@@ -5,11 +5,11 @@ format :html do
5
5
  end
6
6
 
7
7
  view :toolbar do |args|
8
- navbar "toolbar-#{card.cardname.safe_key}-#{args[:home_view]}", :toggle_align=>:left, :class=>"slotter toolbar", :navbar_type=>'inverse',
9
- :collapsed_content=>close_link(args.merge(:class=>'pull-right visible-xs')) do
8
+ navbar "toolbar-#{card.cardname.safe_key}-#{args[:home_view]}", toggle_align: :left, class: "slotter toolbar", navbar_type: 'inverse',
9
+ collapsed_content: close_link(args.merge(class: 'pull-right visible-xs')) do
10
10
  [
11
- close_link(args.merge(:class=>'hidden-xs navbar-right')),
12
- (wrap_with(:form, :class=>'navbar-form navbar-left') do
11
+ close_link(args.merge(class: 'hidden-xs navbar-right')),
12
+ (wrap_with(:form, class: 'navbar-form navbar-left') do
13
13
  [
14
14
  (account_split_button(args) if card.accountable?),
15
15
  activity_split_button(args),
@@ -17,8 +17,8 @@ format :html do
17
17
  edit_split_button(args),
18
18
  ]
19
19
  end),
20
- (wrap_with(:form, :class=>'navbar-form navbar-right') do
21
- content_tag :div, :class=>'form-group' do
20
+ (wrap_with(:form, class: 'navbar-form navbar-right') do
21
+ content_tag :div, class: 'form-group' do
22
22
  _optional_render(:toolbar_buttons, args, :show)
23
23
  end
24
24
  end)
@@ -59,65 +59,65 @@ format :html do
59
59
  if view == :edit_rules
60
60
  current_set_card.name
61
61
  else
62
- {:edit=>'content', :edit_name=>'name', :edit_type=>'type', :edit_structure=>'structure', :edit_nests=>'nests', :history=>'history', :common_rules=>'common', :recent_rules=>'recent', :grouped_rules=>'all', :edit_nest_rules=>'nests'}[view]
62
+ {edit: 'content', edit_name: 'name', edit_type: 'type', edit_structure: 'structure', edit_nests: 'nests', history: 'history', common_rules: 'common', recent_rules: 'recent', grouped_rules: 'all', edit_nest_rules: 'nests'}[view]
63
63
  end
64
64
  end
65
65
 
66
66
  def activity_split_button args
67
- discuss = smart_link 'discuss', { :related=>Card[:discussion].key }
68
- editors = smart_link 'editors', { :related=>Card[:editors].key }
69
- toolbar_split_button 'activity', { :view=>:history }, args do
67
+ discuss = smart_link 'discuss', { related: Card[:discussion].key }
68
+ editors = smart_link 'editors', { related: Card[:editors].key }
69
+ toolbar_split_button 'activity', { view: :history }, args do
70
70
  {
71
- :history => (_render_history_link if card.history?),
72
- :discuss => discuss,
73
- :follow =>_render_follow_link(args),
74
- :editors => editors
71
+ history: (_render_history_link if card.history?),
72
+ discuss: discuss,
73
+ follow: _render_follow_link(args),
74
+ editors: editors
75
75
  }
76
76
  end
77
77
  end
78
78
  def rules_split_button args
79
- recent = smart_link 'recent', {:view => :edit_rules, :slot=>{:rule_view=>:recent_rules}}
80
- common = smart_link 'common', {:view => :edit_rules, :slot=>{:rule_view=>:common_rules}}
81
- group = smart_link 'by group', {:view => :edit_rules, :slot=>{:rule_view=>:grouped_rules}}
82
- all = smart_link 'by name', {:view => :edit_rules, :slot=>{:rule_view=>:all_rules}}
83
- nests = smart_link 'nests', {:view => :edit_nest_rules, :slot=>{:rule_view=>:field_related_rules}}
84
- toolbar_split_button 'rules', {:view => :edit_rules }, args do
79
+ recent = smart_link 'recent', {view: :edit_rules, slot: {rule_view: :recent_rules}}
80
+ common = smart_link 'common', {view: :edit_rules, slot: {rule_view: :common_rules}}
81
+ group = smart_link 'by group', {view: :edit_rules, slot: {rule_view: :grouped_rules}}
82
+ all = smart_link 'by name', {view: :edit_rules, slot: {rule_view: :all_rules}}
83
+ nests = smart_link 'nests', {view: :edit_nest_rules, slot: {rule_view: :field_related_rules}}
84
+ toolbar_split_button 'rules', {view: :edit_rules }, args do
85
85
  {
86
- :common_rules => common,
87
- :grouped_rules => group,
88
- :all_rules => all,
89
- :separator => (separator if args[:nested_fields].present?),
90
- :recent_rules => (recent if recently_edited_settings?),
91
- :edit_nest_rules => (nests if args[:nested_fields].present?)
86
+ common_rules: common,
87
+ grouped_rules: group,
88
+ all_rules: all,
89
+ separator: (separator if args[:nested_fields].present?),
90
+ recent_rules: (recent if recently_edited_settings?),
91
+ edit_nest_rules: (nests if args[:nested_fields].present?)
92
92
  }
93
93
  end
94
94
  end
95
95
  def edit_split_button args
96
- toolbar_split_button 'edit', {:view=>:edit}, args do
96
+ toolbar_split_button 'edit', {view: :edit}, args do
97
97
  {
98
- :edit => _render_edit_content_link(args),
99
- :edit_nests => (_render_edit_nests_link if !card.structure && args[:nested_fields].present?),
100
- :structure => (smart_link 'structure', {:view => :edit_structure} if structure_editable?),
101
- :edit_name => _render_edit_name_link,
102
- :edit_type => _render_edit_type_link,
98
+ edit: _render_edit_content_link(args),
99
+ edit_nests: (_render_edit_nests_link if !card.structure && args[:nested_fields].present?),
100
+ structure: (smart_link 'structure', {view: :edit_structure} if structure_editable?),
101
+ edit_name: _render_edit_name_link,
102
+ edit_type: _render_edit_type_link,
103
103
  }
104
104
  end
105
105
  end
106
106
  def account_split_button args
107
- toolbar_split_button 'account', {:related=>Card[:account].key}, args do
107
+ toolbar_split_button 'account', {related: Card[:account].key}, args do
108
108
  {
109
- :account => smart_link('details',{:related=>{:name=>"#{card.name}+#{Card[:account].key}", :view=>:edit}}),
110
- :roles => smart_link('roles', {:related=>Card[:roles].key}),
111
- :created => smart_link('created',{:related=>Card[:created].key}),
112
- :edited => smart_link('edited', {:related=>Card[:edited].key}),
113
- :follow => smart_link('follow', {:related=>Card[:follow].key})
109
+ account: smart_link('details',{related: {name: "#{card.name}+#{Card[:account].key}", view: :edit}}),
110
+ roles: smart_link('roles', {related: Card[:roles].key}),
111
+ created: smart_link('created',{related: Card[:created].key}),
112
+ edited: smart_link('edited', {related: Card[:edited].key}),
113
+ follow: smart_link('follow', {related: Card[:follow].key})
114
114
  }
115
115
  end
116
116
  end
117
117
 
118
118
 
119
119
  def toolbar_split_button name, button_args, args
120
- button = button_link name, button_args, :class=>('active' if args[:active_toolbar_button] == name)
120
+ button = button_link name, button_args, class: ('active' if args[:active_toolbar_button] == name)
121
121
  active_item =
122
122
  if @slot_view == :related
123
123
  if args[:rule_view]
@@ -128,34 +128,34 @@ format :html do
128
128
  else
129
129
  @slot_view
130
130
  end
131
- split_button button, args.merge(:active_item=>active_item) do
131
+ split_button button, args.merge(active_item: active_item) do
132
132
  yield
133
133
  end
134
134
  end
135
135
 
136
136
 
137
137
  def close_link args
138
- link_opts = {:title=>'cancel'}
138
+ link_opts = {title: 'cancel'}
139
139
  if args[:subslot]
140
- link_opts[:path_opts] = {:slot=>{:subframe=>true}}
140
+ link_opts[:path_opts] = {slot: {subframe: true}}
141
141
  end
142
142
 
143
- link = view_link glyphicon('remove'), :home, link_opts.merge(:class=>'btn-toolbar-control btn btn-primary')
143
+ link = view_link glyphicon('remove'), :home, link_opts.merge(class: 'btn-toolbar-control btn btn-primary')
144
144
  css_class = ['nav navbar-nav', args[:class]].compact.join "\n"
145
- wrap_with :div, :class=>css_class do
145
+ wrap_with :div, class: css_class do
146
146
  [
147
147
  toolbar_pin_button,
148
148
  link
149
149
  ]
150
150
  end
151
- #list_tag link, :class=>css_class
151
+ #list_tag link, class: css_class
152
152
  end
153
153
  def toolbar_pin_button
154
- button_tag glyphicon('pushpin'), :situation=>:primary, :remote=>true, :title=>"#{'un' if toolbar_pinned?}pin", :class=>"btn-toolbar-control toolbar-pin #{'in' unless toolbar_pinned?}active"
154
+ button_tag glyphicon('pushpin'), situation: :primary, remote: true, title: "#{'un' if toolbar_pinned?}pin", class: "btn-toolbar-control toolbar-pin #{'in' unless toolbar_pinned?}active"
155
155
  end
156
156
 
157
157
  view :toolbar_buttons do |args|
158
- wrap_with(:div, :class=>'btn-group') do
158
+ wrap_with(:div, class: 'btn-group') do
159
159
  [
160
160
  _optional_render(:delete_button, args, (card.ok?(:delete) ? :show : :hide)),
161
161
  _optional_render(:refresh_button, args, :show),
@@ -169,29 +169,29 @@ format :html do
169
169
 
170
170
 
171
171
  view :related_button do |args|
172
- path_opts = {:slot=>{:show=>:toolbar}}
173
- dropdown_button '', :icon=>'education', :class=>'related' do #, :icon=>'eye-open' do
172
+ path_opts = {slot: {show: :toolbar}}
173
+ dropdown_button '', icon: 'education', class: 'related' do #, icon: 'eye-open' do
174
174
  [
175
- menu_item(' children', 'baby-formula', path_opts.merge(:related=>'*children')),
176
- menu_item(' mates', 'bed', path_opts.merge(:related=>'*mates')),
177
- menu_item(' references out', 'log-out', path_opts.merge(:related=>'*refers_to')),
178
- menu_item(' references in', 'log-in', path_opts.merge(:related=>'*referred_to_by'))
175
+ menu_item(' children', 'baby-formula', path_opts.merge(related: '*children')),
176
+ menu_item(' mates', 'bed', path_opts.merge(related: '*mates')),
177
+ menu_item(' references out', 'log-out', path_opts.merge(related: '*refers_to')),
178
+ menu_item(' references in', 'log-in', path_opts.merge(related: '*referred_to_by'))
179
179
  ]
180
180
  end
181
181
  end
182
182
  view :refresh_button do |args|
183
- path_opts = {:slot=>{:show=>:toolbar},:page=>card}
183
+ path_opts = {slot: {show: :toolbar},page: card}
184
184
  icon = main? ? 'refresh' : 'new-window'
185
- toolbar_button('refresh', icon, 'hidden-xs hidden-sm hidden-md hidden-lg', :path_opts=>path_opts)
185
+ toolbar_button('refresh', icon, 'hidden-xs hidden-sm hidden-md hidden-lg', path_opts: path_opts)
186
186
  end
187
187
 
188
188
 
189
189
  view :delete_button do |args|
190
190
  toolbar_button('delete', 'trash', 'hidden-xs hidden-sm hidden-md hidden-lg',
191
- :action=>:delete,
192
- :class => 'slotter',
193
- :remote => true,
194
- :path_opts=> {:success => main? ? 'REDIRECT: *previous' : "TEXT: #{card.name} deleted"},
191
+ action: :delete,
192
+ class: 'slotter',
193
+ remote: true,
194
+ path_opts: {success: main? ? 'REDIRECT: *previous' : "TEXT: #{card.name} deleted"},
195
195
  :'data-confirm' => "Are you sure you want to delete #{card.name}?"
196
196
  )
197
197
  end
@@ -205,19 +205,19 @@ format :html do
205
205
  link_text = "#{glyphicon symbol}<span class='menu-item-label #{hide}'>#{text}</span>"
206
206
 
207
207
  if cardname = tag_args.delete(:page)
208
- card_link cardname, :class=>klass, :text=>link_text
208
+ card_link cardname, class: klass, text: link_text
209
209
  elsif viewname = tag_args.delete(:view)
210
- tag_args[:path_opts] ||= {:slot=>{:show=>:toolbar}}
210
+ tag_args[:path_opts] ||= {slot: {show: :toolbar}}
211
211
  view_link link_text, viewname, tag_args
212
212
  else
213
213
  path_opts = tag_args.delete(:path_opts) || {}
214
- path_opts.merge! :action=>tag_args.delete(:action) if tag_args[:action]
214
+ path_opts.merge! action: tag_args.delete(:action) if tag_args[:action]
215
215
  link_to link_text, path_opts, tag_args
216
216
  end
217
217
  end
218
218
 
219
219
  def autosaved_draft_link
220
- view_link('autosaved draft', :edit, :path_opts=>{:edit_draft=>true, :slot=>{:show=>:toolbar}}, :class=>'navbar-link slotter pull-right')
220
+ view_link('autosaved draft', :edit, path_opts: {edit_draft: true, slot: {show: :toolbar}}, class: 'navbar-link slotter pull-right')
221
221
  end
222
222
 
223
223