alchemy_cms 5.3.1 → 6.0.0.b1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (295) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/ci.yml +6 -14
  3. data/.gitignore +1 -1
  4. data/.hound.yml +1 -1
  5. data/.rubocop.yml +46 -4
  6. data/CHANGELOG.md +80 -52
  7. data/Gemfile +4 -2
  8. data/README.md +5 -2
  9. data/Rakefile +0 -18
  10. data/alchemy_cms.gemspec +78 -65
  11. data/app/assets/javascripts/alchemy/admin.js +2 -2
  12. data/app/assets/javascripts/alchemy/alchemy.base.js.coffee +0 -27
  13. data/app/assets/javascripts/alchemy/alchemy.confirm_dialog.js.coffee +2 -1
  14. data/app/assets/javascripts/alchemy/alchemy.dialog.js.coffee +2 -7
  15. data/app/assets/javascripts/alchemy/alchemy.dragndrop.js.coffee +0 -25
  16. data/app/assets/javascripts/alchemy/alchemy.element_editors.js.coffee +1 -1
  17. data/app/assets/javascripts/alchemy/alchemy.elements_window.js.coffee +2 -0
  18. data/app/assets/javascripts/alchemy/alchemy.fixed_elements.js +1 -1
  19. data/app/assets/javascripts/alchemy/alchemy.gui.js.coffee +3 -1
  20. data/app/assets/javascripts/alchemy/alchemy.image_overlay.coffee +1 -1
  21. data/app/assets/javascripts/alchemy/alchemy.link_dialog.js.coffee +40 -27
  22. data/app/assets/javascripts/alchemy/alchemy.page_sorter.js +24 -0
  23. data/app/assets/javascripts/alchemy/alchemy.sitemap.js.coffee +119 -0
  24. data/app/assets/javascripts/alchemy/page_select.js +8 -13
  25. data/app/assets/javascripts/alchemy/templates/index.js +0 -1
  26. data/app/assets/javascripts/alchemy/templates/node_folder.hbs +1 -1
  27. data/app/assets/javascripts/alchemy/templates/page.hbs +7 -17
  28. data/app/assets/stylesheets/alchemy/admin.scss +1 -1
  29. data/app/assets/stylesheets/alchemy/archive.scss +4 -4
  30. data/app/assets/stylesheets/alchemy/buttons.scss +0 -4
  31. data/app/assets/stylesheets/alchemy/elements.scss +73 -61
  32. data/app/assets/stylesheets/alchemy/images.scss +8 -0
  33. data/app/assets/stylesheets/alchemy/node-select.scss +4 -3
  34. data/app/assets/stylesheets/alchemy/page-select.scss +5 -29
  35. data/app/assets/stylesheets/alchemy/sitemap.scss +7 -9
  36. data/app/assets/stylesheets/tinymce/skins/alchemy/content.min.css.scss +3 -3
  37. data/app/assets/stylesheets/tinymce/skins/alchemy/skin.min.css.scss +7 -7
  38. data/app/controllers/alchemy/admin/attachments_controller.rb +6 -2
  39. data/app/controllers/alchemy/admin/base_controller.rb +8 -16
  40. data/app/controllers/alchemy/admin/elements_controller.rb +58 -34
  41. data/app/controllers/alchemy/admin/essence_audios_controller.rb +30 -0
  42. data/app/controllers/alchemy/admin/essence_files_controller.rb +0 -14
  43. data/app/controllers/alchemy/admin/essence_pictures_controller.rb +8 -79
  44. data/app/controllers/alchemy/admin/essence_videos_controller.rb +33 -0
  45. data/app/controllers/alchemy/admin/ingredients_controller.rb +30 -0
  46. data/app/controllers/alchemy/admin/layoutpages_controller.rb +0 -1
  47. data/app/controllers/alchemy/admin/pages_controller.rb +19 -23
  48. data/app/controllers/alchemy/admin/pictures_controller.rb +35 -9
  49. data/app/controllers/alchemy/api/elements_controller.rb +10 -5
  50. data/app/controllers/alchemy/api/pages_controller.rb +3 -15
  51. data/app/controllers/concerns/alchemy/admin/archive_overlay.rb +13 -3
  52. data/app/controllers/concerns/alchemy/admin/crop_action.rb +26 -0
  53. data/app/decorators/alchemy/element_editor.rb +23 -1
  54. data/app/decorators/alchemy/ingredient_editor.rb +154 -0
  55. data/app/helpers/alchemy/admin/elements_helper.rb +1 -0
  56. data/app/helpers/alchemy/admin/essences_helper.rb +1 -1
  57. data/app/helpers/alchemy/admin/ingredients_helper.rb +42 -0
  58. data/app/helpers/alchemy/elements_block_helper.rb +22 -7
  59. data/app/helpers/alchemy/elements_helper.rb +12 -5
  60. data/app/helpers/alchemy/pages_helper.rb +3 -11
  61. data/app/jobs/alchemy/base_job.rb +11 -0
  62. data/app/jobs/alchemy/publish_page_job.rb +11 -0
  63. data/app/models/alchemy/attachment.rb +1 -1
  64. data/app/models/alchemy/content/factory.rb +23 -27
  65. data/app/models/alchemy/content.rb +1 -6
  66. data/app/models/alchemy/element/definitions.rb +29 -27
  67. data/app/models/alchemy/element/element_contents.rb +131 -122
  68. data/app/models/alchemy/element/element_essences.rb +100 -98
  69. data/app/models/alchemy/element/element_ingredients.rb +176 -0
  70. data/app/models/alchemy/element/presenters.rb +89 -87
  71. data/app/models/alchemy/element.rb +40 -73
  72. data/app/models/alchemy/elements_repository.rb +126 -0
  73. data/app/models/alchemy/essence_audio.rb +12 -0
  74. data/app/models/alchemy/essence_headline.rb +40 -0
  75. data/app/models/alchemy/essence_picture.rb +4 -116
  76. data/app/models/alchemy/essence_richtext.rb +12 -0
  77. data/app/models/alchemy/essence_video.rb +12 -0
  78. data/app/models/alchemy/image_cropper_settings.rb +87 -0
  79. data/app/models/alchemy/ingredient.rb +219 -0
  80. data/app/models/alchemy/ingredient_validator.rb +97 -0
  81. data/app/models/alchemy/ingredients/audio.rb +29 -0
  82. data/app/models/alchemy/ingredients/boolean.rb +21 -0
  83. data/app/models/alchemy/ingredients/datetime.rb +20 -0
  84. data/app/models/alchemy/ingredients/file.rb +30 -0
  85. data/app/models/alchemy/ingredients/headline.rb +42 -0
  86. data/app/models/alchemy/ingredients/html.rb +19 -0
  87. data/app/models/alchemy/ingredients/link.rb +16 -0
  88. data/app/models/alchemy/ingredients/node.rb +23 -0
  89. data/app/models/alchemy/ingredients/page.rb +23 -0
  90. data/app/models/alchemy/ingredients/picture.rb +41 -0
  91. data/app/models/alchemy/ingredients/richtext.rb +57 -0
  92. data/app/models/alchemy/ingredients/select.rb +10 -0
  93. data/app/models/alchemy/ingredients/text.rb +17 -0
  94. data/app/models/alchemy/ingredients/video.rb +33 -0
  95. data/app/models/alchemy/language.rb +0 -11
  96. data/app/models/alchemy/node.rb +1 -1
  97. data/app/models/alchemy/page/fixed_attributes.rb +53 -51
  98. data/app/models/alchemy/page/page_elements.rb +186 -205
  99. data/app/models/alchemy/page/page_naming.rb +66 -64
  100. data/app/models/alchemy/page/page_natures.rb +139 -142
  101. data/app/models/alchemy/page/page_scopes.rb +113 -102
  102. data/app/models/alchemy/page/publisher.rb +50 -0
  103. data/app/models/alchemy/page/url_path.rb +1 -1
  104. data/app/models/alchemy/page.rb +69 -36
  105. data/app/models/alchemy/page_version.rb +58 -0
  106. data/app/models/alchemy/picture/calculations.rb +2 -8
  107. data/app/models/alchemy/picture/preprocessor.rb +2 -0
  108. data/app/models/alchemy/picture/transformations.rb +21 -93
  109. data/app/models/alchemy/picture.rb +4 -2
  110. data/app/models/concerns/alchemy/picture_thumbnails.rb +181 -0
  111. data/app/models/concerns/alchemy/touch_elements.rb +2 -2
  112. data/app/presenters/alchemy/picture_view.rb +88 -0
  113. data/app/serializers/alchemy/element_serializer.rb +5 -0
  114. data/app/serializers/alchemy/page_serializer.rb +1 -7
  115. data/app/serializers/alchemy/page_tree_serializer.rb +6 -5
  116. data/app/services/alchemy/delete_elements.rb +44 -0
  117. data/app/services/alchemy/duplicate_element.rb +56 -0
  118. data/app/views/alchemy/admin/attachments/_archive_overlay.html.erb +1 -2
  119. data/app/views/alchemy/admin/attachments/_file_to_assign.html.erb +3 -3
  120. data/app/views/alchemy/admin/attachments/assign.js.erb +11 -0
  121. data/app/views/alchemy/admin/crop.html.erb +36 -0
  122. data/app/views/alchemy/admin/elements/_element.html.erb +14 -10
  123. data/app/views/alchemy/admin/elements/{_element_footer.html.erb → _footer.html.erb} +0 -0
  124. data/app/views/alchemy/admin/elements/{_new_element_form.html.erb → _form.html.erb} +1 -1
  125. data/app/views/alchemy/admin/elements/{_element_header.html.erb → _header.html.erb} +1 -1
  126. data/app/views/alchemy/admin/elements/{_element_toolbar.html.erb → _toolbar.html.erb} +5 -6
  127. data/app/views/alchemy/admin/elements/{trash.js.erb → destroy.js.erb} +1 -3
  128. data/app/views/alchemy/admin/elements/new.html.erb +3 -3
  129. data/app/views/alchemy/admin/elements/order.js.erb +0 -17
  130. data/app/views/alchemy/admin/elements/update.js.erb +3 -2
  131. data/app/views/alchemy/admin/essence_audios/edit.html.erb +7 -0
  132. data/app/views/alchemy/admin/essence_pictures/update.js.erb +0 -1
  133. data/app/views/alchemy/admin/essence_videos/edit.html.erb +11 -0
  134. data/app/views/alchemy/admin/ingredients/_audio_fields.html.erb +4 -0
  135. data/app/views/alchemy/admin/ingredients/_file_fields.html.erb +18 -0
  136. data/app/views/alchemy/admin/ingredients/_picture_fields.html.erb +25 -0
  137. data/app/views/alchemy/admin/ingredients/_video_fields.html.erb +8 -0
  138. data/app/views/alchemy/admin/ingredients/edit.html.erb +4 -0
  139. data/app/views/alchemy/admin/layoutpages/edit.html.erb +0 -5
  140. data/app/views/alchemy/admin/nodes/_node.html.erb +2 -2
  141. data/app/views/alchemy/admin/pages/_anchor_link.html.erb +1 -1
  142. data/app/views/alchemy/admin/pages/_external_link.html.erb +1 -1
  143. data/app/views/alchemy/admin/pages/_file_link.html.erb +1 -1
  144. data/app/views/alchemy/admin/pages/_form.html.erb +0 -25
  145. data/app/views/alchemy/admin/pages/_internal_link.html.erb +1 -1
  146. data/app/views/alchemy/admin/pages/_new_page_form.html.erb +5 -16
  147. data/app/views/alchemy/admin/pages/_page.html.erb +133 -111
  148. data/app/views/alchemy/admin/pages/_sitemap.html.erb +16 -10
  149. data/app/views/alchemy/admin/pages/_tinymce_custom_config.html.erb +5 -2
  150. data/app/views/alchemy/admin/pages/_toolbar.html.erb +12 -0
  151. data/app/views/alchemy/admin/pages/edit.html.erb +37 -25
  152. data/app/views/alchemy/admin/pages/fold.js.erb +2 -0
  153. data/app/views/alchemy/admin/pages/index.html.erb +1 -1
  154. data/app/views/alchemy/admin/pages/sort.html.erb +19 -0
  155. data/app/views/alchemy/admin/pages/update.js.erb +0 -7
  156. data/app/views/alchemy/admin/partials/_remote_search_form.html.erb +2 -4
  157. data/app/views/alchemy/admin/partials/_routes.html.erb +8 -19
  158. data/app/views/alchemy/admin/pictures/_filter_and_size_bar.html.erb +4 -8
  159. data/app/views/alchemy/admin/pictures/_infos.html.erb +0 -1
  160. data/app/views/alchemy/admin/pictures/_picture_to_assign.html.erb +4 -4
  161. data/app/views/alchemy/admin/pictures/assign.js.erb +10 -0
  162. data/app/views/alchemy/admin/resources/_form.html.erb +1 -0
  163. data/app/views/alchemy/essences/_essence_audio_editor.html.erb +4 -0
  164. data/app/views/alchemy/essences/_essence_audio_view.html.erb +15 -0
  165. data/app/views/alchemy/essences/_essence_file_editor.html.erb +15 -6
  166. data/app/views/alchemy/essences/_essence_headline_editor.html.erb +36 -0
  167. data/app/views/alchemy/essences/_essence_headline_view.html.erb +10 -0
  168. data/app/views/alchemy/essences/_essence_link_editor.html.erb +8 -4
  169. data/app/views/alchemy/essences/_essence_page_editor.html.erb +1 -1
  170. data/app/views/alchemy/essences/_essence_picture_editor.html.erb +27 -12
  171. data/app/views/alchemy/essences/_essence_text_editor.html.erb +12 -4
  172. data/app/views/alchemy/essences/_essence_video_editor.html.erb +4 -0
  173. data/app/views/alchemy/essences/_essence_video_view.html.erb +18 -0
  174. data/app/views/alchemy/essences/shared/_essence_picture_tools.html.erb +21 -16
  175. data/app/views/alchemy/essences/shared/_linkable_essence_tools.html.erb +2 -2
  176. data/app/views/alchemy/ingredients/_audio_editor.html.erb +5 -0
  177. data/app/views/alchemy/ingredients/_audio_view.html.erb +14 -0
  178. data/app/views/alchemy/ingredients/_boolean_editor.html.erb +11 -0
  179. data/app/views/alchemy/ingredients/_boolean_view.html.erb +1 -0
  180. data/app/views/alchemy/ingredients/_datetime_editor.html.erb +17 -0
  181. data/app/views/alchemy/ingredients/_datetime_view.html.erb +9 -0
  182. data/app/views/alchemy/ingredients/_file_editor.html.erb +50 -0
  183. data/app/views/alchemy/ingredients/_file_view.html.erb +17 -0
  184. data/app/views/alchemy/ingredients/_headline_editor.html.erb +30 -0
  185. data/app/views/alchemy/ingredients/_headline_view.html.erb +9 -0
  186. data/app/views/alchemy/ingredients/_html_editor.html.erb +8 -0
  187. data/app/views/alchemy/ingredients/_html_view.html.erb +1 -0
  188. data/app/views/alchemy/ingredients/_link_editor.html.erb +24 -0
  189. data/app/views/alchemy/ingredients/_link_view.html.erb +9 -0
  190. data/app/views/alchemy/ingredients/_node_editor.html.erb +25 -0
  191. data/app/views/alchemy/ingredients/_node_view.html.erb +1 -0
  192. data/app/views/alchemy/ingredients/_page_editor.html.erb +24 -0
  193. data/app/views/alchemy/ingredients/_page_view.html.erb +4 -0
  194. data/app/views/alchemy/ingredients/_picture_editor.html.erb +59 -0
  195. data/app/views/alchemy/ingredients/_picture_view.html.erb +5 -0
  196. data/app/views/alchemy/ingredients/_richtext_editor.html.erb +12 -0
  197. data/app/views/alchemy/ingredients/_richtext_view.html.erb +3 -0
  198. data/app/views/alchemy/ingredients/_select_editor.html.erb +29 -0
  199. data/app/views/alchemy/ingredients/_select_view.html.erb +1 -0
  200. data/app/views/alchemy/ingredients/_text_editor.html.erb +19 -0
  201. data/app/views/alchemy/ingredients/_text_view.html.erb +16 -0
  202. data/app/views/alchemy/ingredients/_video_editor.html.erb +5 -0
  203. data/app/views/alchemy/ingredients/_video_view.html.erb +17 -0
  204. data/app/views/alchemy/ingredients/shared/_link_tools.html.erb +20 -0
  205. data/app/views/alchemy/ingredients/shared/_picture_tools.html.erb +57 -0
  206. data/config/brakeman.ignore +66 -159
  207. data/config/initializers/dragonfly.rb +2 -0
  208. data/config/locales/alchemy.en.yml +26 -15
  209. data/config/routes.rb +19 -26
  210. data/db/migrate/20201207131309_create_page_versions.rb +19 -0
  211. data/db/migrate/20201207135820_add_page_version_id_to_alchemy_elements.rb +76 -0
  212. data/db/migrate/20210205143548_rename_public_on_and_public_until_on_alchemy_pages.rb +10 -0
  213. data/db/migrate/20210326105046_add_sanitized_body_to_alchemy_essence_richtexts.rb +7 -0
  214. data/db/migrate/20210406093436_add_alchemy_essence_headlines.rb +12 -0
  215. data/db/migrate/20210506135919_create_essence_audios.rb +19 -0
  216. data/db/migrate/20210506140258_create_essence_videos.rb +23 -0
  217. data/db/migrate/20210508091432_create_alchemy_ingredients.rb +22 -0
  218. data/lib/alchemy/admin/preview_url.rb +2 -0
  219. data/lib/alchemy/deprecation.rb +1 -1
  220. data/lib/alchemy/dragonfly/processors/auto_orient.rb +18 -0
  221. data/lib/alchemy/elements_finder.rb +14 -60
  222. data/lib/alchemy/engine.rb +1 -8
  223. data/lib/alchemy/essence.rb +1 -2
  224. data/lib/alchemy/hints.rb +8 -4
  225. data/lib/alchemy/page_layout.rb +0 -13
  226. data/lib/alchemy/permissions.rb +31 -29
  227. data/lib/alchemy/resource.rb +13 -3
  228. data/lib/alchemy/tasks/tidy.rb +29 -0
  229. data/lib/alchemy/test_support/essence_shared_examples.rb +0 -1
  230. data/lib/alchemy/test_support/factories/element_factory.rb +8 -8
  231. data/lib/alchemy/test_support/factories/essence_audio_factory.rb +7 -0
  232. data/lib/alchemy/test_support/factories/essence_video_factory.rb +7 -0
  233. data/lib/alchemy/test_support/factories/ingredient_factory.rb +25 -0
  234. data/lib/alchemy/test_support/factories/page_factory.rb +20 -1
  235. data/lib/alchemy/test_support/factories/page_version_factory.rb +23 -0
  236. data/lib/alchemy/test_support/having_crop_action_examples.rb +170 -0
  237. data/lib/alchemy/test_support/having_picture_thumbnails_examples.rb +646 -0
  238. data/lib/alchemy/test_support/shared_ingredient_editor_examples.rb +21 -0
  239. data/lib/alchemy/test_support/shared_ingredient_examples.rb +57 -0
  240. data/lib/alchemy/test_support.rb +2 -11
  241. data/lib/alchemy/tinymce.rb +17 -0
  242. data/lib/alchemy/upgrader/five_point_zero.rb +0 -32
  243. data/lib/alchemy/upgrader/six_point_zero.rb +21 -0
  244. data/lib/alchemy/upgrader/tasks/add_page_versions.rb +33 -0
  245. data/lib/alchemy/upgrader/tasks/ingredients_migrator.rb +51 -0
  246. data/lib/alchemy/version.rb +1 -1
  247. data/lib/alchemy_cms.rb +0 -1
  248. data/lib/generators/alchemy/elements/elements_generator.rb +1 -0
  249. data/lib/generators/alchemy/elements/templates/view.html.erb +9 -0
  250. data/lib/generators/alchemy/elements/templates/view.html.haml +9 -0
  251. data/lib/generators/alchemy/elements/templates/view.html.slim +9 -0
  252. data/lib/generators/alchemy/ingredient/ingredient_generator.rb +38 -0
  253. data/lib/generators/alchemy/ingredient/templates/editor.html.erb +14 -0
  254. data/lib/generators/alchemy/ingredient/templates/model.rb.tt +13 -0
  255. data/lib/generators/alchemy/ingredient/templates/view.html.erb +1 -0
  256. data/lib/generators/alchemy/install/install_generator.rb +1 -2
  257. data/lib/generators/alchemy/install/templates/dragonfly.rb.tt +1 -1
  258. data/lib/generators/alchemy/menus/templates/node.html.erb +1 -1
  259. data/lib/generators/alchemy/menus/templates/node.html.haml +1 -1
  260. data/lib/generators/alchemy/menus/templates/node.html.slim +1 -1
  261. data/lib/generators/alchemy/menus/templates/wrapper.html.erb +1 -1
  262. data/lib/generators/alchemy/menus/templates/wrapper.html.haml +1 -1
  263. data/lib/generators/alchemy/menus/templates/wrapper.html.slim +1 -1
  264. data/lib/tasks/alchemy/tidy.rake +12 -0
  265. data/lib/tasks/alchemy/upgrade.rake +21 -15
  266. data/package/admin.js +8 -4
  267. data/package/src/file_editors.js +28 -0
  268. data/package/src/image_cropper.js +103 -0
  269. data/package/src/image_loader.js +58 -0
  270. data/package/src/node_tree.js +5 -5
  271. data/package/src/picture_editors.js +169 -0
  272. data/package/src/utils/__tests__/ajax.spec.js +20 -12
  273. data/package/src/utils/ajax.js +8 -3
  274. data/package.json +3 -2
  275. data/vendor/assets/javascripts/jquery_plugins/jquery.Jcrop.min.js +3 -18
  276. data/vendor/assets/javascripts/jquery_plugins/jquery.ui.nestedSortable.js +434 -0
  277. data/vendor/assets/stylesheets/jquery.Jcrop.min.scss +2 -28
  278. metadata +291 -53
  279. data/.rspec +0 -1
  280. data/app/assets/javascripts/alchemy/alchemy.image_cropper.js.coffee +0 -44
  281. data/app/assets/javascripts/alchemy/alchemy.trash_window.js.coffee +0 -30
  282. data/app/assets/javascripts/alchemy/templates/page_folder.hbs +0 -3
  283. data/app/assets/stylesheets/alchemy/trash.scss +0 -8
  284. data/app/controllers/alchemy/admin/trash_controller.rb +0 -44
  285. data/app/views/alchemy/admin/essence_files/assign.js.erb +0 -3
  286. data/app/views/alchemy/admin/essence_pictures/assign.js.erb +0 -4
  287. data/app/views/alchemy/admin/essence_pictures/crop.html.erb +0 -48
  288. data/app/views/alchemy/admin/trash/clear.js.erb +0 -4
  289. data/app/views/alchemy/admin/trash/index.html.erb +0 -31
  290. data/lib/alchemy/error_tracking/airbrake_handler.rb +0 -13
  291. data/lib/alchemy/error_tracking.rb +0 -14
  292. data/lib/alchemy/test_support/factories.rb +0 -20
  293. data/package/src/page_publication_fields.js +0 -27
  294. data/package/src/page_sorter.js +0 -68
  295. data/package/src/sitemap.js +0 -152
@@ -1,37 +1,39 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module Alchemy
4
- # Module concerning element definitions
5
- #
6
- module Element::Definitions
7
- extend ActiveSupport::Concern
4
+ class Element < BaseRecord
5
+ # Module concerning element definitions
6
+ #
7
+ module Definitions
8
+ extend ActiveSupport::Concern
8
9
 
9
- module ClassMethods
10
- # Returns the definitions from elements.yml file.
11
- #
12
- # Place a +elements.yml+ file inside your apps +config/alchemy+ folder to define
13
- # your own set of elements
14
- #
15
- def definitions
16
- ElementDefinition.all
17
- end
10
+ module ClassMethods
11
+ # Returns the definitions from elements.yml file.
12
+ #
13
+ # Place a +elements.yml+ file inside your apps +config/alchemy+ folder to define
14
+ # your own set of elements
15
+ #
16
+ def definitions
17
+ ElementDefinition.all
18
+ end
18
19
 
19
- # Returns one element definition by given name.
20
- #
21
- def definition_by_name(name)
22
- ElementDefinition.get(name)
20
+ # Returns one element definition by given name.
21
+ #
22
+ def definition_by_name(name)
23
+ ElementDefinition.get(name)
24
+ end
23
25
  end
24
- end
25
26
 
26
- # The definition of this element.
27
- #
28
- def definition
29
- if definition = self.class.definition_by_name(name)
30
- definition
31
- else
32
- log_warning "Could not find element definition for #{name}. " \
33
- "Please check your elements.yml file!"
34
- {}
27
+ # The definition of this element.
28
+ #
29
+ def definition
30
+ if definition = self.class.definition_by_name(name)
31
+ definition
32
+ else
33
+ log_warning "Could not find element definition for #{name}. " \
34
+ "Please check your elements.yml file!"
35
+ {}
36
+ end
35
37
  end
36
38
  end
37
39
  end
@@ -1,151 +1,160 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- # Methods concerning contents for elements
4
- #
5
3
  module Alchemy
6
- module Element::ElementContents
7
- # Find first content from element by given name.
8
- def content_by_name(name)
9
- contents_by_name(name).first
10
- end
4
+ class Element < BaseRecord
5
+ # Methods concerning contents for elements
6
+ #
7
+ module ElementContents
8
+ # Find first content from element by given name.
9
+ def content_by_name(name)
10
+ contents_by_name(name).first
11
+ end
11
12
 
12
- # Find first content from element by given essence type.
13
- def content_by_type(essence_type)
14
- contents_by_type(essence_type).first
15
- end
13
+ # Find first content from element by given essence type.
14
+ def content_by_type(essence_type)
15
+ contents_by_type(essence_type).first
16
+ end
16
17
 
17
- # All contents from element by given name.
18
- def contents_by_name(name)
19
- contents.select { |content| content.name == name.to_s }
20
- end
21
- alias_method :all_contents_by_name, :contents_by_name
18
+ # All contents from element by given name.
19
+ def contents_by_name(name)
20
+ contents.select { |content| content.name == name.to_s }
21
+ end
22
+
23
+ alias_method :all_contents_by_name, :contents_by_name
22
24
 
23
- # All contents from element by given essence type.
24
- def contents_by_type(essence_type)
25
- contents.select do |content|
26
- content.essence_type == Content.normalize_essence_type(essence_type)
25
+ # All contents from element by given essence type.
26
+ def contents_by_type(essence_type)
27
+ contents.select do |content|
28
+ content.essence_type == Content.normalize_essence_type(essence_type)
29
+ end
27
30
  end
28
- end
29
- alias_method :all_contents_by_type, :contents_by_type
30
31
 
31
- # Updates all related contents by calling +update_essence+ on each of them.
32
- #
33
- # @param contents_attributes [Hash]
34
- # Hash of contents attributes.
35
- # The keys has to be the #id of the content to update.
36
- # The values a Hash of attribute names and values
37
- #
38
- # @return [Boolean]
39
- # True if +errors+ are blank or +contents_attributes+ hash is nil
40
- #
41
- # == Example
42
- #
43
- # @element.update_contents(
44
- # "1" => {ingredient: "Title"},
45
- # "2" => {link: "https://google.com"}
46
- # )
47
- #
48
- def update_contents(contents_attributes)
49
- return true if contents_attributes.nil?
32
+ alias_method :all_contents_by_type, :contents_by_type
33
+
34
+ # Updates all related contents by calling +update_essence+ on each of them.
35
+ #
36
+ # @param contents_attributes [Hash]
37
+ # Hash of contents attributes.
38
+ # The keys has to be the #id of the content to update.
39
+ # The values a Hash of attribute names and values
40
+ #
41
+ # @return [Boolean]
42
+ # True if +errors+ are blank or +contents_attributes+ hash is nil
43
+ #
44
+ # == Example
45
+ #
46
+ # @element.update_contents(
47
+ # "1" => {ingredient: "Title"},
48
+ # "2" => {link: "https://google.com"}
49
+ # )
50
+ #
51
+ def update_contents(contents_attributes)
52
+ return true if contents_attributes.nil?
53
+
54
+ contents.each do |content|
55
+ content_hash = contents_attributes[content.id.to_s] || next
56
+ content.update_essence(content_hash) || errors.add(:base, :essence_validation_failed)
57
+ end
58
+ errors.blank?
59
+ end
50
60
 
51
- contents.each do |content|
52
- content_hash = contents_attributes[content.id.to_s] || next
53
- content.update_essence(content_hash) || errors.add(:base, :essence_validation_failed)
61
+ # Copy current content's contents to given target element
62
+ def copy_contents_to(element)
63
+ contents.map do |content|
64
+ Content.copy(content, element_id: element.id)
65
+ end
54
66
  end
55
- errors.blank?
56
- end
57
67
 
58
- # Copy current content's contents to given target element
59
- def copy_contents_to(element)
60
- contents.map do |content|
61
- Content.copy(content, element_id: element.id)
68
+ # Returns the content that is marked as rss title.
69
+ #
70
+ # Mark a content as rss title in your +elements.yml+ file:
71
+ #
72
+ # - name: news
73
+ # contents:
74
+ # - name: headline
75
+ # type: EssenceText
76
+ # rss_title: true
77
+ #
78
+ def content_for_rss_title
79
+ content_for_rss_meta("title")
62
80
  end
63
- end
64
81
 
65
- # Returns the content that is marked as rss title.
66
- #
67
- # Mark a content as rss title in your +elements.yml+ file:
68
- #
69
- # - name: news
70
- # contents:
71
- # - name: headline
72
- # type: EssenceText
73
- # rss_title: true
74
- #
75
- def content_for_rss_title
76
- content_for_rss_meta("title")
77
- end
82
+ # Returns the content that is marked as rss description.
83
+ #
84
+ # Mark a content as rss description in your +elements.yml+ file:
85
+ #
86
+ # - name: news
87
+ # contents:
88
+ # - name: body
89
+ # type: EssenceRichtext
90
+ # rss_description: true
91
+ #
92
+ def content_for_rss_description
93
+ content_for_rss_meta("description")
94
+ end
78
95
 
79
- # Returns the content that is marked as rss description.
80
- #
81
- # Mark a content as rss description in your +elements.yml+ file:
82
- #
83
- # - name: news
84
- # contents:
85
- # - name: body
86
- # type: EssenceRichtext
87
- # rss_description: true
88
- #
89
- def content_for_rss_description
90
- content_for_rss_meta("description")
91
- end
96
+ # Returns the array with the hashes for all element contents in the elements.yml file
97
+ def content_definitions
98
+ return nil if definition.blank?
92
99
 
93
- # Returns the array with the hashes for all element contents in the elements.yml file
94
- def content_definitions
95
- return nil if definition.blank?
100
+ definition["contents"]
101
+ end
96
102
 
97
- definition["contents"]
98
- end
103
+ # Returns the definition for given content_name
104
+ def content_definition_for(content_name)
105
+ if content_definitions.blank?
106
+ log_warning "Element #{name} is missing the content definition for #{content_name}"
107
+ nil
108
+ else
109
+ content_definitions.detect { |d| d["name"] == content_name.to_s }
110
+ end
111
+ end
99
112
 
100
- # Returns the definition for given content_name
101
- def content_definition_for(content_name)
102
- if content_definitions.blank?
103
- log_warning "Element #{name} is missing the content definition for #{content_name}"
104
- nil
105
- else
106
- content_definitions.detect { |d| d["name"] == content_name.to_s }
113
+ # Returns an array of all EssenceRichtext contents ids from elements
114
+ #
115
+ # This is used to re-initialize the TinyMCE editor in the element editor.
116
+ #
117
+ def richtext_contents_ids
118
+ # This is not very efficient SQL wise I know, but we need to iterate
119
+ # recursivly through all descendent elements and I don't know how to do this
120
+ # in pure SQL. Anyone with a better idea is welcome to submit a patch.
121
+ ids = contents.select(&:has_tinymce?).collect(&:id)
122
+ expanded_nested_elements = nested_elements.expanded
123
+ if expanded_nested_elements.present?
124
+ ids += expanded_nested_elements.collect(&:richtext_contents_ids)
125
+ end
126
+ ids.flatten
107
127
  end
108
- end
109
128
 
110
- # Returns an array of all EssenceRichtext contents ids from elements
111
- #
112
- # This is used to re-initialize the TinyMCE editor in the element editor.
113
- #
114
- def richtext_contents_ids
115
- # This is not very efficient SQL wise I know, but we need to iterate
116
- # recursivly through all descendent elements and I don't know how to do this
117
- # in pure SQL. Anyone with a better idea is welcome to submit a patch.
118
- ids = contents.select(&:has_tinymce?).collect(&:id)
119
- expanded_nested_elements = nested_elements.expanded
120
- if expanded_nested_elements.present?
121
- ids += expanded_nested_elements.collect(&:richtext_contents_ids)
129
+ # True, if any of the element's contents has essence validations defined.
130
+ def has_validations?
131
+ !contents.detect(&:has_validations?).blank?
122
132
  end
123
- ids.flatten
124
- end
125
133
 
126
- # True, if any of the element's contents has essence validations defined.
127
- def has_validations?
128
- !contents.detect(&:has_validations?).blank?
129
- end
134
+ # All element contents where the essence validation has failed.
135
+ def contents_with_errors
136
+ contents.select(&:essence_validation_failed?)
137
+ end
130
138
 
131
- # All element contents where the essence validation has failed.
132
- def contents_with_errors
133
- contents.select(&:essence_validation_failed?)
134
- end
139
+ private
135
140
 
136
- private
141
+ def content_for_rss_meta(type)
142
+ definition = content_definitions.detect { |c| c["rss_#{type}"] }
143
+ return if definition.blank?
137
144
 
138
- def content_for_rss_meta(type)
139
- definition = content_definitions.detect { |c| c["rss_#{type}"] }
140
- return if definition.blank?
145
+ contents.detect { |content| content.name == definition["name"] }
146
+ end
141
147
 
142
- contents.detect { |content| content.name == definition["name"] }
143
- end
148
+ # creates the contents for this element as described in the elements.yml
149
+ #
150
+ # If ingredients are defined as well no contents get created,
151
+ # ingredients get created instead.
152
+ def create_contents
153
+ return if definition.fetch(:ingredients, []).any?
144
154
 
145
- # creates the contents for this element as described in the elements.yml
146
- def create_contents
147
- definition.fetch("contents", []).each do |attributes|
148
- Content.create(attributes.merge(element: self))
155
+ definition.fetch("contents", []).each do |attributes|
156
+ Content.create(attributes.merge(element: self))
157
+ end
149
158
  end
150
159
  end
151
160
  end
@@ -1,112 +1,114 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module Alchemy
4
- module Element::ElementEssences
5
- # Returns the contents essence value (aka. ingredient) for passed content name.
6
- def ingredient(name)
7
- content = content_by_name(name)
8
- return nil if content.blank?
4
+ class Element < BaseRecord
5
+ module ElementEssences
6
+ # Returns the contents essence value (aka. ingredient) for passed content name.
7
+ def ingredient(name)
8
+ content = content_by_name(name)
9
+ return nil if content.blank?
9
10
 
10
- content.ingredient
11
- end
11
+ content.ingredient
12
+ end
12
13
 
13
- # True if the element has a content for given name,
14
- # that has an essence value (aka. ingredient) that is not blank.
15
- def has_ingredient?(name)
16
- ingredient(name).present?
17
- end
14
+ # True if the element has a content for given name,
15
+ # that has an essence value (aka. ingredient) that is not blank.
16
+ def has_ingredient?(name)
17
+ ingredient(name).present?
18
+ end
18
19
 
19
- # Returns all essence errors in the format of:
20
- #
21
- # {
22
- # content.name => [
23
- # error_message_for_validation_1,
24
- # error_message_for_validation_2
25
- # ]
26
- # }
27
- #
28
- # Get translated error messages with +Element#essence_error_messages+
29
- #
30
- def essence_errors
31
- essence_errors = {}
32
- contents.each do |content|
33
- if content.essence_validation_failed?
34
- essence_errors[content.name] = content.essence.validation_errors
20
+ # Returns all essence errors in the format of:
21
+ #
22
+ # {
23
+ # content.name => [
24
+ # error_message_for_validation_1,
25
+ # error_message_for_validation_2
26
+ # ]
27
+ # }
28
+ #
29
+ # Get translated error messages with +Element#essence_error_messages+
30
+ #
31
+ def essence_errors
32
+ essence_errors = {}
33
+ contents.each do |content|
34
+ if content.essence_validation_failed?
35
+ essence_errors[content.name] = content.essence.validation_errors
36
+ end
35
37
  end
38
+ essence_errors
36
39
  end
37
- essence_errors
38
- end
39
40
 
40
- # Essence validation errors
41
- #
42
- # == Error messages are translated via I18n
43
- #
44
- # Inside your translation file add translations like:
45
- #
46
- # alchemy:
47
- # content_validations:
48
- # name_of_the_element:
49
- # name_of_the_content:
50
- # validation_error_type: Error Message
51
- #
52
- # NOTE: +validation_error_type+ has to be one of:
53
- #
54
- # * blank
55
- # * taken
56
- # * invalid
57
- #
58
- # === Example:
59
- #
60
- # de:
61
- # alchemy:
62
- # content_validations:
63
- # contactform:
64
- # email:
65
- # invalid: 'Die Email hat nicht das richtige Format'
66
- #
67
- #
68
- # == Error message translation fallbacks
69
- #
70
- # In order to not translate every single content for every element
71
- # you can provide default error messages per content name:
72
- #
73
- # === Example
74
- #
75
- # en:
76
- # alchemy:
77
- # content_validations:
78
- # fields:
79
- # email:
80
- # invalid: E-Mail has wrong format
81
- # blank: E-Mail can't be blank
82
- #
83
- # And even further you can provide general field agnostic error messages:
84
- #
85
- # === Example
86
- #
87
- # en:
88
- # alchemy:
89
- # content_validations:
90
- # errors:
91
- # invalid: %{field} has wrong format
92
- # blank: %{field} can't be blank
93
- #
94
- def essence_error_messages
95
- messages = []
96
- essence_errors.each do |content_name, errors|
97
- errors.each do |error|
98
- messages << Alchemy.t(
99
- "#{name}.#{content_name}.#{error}",
100
- scope: "content_validations",
101
- default: [
102
- "fields.#{content_name}.#{error}".to_sym,
103
- "errors.#{error}".to_sym,
104
- ],
105
- field: Content.translated_label_for(content_name, name),
106
- )
41
+ # Essence validation errors
42
+ #
43
+ # == Error messages are translated via I18n
44
+ #
45
+ # Inside your translation file add translations like:
46
+ #
47
+ # alchemy:
48
+ # content_validations:
49
+ # name_of_the_element:
50
+ # name_of_the_content:
51
+ # validation_error_type: Error Message
52
+ #
53
+ # NOTE: +validation_error_type+ has to be one of:
54
+ #
55
+ # * blank
56
+ # * taken
57
+ # * invalid
58
+ #
59
+ # === Example:
60
+ #
61
+ # de:
62
+ # alchemy:
63
+ # content_validations:
64
+ # contactform:
65
+ # email:
66
+ # invalid: 'Die Email hat nicht das richtige Format'
67
+ #
68
+ #
69
+ # == Error message translation fallbacks
70
+ #
71
+ # In order to not translate every single content for every element
72
+ # you can provide default error messages per content name:
73
+ #
74
+ # === Example
75
+ #
76
+ # en:
77
+ # alchemy:
78
+ # content_validations:
79
+ # fields:
80
+ # email:
81
+ # invalid: E-Mail has wrong format
82
+ # blank: E-Mail can't be blank
83
+ #
84
+ # And even further you can provide general field agnostic error messages:
85
+ #
86
+ # === Example
87
+ #
88
+ # en:
89
+ # alchemy:
90
+ # content_validations:
91
+ # errors:
92
+ # invalid: %{field} has wrong format
93
+ # blank: %{field} can't be blank
94
+ #
95
+ def essence_error_messages
96
+ messages = []
97
+ essence_errors.each do |content_name, errors|
98
+ errors.each do |error|
99
+ messages << Alchemy.t(
100
+ "#{name}.#{content_name}.#{error}",
101
+ scope: "content_validations",
102
+ default: [
103
+ "fields.#{content_name}.#{error}".to_sym,
104
+ "errors.#{error}".to_sym,
105
+ ],
106
+ field: Content.translated_label_for(content_name, name),
107
+ )
108
+ end
107
109
  end
110
+ messages
108
111
  end
109
- messages
110
112
  end
111
113
  end
112
114
  end