alchemy_cms 4.4.3 → 5.0.0.beta1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (384) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/ci.yml +56 -18
  3. data/.github/workflows/stale.yml +1 -1
  4. data/.gitignore +20 -2
  5. data/.hound.yml +2 -1
  6. data/.prettierrc +6 -0
  7. data/.rubocop.yml +34 -21
  8. data/CHANGELOG.md +120 -0
  9. data/Gemfile +24 -22
  10. data/README.md +31 -19
  11. data/Rakefile +10 -8
  12. data/alchemy_cms.gemspec +6 -4
  13. data/app/assets/javascripts/alchemy/admin.js +1 -2
  14. data/app/assets/javascripts/alchemy/alchemy.base.js.coffee +2 -1
  15. data/app/assets/javascripts/alchemy/alchemy.element_editors.js.coffee +0 -2
  16. data/app/assets/javascripts/alchemy/alchemy.link_dialog.js.coffee +5 -5
  17. data/app/assets/javascripts/alchemy/alchemy.page_sorter.js +17 -17
  18. data/app/assets/javascripts/alchemy/node_select.js +39 -0
  19. data/app/assets/javascripts/alchemy/templates/index.js +2 -0
  20. data/app/assets/javascripts/alchemy/templates/node.hbs +16 -0
  21. data/app/assets/javascripts/alchemy/templates/node_folder.hbs +3 -0
  22. data/app/assets/javascripts/alchemy/templates/page.hbs +1 -1
  23. data/app/assets/stylesheets/alchemy/_mixins.scss +2 -3
  24. data/app/assets/stylesheets/alchemy/_variables.scss +2 -2
  25. data/app/assets/stylesheets/alchemy/admin.scss +3 -2
  26. data/app/assets/stylesheets/alchemy/base.scss +0 -1
  27. data/app/assets/stylesheets/alchemy/elements.scss +1 -1
  28. data/app/assets/stylesheets/alchemy/forms.scss +5 -0
  29. data/app/assets/stylesheets/alchemy/lists.scss +0 -8
  30. data/app/assets/stylesheets/alchemy/node-select.scss +43 -0
  31. data/app/assets/stylesheets/alchemy/nodes.scss +6 -1
  32. data/app/assets/stylesheets/alchemy/sitemap.scss +63 -21
  33. data/app/assets/stylesheets/alchemy/tables.scss +1 -24
  34. data/app/controllers/alchemy/admin/attachments_controller.rb +8 -7
  35. data/app/controllers/alchemy/admin/base_controller.rb +13 -33
  36. data/app/controllers/alchemy/admin/clipboard_controller.rb +5 -4
  37. data/app/controllers/alchemy/admin/contents_controller.rb +1 -2
  38. data/app/controllers/alchemy/admin/dashboard_controller.rb +10 -9
  39. data/app/controllers/alchemy/admin/elements_controller.rb +20 -20
  40. data/app/controllers/alchemy/admin/essence_pictures_controller.rb +12 -14
  41. data/app/controllers/alchemy/admin/languages_controller.rb +35 -2
  42. data/app/controllers/alchemy/admin/layoutpages_controller.rb +5 -2
  43. data/app/controllers/alchemy/admin/nodes_controller.rb +5 -14
  44. data/app/controllers/alchemy/admin/pages_controller.rb +50 -63
  45. data/app/controllers/alchemy/admin/pictures_controller.rb +16 -16
  46. data/app/controllers/alchemy/admin/resources_controller.rb +21 -13
  47. data/app/controllers/alchemy/admin/sites_controller.rb +18 -0
  48. data/app/controllers/alchemy/admin/styleguide_controller.rb +1 -0
  49. data/app/controllers/alchemy/admin/tags_controller.rb +5 -3
  50. data/app/controllers/alchemy/admin/trash_controller.rb +6 -6
  51. data/app/controllers/alchemy/api/base_controller.rb +2 -2
  52. data/app/controllers/alchemy/api/contents_controller.rb +4 -4
  53. data/app/controllers/alchemy/api/elements_controller.rb +8 -8
  54. data/app/controllers/alchemy/api/nodes_controller.rb +65 -0
  55. data/app/controllers/alchemy/api/pages_controller.rb +15 -22
  56. data/app/controllers/alchemy/attachments_controller.rb +5 -5
  57. data/app/controllers/alchemy/base_controller.rb +10 -9
  58. data/app/controllers/alchemy/messages_controller.rb +16 -23
  59. data/app/controllers/alchemy/pages_controller.rb +13 -11
  60. data/app/controllers/concerns/alchemy/admin/archive_overlay.rb +3 -2
  61. data/app/controllers/concerns/alchemy/admin/current_language.rb +23 -0
  62. data/app/controllers/concerns/alchemy/admin/uploader_responses.rb +5 -5
  63. data/app/controllers/concerns/alchemy/legacy_page_redirects.rb +4 -4
  64. data/app/controllers/concerns/alchemy/page_redirects.rb +2 -9
  65. data/app/controllers/concerns/alchemy/site_redirects.rb +2 -2
  66. data/app/decorators/alchemy/content_editor.rb +55 -0
  67. data/app/decorators/alchemy/element_editor.rb +39 -0
  68. data/app/helpers/alchemy/admin/attachments_helper.rb +6 -6
  69. data/app/helpers/alchemy/admin/base_helper.rb +36 -35
  70. data/app/helpers/alchemy/admin/contents_helper.rb +3 -3
  71. data/app/helpers/alchemy/admin/elements_helper.rb +3 -88
  72. data/app/helpers/alchemy/admin/essences_helper.rb +8 -117
  73. data/app/helpers/alchemy/admin/form_helper.rb +1 -1
  74. data/app/helpers/alchemy/admin/navigation_helper.rb +24 -23
  75. data/app/helpers/alchemy/admin/pages_helper.rb +12 -12
  76. data/app/helpers/alchemy/admin/pictures_helper.rb +3 -3
  77. data/app/helpers/alchemy/admin/tags_helper.rb +8 -7
  78. data/app/helpers/alchemy/base_helper.rb +13 -8
  79. data/app/helpers/alchemy/elements_block_helper.rb +2 -31
  80. data/app/helpers/alchemy/elements_helper.rb +12 -58
  81. data/app/helpers/alchemy/pages_helper.rb +24 -174
  82. data/app/helpers/alchemy/url_helper.rb +2 -1
  83. data/app/mailers/alchemy/base_mailer.rb +1 -1
  84. data/app/mailers/alchemy/messages_mailer.rb +1 -1
  85. data/app/models/alchemy/attachment.rb +20 -18
  86. data/app/models/alchemy/base_record.rb +2 -5
  87. data/app/models/alchemy/content.rb +33 -52
  88. data/app/models/alchemy/content/factory.rb +24 -31
  89. data/app/models/alchemy/element.rb +45 -53
  90. data/app/models/alchemy/element/definitions.rb +4 -4
  91. data/app/models/alchemy/element/element_contents.rb +9 -6
  92. data/app/models/alchemy/element/element_essences.rb +4 -3
  93. data/app/models/alchemy/element/presenters.rb +3 -2
  94. data/app/models/alchemy/element_to_page.rb +1 -1
  95. data/app/models/alchemy/essence_boolean.rb +1 -3
  96. data/app/models/alchemy/essence_date.rb +2 -3
  97. data/app/models/alchemy/essence_file.rb +4 -4
  98. data/app/models/alchemy/essence_html.rb +1 -3
  99. data/app/models/alchemy/essence_link.rb +1 -3
  100. data/app/models/alchemy/essence_node.rb +18 -0
  101. data/app/models/alchemy/essence_page.rb +3 -16
  102. data/app/models/alchemy/essence_picture.rb +17 -16
  103. data/app/models/alchemy/essence_picture_view.rb +7 -6
  104. data/app/models/alchemy/essence_richtext.rb +1 -3
  105. data/app/models/alchemy/essence_select.rb +1 -3
  106. data/app/models/alchemy/essence_text.rb +0 -2
  107. data/app/models/alchemy/folded_page.rb +1 -0
  108. data/app/models/alchemy/language.rb +21 -35
  109. data/app/models/alchemy/language/code.rb +4 -4
  110. data/app/models/alchemy/legacy_page_url.rb +1 -1
  111. data/app/models/alchemy/message.rb +3 -3
  112. data/app/models/alchemy/node.rb +55 -9
  113. data/app/models/alchemy/page.rb +53 -123
  114. data/app/models/alchemy/page/fixed_attributes.rb +3 -2
  115. data/app/models/alchemy/page/page_elements.rb +35 -44
  116. data/app/models/alchemy/page/page_naming.rb +20 -70
  117. data/app/models/alchemy/page/page_natures.rb +7 -34
  118. data/app/models/alchemy/page/page_scopes.rb +23 -29
  119. data/app/models/alchemy/page/url_path.rb +64 -0
  120. data/app/models/alchemy/picture.rb +18 -27
  121. data/app/models/alchemy/picture/transformations.rb +9 -7
  122. data/app/models/alchemy/picture/url.rb +5 -5
  123. data/app/models/alchemy/site.rb +6 -36
  124. data/app/models/alchemy/site/layout.rb +2 -2
  125. data/app/models/concerns/alchemy/touch_elements.rb +24 -0
  126. data/app/serializers/alchemy/content_serializer.rb +0 -3
  127. data/app/serializers/alchemy/essence_boolean_serializer.rb +3 -3
  128. data/app/serializers/alchemy/essence_date_serializer.rb +3 -3
  129. data/app/serializers/alchemy/essence_file_serializer.rb +4 -2
  130. data/app/serializers/alchemy/essence_html_serializer.rb +3 -3
  131. data/app/serializers/alchemy/essence_link_serializer.rb +3 -3
  132. data/app/serializers/alchemy/essence_picture_serializer.rb +5 -4
  133. data/app/serializers/alchemy/essence_richtext_serializer.rb +3 -3
  134. data/app/serializers/alchemy/essence_select_serializer.rb +3 -3
  135. data/app/serializers/alchemy/essence_text_serializer.rb +5 -4
  136. data/app/serializers/alchemy/node_serializer.rb +14 -0
  137. data/app/serializers/alchemy/page_serializer.rb +2 -1
  138. data/app/serializers/alchemy/page_tree_serializer.rb +11 -14
  139. data/app/views/alchemy/admin/attachments/_archive_overlay.html.erb +1 -2
  140. data/app/views/alchemy/admin/attachments/_file_to_assign.html.erb +1 -2
  141. data/app/views/alchemy/admin/attachments/_files_list.html.erb +4 -4
  142. data/app/views/alchemy/admin/contents/create.js.erb +1 -3
  143. data/app/views/alchemy/admin/elements/_element.html.erb +9 -18
  144. data/app/views/alchemy/admin/elements/create.js.erb +1 -1
  145. data/app/views/alchemy/admin/elements/fold.js.erb +1 -1
  146. data/app/views/alchemy/admin/elements/index.html.erb +3 -3
  147. data/app/views/alchemy/admin/essence_files/assign.js.erb +1 -6
  148. data/app/views/alchemy/admin/essence_files/edit.html.erb +1 -1
  149. data/app/views/alchemy/admin/essence_pictures/assign.js.erb +1 -7
  150. data/app/views/alchemy/admin/essence_pictures/crop.html.erb +1 -1
  151. data/app/views/alchemy/admin/essence_pictures/edit.html.erb +7 -7
  152. data/app/views/alchemy/admin/essence_pictures/update.js.erb +1 -1
  153. data/app/views/alchemy/admin/languages/_form.html.erb +5 -5
  154. data/app/views/alchemy/admin/languages/_table.html.erb +3 -3
  155. data/app/views/alchemy/admin/languages/edit.html.erb +1 -0
  156. data/app/views/alchemy/admin/languages/index.html.erb +23 -4
  157. data/app/views/alchemy/admin/languages/new.html.erb +1 -0
  158. data/app/views/alchemy/admin/layoutpages/index.html.erb +6 -2
  159. data/app/views/alchemy/admin/nodes/_form.html.erb +23 -15
  160. data/app/views/alchemy/admin/nodes/_node.html.erb +5 -19
  161. data/app/views/alchemy/admin/nodes/index.html.erb +8 -19
  162. data/app/views/alchemy/admin/pages/_create_language_form.html.erb +0 -8
  163. data/app/views/alchemy/admin/pages/_form.html.erb +1 -2
  164. data/app/views/alchemy/admin/pages/_new_page_form.html.erb +1 -0
  165. data/app/views/alchemy/admin/pages/_page.html.erb +14 -25
  166. data/app/views/alchemy/admin/pages/_page_infos.html.erb +0 -4
  167. data/app/views/alchemy/admin/pages/_sitemap.html.erb +6 -0
  168. data/app/views/alchemy/admin/pages/edit.html.erb +1 -1
  169. data/app/views/alchemy/admin/pages/info.html.erb +0 -9
  170. data/app/views/alchemy/admin/pages/unlock.js.erb +13 -6
  171. data/app/views/alchemy/admin/partials/_remote_search_form.html.erb +0 -2
  172. data/app/views/alchemy/admin/partials/_routes.html.erb +8 -0
  173. data/app/views/alchemy/admin/pictures/_filter_and_size_bar.html.erb +1 -5
  174. data/app/views/alchemy/admin/pictures/_overlay_picture_list.html.erb +1 -1
  175. data/app/views/alchemy/admin/pictures/_picture_to_assign.html.erb +1 -2
  176. data/app/views/alchemy/admin/resources/_resource.html.erb +1 -1
  177. data/app/views/alchemy/admin/resources/_table.html.erb +2 -2
  178. data/app/views/alchemy/admin/sites/_form.html.erb +8 -0
  179. data/app/views/alchemy/admin/sites/edit.html.erb +1 -0
  180. data/app/views/alchemy/admin/sites/index.html.erb +21 -9
  181. data/app/views/alchemy/admin/sites/new.html.erb +1 -0
  182. data/app/views/alchemy/admin/tags/index.html.erb +2 -2
  183. data/app/views/alchemy/essences/_essence_boolean_editor.html.erb +10 -12
  184. data/app/views/alchemy/essences/_essence_date_editor.html.erb +11 -8
  185. data/app/views/alchemy/essences/_essence_file_editor.html.erb +16 -17
  186. data/app/views/alchemy/essences/_essence_html_editor.html.erb +8 -5
  187. data/app/views/alchemy/essences/_essence_link_editor.html.erb +18 -15
  188. data/app/views/alchemy/essences/_essence_node_editor.html.erb +27 -0
  189. data/app/views/alchemy/essences/_essence_node_view.html.erb +1 -0
  190. data/app/views/alchemy/essences/_essence_page_editor.html.erb +14 -11
  191. data/app/views/alchemy/essences/_essence_picture_editor.html.erb +22 -20
  192. data/app/views/alchemy/essences/_essence_richtext_editor.html.erb +10 -7
  193. data/app/views/alchemy/essences/_essence_select_editor.html.erb +12 -16
  194. data/app/views/alchemy/essences/_essence_text_editor.html.erb +18 -17
  195. data/app/views/alchemy/essences/shared/_essence_picture_tools.html.erb +6 -11
  196. data/app/views/alchemy/pages/show.rss.builder +3 -2
  197. data/app/views/layouts/alchemy/admin.html.erb +1 -0
  198. data/babel.config.js +12 -0
  199. data/bin/rails +5 -4
  200. data/config/alchemy/config.yml +15 -24
  201. data/config/brakeman.ignore +1 -1
  202. data/config/initializers/assets.rb +2 -1
  203. data/config/initializers/dragonfly.rb +2 -1
  204. data/config/initializers/mime_types.rb +1 -0
  205. data/config/initializers/mini_profiler.rb +3 -2
  206. data/config/initializers/simple_form.rb +6 -6
  207. data/config/locales/alchemy.en.yml +37 -14
  208. data/config/routes.rb +32 -28
  209. data/config/spring.rb +3 -2
  210. data/db/migrate/20200226213334_alchemy_four_point_four.rb +313 -0
  211. data/db/migrate/20200423073425_create_alchemy_essence_nodes.rb +11 -0
  212. data/db/migrate/20200504210159_remove_site_id_from_nodes.rb +28 -0
  213. data/db/migrate/20200505215518_add_language_id_foreign_key_to_alchemy_pages.rb +8 -0
  214. data/db/migrate/20200511113603_add_menu_type_to_alchemy_nodes.rb +27 -0
  215. data/db/migrate/20200514091507_make_page_layoutpage_null_false.rb +6 -0
  216. data/db/migrate/20200519073500_remove_visible_from_alchemy_pages.rb +24 -0
  217. data/lib/alchemy/admin/locale.rb +3 -1
  218. data/lib/alchemy/admin/preview_url.rb +64 -0
  219. data/lib/alchemy/auth_accessors.rb +8 -7
  220. data/lib/alchemy/cache_digests/template_tracker.rb +5 -4
  221. data/lib/alchemy/config.rb +26 -2
  222. data/lib/alchemy/configuration_methods.rb +3 -1
  223. data/lib/alchemy/controller_actions.rb +6 -5
  224. data/lib/alchemy/deprecation.rb +2 -1
  225. data/lib/alchemy/elements_finder.rb +5 -5
  226. data/lib/alchemy/engine.rb +23 -8
  227. data/lib/alchemy/errors.rb +0 -7
  228. data/lib/alchemy/essence.rb +17 -16
  229. data/lib/alchemy/filetypes.rb +5 -5
  230. data/lib/alchemy/forms/builder.rb +4 -4
  231. data/lib/alchemy/hints.rb +1 -1
  232. data/lib/alchemy/i18n.rb +2 -1
  233. data/lib/alchemy/modules.rb +12 -12
  234. data/lib/alchemy/name_conversions.rb +5 -5
  235. data/lib/alchemy/on_page_layout/callbacks_runner.rb +1 -0
  236. data/lib/alchemy/page_layout.rb +15 -12
  237. data/lib/alchemy/paths.rb +1 -1
  238. data/lib/alchemy/permissions.rb +7 -6
  239. data/lib/alchemy/resource.rb +23 -13
  240. data/lib/alchemy/resources_helper.rb +12 -18
  241. data/lib/alchemy/routing_constraints.rb +1 -1
  242. data/lib/alchemy/seeder.rb +42 -14
  243. data/lib/alchemy/shell.rb +13 -10
  244. data/lib/alchemy/taggable.rb +1 -0
  245. data/lib/alchemy/tasks/tidy.rb +4 -3
  246. data/lib/alchemy/test_support/config_stubbing.rb +1 -0
  247. data/lib/alchemy/test_support/essence_shared_examples.rb +72 -72
  248. data/lib/alchemy/test_support/factories.rb +1 -1
  249. data/lib/alchemy/test_support/factories/attachment_factory.rb +5 -5
  250. data/lib/alchemy/test_support/factories/content_factory.rb +6 -6
  251. data/lib/alchemy/test_support/factories/dummy_user_factory.rb +7 -7
  252. data/lib/alchemy/test_support/factories/element_factory.rb +9 -9
  253. data/lib/alchemy/test_support/factories/essence_file_factory.rb +3 -3
  254. data/lib/alchemy/test_support/factories/essence_page_factory.rb +3 -3
  255. data/lib/alchemy/test_support/factories/essence_picture_factory.rb +4 -4
  256. data/lib/alchemy/test_support/factories/essence_text_factory.rb +3 -3
  257. data/lib/alchemy/test_support/factories/language_factory.rb +16 -14
  258. data/lib/alchemy/test_support/factories/node_factory.rb +8 -8
  259. data/lib/alchemy/test_support/factories/page_factory.rb +15 -27
  260. data/lib/alchemy/test_support/factories/picture_factory.rb +5 -5
  261. data/lib/alchemy/test_support/factories/site_factory.rb +7 -6
  262. data/lib/alchemy/test_support/integration_helpers.rb +1 -0
  263. data/lib/alchemy/test_support/shared_contexts.rb +5 -4
  264. data/lib/alchemy/test_support/shared_uploader_examples.rb +4 -3
  265. data/lib/alchemy/tinymce.rb +15 -13
  266. data/lib/alchemy/upgrader.rb +8 -7
  267. data/lib/alchemy/upgrader/five_point_zero.rb +41 -0
  268. data/lib/alchemy/upgrader/tasks/element_views_updater.rb +4 -4
  269. data/lib/alchemy/upgrader/tasks/harden_gutentag_migrations.rb +29 -0
  270. data/lib/alchemy/version.rb +1 -1
  271. data/lib/alchemy_cms.rb +52 -50
  272. data/lib/{rails/generators → generators}/alchemy/base.rb +5 -4
  273. data/lib/{rails/generators → generators}/alchemy/elements/elements_generator.rb +13 -9
  274. data/lib/{rails/generators → generators}/alchemy/elements/templates/view.html.erb +0 -0
  275. data/lib/{rails/generators → generators}/alchemy/elements/templates/view.html.haml +0 -0
  276. data/lib/{rails/generators → generators}/alchemy/elements/templates/view.html.slim +0 -0
  277. data/lib/{rails/generators → generators}/alchemy/essence/essence_generator.rb +15 -13
  278. data/lib/generators/alchemy/essence/templates/editor.html.erb +17 -0
  279. data/lib/{rails/generators → generators}/alchemy/essence/templates/view.html.erb +0 -0
  280. data/lib/{rails/generators → generators}/alchemy/install/files/_article.html.erb +0 -0
  281. data/lib/{rails/generators → generators}/alchemy/install/files/_standard.html.erb +0 -0
  282. data/lib/{rails/generators → generators}/alchemy/install/files/alchemy.en.yml +0 -0
  283. data/lib/generators/alchemy/install/files/alchemy_admin.js +1 -0
  284. data/lib/{rails/generators → generators}/alchemy/install/files/all.css +0 -0
  285. data/lib/{rails/generators → generators}/alchemy/install/files/all.js +0 -0
  286. data/lib/{rails/generators → generators}/alchemy/install/files/application.html.erb +0 -0
  287. data/lib/{rails/generators → generators}/alchemy/install/files/article.scss +0 -0
  288. data/lib/generators/alchemy/install/install_generator.rb +110 -0
  289. data/lib/{rails/generators → generators}/alchemy/install/templates/dragonfly.rb.tt +0 -0
  290. data/lib/{rails/generators → generators}/alchemy/install/templates/elements.yml.tt +0 -0
  291. data/lib/generators/alchemy/install/templates/menus.yml.tt +8 -0
  292. data/lib/{rails/generators → generators}/alchemy/install/templates/page_layouts.yml.tt +0 -0
  293. data/lib/{rails/generators → generators}/alchemy/menus/menus_generator.rb +5 -5
  294. data/lib/{rails/generators → generators}/alchemy/menus/templates/node.html.erb +1 -4
  295. data/lib/{rails/generators → generators}/alchemy/menus/templates/node.html.haml +1 -4
  296. data/lib/{rails/generators → generators}/alchemy/menus/templates/node.html.slim +1 -4
  297. data/lib/{rails/generators → generators}/alchemy/menus/templates/wrapper.html.erb +1 -1
  298. data/lib/{rails/generators → generators}/alchemy/menus/templates/wrapper.html.haml +2 -2
  299. data/lib/{rails/generators → generators}/alchemy/menus/templates/wrapper.html.slim +2 -2
  300. data/lib/{rails/generators → generators}/alchemy/module/module_generator.rb +3 -2
  301. data/lib/{rails/generators → generators}/alchemy/module/templates/ability.rb.tt +0 -0
  302. data/lib/{rails/generators → generators}/alchemy/module/templates/controller.rb.tt +0 -0
  303. data/lib/{rails/generators → generators}/alchemy/module/templates/module_config.rb.tt +0 -0
  304. data/lib/{rails/generators → generators}/alchemy/page_layouts/page_layouts_generator.rb +5 -4
  305. data/lib/{rails/generators → generators}/alchemy/page_layouts/templates/layout.html.erb +0 -0
  306. data/lib/{rails/generators → generators}/alchemy/page_layouts/templates/layout.html.haml +0 -0
  307. data/lib/{rails/generators → generators}/alchemy/page_layouts/templates/layout.html.slim +0 -0
  308. data/lib/{rails/generators → generators}/alchemy/site_layouts/site_layouts_generator.rb +4 -2
  309. data/lib/{rails/generators → generators}/alchemy/site_layouts/templates/layout.html.erb +0 -0
  310. data/lib/{rails/generators → generators}/alchemy/site_layouts/templates/layout.html.haml +0 -0
  311. data/lib/{rails/generators → generators}/alchemy/site_layouts/templates/layout.html.slim +0 -0
  312. data/lib/{rails/generators → generators}/alchemy/views/views_generator.rb +7 -6
  313. data/lib/kaminari/scoped_pagination_url_helper.rb +1 -0
  314. data/lib/tasks/alchemy/db.rake +3 -19
  315. data/lib/tasks/alchemy/install.rake +3 -2
  316. data/lib/tasks/alchemy/tidy.rake +9 -8
  317. data/lib/tasks/alchemy/upgrade.rake +28 -105
  318. data/package.json +45 -0
  319. data/package/admin.js +14 -0
  320. data/package/src/__tests__/i18n.spec.js +70 -0
  321. data/package/src/i18n.js +48 -0
  322. data/package/src/node_tree.js +72 -0
  323. data/package/src/translations.js +32 -0
  324. data/package/src/utils/__tests__/ajax.spec.js +124 -0
  325. data/package/src/utils/__tests__/events.spec.js +38 -0
  326. data/package/src/utils/ajax.js +48 -0
  327. data/package/src/utils/events.js +16 -0
  328. data/vendor/assets/fonts/fa-regular-400.eot +0 -0
  329. data/vendor/assets/fonts/fa-regular-400.svg +798 -358
  330. data/vendor/assets/fonts/fa-regular-400.ttf +0 -0
  331. data/vendor/assets/fonts/fa-regular-400.woff +0 -0
  332. data/vendor/assets/fonts/fa-regular-400.woff2 +0 -0
  333. data/vendor/assets/fonts/fa-solid-900.eot +0 -0
  334. data/vendor/assets/fonts/fa-solid-900.svg +4933 -1408
  335. data/vendor/assets/fonts/fa-solid-900.ttf +0 -0
  336. data/vendor/assets/fonts/fa-solid-900.woff +0 -0
  337. data/vendor/assets/fonts/fa-solid-900.woff2 +0 -0
  338. data/vendor/assets/javascripts/jquery_plugins/jquery.ui.nestedSortable.js +1 -2
  339. data/vendor/assets/stylesheets/fontawesome/_core.scss +5 -0
  340. data/vendor/assets/stylesheets/fontawesome/_fixed-width.scss +1 -1
  341. data/vendor/assets/stylesheets/fontawesome/_icons.scss +651 -2
  342. data/vendor/assets/stylesheets/fontawesome/_mixins.scss +0 -1
  343. data/vendor/assets/stylesheets/fontawesome/_rotated-flipped.scss +3 -2
  344. data/vendor/assets/stylesheets/fontawesome/_stacked.scss +1 -1
  345. data/vendor/assets/stylesheets/fontawesome/_variables.scss +662 -9
  346. data/vendor/assets/stylesheets/fontawesome/fontawesome.scss +2 -2
  347. data/vendor/assets/stylesheets/fontawesome/regular.scss +23 -0
  348. data/vendor/assets/stylesheets/fontawesome/solid.scss +24 -0
  349. metadata +128 -81
  350. data/app/assets/javascripts/alchemy/alchemy.i18n.js.coffee +0 -32
  351. data/app/assets/javascripts/alchemy/alchemy.translations.js.coffee +0 -29
  352. data/app/helpers/alchemy/essences_helper.rb +0 -119
  353. data/app/models/concerns/alchemy/content_touching.rb +0 -23
  354. data/app/serializers/alchemy/legacy_element_serializer.rb +0 -15
  355. data/app/views/alchemy/admin/contents/_missing.html.erb +0 -17
  356. data/app/views/alchemy/admin/pages/_menu_fields.html.erb +0 -33
  357. data/app/views/alchemy/admin/pages/configure_external.html.erb +0 -32
  358. data/app/views/alchemy/elements/_editor_not_found.html.erb +0 -4
  359. data/app/views/alchemy/navigation/_image_link.html.erb +0 -14
  360. data/app/views/alchemy/navigation/_link.html.erb +0 -19
  361. data/app/views/alchemy/navigation/_renderer.html.erb +0 -29
  362. data/db/migrate/20180226123013_alchemy_four_point_zero.rb +0 -363
  363. data/db/migrate/20180227224537_migrate_tags_to_gutentag.rb +0 -41
  364. data/db/migrate/20180519204655_add_fixed_to_alchemy_elements.rb +0 -6
  365. data/db/migrate/20191016073858_create_alchemy_essence_pages.rb +0 -8
  366. data/db/migrate/20191029212236_create_alchemy_nodes.rb +0 -24
  367. data/db/migrate/20200226081535_add_site_id_to_alchemy_nodes.rb +0 -15
  368. data/lib/alchemy/ssl_protection.rb +0 -32
  369. data/lib/alchemy/tasks/helpers.rb +0 -81
  370. data/lib/alchemy/test_support/controller_requests.rb +0 -93
  371. data/lib/alchemy/upgrader/four_point_four.rb +0 -52
  372. data/lib/alchemy/upgrader/four_point_one.rb +0 -42
  373. data/lib/alchemy/upgrader/four_point_two.rb +0 -85
  374. data/lib/alchemy/upgrader/tasks/cells_migration.rb +0 -43
  375. data/lib/alchemy/upgrader/tasks/cells_upgrader.rb +0 -148
  376. data/lib/alchemy/upgrader/tasks/element_partial_name_variable_updater.rb +0 -28
  377. data/lib/alchemy/upgrader/tasks/harden_acts_as_taggable_on_migrations.rb +0 -27
  378. data/lib/alchemy/upgrader/tasks/picture_gallery_migration.rb +0 -65
  379. data/lib/alchemy/upgrader/tasks/picture_gallery_upgrader.rb +0 -210
  380. data/lib/rails/generators/alchemy/essence/templates/editor.html.erb +0 -15
  381. data/lib/rails/generators/alchemy/install/install_generator.rb +0 -60
  382. data/lib/tasks/alchemy/convert.rake +0 -95
  383. data/vendor/assets/stylesheets/fontawesome/fa-regular.scss +0 -22
  384. data/vendor/assets/stylesheets/fontawesome/fa-solid.scss +0 -23
@@ -0,0 +1,45 @@
1
+ {
2
+ "name": "@alchemy_cms/admin",
3
+ "version": "0.2.0",
4
+ "description": "AlchemyCMS",
5
+ "browser": "package/admin.js",
6
+ "files": [
7
+ "package/**/*"
8
+ ],
9
+ "directories": {
10
+ "lib": "package"
11
+ },
12
+ "scripts": {
13
+ "test": "jest"
14
+ },
15
+ "repository": {
16
+ "type": "git",
17
+ "url": "git+https://github.com/AlchemyCMS/alchemy_cms.git"
18
+ },
19
+ "keywords": [],
20
+ "author": "Thomas von Deyen",
21
+ "license": "BSD-3-Clause",
22
+ "bugs": {
23
+ "url": "https://github.com/AlchemyCMS/alchemy_cms/issues"
24
+ },
25
+ "homepage": "https://github.com/AlchemyCMS/alchemy_cms#readme",
26
+ "dependencies": {
27
+ "sortablejs": "^1.10.2"
28
+ },
29
+ "devDependencies": {
30
+ "@babel/core": "^7.9.6",
31
+ "@babel/preset-env": "^7.9.6",
32
+ "babel-jest": "^26.0.1",
33
+ "jest": "^25.2.7",
34
+ "prettier": "^2.0.2",
35
+ "xhr-mock": "^2.5.1"
36
+ },
37
+ "jest": {
38
+ "globals": {
39
+ "Alchemy": {}
40
+ },
41
+ "roots": [
42
+ "package"
43
+ ]
44
+ }
45
+ }
@@ -0,0 +1,14 @@
1
+ import translate from "./src/i18n"
2
+ import NodeTree from "./src/node_tree"
3
+
4
+ // Global Alchemy object
5
+ if (typeof window.Alchemy === "undefined") {
6
+ window.Alchemy = {}
7
+ }
8
+
9
+ // Enhance the global Alchemy object with imported features
10
+ Object.assign(Alchemy, {
11
+ // Global utility method for translating a given string
12
+ t: translate,
13
+ NodeTree
14
+ })
@@ -0,0 +1,70 @@
1
+ import translate from "../i18n"
2
+
3
+ describe("translate", () => {
4
+ describe("if Alchemy.locale is not set", () => {
5
+ it("Throws an error", () => {
6
+ expect(() => {
7
+ translate("help")
8
+ }).toThrow("Alchemy.locale is not set")
9
+ })
10
+ })
11
+
12
+ describe("if Alchemy.locale is set to a known locale", () => {
13
+ beforeEach(() => {
14
+ Alchemy.locale = "en"
15
+ })
16
+
17
+ describe("if translation is present", () => {
18
+ it("Returns translated string", () => {
19
+ expect(translate("help")).toEqual("Help")
20
+ })
21
+
22
+ describe("if key includes a period", () => {
23
+ describe("that is translated", () => {
24
+ it("splits into group", () => {
25
+ expect(translate("formats.date")).toEqual("Y-m-d")
26
+ })
27
+ })
28
+
29
+ describe("that is not translated", () => {
30
+ it("returns key", () => {
31
+ expect(translate("formats.lala")).toEqual("formats.lala")
32
+ })
33
+ })
34
+
35
+ describe("that has unknown group", () => {
36
+ it("returns key", () => {
37
+ expect(translate("foo.bar")).toEqual("foo.bar")
38
+ })
39
+ })
40
+ })
41
+
42
+ describe("if replacement is given", () => {
43
+ it("replaces it", () => {
44
+ expect(translate("allowed_chars", 5)).toEqual("of 5 chars")
45
+ })
46
+ })
47
+ })
48
+
49
+ describe("if translation is not present", () => {
50
+ it("Returns passed string", () => {
51
+ expect(translate("foo")).toEqual("foo")
52
+ })
53
+ })
54
+ })
55
+
56
+ describe("if Alchemy.locale is set to a unknown locale", () => {
57
+ beforeEach(() => {
58
+ Alchemy.locale = "kl"
59
+ })
60
+
61
+ it("Returns passed string and logs a warning", () => {
62
+ const spy = jest.spyOn(console, "warn").mockImplementation(() => {})
63
+ expect(translate("help")).toEqual("help")
64
+ expect(spy.mock.calls).toEqual([
65
+ ["Translations for locale kl not found!"]
66
+ ])
67
+ spy.mockRestore()
68
+ })
69
+ })
70
+ })
@@ -0,0 +1,48 @@
1
+ import translationData from "./translations"
2
+
3
+ const KEY_SEPARATOR = /\./
4
+
5
+ function currentLocale() {
6
+ if (Alchemy.locale == null) {
7
+ throw "Alchemy.locale is not set! Please set Alchemy.locale to a locale string in order to translate something."
8
+ }
9
+ return Alchemy.locale
10
+ }
11
+
12
+ function getTranslations() {
13
+ const locale = currentLocale()
14
+ const translations = translationData[locale]
15
+
16
+ if (translations) {
17
+ return translations
18
+ }
19
+ console.warn(`Translations for locale ${locale} not found!`)
20
+ return {}
21
+ }
22
+
23
+ function nestedTranslation(translations, key) {
24
+ const keys = key.split(KEY_SEPARATOR)
25
+ const group = translations[keys[0]]
26
+ if (group) {
27
+ return group[keys[1]] || key
28
+ }
29
+ return key
30
+ }
31
+
32
+ function getTranslation(key) {
33
+ const translations = getTranslations()
34
+
35
+ if (KEY_SEPARATOR.test(key)) {
36
+ return nestedTranslation(translations, key)
37
+ }
38
+ return translations[key] || key
39
+ }
40
+
41
+ export default function translate(key, replacement) {
42
+ let translation = getTranslation(key)
43
+
44
+ if (replacement) {
45
+ return translation.replace(/%\{.+\}/, replacement)
46
+ }
47
+ return translation
48
+ }
@@ -0,0 +1,72 @@
1
+ import Sortable from "sortablejs"
2
+ import ajax from "./utils/ajax"
3
+ import { on } from "./utils/events"
4
+
5
+ function displayNodeFolders() {
6
+ document.querySelectorAll("li.menu-item").forEach((el) => {
7
+ const leftIconArea = el.querySelector(".nodes_tree-left_images")
8
+ const list = el.querySelector(".children")
9
+ const node = { folded: el.dataset.folded === "true", id: el.dataset.id }
10
+
11
+ if (list.children.length > 0 || node.folded) {
12
+ leftIconArea.innerHTML = HandlebarsTemplates.node_folder({ node: node })
13
+ } else {
14
+ leftIconArea.innerHTML = " "
15
+ }
16
+ })
17
+ }
18
+
19
+ function onFinishDragging(evt) {
20
+ const url = Alchemy.routes.move_api_node_path(evt.item.dataset.id)
21
+ const data = {
22
+ target_parent_id: evt.to.dataset.nodeId,
23
+ new_position: evt.newIndex
24
+ }
25
+
26
+ ajax("PATCH", url, data)
27
+ .then(() => {
28
+ const message = Alchemy.t("Successfully moved menu item")
29
+ Alchemy.growl(message)
30
+ displayNodeFolders()
31
+ })
32
+ .catch((error) => {
33
+ Alchemy.growl(error.message || error, "error")
34
+ })
35
+ }
36
+
37
+ function handleNodeFolders() {
38
+ on("click", ".nodes_tree", ".node_folder", function () {
39
+ const nodeId = this.dataset.nodeId
40
+ const menu_item = this.closest("li.menu-item")
41
+ const url = Alchemy.routes.toggle_folded_api_node_path(nodeId)
42
+ const list = menu_item.querySelector(".children")
43
+
44
+ ajax("PATCH", url)
45
+ .then(() => {
46
+ list.classList.toggle("folded")
47
+ menu_item.dataset.folded =
48
+ menu_item.dataset.folded == "true" ? "false" : "true"
49
+ displayNodeFolders()
50
+ })
51
+ .catch((error) => {
52
+ Alchemy.growl(error.message || error)
53
+ })
54
+ })
55
+ }
56
+
57
+ export default function NodeTree() {
58
+ handleNodeFolders()
59
+ displayNodeFolders()
60
+
61
+ document.querySelectorAll(".nodes_tree ul.children").forEach((el) => {
62
+ new Sortable(el, {
63
+ group: "nodes",
64
+ animation: 150,
65
+ fallbackOnBody: true,
66
+ swapThreshold: 0.65,
67
+ handle: ".node_name",
68
+ invertSwap: true,
69
+ onEnd: onFinishDragging
70
+ })
71
+ })
72
+ }
@@ -0,0 +1,32 @@
1
+ const translations = {
2
+ en: {
3
+ allowed_chars: "of %{count} chars",
4
+ cancel: "Cancel",
5
+ cancelled: "Cancelled",
6
+ click_to_edit: "click to edit",
7
+ complete: "Complete",
8
+ element_dirty_notice:
9
+ "This element has unsaved changes. Do you really want to fold it?",
10
+ help: "Help",
11
+ ok: "Ok",
12
+ page_dirty_notice:
13
+ "You have unsaved changes on this page. They will be lost if you continue.",
14
+ page_found: "Page found",
15
+ pages_found: "Pages found",
16
+ url_validation_failed: "The url has no valid format.",
17
+ warning: "Warning!",
18
+ "File is too large": "File is too large",
19
+ "File is too small": "File is too small",
20
+ "File type not allowed": "File type not allowed",
21
+ "Maximum number of files exceeded": "Maximum number of files exceeded.",
22
+ "Uploaded bytes exceed file size": "Uploaded bytes exceed file size",
23
+ formats: {
24
+ datetime: "Y-m-d H:i",
25
+ date: "Y-m-d",
26
+ time: "H:i",
27
+ time_24hr: false
28
+ }
29
+ }
30
+ }
31
+
32
+ export default translations
@@ -0,0 +1,124 @@
1
+ import xhrMock from "xhr-mock"
2
+ import ajax from "../ajax"
3
+
4
+ const token = "s3cr3t"
5
+
6
+ beforeEach(() => {
7
+ document.head.innerHTML = `<meta name="csrf-token" content="${token}">`
8
+ xhrMock.setup()
9
+ })
10
+
11
+ describe("ajax('get')", () => {
12
+ it("sends X-CSRF-TOKEN header", async () => {
13
+ xhrMock.get("/users", (req, res) => {
14
+ expect(req.header("X-CSRF-TOKEN")).toEqual(token)
15
+ return res.status(200).body('{"message":"Ok"}')
16
+ })
17
+ await ajax("get", "/users")
18
+ })
19
+
20
+ it("sends Content-Type header", async () => {
21
+ xhrMock.get("/users", (req, res) => {
22
+ expect(req.header("Content-Type")).toEqual(
23
+ "application/json; charset=utf-8"
24
+ )
25
+ return res.status(200).body('{"message":"Ok"}')
26
+ })
27
+ await ajax("get", "/users")
28
+ })
29
+
30
+ it("sends Accept header", async () => {
31
+ xhrMock.get("/users", (req, res) => {
32
+ expect(req.header("Accept")).toEqual("application/json")
33
+ return res.status(200).body('{"message":"Ok"}')
34
+ })
35
+ await ajax("get", "/users")
36
+ })
37
+
38
+ it("returns JSON", async () => {
39
+ xhrMock.get("/users", (_req, res) => {
40
+ return res.status(200).body('{"email":"mail@example.com"}')
41
+ })
42
+ await ajax("get", "/users").then((res) => {
43
+ expect(res.data).toEqual({ email: "mail@example.com" })
44
+ })
45
+ })
46
+
47
+ it("JSON parse errors get rejected", async () => {
48
+ xhrMock.get("/users", (_req, res) => {
49
+ return res.status(200).body('email => "mail@example.com"')
50
+ })
51
+ expect.assertions(1)
52
+ await ajax("get", "/users").catch((e) => {
53
+ expect(e.message).toMatch("Unexpected token")
54
+ })
55
+ })
56
+
57
+ it("network errors get rejected", async () => {
58
+ xhrMock.get("/users", () => {
59
+ return Promise.reject(new Error())
60
+ })
61
+ expect.assertions(1)
62
+ await ajax("get", "/users").catch((e) => {
63
+ expect(e.message).toEqual("An error occurred during the transaction")
64
+ })
65
+ })
66
+
67
+ it("server errors get rejected", async () => {
68
+ xhrMock.get("/users", (_req, res) => {
69
+ return res.status(401).body('{"error":"Unauthorized"}')
70
+ })
71
+ expect.assertions(1)
72
+ await ajax("get", "/users").catch((e) => {
73
+ expect(e.error).toEqual("Unauthorized")
74
+ })
75
+ })
76
+
77
+ it("server errors parsing errors get rejected", async () => {
78
+ xhrMock.get("/users", (_req, res) => {
79
+ return res.status(401).body("Unauthorized")
80
+ })
81
+ expect.assertions(1)
82
+ await ajax("get", "/users").catch((e) => {
83
+ expect(e.message).toMatch("Unexpected token")
84
+ })
85
+ })
86
+ })
87
+
88
+ describe("ajax('post')", () => {
89
+ it("sends X-CSRF-TOKEN header", async () => {
90
+ xhrMock.post("/users", (req, res) => {
91
+ expect(req.header("X-CSRF-TOKEN")).toEqual(token)
92
+ return res.status(200).body('{"message":"Ok"}')
93
+ })
94
+ await ajax("post", "/users")
95
+ })
96
+
97
+ it("sends Content-Type header", async () => {
98
+ xhrMock.post("/users", (req, res) => {
99
+ expect(req.header("Content-Type")).toEqual(
100
+ "application/json; charset=utf-8"
101
+ )
102
+ return res.status(200).body('{"message":"Ok"}')
103
+ })
104
+ await ajax("post", "/users")
105
+ })
106
+
107
+ it("sends Accept header", async () => {
108
+ xhrMock.post("/users", (req, res) => {
109
+ expect(req.header("Accept")).toEqual("application/json")
110
+ return res.status(200).body('{"message":"Ok"}')
111
+ })
112
+ await ajax("post", "/users")
113
+ })
114
+
115
+ it("sends JSON data", async () => {
116
+ xhrMock.post("/users", (req, res) => {
117
+ expect(req.body()).toEqual('{"email":"mail@example.com"}')
118
+ return res.status(200).body('{"message":"Ok"}')
119
+ })
120
+ await ajax("post", "/users", { email: "mail@example.com" })
121
+ })
122
+ })
123
+
124
+ afterEach(() => xhrMock.teardown())
@@ -0,0 +1,38 @@
1
+ import { on } from "../events"
2
+
3
+ describe("on", () => {
4
+ const callback = jest.fn()
5
+
6
+ beforeEach(() => {
7
+ document.body.innerHTML = `
8
+ <ul class="list">
9
+ <li class="first item"><span>One</span></li>
10
+ <li class="second item">Two</li>
11
+ </ul>
12
+ `
13
+ })
14
+
15
+ it("adds event listener to base node", () => {
16
+ const baseNode = document.querySelector(".list")
17
+ const spy = jest.spyOn(baseNode, "addEventListener")
18
+ on("click", ".list", ".item", callback)
19
+ expect(spy).toHaveBeenCalledWith("click", expect.any(Function))
20
+ spy.mockReset()
21
+ })
22
+
23
+ it("event triggered on matching child node calls callback", () => {
24
+ const childNode = document.querySelector(".first.item")
25
+ on("click", ".list", ".item", callback)
26
+ childNode.click()
27
+ expect(callback).toHaveBeenCalledWith(expect.any(MouseEvent))
28
+ })
29
+
30
+ it("event triggered on child of registered target still calls callback", () => {
31
+ const child = document.querySelector(".first.item span")
32
+ on("click", ".list", ".item", callback)
33
+ child.click()
34
+ expect(callback).toHaveBeenCalledWith(expect.any(MouseEvent))
35
+ })
36
+
37
+ afterEach(() => callback.mockReset())
38
+ })