alchemy_cms 6.1.5 → 7.0.0.pre.b

Sign up to get free protection for your applications and to get access to all the features.
Files changed (363) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/brakeman-analysis.yml +2 -2
  3. data/.github/workflows/ci.yml +7 -10
  4. data/.github/workflows/lint.yml +17 -0
  5. data/.gitignore +1 -6
  6. data/.hound.yml +2 -3
  7. data/.rubocop.yml +4 -350
  8. data/.standard.yml +3 -0
  9. data/CHANGELOG.md +49 -19
  10. data/Gemfile +4 -2
  11. data/README.md +7 -9
  12. data/Rakefile +12 -7
  13. data/alchemy_cms.gemspec +3 -3
  14. data/app/assets/javascripts/alchemy/admin.js +0 -1
  15. data/app/assets/javascripts/alchemy/alchemy.dirty.js.coffee +1 -1
  16. data/app/assets/javascripts/alchemy/alchemy.element_editors.js.coffee +18 -32
  17. data/app/assets/javascripts/alchemy/alchemy.elements_window.js.coffee +2 -2
  18. data/app/assets/javascripts/alchemy/alchemy.gui.js.coffee +2 -2
  19. data/app/assets/javascripts/alchemy/alchemy.link_dialog.js.coffee +33 -30
  20. data/app/assets/stylesheets/alchemy/elements.scss +16 -35
  21. data/app/assets/stylesheets/alchemy/forms.scss +0 -4
  22. data/app/assets/stylesheets/alchemy/node-select.scss +2 -2
  23. data/app/components/alchemy/ingredients/audio_view.rb +37 -0
  24. data/app/components/alchemy/ingredients/base_view.rb +38 -0
  25. data/app/components/alchemy/ingredients/boolean_view.rb +13 -0
  26. data/app/components/alchemy/ingredients/datetime_view.rb +22 -0
  27. data/app/components/alchemy/ingredients/file_view.rb +40 -0
  28. data/app/components/alchemy/ingredients/headline_view.rb +20 -0
  29. data/app/components/alchemy/ingredients/html_view.rb +9 -0
  30. data/app/components/alchemy/ingredients/link_view.rb +25 -0
  31. data/app/components/alchemy/ingredients/node_view.rb +11 -0
  32. data/app/components/alchemy/ingredients/page_view.rb +15 -0
  33. data/app/components/alchemy/ingredients/picture_view.rb +108 -0
  34. data/app/components/alchemy/ingredients/richtext_view.rb +22 -0
  35. data/app/components/alchemy/ingredients/select_view.rb +6 -0
  36. data/app/components/alchemy/ingredients/text_view.rb +41 -0
  37. data/app/components/alchemy/ingredients/video_view.rb +39 -0
  38. data/app/controllers/alchemy/admin/attachments_controller.rb +3 -4
  39. data/app/controllers/alchemy/admin/base_controller.rb +7 -7
  40. data/app/controllers/alchemy/admin/clipboard_controller.rb +2 -2
  41. data/app/controllers/alchemy/admin/elements_controller.rb +33 -43
  42. data/app/controllers/alchemy/admin/languages_controller.rb +1 -1
  43. data/app/controllers/alchemy/admin/nodes_controller.rb +2 -2
  44. data/app/controllers/alchemy/admin/pages_controller.rb +11 -11
  45. data/app/controllers/alchemy/admin/pictures_controller.rb +15 -15
  46. data/app/controllers/alchemy/admin/resources_controller.rb +28 -46
  47. data/app/controllers/alchemy/admin/styleguide_controller.rb +1 -0
  48. data/app/controllers/alchemy/admin/tags_controller.rb +11 -11
  49. data/app/controllers/alchemy/api/base_controller.rb +2 -2
  50. data/app/controllers/alchemy/api/elements_controller.rb +11 -13
  51. data/app/controllers/alchemy/api/ingredients_controller.rb +1 -1
  52. data/app/controllers/alchemy/api/nodes_controller.rb +1 -1
  53. data/app/controllers/alchemy/api/pages_controller.rb +14 -12
  54. data/app/controllers/alchemy/attachments_controller.rb +3 -3
  55. data/app/controllers/alchemy/base_controller.rb +1 -1
  56. data/app/controllers/alchemy/messages_controller.rb +18 -18
  57. data/app/controllers/alchemy/pages_controller.rb +10 -16
  58. data/app/controllers/concerns/alchemy/admin/archive_overlay.rb +1 -0
  59. data/app/controllers/concerns/alchemy/admin/uploader_responses.rb +5 -7
  60. data/app/controllers/concerns/alchemy/legacy_page_redirects.rb +5 -5
  61. data/app/decorators/alchemy/element_editor.rb +13 -33
  62. data/app/decorators/alchemy/ingredient_editor.rb +6 -6
  63. data/app/helpers/alchemy/admin/attachments_helper.rb +1 -1
  64. data/app/helpers/alchemy/admin/base_helper.rb +21 -22
  65. data/app/helpers/alchemy/admin/elements_helper.rb +1 -3
  66. data/app/helpers/alchemy/admin/form_helper.rb +1 -1
  67. data/app/helpers/alchemy/admin/navigation_helper.rb +7 -7
  68. data/app/helpers/alchemy/admin/pages_helper.rb +2 -2
  69. data/app/helpers/alchemy/admin/tags_helper.rb +3 -3
  70. data/app/helpers/alchemy/base_helper.rb +2 -2
  71. data/app/helpers/alchemy/elements_block_helper.rb +13 -48
  72. data/app/helpers/alchemy/elements_helper.rb +15 -23
  73. data/app/helpers/alchemy/pages_helper.rb +11 -15
  74. data/app/helpers/alchemy/url_helper.rb +1 -1
  75. data/app/mailers/alchemy/messages_mailer.rb +1 -1
  76. data/app/models/alchemy/attachment.rb +12 -9
  77. data/app/models/alchemy/base_record.rb +3 -0
  78. data/app/models/alchemy/eager_loading.rb +6 -7
  79. data/app/models/alchemy/element/definitions.rb +1 -1
  80. data/app/models/alchemy/element/element_ingredients.rb +4 -11
  81. data/app/models/alchemy/element/presenters.rb +9 -25
  82. data/app/models/alchemy/element.rb +4 -19
  83. data/app/models/alchemy/elements_repository.rb +1 -1
  84. data/app/models/alchemy/image_cropper_settings.rb +2 -2
  85. data/app/models/alchemy/ingredient.rb +29 -16
  86. data/app/models/alchemy/ingredient_validator.rb +1 -1
  87. data/app/models/alchemy/ingredients/audio.rb +2 -0
  88. data/app/models/alchemy/ingredients/datetime.rb +3 -1
  89. data/app/models/alchemy/ingredients/file.rb +7 -0
  90. data/app/models/alchemy/ingredients/headline.rb +6 -0
  91. data/app/models/alchemy/ingredients/link.rb +2 -0
  92. data/app/models/alchemy/ingredients/node.rb +2 -0
  93. data/app/models/alchemy/ingredients/page.rb +2 -0
  94. data/app/models/alchemy/ingredients/picture.rb +29 -0
  95. data/app/models/alchemy/ingredients/richtext.rb +17 -8
  96. data/app/models/alchemy/ingredients/select.rb +1 -0
  97. data/app/models/alchemy/ingredients/text.rb +8 -0
  98. data/app/models/alchemy/ingredients/video.rb +2 -0
  99. data/app/models/alchemy/language/code.rb +1 -1
  100. data/app/models/alchemy/language.rb +4 -4
  101. data/app/models/alchemy/legacy_page_url.rb +1 -1
  102. data/app/models/alchemy/node.rb +11 -8
  103. data/app/models/alchemy/page/page_elements.rb +19 -40
  104. data/app/models/alchemy/page/page_layouts.rb +0 -14
  105. data/app/models/alchemy/page/page_naming.rb +4 -4
  106. data/app/models/alchemy/page/page_natures.rb +1 -11
  107. data/app/models/alchemy/page/page_scopes.rb +5 -5
  108. data/app/models/alchemy/page.rb +11 -19
  109. data/app/models/alchemy/picture/calculations.rb +2 -2
  110. data/app/models/alchemy/picture/transformations.rb +2 -32
  111. data/app/models/alchemy/picture/url.rb +5 -5
  112. data/app/models/alchemy/picture.rb +22 -20
  113. data/app/models/alchemy/picture_thumb/create.rb +7 -18
  114. data/app/models/alchemy/picture_thumb/file_store.rb +33 -0
  115. data/app/models/alchemy/picture_thumb.rb +11 -11
  116. data/app/models/alchemy/picture_variant.rb +2 -3
  117. data/app/models/alchemy/tag.rb +8 -0
  118. data/app/models/concerns/alchemy/picture_thumbnails.rb +8 -8
  119. data/app/serializers/alchemy/base_serializer.rb +1 -1
  120. data/app/serializers/alchemy/element_serializer.rb +1 -6
  121. data/app/serializers/alchemy/page_tree_serializer.rb +7 -7
  122. data/app/services/alchemy/delete_elements.rb +1 -7
  123. data/app/services/alchemy/duplicate_element.rb +2 -7
  124. data/app/services/alchemy/tag_validations.rb +1 -1
  125. data/app/views/alchemy/admin/elements/_element.html.erb +8 -22
  126. data/app/views/alchemy/admin/elements/create.js.erb +1 -1
  127. data/app/views/alchemy/admin/elements/fold.js.erb +2 -2
  128. data/app/views/alchemy/admin/elements/order.js.erb +1 -1
  129. data/app/views/alchemy/admin/elements/update.js.erb +1 -2
  130. data/app/views/alchemy/admin/pages/_external_link.html.erb +2 -2
  131. data/app/views/alchemy/admin/pages/_file_link.html.erb +2 -2
  132. data/app/views/alchemy/admin/pages/_internal_link.html.erb +2 -2
  133. data/app/views/alchemy/admin/pages/edit.html.erb +1 -4
  134. data/app/views/alchemy/admin/pages/update.js.erb +10 -4
  135. data/app/views/alchemy/admin/pictures/_filter_and_size_bar.html.erb +1 -3
  136. data/app/views/alchemy/admin/pictures/_infos.html.erb +4 -6
  137. data/app/views/alchemy/ingredients/_audio_view.html.erb +1 -14
  138. data/app/views/alchemy/ingredients/_boolean_editor.html.erb +1 -1
  139. data/app/views/alchemy/ingredients/_boolean_view.html.erb +1 -1
  140. data/app/views/alchemy/ingredients/_datetime_view.html.erb +3 -9
  141. data/app/views/alchemy/ingredients/_file_view.html.erb +3 -16
  142. data/app/views/alchemy/ingredients/_headline_editor.html.erb +1 -1
  143. data/app/views/alchemy/ingredients/_headline_view.html.erb +4 -10
  144. data/app/views/alchemy/ingredients/_html_editor.html.erb +1 -1
  145. data/app/views/alchemy/ingredients/_html_view.html.erb +1 -1
  146. data/app/views/alchemy/ingredients/_link_view.html.erb +4 -9
  147. data/app/views/alchemy/ingredients/_node_editor.html.erb +1 -1
  148. data/app/views/alchemy/ingredients/_node_view.html.erb +1 -1
  149. data/app/views/alchemy/ingredients/_page_view.html.erb +1 -4
  150. data/app/views/alchemy/ingredients/_picture_editor.html.erb +4 -4
  151. data/app/views/alchemy/ingredients/_picture_view.html.erb +4 -5
  152. data/app/views/alchemy/ingredients/_richtext_editor.html.erb +11 -2
  153. data/app/views/alchemy/ingredients/_richtext_view.html.erb +3 -3
  154. data/app/views/alchemy/ingredients/_select_editor.html.erb +2 -2
  155. data/app/views/alchemy/ingredients/_select_view.html.erb +1 -1
  156. data/app/views/alchemy/ingredients/_text_editor.html.erb +1 -1
  157. data/app/views/alchemy/ingredients/_text_view.html.erb +3 -19
  158. data/app/views/alchemy/ingredients/_video_view.html.erb +3 -18
  159. data/app/views/alchemy/ingredients/shared/_link_tools.html.erb +4 -3
  160. data/app/views/alchemy/ingredients/shared/_picture_tools.html.erb +1 -0
  161. data/app/views/alchemy/pages/_meta_data.html.erb +0 -1
  162. data/app/views/layouts/alchemy/admin.html.erb +10 -8
  163. data/bin/setup +37 -0
  164. data/bin/start +17 -0
  165. data/config/alchemy/config.yml +6 -6
  166. data/config/brakeman.ignore +56 -57
  167. data/config/initializers/assets.rb +1 -0
  168. data/config/initializers/dragonfly.rb +1 -0
  169. data/config/initializers/mime_types.rb +1 -0
  170. data/config/initializers/mini_profiler.rb +1 -0
  171. data/config/initializers/simple_form.rb +3 -2
  172. data/config/locales/alchemy.en.yml +98 -112
  173. data/config/routes.rb +22 -36
  174. data/config/spring.rb +1 -0
  175. data/db/migrate/20230121212637_alchemy_six_point_one.rb +248 -0
  176. data/db/migrate/20230505132743_add_indexes_to_alchemy_pictures.rb +6 -0
  177. data/lib/alchemy/admin/locale.rb +3 -3
  178. data/lib/alchemy/admin/preview_url.rb +2 -2
  179. data/lib/alchemy/auth_accessors.rb +1 -1
  180. data/lib/alchemy/cache_digests/template_tracker.rb +6 -7
  181. data/lib/alchemy/config.rb +3 -3
  182. data/lib/alchemy/controller_actions.rb +4 -4
  183. data/lib/alchemy/deprecation.rb +2 -1
  184. data/lib/alchemy/dragonfly/processors/thumbnail.rb +1 -1
  185. data/lib/alchemy/element_definition.rb +2 -2
  186. data/lib/alchemy/engine.rb +2 -1
  187. data/lib/alchemy/errors.rb +0 -11
  188. data/lib/alchemy/filetypes.rb +7 -7
  189. data/lib/alchemy/forms/builder.rb +4 -4
  190. data/lib/alchemy/hints.rb +10 -10
  191. data/lib/alchemy/i18n.rb +6 -4
  192. data/lib/alchemy/install/tasks.rb +2 -1
  193. data/lib/alchemy/name_conversions.rb +1 -1
  194. data/lib/alchemy/page_layout.rb +1 -1
  195. data/lib/alchemy/permissions.rb +5 -17
  196. data/lib/alchemy/resource.rb +10 -10
  197. data/lib/alchemy/resources_helper.rb +7 -7
  198. data/lib/alchemy/routing_constraints.rb +5 -5
  199. data/lib/alchemy/searchable_resource.rb +38 -0
  200. data/lib/alchemy/seeder.rb +4 -3
  201. data/lib/alchemy/shell.rb +2 -1
  202. data/lib/alchemy/taggable.rb +3 -2
  203. data/lib/alchemy/tasks/tidy.rb +1 -38
  204. data/lib/alchemy/test_support/capybara_helpers.rb +69 -0
  205. data/lib/alchemy/test_support/config_stubbing.rb +1 -0
  206. data/lib/alchemy/test_support/factories/element_factory.rb +2 -4
  207. data/lib/alchemy/test_support/factories/ingredient_factory.rb +1 -1
  208. data/lib/alchemy/test_support/factories/page_factory.rb +5 -3
  209. data/lib/alchemy/test_support/having_crop_action_examples.rb +9 -9
  210. data/lib/alchemy/test_support/having_picture_thumbnails_examples.rb +33 -33
  211. data/lib/alchemy/test_support/integration_helpers.rb +4 -3
  212. data/lib/alchemy/test_support/shared_contexts.rb +2 -1
  213. data/lib/alchemy/test_support/shared_dom_ids_examples.rb +10 -10
  214. data/lib/alchemy/test_support/shared_ingredient_examples.rb +13 -7
  215. data/lib/alchemy/test_support/shared_uploader_examples.rb +1 -0
  216. data/lib/alchemy/tinymce.rb +3 -43
  217. data/lib/alchemy/upgrader/seven_point_zero.rb +45 -0
  218. data/lib/alchemy/upgrader/tasks/.keep +0 -0
  219. data/lib/alchemy/upgrader.rb +9 -3
  220. data/lib/alchemy/version.rb +1 -1
  221. data/lib/alchemy.rb +0 -19
  222. data/lib/alchemy_cms.rb +2 -2
  223. data/lib/generators/alchemy/base.rb +3 -2
  224. data/lib/generators/alchemy/elements/elements_generator.rb +2 -2
  225. data/lib/generators/alchemy/elements/templates/view.html.erb +1 -10
  226. data/lib/generators/alchemy/elements/templates/view.html.haml +1 -9
  227. data/lib/generators/alchemy/elements/templates/view.html.slim +1 -9
  228. data/lib/generators/alchemy/ingredient/ingredient_generator.rb +1 -0
  229. data/lib/generators/alchemy/install/files/alchemy.en.yml +7 -8
  230. data/lib/generators/alchemy/install/files/application.html.erb +1 -1
  231. data/lib/generators/alchemy/install/install_generator.rb +20 -23
  232. data/lib/generators/alchemy/install/templates/elements.yml.tt +12 -12
  233. data/lib/generators/alchemy/module/module_generator.rb +1 -0
  234. data/lib/generators/alchemy/page_layouts/page_layouts_generator.rb +1 -0
  235. data/lib/generators/alchemy/site_layouts/site_layouts_generator.rb +1 -0
  236. data/lib/generators/alchemy/views/views_generator.rb +2 -1
  237. data/lib/tasks/alchemy/thumbnails.rake +6 -25
  238. data/lib/tasks/alchemy/tidy.rake +2 -12
  239. data/lib/tasks/alchemy/upgrade.rake +13 -49
  240. data/package/admin.js +2 -0
  241. data/package/dist/admin.js +16 -0
  242. data/package/dist/admin.js.map +7 -0
  243. data/package/src/datepicker.js +1 -0
  244. data/package/src/tinymce.js +142 -0
  245. data/package.json +5 -3
  246. metadata +41 -135
  247. data/app/assets/javascripts/alchemy/alchemy.tinymce.js.coffee +0 -93
  248. data/app/controllers/alchemy/admin/contents_controller.rb +0 -21
  249. data/app/controllers/alchemy/admin/essence_audios_controller.rb +0 -30
  250. data/app/controllers/alchemy/admin/essence_files_controller.rb +0 -31
  251. data/app/controllers/alchemy/admin/essence_pictures_controller.rb +0 -43
  252. data/app/controllers/alchemy/admin/essence_videos_controller.rb +0 -34
  253. data/app/controllers/alchemy/api/contents_controller.rb +0 -52
  254. data/app/decorators/alchemy/content_editor.rb +0 -119
  255. data/app/helpers/alchemy/admin/contents_helper.rb +0 -42
  256. data/app/helpers/alchemy/admin/essences_helper.rb +0 -31
  257. data/app/models/alchemy/content/factory.rb +0 -143
  258. data/app/models/alchemy/content.rb +0 -247
  259. data/app/models/alchemy/element/element_contents.rb +0 -200
  260. data/app/models/alchemy/element/element_essences.rb +0 -133
  261. data/app/models/alchemy/essence_audio.rb +0 -13
  262. data/app/models/alchemy/essence_boolean.rb +0 -20
  263. data/app/models/alchemy/essence_date.rb +0 -25
  264. data/app/models/alchemy/essence_file.rb +0 -49
  265. data/app/models/alchemy/essence_headline.rb +0 -41
  266. data/app/models/alchemy/essence_html.rb +0 -23
  267. data/app/models/alchemy/essence_link.rb +0 -21
  268. data/app/models/alchemy/essence_node.rb +0 -19
  269. data/app/models/alchemy/essence_page.rb +0 -17
  270. data/app/models/alchemy/essence_picture.rb +0 -67
  271. data/app/models/alchemy/essence_picture_view.rb +0 -90
  272. data/app/models/alchemy/essence_richtext.rb +0 -44
  273. data/app/models/alchemy/essence_select.rb +0 -19
  274. data/app/models/alchemy/essence_text.rb +0 -23
  275. data/app/models/alchemy/essence_video.rb +0 -13
  276. data/app/presenters/alchemy/picture_view.rb +0 -88
  277. data/app/serializers/alchemy/content_serializer.rb +0 -17
  278. data/app/serializers/alchemy/essence_boolean_serializer.rb +0 -10
  279. data/app/serializers/alchemy/essence_date_serializer.rb +0 -10
  280. data/app/serializers/alchemy/essence_file_serializer.rb +0 -13
  281. data/app/serializers/alchemy/essence_html_serializer.rb +0 -10
  282. data/app/serializers/alchemy/essence_link_serializer.rb +0 -13
  283. data/app/serializers/alchemy/essence_picture_serializer.rb +0 -28
  284. data/app/serializers/alchemy/essence_richtext_serializer.rb +0 -11
  285. data/app/serializers/alchemy/essence_select_serializer.rb +0 -10
  286. data/app/serializers/alchemy/essence_text_serializer.rb +0 -22
  287. data/app/views/alchemy/admin/contents/create.js.erb +0 -21
  288. data/app/views/alchemy/admin/essence_audios/edit.html.erb +0 -7
  289. data/app/views/alchemy/admin/essence_files/edit.html.erb +0 -21
  290. data/app/views/alchemy/admin/essence_pictures/destroy.js.erb +0 -5
  291. data/app/views/alchemy/admin/essence_pictures/edit.html.erb +0 -30
  292. data/app/views/alchemy/admin/essence_pictures/save_link.js.erb +0 -3
  293. data/app/views/alchemy/admin/essence_pictures/update.js.erb +0 -8
  294. data/app/views/alchemy/admin/essence_videos/edit.html.erb +0 -12
  295. data/app/views/alchemy/admin/pages/_tinymce_custom_config.html.erb +0 -13
  296. data/app/views/alchemy/essences/_essence_audio_editor.html.erb +0 -4
  297. data/app/views/alchemy/essences/_essence_audio_view.html.erb +0 -15
  298. data/app/views/alchemy/essences/_essence_boolean_editor.html.erb +0 -11
  299. data/app/views/alchemy/essences/_essence_boolean_view.html.erb +0 -2
  300. data/app/views/alchemy/essences/_essence_date_editor.html.erb +0 -16
  301. data/app/views/alchemy/essences/_essence_date_view.html.erb +0 -10
  302. data/app/views/alchemy/essences/_essence_file_editor.html.erb +0 -54
  303. data/app/views/alchemy/essences/_essence_file_view.html.erb +0 -18
  304. data/app/views/alchemy/essences/_essence_headline_editor.html.erb +0 -36
  305. data/app/views/alchemy/essences/_essence_headline_view.html.erb +0 -10
  306. data/app/views/alchemy/essences/_essence_html_editor.html.erb +0 -10
  307. data/app/views/alchemy/essences/_essence_html_view.html.erb +0 -2
  308. data/app/views/alchemy/essences/_essence_link_editor.html.erb +0 -30
  309. data/app/views/alchemy/essences/_essence_link_view.html.erb +0 -10
  310. data/app/views/alchemy/essences/_essence_node_editor.html.erb +0 -27
  311. data/app/views/alchemy/essences/_essence_node_view.html.erb +0 -1
  312. data/app/views/alchemy/essences/_essence_page_editor.html.erb +0 -26
  313. data/app/views/alchemy/essences/_essence_page_view.html.erb +0 -5
  314. data/app/views/alchemy/essences/_essence_picture_editor.html.erb +0 -59
  315. data/app/views/alchemy/essences/_essence_picture_view.html.erb +0 -6
  316. data/app/views/alchemy/essences/_essence_richtext_editor.html.erb +0 -14
  317. data/app/views/alchemy/essences/_essence_richtext_view.html.erb +0 -4
  318. data/app/views/alchemy/essences/_essence_select_editor.html.erb +0 -28
  319. data/app/views/alchemy/essences/_essence_select_view.html.erb +0 -2
  320. data/app/views/alchemy/essences/_essence_text_editor.html.erb +0 -29
  321. data/app/views/alchemy/essences/_essence_text_view.html.erb +0 -17
  322. data/app/views/alchemy/essences/_essence_video_editor.html.erb +0 -4
  323. data/app/views/alchemy/essences/_essence_video_view.html.erb +0 -19
  324. data/app/views/alchemy/essences/shared/_essence_picture_tools.html.erb +0 -59
  325. data/app/views/alchemy/essences/shared/_linkable_essence_tools.html.erb +0 -20
  326. data/app/views/alchemy/pages/show.rss.builder +0 -21
  327. data/db/migrate/20200226213334_alchemy_four_point_four.rb +0 -313
  328. data/db/migrate/20200423073425_create_alchemy_essence_nodes.rb +0 -11
  329. data/db/migrate/20200504210159_remove_site_id_from_nodes.rb +0 -28
  330. data/db/migrate/20200505215518_add_language_id_foreign_key_to_alchemy_pages.rb +0 -8
  331. data/db/migrate/20200511113603_add_menu_type_to_alchemy_nodes.rb +0 -27
  332. data/db/migrate/20200514091507_make_page_layoutpage_null_false.rb +0 -6
  333. data/db/migrate/20200519073500_remove_visible_from_alchemy_pages.rb +0 -24
  334. data/db/migrate/20200617110713_create_alchemy_picture_thumbs.rb +0 -22
  335. data/db/migrate/20200907111332_remove_tri_state_booleans.rb +0 -33
  336. data/db/migrate/20201207131309_create_page_versions.rb +0 -19
  337. data/db/migrate/20201207135820_add_page_version_id_to_alchemy_elements.rb +0 -76
  338. data/db/migrate/20210205143548_rename_public_on_and_public_until_on_alchemy_pages.rb +0 -10
  339. data/db/migrate/20210326105046_add_sanitized_body_to_alchemy_essence_richtexts.rb +0 -7
  340. data/db/migrate/20210406093436_add_alchemy_essence_headlines.rb +0 -12
  341. data/db/migrate/20210506135919_create_essence_audios.rb +0 -19
  342. data/db/migrate/20210506140258_create_essence_videos.rb +0 -23
  343. data/db/migrate/20210508091432_create_alchemy_ingredients.rb +0 -22
  344. data/db/migrate/20220514072456_restrict_on_delete_page_id_foreign_key_from_alchemy_nodes.rb +0 -13
  345. data/db/migrate/20220622130905_add_playsinline_to_alchemy_essence_videos.rb +0 -9
  346. data/lib/alchemy/essence.rb +0 -250
  347. data/lib/alchemy/test_support/essence_shared_examples.rb +0 -271
  348. data/lib/alchemy/test_support/factories/content_factory.rb +0 -20
  349. data/lib/alchemy/test_support/factories/essence_audio_factory.rb +0 -7
  350. data/lib/alchemy/test_support/factories/essence_file_factory.rb +0 -7
  351. data/lib/alchemy/test_support/factories/essence_page_factory.rb +0 -7
  352. data/lib/alchemy/test_support/factories/essence_picture_factory.rb +0 -11
  353. data/lib/alchemy/test_support/factories/essence_text_factory.rb +0 -7
  354. data/lib/alchemy/test_support/factories/essence_video_factory.rb +0 -7
  355. data/lib/alchemy/upgrader/five_point_zero.rb +0 -41
  356. data/lib/alchemy/upgrader/six_point_zero.rb +0 -21
  357. data/lib/alchemy/upgrader/tasks/add_page_versions.rb +0 -33
  358. data/lib/alchemy/upgrader/tasks/element_views_updater.rb +0 -34
  359. data/lib/alchemy/upgrader/tasks/harden_gutentag_migrations.rb +0 -29
  360. data/lib/alchemy/upgrader/tasks/ingredients_migrator.rb +0 -74
  361. data/lib/generators/alchemy/essence/essence_generator.rb +0 -49
  362. data/lib/generators/alchemy/essence/templates/editor.html.erb +0 -17
  363. data/lib/generators/alchemy/essence/templates/view.html.erb +0 -2
@@ -0,0 +1,248 @@
1
+ # frozen_string_literal: true
2
+
3
+ class AlchemySixPointOne < ActiveRecord::Migration[ActiveRecord::Migration.current_version]
4
+ def up
5
+ unless table_exists?("alchemy_attachments")
6
+ create_table "alchemy_attachments" do |t|
7
+ t.string "name"
8
+ t.string "file_name"
9
+ t.string "file_mime_type"
10
+ t.integer "file_size"
11
+ t.integer "creator_id"
12
+ t.integer "updater_id"
13
+ t.datetime "created_at", null: false
14
+ t.datetime "updated_at", null: false
15
+ t.string "file_uid"
16
+ t.index ["creator_id"], name: "index_alchemy_attachments_on_creator_id"
17
+ t.index ["file_uid"], name: "index_alchemy_attachments_on_file_uid"
18
+ t.index ["updater_id"], name: "index_alchemy_attachments_on_updater_id"
19
+ end
20
+ end
21
+
22
+ unless table_exists?("alchemy_elements_alchemy_pages")
23
+ create_table "alchemy_elements_alchemy_pages", id: false do |t|
24
+ t.integer "element_id"
25
+ t.integer "page_id"
26
+ t.index ["element_id"], name: "index_alchemy_elements_alchemy_pages_on_element_id"
27
+ t.index ["page_id"], name: "index_alchemy_elements_alchemy_pages_on_page_id"
28
+ end
29
+ end
30
+
31
+ unless table_exists?("alchemy_folded_pages")
32
+ create_table "alchemy_folded_pages" do |t|
33
+ t.integer "page_id", null: false
34
+ t.integer "user_id", null: false
35
+ t.boolean "folded", default: false, null: false
36
+ t.index ["page_id", "user_id"], name: "index_alchemy_folded_pages_on_page_id_and_user_id", unique: true
37
+ end
38
+ end
39
+
40
+ unless table_exists?("alchemy_sites")
41
+ create_table "alchemy_sites" do |t|
42
+ t.string "host"
43
+ t.string "name"
44
+ t.datetime "created_at", null: false
45
+ t.datetime "updated_at", null: false
46
+ t.boolean "public", default: false, null: false
47
+ t.text "aliases"
48
+ t.boolean "redirect_to_primary_host", default: false, null: false
49
+ t.index ["host", "public"], name: "alchemy_sites_public_hosts_idx"
50
+ t.index ["host"], name: "index_alchemy_sites_on_host"
51
+ end
52
+ end
53
+
54
+ unless table_exists?("alchemy_languages")
55
+ create_table "alchemy_languages" do |t|
56
+ t.string "name"
57
+ t.string "language_code"
58
+ t.string "frontpage_name"
59
+ t.string "page_layout", default: "intro"
60
+ t.boolean "public", default: false, null: false
61
+ t.datetime "created_at", null: false
62
+ t.datetime "updated_at", null: false
63
+ t.integer "creator_id"
64
+ t.integer "updater_id"
65
+ t.boolean "default", default: false, null: false
66
+ t.string "country_code", default: "", null: false
67
+ t.references "site", null: false, foreign_key: {to_table: :alchemy_sites}
68
+ t.string "locale"
69
+ t.index ["creator_id"], name: "index_alchemy_languages_on_creator_id"
70
+ t.index ["language_code", "country_code"], name: "index_alchemy_languages_on_language_code_and_country_code"
71
+ t.index ["language_code"], name: "index_alchemy_languages_on_language_code"
72
+ t.index ["updater_id"], name: "index_alchemy_languages_on_updater_id"
73
+ end
74
+ end
75
+
76
+ unless table_exists?("alchemy_legacy_page_urls")
77
+ create_table "alchemy_legacy_page_urls" do |t|
78
+ t.string "urlname", null: false
79
+ t.integer "page_id", null: false
80
+ t.datetime "created_at", null: false
81
+ t.datetime "updated_at", null: false
82
+ t.index ["page_id"], name: "index_alchemy_legacy_page_urls_on_page_id"
83
+ t.index ["urlname"], name: "index_alchemy_legacy_page_urls_on_urlname"
84
+ end
85
+ end
86
+
87
+ unless table_exists?("alchemy_pages")
88
+ create_table "alchemy_pages" do |t|
89
+ t.string "name"
90
+ t.string "urlname"
91
+ t.string "title"
92
+ t.string "language_code"
93
+ t.boolean "language_root", default: false, null: false
94
+ t.string "page_layout"
95
+ t.text "meta_keywords"
96
+ t.text "meta_description"
97
+ t.integer "lft"
98
+ t.integer "rgt"
99
+ t.integer "parent_id"
100
+ t.integer "depth"
101
+ t.integer "locked_by"
102
+ t.boolean "restricted", default: false, null: false
103
+ t.boolean "robot_index", default: true, null: false
104
+ t.boolean "robot_follow", default: true, null: false
105
+ t.boolean "sitemap", default: true, null: false
106
+ t.boolean "layoutpage", default: false, null: false
107
+ t.datetime "created_at", null: false
108
+ t.datetime "updated_at", null: false
109
+ t.integer "creator_id"
110
+ t.integer "updater_id"
111
+ t.references "language", null: false, foreign_key: {to_table: :alchemy_languages}
112
+ t.datetime "published_at", precision: nil
113
+ t.datetime "locked_at", precision: nil
114
+ t.index ["creator_id"], name: "index_alchemy_pages_on_creator_id"
115
+ t.index ["locked_at", "locked_by"], name: "index_alchemy_pages_on_locked_at_and_locked_by"
116
+ t.index ["parent_id", "lft"], name: "index_pages_on_parent_id_and_lft"
117
+ t.index ["rgt"], name: "index_alchemy_pages_on_rgt"
118
+ t.index ["updater_id"], name: "index_alchemy_pages_on_updater_id"
119
+ t.index ["urlname"], name: "index_pages_on_urlname"
120
+ end
121
+ end
122
+
123
+ unless table_exists?("alchemy_page_versions")
124
+ create_table "alchemy_page_versions" do |t|
125
+ t.references "page", null: false, foreign_key: {to_table: :alchemy_pages, on_delete: :cascade}
126
+ t.datetime "public_on", precision: nil
127
+ t.datetime "public_until", precision: nil
128
+ t.datetime "created_at", null: false
129
+ t.datetime "updated_at", null: false
130
+ t.index ["public_on", "public_until"], name: "index_alchemy_page_versions_on_public_on_and_public_until"
131
+ end
132
+ end
133
+
134
+ unless table_exists?("alchemy_elements")
135
+ create_table "alchemy_elements" do |t|
136
+ t.string "name"
137
+ t.integer "position"
138
+ t.boolean "public", default: true, null: false
139
+ t.boolean "folded", default: false, null: false
140
+ t.boolean "unique", default: false, null: false
141
+ t.datetime "created_at", null: false
142
+ t.datetime "updated_at", null: false
143
+ t.integer "creator_id"
144
+ t.integer "updater_id"
145
+ t.integer "parent_element_id"
146
+ t.boolean "fixed", default: false, null: false
147
+ t.references "page_version", null: false, foreign_key: {to_table: :alchemy_page_versions, on_delete: :cascade}
148
+ t.index ["creator_id"], name: "index_alchemy_elements_on_creator_id"
149
+ t.index ["fixed"], name: "index_alchemy_elements_on_fixed"
150
+ t.index ["page_version_id", "parent_element_id"], name: "idx_alchemy_elements_on_page_version_id_and_parent_element_id"
151
+ t.index ["page_version_id", "position"], name: "idx_alchemy_elements_on_page_version_id_and_position"
152
+ t.index ["updater_id"], name: "index_alchemy_elements_on_updater_id"
153
+ end
154
+ end
155
+
156
+ unless table_exists?("alchemy_ingredients")
157
+ create_table "alchemy_ingredients" do |t|
158
+ t.references "element", null: false, foreign_key: {to_table: :alchemy_elements, on_delete: :cascade}
159
+ t.string "type", null: false
160
+ t.string "role", null: false
161
+ t.text "value"
162
+ if ActiveRecord::Migration.connection.adapter_name.match?(/postgres/i)
163
+ t.jsonb :data, default: {}
164
+ else
165
+ t.json :data
166
+ end
167
+ t.string "related_object_type"
168
+ t.integer "related_object_id"
169
+ t.datetime "created_at", null: false
170
+ t.datetime "updated_at", null: false
171
+ t.index ["element_id", "role"], name: "index_alchemy_ingredients_on_element_id_and_role", unique: true
172
+ t.index ["related_object_id", "related_object_type"], name: "idx_alchemy_ingredient_relation"
173
+ t.index ["type"], name: "index_alchemy_ingredients_on_type"
174
+ end
175
+ end
176
+
177
+ unless table_exists?("alchemy_nodes")
178
+ create_table "alchemy_nodes" do |t|
179
+ t.string "name"
180
+ t.string "title"
181
+ t.string "url"
182
+ t.boolean "nofollow", default: false, null: false
183
+ t.boolean "external", default: false, null: false
184
+ t.boolean "folded", default: false, null: false
185
+ t.integer "parent_id"
186
+ t.integer "lft", null: false
187
+ t.integer "rgt", null: false
188
+ t.integer "depth", default: 0, null: false
189
+ t.references "page", foreign_key: {to_table: :alchemy_pages, on_delete: :restrict}
190
+ t.references "language", null: false, foreign_key: {to_table: :alchemy_languages}
191
+ t.integer "creator_id"
192
+ t.integer "updater_id"
193
+ t.datetime "created_at", null: false
194
+ t.datetime "updated_at", null: false
195
+ t.string "menu_type", null: false
196
+ t.index ["creator_id"], name: "index_alchemy_nodes_on_creator_id"
197
+ t.index ["lft"], name: "index_alchemy_nodes_on_lft"
198
+ t.index ["parent_id"], name: "index_alchemy_nodes_on_parent_id"
199
+ t.index ["rgt"], name: "index_alchemy_nodes_on_rgt"
200
+ t.index ["updater_id"], name: "index_alchemy_nodes_on_updater_id"
201
+ end
202
+ end
203
+
204
+ unless table_exists?("alchemy_pictures")
205
+ create_table "alchemy_pictures" do |t|
206
+ t.string "name"
207
+ t.string "image_file_name"
208
+ t.integer "image_file_width"
209
+ t.integer "image_file_height"
210
+ t.datetime "created_at", null: false
211
+ t.datetime "updated_at", null: false
212
+ t.integer "creator_id"
213
+ t.integer "updater_id"
214
+ t.string "upload_hash"
215
+ t.string "image_file_uid"
216
+ t.integer "image_file_size"
217
+ t.string "image_file_format"
218
+ t.index ["creator_id"], name: "index_alchemy_pictures_on_creator_id"
219
+ t.index ["updater_id"], name: "index_alchemy_pictures_on_updater_id"
220
+ end
221
+ end
222
+
223
+ unless table_exists?("alchemy_picture_thumbs")
224
+ create_table "alchemy_picture_thumbs" do |t|
225
+ t.references "picture", null: false, foreign_key: {to_table: :alchemy_pictures}
226
+ t.string "signature", null: false
227
+ t.text "uid", null: false
228
+ t.index ["signature"], name: "index_alchemy_picture_thumbs_on_signature", unique: true
229
+ end
230
+ end
231
+ end
232
+
233
+ def down
234
+ drop_table "alchemy_attachments" if table_exists?("alchemy_attachments")
235
+ drop_table "alchemy_elements" if table_exists?("alchemy_elements")
236
+ drop_table "alchemy_elements_alchemy_pages" if table_exists?("alchemy_elements_alchemy_pages")
237
+ drop_table "alchemy_folded_pages" if table_exists?("alchemy_folded_pages")
238
+ drop_table "alchemy_ingredients" if table_exists?("alchemy_ingredients")
239
+ drop_table "alchemy_languages" if table_exists?("alchemy_languages")
240
+ drop_table "alchemy_legacy_page_urls" if table_exists?("alchemy_legacy_page_urls")
241
+ drop_table "alchemy_nodes" if table_exists?("alchemy_nodes")
242
+ drop_table "alchemy_page_versions" if table_exists?("alchemy_page_versions")
243
+ drop_table "alchemy_pages" if table_exists?("alchemy_pages")
244
+ drop_table "alchemy_picture_thumbs" if table_exists?("alchemy_picture_thumbs")
245
+ drop_table "alchemy_pictures" if table_exists?("alchemy_pictures")
246
+ drop_table "alchemy_sites" if table_exists?("alchemy_sites")
247
+ end
248
+ end
@@ -0,0 +1,6 @@
1
+ class AddIndexesToAlchemyPictures < ActiveRecord::Migration[6.1]
2
+ def change
3
+ add_index :alchemy_pictures, :name, if_not_exists: true
4
+ add_index :alchemy_pictures, :image_file_name, if_not_exists: true
5
+ end
6
+ end
@@ -18,10 +18,10 @@ module Alchemy
18
18
  # It respects the default translation from your +config/application.rb+ +default_locale+ config option.
19
19
  #
20
20
  def set_translation
21
- if locale_change_needed?
22
- locale = available_locale || ::I18n.default_locale
21
+ locale = if locale_change_needed?
22
+ available_locale || ::I18n.default_locale
23
23
  else
24
- locale = session[:alchemy_locale]
24
+ session[:alchemy_locale]
25
25
  end
26
26
  ::I18n.locale = session[:alchemy_locale] = locale
27
27
  end
@@ -48,7 +48,7 @@ module Alchemy
48
48
  port: uri.port,
49
49
  path: page.url_path,
50
50
  userinfo: userinfo,
51
- query: { alchemy_preview_mode: true }.to_param,
51
+ query: {alchemy_preview_mode: true}.to_param
52
52
  ).to_s
53
53
  else
54
54
  routes.admin_page_path(page)
@@ -73,7 +73,7 @@ module Alchemy
73
73
  end
74
74
 
75
75
  def uri_class
76
- if uri.class == URI::Generic
76
+ if uri.instance_of?(URI::Generic)
77
77
  raise MissingProtocolError, "Please provide the protocol with preview['host']"
78
78
  else
79
79
  uri.class
@@ -90,7 +90,7 @@ module Alchemy
90
90
  @@user_class ||= begin
91
91
  @@user_class_name.constantize
92
92
  rescue NameError => e
93
- if e.message =~ /#{Regexp.escape(@@user_class_name)}/
93
+ if /#{Regexp.escape(@@user_class_name)}/.match?(e.message)
94
94
  Rails.logger.warn <<~MSG
95
95
  #{e.message}
96
96
  #{e.backtrace.join("\n")}
@@ -18,11 +18,10 @@ module Alchemy
18
18
  when /^alchemy\/page_layouts\/_(\w+)/
19
19
  page_layout = PageLayout.get($1)
20
20
  layout_elements = page_layout.fetch("elements", [])
21
- layout_elements.map { |name| "alchemy/elements/_#{name}_view" } +
22
- layout_elements.map { |name| "alchemy/elements/_#{name}" }
23
- when /^alchemy\/elements\/_(\w+)_view/, /^alchemy\/elements\/_(\w+)/
24
- essence_types($1).map { |name|
25
- "alchemy/essences/_#{name.underscore}_view"
21
+ layout_elements.map { |name| "alchemy/elements/_#{name}" }
22
+ when /^alchemy\/elements\/_(\w+)/
23
+ ingredient_types($1).map { |type|
24
+ "alchemy/ingredients/_#{type.underscore}_view"
26
25
  }.uniq
27
26
  else
28
27
  ActionView::DependencyTracker::ERBTracker.call(@name, @template)
@@ -31,11 +30,11 @@ module Alchemy
31
30
 
32
31
  private
33
32
 
34
- def essence_types(name)
33
+ def ingredient_types(name)
35
34
  element = Element.definitions.detect { |e| e["name"] == name }
36
35
  return [] unless element
37
36
 
38
- element.fetch("contents", []).collect { |c| c["type"] }
37
+ element.fetch("ingredients", []).collect { |c| c["type"] }
39
38
  end
40
39
  end
41
40
  end
@@ -58,7 +58,7 @@ module Alchemy
58
58
  YAML.safe_load(
59
59
  ERB.new(File.read(file)).result,
60
60
  permitted_classes: YAML_PERMITTED_CLASSES,
61
- aliases: true,
61
+ aliases: true
62
62
  ) || {}
63
63
  rescue Errno::ENOENT
64
64
  {}
@@ -78,11 +78,11 @@ module Alchemy
78
78
  if deprecated_configs.key?(name.to_sym)
79
79
  config = deprecated_configs[name.to_sym]
80
80
  if config.nil?
81
- Alchemy::Deprecation.warn("#{name} configuration is deprecated and will be removed from Alchemy 5.1")
81
+ Alchemy::Deprecation.warn("#{name} configuration is deprecated and will be removed from Alchemy #{Alchemy::Deprecation.deprecation_horizon}")
82
82
  else
83
83
  value = show[name.to_s]
84
84
  if value != config
85
- Alchemy::Deprecation.warn("Setting #{name} configuration to #{value} is deprecated and will be always #{config} in Alchemy 5.1")
85
+ Alchemy::Deprecation.warn("Setting #{name} configuration to #{value} is deprecated and will be always #{config} in Alchemy #{Alchemy::Deprecation.deprecation_horizon}")
86
86
  end
87
87
  end
88
88
  end
@@ -20,7 +20,7 @@ module Alchemy
20
20
 
21
21
  # Returns a host string with the domain the app is running on.
22
22
  def current_server
23
- "#{request.protocol}#{request.host_with_port}"
23
+ "#{request.protocol}#{request.host_with_port}"
24
24
  end
25
25
 
26
26
  # The current authorized user.
@@ -62,11 +62,11 @@ module Alchemy
62
62
  # Try to find and stores current language for Alchemy.
63
63
  #
64
64
  def set_alchemy_language(lang = nil)
65
- if lang
66
- @language = lang.is_a?(Language) ? lang : load_alchemy_language_from_id_or_code(lang)
65
+ @language = if lang
66
+ lang.is_a?(Language) ? lang : load_alchemy_language_from_id_or_code(lang)
67
67
  else
68
68
  # find the best language and remember it for later
69
- @language = load_alchemy_language_from_params ||
69
+ load_alchemy_language_from_params ||
70
70
  load_alchemy_language_from_session ||
71
71
  Language.default
72
72
  end
@@ -1,4 +1,5 @@
1
1
  # frozen_string_literal: true
2
+
2
3
  module Alchemy
3
- Deprecation = ActiveSupport::Deprecation.new("7.0", "Alchemy")
4
+ Deprecation = ActiveSupport::Deprecation.new("8.0", "Alchemy")
4
5
  end
@@ -19,7 +19,7 @@ module Alchemy
19
19
  # resize all frames in a GIF
20
20
  # @link https://imagemagick.org/script/command-line-options.php#coalesce
21
21
  # @link https://imagemagick.org/script/command-line-options.php#deconstruct
22
- @content&.mime_type == "image/gif" ? "-coalesce #{super} -deconstruct" : super
22
+ (@content&.mime_type == "image/gif") ? "-coalesce #{super} -deconstruct" : super
23
23
  end
24
24
  end
25
25
  end
@@ -51,11 +51,11 @@ module Alchemy
51
51
  YAML.safe_load(
52
52
  ERB.new(File.read(definitions_file_path)).result,
53
53
  permitted_classes: YAML_PERMITTED_CLASSES,
54
- aliases: true,
54
+ aliases: true
55
55
  ) || []
56
56
  else
57
57
  raise LoadError,
58
- "Could not find elements.yml file! Please run `rails generate alchemy:install`"
58
+ "Could not find elements.yml file! Please run `rails generate alchemy:install`"
59
59
  end
60
60
  end
61
61
 
@@ -1,4 +1,5 @@
1
1
  # frozen_string_literal: true
2
+
2
3
  module Alchemy
3
4
  class Engine < Rails::Engine
4
5
  isolate_namespace Alchemy
@@ -32,7 +33,7 @@ module Alchemy
32
33
  Ransack.configure do |config|
33
34
  config.custom_arrows = {
34
35
  up_arrow: '<i class="fa fas fa-xs fa-arrow-up"></i>',
35
- down_arrow: '<i class="fa fas fa-xs fa-arrow-down"></i>',
36
+ down_arrow: '<i class="fa fas fa-xs fa-arrow-down"></i>'
36
37
  }
37
38
  end
38
39
  end
@@ -3,10 +3,6 @@
3
3
  # Custom error classes.
4
4
  #
5
5
  module Alchemy
6
- class ContentDefinitionError < StandardError
7
- # Raised if no content definition can be found.
8
- end
9
-
10
6
  class DefaultLanguageNotFoundError < StandardError
11
7
  # Raised if no default language configuration can be found.
12
8
  def message
@@ -34,13 +30,6 @@ module Alchemy
34
30
  end
35
31
  end
36
32
 
37
- class EssenceMissingError < StandardError
38
- # Raised if a content misses its essence.
39
- def message
40
- "Essence not found"
41
- end
42
- end
43
-
44
33
  # Raised if calling +image_file+ on a Picture object returns nil.
45
34
  class MissingImageFileError < StandardError; end
46
35
 
@@ -8,7 +8,7 @@ module Alchemy
8
8
  "audio/mpeg",
9
9
  "audio/mp4",
10
10
  "audio/wav",
11
- "audio/x-wav",
11
+ "audio/x-wav"
12
12
  ]
13
13
 
14
14
  IMAGE_FILE_TYPES = [
@@ -17,7 +17,7 @@ module Alchemy
17
17
  "image/png",
18
18
  "image/svg+xml",
19
19
  "image/tiff",
20
- "image/x-psd",
20
+ "image/x-psd"
21
21
  ]
22
22
 
23
23
  VCARD_FILE_TYPES = ["text/x-vcard", "application/vcard"]
@@ -29,31 +29,31 @@ module Alchemy
29
29
  "video/mpeg",
30
30
  "video/quicktime",
31
31
  "video/x-msvideo",
32
- "video/x-ms-wmv",
32
+ "video/x-ms-wmv"
33
33
  ]
34
34
 
35
35
  TEXT_FILE_TYPES = [
36
36
  "application/rtf",
37
- "text/plain",
37
+ "text/plain"
38
38
  ]
39
39
 
40
40
  EXCEL_FILE_TYPES = [
41
41
  "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
42
42
  "application/vnd.ms-excel",
43
43
  "application/msexcel",
44
- "text/csv",
44
+ "text/csv"
45
45
  ]
46
46
 
47
47
  WORD_FILE_TYPES = [
48
48
  "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
49
49
  "application/vnd.ms-word",
50
- "application/msword",
50
+ "application/msword"
51
51
  ]
52
52
 
53
53
  POWERPOINT_FILE_TYPES = [
54
54
  "application/vnd.openxmlformats-officedocument.presentationml.presentation",
55
55
  "application/vnd.ms-powerpoint",
56
- "application/mspowerpoint",
56
+ "application/mspowerpoint"
57
57
  ]
58
58
  end
59
59
  end
@@ -11,7 +11,7 @@ module Alchemy
11
11
  if object.respond_to?(:attribute_fixed?) && object.attribute_fixed?(attribute_name)
12
12
  options[:disabled] = true
13
13
  options[:input_html] = options.fetch(:input_html, {}).merge(
14
- "data-alchemy-tooltip" => Alchemy.t(:attribute_fixed, attribute: attribute_name),
14
+ "data-alchemy-tooltip" => Alchemy.t(:attribute_fixed, attribute: attribute_name)
15
15
  )
16
16
  end
17
17
 
@@ -31,8 +31,8 @@ module Alchemy
31
31
  input_options = {
32
32
  type: :text,
33
33
  class: type,
34
- data: { datepicker_type: type },
35
- value: date&.iso8601,
34
+ data: {datepicker_type: type},
35
+ value: date&.iso8601
36
36
  }.merge(options[:input_html] || {})
37
37
 
38
38
  input attribute_name, as: :string, input_html: input_options
@@ -42,7 +42,7 @@ module Alchemy
42
42
  #
43
43
  def submit(label, options = {})
44
44
  options = {
45
- wrapper_html: { class: "submit" },
45
+ wrapper_html: {class: "submit"}
46
46
  }.update(options)
47
47
  template.content_tag("div", options.delete(:wrapper_html)) do
48
48
  template.content_tag("button", label, options.delete(:input_html))
data/lib/alchemy/hints.rb CHANGED
@@ -4,7 +4,7 @@ module Alchemy
4
4
  module Hints
5
5
  # Returns a hint
6
6
  #
7
- # To add a hint to a content pass +hint: true+ to the element definition in its element.yml
7
+ # To add a hint to a ingredient pass +hint: true+ to the element definition in its element.yml
8
8
  #
9
9
  # Then the hint itself is placed in the locale yml files.
10
10
  #
@@ -14,23 +14,23 @@ module Alchemy
14
14
  #
15
15
  # # elements.yml
16
16
  # - name: headline
17
- # contents:
18
- # - name: headline
19
- # type: EssenceText
20
- # hint: true
17
+ # ingredients:
18
+ # - role: headline
19
+ # type: Text
20
+ # hint: true
21
21
  #
22
22
  # # config/locales/de.yml
23
23
  # de:
24
- # content_hints:
24
+ # ingredient_hints:
25
25
  # headline: Lorem ipsum
26
26
  #
27
27
  # == Hint Key Example:
28
28
  #
29
29
  # - name: headline
30
- # contents:
31
- # - name: headline
32
- # type: EssenceText
33
- # hint: Lorem ipsum
30
+ # ingredients:
31
+ # - role: headline
32
+ # type: Text
33
+ # hint: Lorem ipsum
34
34
  #
35
35
  # @return String
36
36
  #
data/lib/alchemy/i18n.rb CHANGED
@@ -54,10 +54,12 @@ module Alchemy
54
54
  end
55
55
 
56
56
  def available_locales
57
- @@available_locales ||= nil
58
- @@available_locales || translation_files.collect { |f|
59
- f.match(LOCALE_FILE_PATTERN)[1].to_sym
60
- }.uniq.sort
57
+ Rails.application.config.i18n.available_locales || begin
58
+ @@available_locales ||= nil
59
+ @@available_locales || translation_files.collect { |f|
60
+ f.match(LOCALE_FILE_PATTERN)[1].to_sym
61
+ }.uniq.sort
62
+ end
61
63
  end
62
64
 
63
65
  def available_locales=(locales)
@@ -1,4 +1,5 @@
1
1
  # frozen_string_literal: true
2
+
2
3
  require "thor"
3
4
 
4
5
  module Alchemy
@@ -15,7 +16,7 @@ module Alchemy
15
16
  mountpoint = ask("- At which path do you want to mount Alchemy CMS at?", default: mountpoint)
16
17
  end
17
18
  sentinel = /\.routes\.draw do(?:\s*\|map\|)?\s*$/
18
- inject_into_file "./config/routes.rb", "\n mount Alchemy::Engine => '#{mountpoint}'\n", { after: sentinel, verbose: true }
19
+ inject_into_file "./config/routes.rb", "\n mount Alchemy::Engine => '#{mountpoint}'\n", {after: sentinel, verbose: true}
19
20
  end
20
21
 
21
22
  def set_primary_language(code: "en", name: "English", auto_accept: false)
@@ -13,7 +13,7 @@ module Alchemy
13
13
  .gsub(/[äÄ]/, "ae")
14
14
  .gsub(/[üÜ]/, "ue")
15
15
  .gsub(/[öÖ]/, "oe")
16
- .gsub(/[ß]/, "ss")
16
+ .gsub(/ß/, "ss")
17
17
  .parameterize
18
18
  end
19
19
 
@@ -51,7 +51,7 @@ module Alchemy
51
51
  YAML.safe_load(
52
52
  ERB.new(File.read(layouts_file_path)).result,
53
53
  permitted_classes: YAML_PERMITTED_CLASSES,
54
- aliases: true,
54
+ aliases: true
55
55
  ) || []
56
56
  )
57
57
  else