alchemy_cms 5.2.1 → 6.0.0.pre.b4

Sign up to get free protection for your applications and to get access to all the features.
Files changed (302) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/ci.yml +6 -14
  3. data/.gitignore +0 -1
  4. data/.hound.yml +1 -1
  5. data/.rubocop.yml +46 -4
  6. data/CHANGELOG.md +121 -8
  7. data/Gemfile +4 -2
  8. data/README.md +19 -4
  9. data/Rakefile +37 -23
  10. data/alchemy_cms.gemspec +78 -65
  11. data/app/assets/javascripts/alchemy/admin.js +0 -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 +1 -1
  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/templates/node_folder.hbs +1 -1
  23. data/app/assets/stylesheets/alchemy/_extends.scss +15 -2
  24. data/app/assets/stylesheets/alchemy/admin.scss +1 -1
  25. data/app/assets/stylesheets/alchemy/archive.scss +20 -5
  26. data/app/assets/stylesheets/alchemy/buttons.scss +0 -4
  27. data/app/assets/stylesheets/alchemy/elements.scss +73 -61
  28. data/app/assets/stylesheets/alchemy/fonts.scss +0 -0
  29. data/app/assets/stylesheets/alchemy/images.scss +8 -0
  30. data/app/assets/stylesheets/alchemy/node-select.scss +4 -3
  31. data/app/assets/stylesheets/alchemy/page-select.scss +1 -0
  32. data/app/assets/stylesheets/tinymce/skins/alchemy/fonts/tinymce-small.svg +0 -0
  33. data/app/assets/stylesheets/tinymce/skins/alchemy/fonts/tinymce-small.ttf +0 -0
  34. data/app/assets/stylesheets/tinymce/skins/alchemy/fonts/tinymce-small.woff +0 -0
  35. data/app/assets/stylesheets/tinymce/skins/alchemy/fonts/tinymce.svg +0 -0
  36. data/app/assets/stylesheets/tinymce/skins/alchemy/fonts/tinymce.ttf +0 -0
  37. data/app/assets/stylesheets/tinymce/skins/alchemy/fonts/tinymce.woff +0 -0
  38. data/app/assets/stylesheets/tinymce/skins/alchemy/img/anchor.gif +0 -0
  39. data/app/assets/stylesheets/tinymce/skins/alchemy/img/loader.gif +0 -0
  40. data/app/assets/stylesheets/tinymce/skins/alchemy/img/object.gif +0 -0
  41. data/app/assets/stylesheets/tinymce/skins/alchemy/img/trans.gif +0 -0
  42. data/app/assets/stylesheets/tinymce/skins/alchemy/skin.min.css.scss +0 -0
  43. data/app/controllers/alchemy/admin/attachments_controller.rb +8 -4
  44. data/app/controllers/alchemy/admin/base_controller.rb +5 -7
  45. data/app/controllers/alchemy/admin/elements_controller.rb +59 -34
  46. data/app/controllers/alchemy/admin/essence_audios_controller.rb +30 -0
  47. data/app/controllers/alchemy/admin/essence_files_controller.rb +0 -14
  48. data/app/controllers/alchemy/admin/essence_pictures_controller.rb +8 -79
  49. data/app/controllers/alchemy/admin/essence_videos_controller.rb +33 -0
  50. data/app/controllers/alchemy/admin/ingredients_controller.rb +30 -0
  51. data/app/controllers/alchemy/admin/layoutpages_controller.rb +0 -1
  52. data/app/controllers/alchemy/admin/pages_controller.rb +7 -22
  53. data/app/controllers/alchemy/admin/pictures_controller.rb +56 -17
  54. data/app/controllers/alchemy/admin/resources_controller.rb +84 -10
  55. data/app/controllers/alchemy/api/elements_controller.rb +13 -4
  56. data/app/controllers/alchemy/api/pages_controller.rb +4 -3
  57. data/app/controllers/concerns/alchemy/admin/archive_overlay.rb +13 -3
  58. data/app/controllers/concerns/alchemy/admin/crop_action.rb +26 -0
  59. data/app/decorators/alchemy/element_editor.rb +26 -1
  60. data/app/decorators/alchemy/ingredient_editor.rb +158 -0
  61. data/app/helpers/alchemy/admin/elements_helper.rb +1 -0
  62. data/app/helpers/alchemy/admin/essences_helper.rb +1 -1
  63. data/app/helpers/alchemy/admin/ingredients_helper.rb +42 -0
  64. data/app/helpers/alchemy/elements_block_helper.rb +29 -6
  65. data/app/helpers/alchemy/elements_helper.rb +12 -5
  66. data/app/helpers/alchemy/pages_helper.rb +3 -11
  67. data/app/jobs/alchemy/base_job.rb +11 -0
  68. data/app/jobs/alchemy/publish_page_job.rb +11 -0
  69. data/app/models/alchemy/attachment.rb +24 -7
  70. data/app/models/alchemy/content/factory.rb +23 -27
  71. data/app/models/alchemy/content.rb +1 -6
  72. data/app/models/alchemy/element/definitions.rb +29 -27
  73. data/app/models/alchemy/element/element_contents.rb +131 -122
  74. data/app/models/alchemy/element/element_essences.rb +111 -98
  75. data/app/models/alchemy/element/element_ingredients.rb +184 -0
  76. data/app/models/alchemy/element/presenters.rb +104 -85
  77. data/app/models/alchemy/element.rb +39 -86
  78. data/app/models/alchemy/elements_repository.rb +126 -0
  79. data/app/models/alchemy/essence_audio.rb +12 -0
  80. data/app/models/alchemy/essence_headline.rb +40 -0
  81. data/app/models/alchemy/essence_picture.rb +4 -116
  82. data/app/models/alchemy/essence_richtext.rb +12 -0
  83. data/app/models/alchemy/essence_video.rb +12 -0
  84. data/app/models/alchemy/image_cropper_settings.rb +87 -0
  85. data/app/models/alchemy/ingredient.rb +183 -0
  86. data/app/models/alchemy/ingredient_validator.rb +97 -0
  87. data/app/models/alchemy/ingredients/audio.rb +29 -0
  88. data/app/models/alchemy/ingredients/boolean.rb +21 -0
  89. data/app/models/alchemy/ingredients/datetime.rb +20 -0
  90. data/app/models/alchemy/ingredients/file.rb +30 -0
  91. data/app/models/alchemy/ingredients/headline.rb +42 -0
  92. data/app/models/alchemy/ingredients/html.rb +19 -0
  93. data/app/models/alchemy/ingredients/link.rb +16 -0
  94. data/app/models/alchemy/ingredients/node.rb +23 -0
  95. data/app/models/alchemy/ingredients/page.rb +23 -0
  96. data/app/models/alchemy/ingredients/picture.rb +41 -0
  97. data/app/models/alchemy/ingredients/richtext.rb +57 -0
  98. data/app/models/alchemy/ingredients/select.rb +10 -0
  99. data/app/models/alchemy/ingredients/text.rb +17 -0
  100. data/app/models/alchemy/ingredients/video.rb +33 -0
  101. data/app/models/alchemy/language.rb +0 -11
  102. data/app/models/alchemy/page/fixed_attributes.rb +53 -51
  103. data/app/models/alchemy/page/page_elements.rb +186 -205
  104. data/app/models/alchemy/page/page_naming.rb +66 -64
  105. data/app/models/alchemy/page/page_natures.rb +131 -143
  106. data/app/models/alchemy/page/page_scopes.rb +117 -102
  107. data/app/models/alchemy/page/publisher.rb +50 -0
  108. data/app/models/alchemy/page/url_path.rb +1 -1
  109. data/app/models/alchemy/page.rb +79 -36
  110. data/app/models/alchemy/page_version.rb +58 -0
  111. data/app/models/alchemy/picture/calculations.rb +2 -8
  112. data/app/models/alchemy/picture/preprocessor.rb +2 -0
  113. data/app/models/alchemy/picture/transformations.rb +24 -96
  114. data/app/models/alchemy/picture.rb +17 -39
  115. data/app/models/concerns/alchemy/picture_thumbnails.rb +181 -0
  116. data/app/models/concerns/alchemy/touch_elements.rb +2 -2
  117. data/app/presenters/alchemy/picture_view.rb +88 -0
  118. data/app/serializers/alchemy/element_serializer.rb +5 -0
  119. data/app/serializers/alchemy/page_tree_serializer.rb +3 -2
  120. data/app/services/alchemy/delete_elements.rb +44 -0
  121. data/app/services/alchemy/duplicate_element.rb +56 -0
  122. data/app/views/alchemy/admin/attachments/_archive_overlay.html.erb +2 -3
  123. data/app/views/alchemy/admin/attachments/_file_to_assign.html.erb +3 -3
  124. data/app/views/alchemy/admin/attachments/assign.js.erb +11 -0
  125. data/app/views/alchemy/admin/attachments/index.html.erb +2 -3
  126. data/app/views/alchemy/admin/crop.html.erb +36 -0
  127. data/app/views/alchemy/admin/elements/_element.html.erb +14 -10
  128. data/app/views/alchemy/admin/elements/{_element_footer.html.erb → _footer.html.erb} +0 -0
  129. data/app/views/alchemy/admin/elements/{_new_element_form.html.erb → _form.html.erb} +1 -1
  130. data/app/views/alchemy/admin/elements/{_element_header.html.erb → _header.html.erb} +1 -1
  131. data/app/views/alchemy/admin/elements/{_element_toolbar.html.erb → _toolbar.html.erb} +5 -6
  132. data/app/views/alchemy/admin/elements/create.js.erb +1 -1
  133. data/app/views/alchemy/admin/elements/{trash.js.erb → destroy.js.erb} +2 -6
  134. data/app/views/alchemy/admin/elements/fold.js.erb +2 -2
  135. data/app/views/alchemy/admin/elements/new.html.erb +3 -3
  136. data/app/views/alchemy/admin/elements/order.js.erb +0 -17
  137. data/app/views/alchemy/admin/elements/update.js.erb +3 -2
  138. data/app/views/alchemy/admin/essence_audios/edit.html.erb +7 -0
  139. data/app/views/alchemy/admin/essence_pictures/update.js.erb +0 -1
  140. data/app/views/alchemy/admin/essence_videos/edit.html.erb +11 -0
  141. data/app/views/alchemy/admin/ingredients/_audio_fields.html.erb +4 -0
  142. data/app/views/alchemy/admin/ingredients/_file_fields.html.erb +18 -0
  143. data/app/views/alchemy/admin/ingredients/_picture_fields.html.erb +25 -0
  144. data/app/views/alchemy/admin/ingredients/_video_fields.html.erb +8 -0
  145. data/app/views/alchemy/admin/ingredients/edit.html.erb +4 -0
  146. data/app/views/alchemy/admin/layoutpages/edit.html.erb +0 -5
  147. data/app/views/alchemy/admin/nodes/_node.html.erb +2 -2
  148. data/app/views/alchemy/admin/pages/_anchor_link.html.erb +1 -1
  149. data/app/views/alchemy/admin/pages/_external_link.html.erb +1 -1
  150. data/app/views/alchemy/admin/pages/_file_link.html.erb +1 -1
  151. data/app/views/alchemy/admin/pages/_form.html.erb +0 -6
  152. data/app/views/alchemy/admin/pages/_internal_link.html.erb +1 -1
  153. data/app/views/alchemy/admin/pages/_tinymce_custom_config.html.erb +5 -2
  154. data/app/views/alchemy/admin/pages/_toolbar.html.erb +1 -1
  155. data/app/views/alchemy/admin/pages/edit.html.erb +37 -25
  156. data/app/views/alchemy/admin/pages/index.html.erb +2 -9
  157. data/app/views/alchemy/admin/partials/_remote_search_form.html.erb +2 -4
  158. data/app/views/alchemy/admin/partials/_routes.html.erb +7 -11
  159. data/app/views/alchemy/admin/partials/_search_form.html.erb +9 -0
  160. data/app/views/alchemy/admin/pictures/_archive.html.erb +1 -1
  161. data/app/views/alchemy/admin/pictures/_archive_overlay.html.erb +1 -1
  162. data/app/views/alchemy/admin/pictures/_filter_and_size_bar.html.erb +5 -7
  163. data/app/views/alchemy/admin/pictures/_infos.html.erb +0 -1
  164. data/app/views/alchemy/admin/pictures/_picture_to_assign.html.erb +4 -4
  165. data/app/views/alchemy/admin/pictures/assign.js.erb +10 -0
  166. data/app/views/alchemy/admin/pictures/index.html.erb +8 -3
  167. data/app/views/alchemy/admin/resources/_filter.html.erb +12 -0
  168. data/app/views/alchemy/admin/resources/_filter_bar.html.erb +14 -17
  169. data/app/views/alchemy/admin/resources/_form.html.erb +3 -0
  170. data/app/views/alchemy/admin/resources/_table_header.html.erb +15 -0
  171. data/app/views/alchemy/admin/resources/index.html.erb +3 -11
  172. data/app/views/alchemy/essences/_essence_audio_editor.html.erb +4 -0
  173. data/app/views/alchemy/essences/_essence_audio_view.html.erb +15 -0
  174. data/app/views/alchemy/essences/_essence_file_editor.html.erb +15 -6
  175. data/app/views/alchemy/essences/_essence_headline_editor.html.erb +36 -0
  176. data/app/views/alchemy/essences/_essence_headline_view.html.erb +10 -0
  177. data/app/views/alchemy/essences/_essence_link_editor.html.erb +8 -4
  178. data/app/views/alchemy/essences/_essence_picture_editor.html.erb +27 -12
  179. data/app/views/alchemy/essences/_essence_picture_view.html.erb +3 -3
  180. data/app/views/alchemy/essences/_essence_text_editor.html.erb +12 -4
  181. data/app/views/alchemy/essences/_essence_video_editor.html.erb +4 -0
  182. data/app/views/alchemy/essences/_essence_video_view.html.erb +18 -0
  183. data/app/views/alchemy/essences/shared/_essence_picture_tools.html.erb +21 -16
  184. data/app/views/alchemy/essences/shared/_linkable_essence_tools.html.erb +2 -2
  185. data/app/views/alchemy/ingredients/_audio_editor.html.erb +5 -0
  186. data/app/views/alchemy/ingredients/_audio_view.html.erb +14 -0
  187. data/app/views/alchemy/ingredients/_boolean_editor.html.erb +11 -0
  188. data/app/views/alchemy/ingredients/_boolean_view.html.erb +1 -0
  189. data/app/views/alchemy/ingredients/_datetime_editor.html.erb +17 -0
  190. data/app/views/alchemy/ingredients/_datetime_view.html.erb +9 -0
  191. data/app/views/alchemy/ingredients/_file_editor.html.erb +52 -0
  192. data/app/views/alchemy/ingredients/_file_view.html.erb +17 -0
  193. data/app/views/alchemy/ingredients/_headline_editor.html.erb +30 -0
  194. data/app/views/alchemy/ingredients/_headline_view.html.erb +9 -0
  195. data/app/views/alchemy/ingredients/_html_editor.html.erb +8 -0
  196. data/app/views/alchemy/ingredients/_html_view.html.erb +1 -0
  197. data/app/views/alchemy/ingredients/_link_editor.html.erb +24 -0
  198. data/app/views/alchemy/ingredients/_link_view.html.erb +9 -0
  199. data/app/views/alchemy/ingredients/_node_editor.html.erb +26 -0
  200. data/app/views/alchemy/ingredients/_node_view.html.erb +1 -0
  201. data/app/views/alchemy/ingredients/_page_editor.html.erb +25 -0
  202. data/app/views/alchemy/ingredients/_page_view.html.erb +4 -0
  203. data/app/views/alchemy/ingredients/_picture_editor.html.erb +60 -0
  204. data/app/views/alchemy/ingredients/_picture_view.html.erb +5 -0
  205. data/app/views/alchemy/ingredients/_richtext_editor.html.erb +12 -0
  206. data/app/views/alchemy/ingredients/_richtext_view.html.erb +3 -0
  207. data/app/views/alchemy/ingredients/_select_editor.html.erb +30 -0
  208. data/app/views/alchemy/ingredients/_select_view.html.erb +1 -0
  209. data/app/views/alchemy/ingredients/_text_editor.html.erb +20 -0
  210. data/app/views/alchemy/ingredients/_text_view.html.erb +16 -0
  211. data/app/views/alchemy/ingredients/_video_editor.html.erb +5 -0
  212. data/app/views/alchemy/ingredients/_video_view.html.erb +17 -0
  213. data/app/views/alchemy/ingredients/shared/_link_tools.html.erb +20 -0
  214. data/app/views/alchemy/ingredients/shared/_picture_tools.html.erb +57 -0
  215. data/config/brakeman.ignore +66 -159
  216. data/config/initializers/dragonfly.rb +10 -0
  217. data/config/locales/alchemy.en.yml +108 -64
  218. data/config/routes.rb +17 -22
  219. data/db/migrate/20201207131309_create_page_versions.rb +19 -0
  220. data/db/migrate/20201207135820_add_page_version_id_to_alchemy_elements.rb +76 -0
  221. data/db/migrate/20210205143548_rename_public_on_and_public_until_on_alchemy_pages.rb +10 -0
  222. data/db/migrate/20210326105046_add_sanitized_body_to_alchemy_essence_richtexts.rb +7 -0
  223. data/db/migrate/20210406093436_add_alchemy_essence_headlines.rb +12 -0
  224. data/db/migrate/20210506135919_create_essence_audios.rb +19 -0
  225. data/db/migrate/20210506140258_create_essence_videos.rb +23 -0
  226. data/db/migrate/20210508091432_create_alchemy_ingredients.rb +22 -0
  227. data/lib/alchemy/admin/preview_url.rb +2 -0
  228. data/lib/alchemy/deprecation.rb +1 -1
  229. data/lib/alchemy/dragonfly/processors/auto_orient.rb +18 -0
  230. data/lib/alchemy/dragonfly/processors/crop_resize.rb +35 -0
  231. data/lib/alchemy/elements_finder.rb +14 -60
  232. data/lib/alchemy/essence.rb +1 -2
  233. data/lib/alchemy/forms/builder.rb +21 -1
  234. data/lib/alchemy/hints.rb +8 -4
  235. data/lib/alchemy/page_layout.rb +0 -13
  236. data/lib/alchemy/permissions.rb +30 -29
  237. data/lib/alchemy/resource.rb +13 -3
  238. data/lib/alchemy/resource_filter.rb +40 -0
  239. data/lib/alchemy/resources_helper.rb +1 -16
  240. data/lib/alchemy/tasks/tidy.rb +29 -0
  241. data/lib/alchemy/test_support/essence_shared_examples.rb +0 -1
  242. data/lib/alchemy/test_support/factories/element_factory.rb +8 -8
  243. data/lib/alchemy/test_support/factories/essence_audio_factory.rb +7 -0
  244. data/lib/alchemy/test_support/factories/essence_video_factory.rb +7 -0
  245. data/lib/alchemy/test_support/factories/ingredient_factory.rb +25 -0
  246. data/lib/alchemy/test_support/factories/page_factory.rb +20 -1
  247. data/lib/alchemy/test_support/factories/page_version_factory.rb +23 -0
  248. data/lib/alchemy/test_support/having_crop_action_examples.rb +170 -0
  249. data/lib/alchemy/test_support/having_picture_thumbnails_examples.rb +646 -0
  250. data/lib/alchemy/test_support/shared_ingredient_editor_examples.rb +21 -0
  251. data/lib/alchemy/test_support/shared_ingredient_examples.rb +75 -0
  252. data/lib/alchemy/test_support.rb +2 -11
  253. data/lib/alchemy/tinymce.rb +21 -0
  254. data/lib/alchemy/upgrader/six_point_zero.rb +21 -0
  255. data/lib/alchemy/upgrader/tasks/add_page_versions.rb +33 -0
  256. data/lib/alchemy/upgrader/tasks/ingredients_migrator.rb +62 -0
  257. data/lib/alchemy/version.rb +1 -1
  258. data/lib/alchemy_cms.rb +1 -0
  259. data/lib/generators/alchemy/elements/elements_generator.rb +1 -0
  260. data/lib/generators/alchemy/elements/templates/view.html.erb +9 -0
  261. data/lib/generators/alchemy/elements/templates/view.html.haml +9 -0
  262. data/lib/generators/alchemy/elements/templates/view.html.slim +9 -0
  263. data/lib/generators/alchemy/ingredient/ingredient_generator.rb +38 -0
  264. data/lib/generators/alchemy/ingredient/templates/editor.html.erb +14 -0
  265. data/lib/generators/alchemy/ingredient/templates/model.rb.tt +13 -0
  266. data/lib/generators/alchemy/ingredient/templates/view.html.erb +1 -0
  267. data/lib/generators/alchemy/install/templates/dragonfly.rb.tt +1 -1
  268. data/lib/generators/alchemy/menus/templates/node.html.erb +1 -1
  269. data/lib/generators/alchemy/menus/templates/node.html.haml +1 -1
  270. data/lib/generators/alchemy/menus/templates/node.html.slim +1 -1
  271. data/lib/generators/alchemy/menus/templates/wrapper.html.erb +1 -1
  272. data/lib/generators/alchemy/menus/templates/wrapper.html.haml +1 -1
  273. data/lib/generators/alchemy/menus/templates/wrapper.html.slim +1 -1
  274. data/lib/tasks/alchemy/thumbnails.rake +2 -0
  275. data/lib/tasks/alchemy/tidy.rake +12 -0
  276. data/lib/tasks/alchemy/upgrade.rake +26 -0
  277. data/package/admin.js +11 -1
  278. data/package/src/__tests__/i18n.spec.js +23 -0
  279. data/package/src/file_editors.js +28 -0
  280. data/package/src/i18n.js +1 -3
  281. data/package/src/image_cropper.js +103 -0
  282. data/package/src/image_loader.js +58 -0
  283. data/package/src/node_tree.js +5 -5
  284. data/package/src/picture_editors.js +169 -0
  285. data/package/src/utils/__tests__/ajax.spec.js +20 -12
  286. data/package/src/utils/ajax.js +8 -3
  287. data/package.json +3 -2
  288. data/vendor/assets/javascripts/jquery_plugins/jquery.Jcrop.min.js +3 -18
  289. data/vendor/assets/stylesheets/jquery.Jcrop.min.scss +2 -28
  290. metadata +289 -53
  291. data/app/assets/javascripts/alchemy/alchemy.image_cropper.js.coffee +0 -44
  292. data/app/assets/javascripts/alchemy/alchemy.trash_window.js.coffee +0 -30
  293. data/app/assets/stylesheets/alchemy/trash.scss +0 -8
  294. data/app/controllers/alchemy/admin/trash_controller.rb +0 -44
  295. data/app/views/alchemy/admin/attachments/_filter_bar.html.erb +0 -29
  296. data/app/views/alchemy/admin/essence_files/assign.js.erb +0 -3
  297. data/app/views/alchemy/admin/essence_pictures/assign.js.erb +0 -4
  298. data/app/views/alchemy/admin/essence_pictures/crop.html.erb +0 -48
  299. data/app/views/alchemy/admin/pictures/_filter_bar.html.erb +0 -30
  300. data/app/views/alchemy/admin/trash/clear.js.erb +0 -4
  301. data/app/views/alchemy/admin/trash/index.html.erb +0 -31
  302. data/lib/alchemy/test_support/factories.rb +0 -20
@@ -0,0 +1,50 @@
1
+ # frozen_string_literal: true
2
+
3
+ require_dependency "alchemy/page"
4
+
5
+ module Alchemy
6
+ class Page < BaseRecord
7
+ # Handles publishing of pages
8
+ class Publisher
9
+ def initialize(page)
10
+ @page = page
11
+ end
12
+
13
+ # Copies all currently visible elements to the public version of page
14
+ #
15
+ # Creates a new published version if none exists yet.
16
+ #
17
+ # Sends a publish notification to all registered publish targets
18
+ #
19
+ def publish!(public_on:)
20
+ Page.transaction do
21
+ version = public_version(public_on)
22
+ DeleteElements.new(version.elements).call
23
+
24
+ repository = page.draft_version.element_repository
25
+ ActiveRecord::Base.no_touching do
26
+ Element.acts_as_list_no_update do
27
+ repository.visible.not_nested.each.with_index(1) do |element, position|
28
+ Alchemy::DuplicateElement.new(element, repository: repository).call(
29
+ page_version_id: version.id,
30
+ position: position
31
+ )
32
+ end
33
+ end
34
+ end
35
+ end
36
+
37
+ Alchemy.publish_targets.each { |p| p.perform_later(page) }
38
+ end
39
+
40
+ private
41
+
42
+ attr_reader :page
43
+
44
+ # Load the pages public version or create one
45
+ def public_version(public_on)
46
+ page.public_version || page.versions.create!(public_on: public_on)
47
+ end
48
+ end
49
+ end
50
+ end
@@ -29,7 +29,7 @@ module Alchemy
29
29
  def call
30
30
  if @page.language_root?
31
31
  language_root_path
32
- elsif @site.languages.select(&:public?).length > 1
32
+ elsif @site.languages.count(&:public?) > 1
33
33
  page_path_with_language_prefix
34
34
  else
35
35
  page_path_with_leading_slash
@@ -35,6 +35,12 @@
35
35
  # locked_at :datetime
36
36
  #
37
37
 
38
+ require_dependency "alchemy/page/fixed_attributes"
39
+ require_dependency "alchemy/page/page_scopes"
40
+ require_dependency "alchemy/page/page_natures"
41
+ require_dependency "alchemy/page/page_naming"
42
+ require_dependency "alchemy/page/page_elements"
43
+
38
44
  module Alchemy
39
45
  class Page < BaseRecord
40
46
  include Alchemy::Hints
@@ -109,6 +115,9 @@ module Alchemy
109
115
  has_many :folded_pages
110
116
  has_many :legacy_urls, class_name: "Alchemy::LegacyPageUrl"
111
117
  has_many :nodes, class_name: "Alchemy::Node", inverse_of: :page
118
+ has_many :versions, class_name: "Alchemy::PageVersion", inverse_of: :page, dependent: :destroy
119
+ has_one :draft_version, -> { drafts }, class_name: "Alchemy::PageVersion"
120
+ has_one :public_version, -> { published }, class_name: "Alchemy::PageVersion"
112
121
 
113
122
  before_validation :set_language,
114
123
  if: -> { language.nil? }
@@ -117,6 +126,9 @@ module Alchemy
117
126
  validates_format_of :page_layout, with: /\A[a-z0-9_-]+\z/, unless: -> { page_layout.blank? }
118
127
  validates_presence_of :parent, unless: -> { layoutpage? || language_root? }
119
128
 
129
+ before_create -> { versions.build },
130
+ if: -> { versions.none? }
131
+
120
132
  before_save :set_language_code,
121
133
  if: -> { language.present? }
122
134
 
@@ -126,9 +138,6 @@ module Alchemy
126
138
  before_save :inherit_restricted_status,
127
139
  if: -> { parent && parent.restricted? }
128
140
 
129
- before_save :set_published_at,
130
- if: -> { public_on.present? && published_at.nil? }
131
-
132
141
  before_save :set_fixed_attributes,
133
142
  if: -> { fixed_attributes.any? }
134
143
 
@@ -138,14 +147,22 @@ module Alchemy
138
147
  after_update -> { nodes.update_all(updated_at: Time.current) }
139
148
 
140
149
  # Concerns
141
- include Alchemy::Page::PageScopes
142
- include Alchemy::Page::PageNatures
143
- include Alchemy::Page::PageNaming
144
- include Alchemy::Page::PageElements
150
+ include PageScopes
151
+ include PageNatures
152
+ include PageNaming
153
+ include PageElements
145
154
 
146
155
  # site_name accessor
147
156
  delegate :name, to: :site, prefix: true, allow_nil: true
148
157
 
158
+ # Old public_on and public_until attributes for historical reasons
159
+ #
160
+ # These attributes now exist on the page versions
161
+ #
162
+ attr_readonly :legacy_public_on, :legacy_public_until
163
+ deprecate :legacy_public_on, deprecator: Alchemy::Deprecation
164
+ deprecate :legacy_public_until, deprecator: Alchemy::Deprecation
165
+
149
166
  # Class methods
150
167
  #
151
168
  class << self
@@ -165,20 +182,29 @@ module Alchemy
165
182
  end
166
183
 
167
184
  def alchemy_resource_filters
168
- %w[published not_public restricted]
185
+ [
186
+ {
187
+ name: :by_page_layout,
188
+ values: PageLayout.all.map { |p| [Alchemy.t(p["name"], scope: "page_layout_names"), p["name"]] },
189
+ },
190
+ {
191
+ name: :status,
192
+ values: %w[published not_public restricted],
193
+ },
194
+ ]
169
195
  end
170
196
 
171
197
  def searchable_alchemy_resource_attributes
172
198
  %w[name urlname title]
173
199
  end
174
200
 
175
- # Used to store the current page previewed in the edit page template.
201
+ # Used to store the current page id previewed in the edit page template.
176
202
  #
177
203
  def current_preview=(page)
178
- RequestStore.store[:alchemy_current_preview] = page
204
+ RequestStore.store[:alchemy_current_preview] = page&.id
179
205
  end
180
206
 
181
- # Returns the current page previewed in the edit page template.
207
+ # Returns the current page id previewed in the edit page template.
182
208
  #
183
209
  def current_preview
184
210
  RequestStore.store[:alchemy_current_preview]
@@ -207,11 +233,13 @@ module Alchemy
207
233
  # @return [Alchemy::Page]
208
234
  #
209
235
  def copy(source, differences = {})
210
- page = Alchemy::Page.new(attributes_from_source_for_copy(source, differences))
211
- page.tag_list = source.tag_list
212
- if page.save!
213
- copy_elements(source, page)
214
- page
236
+ transaction do
237
+ page = Alchemy::Page.new(attributes_from_source_for_copy(source, differences))
238
+ page.tag_list = source.tag_list
239
+ if page.save!
240
+ copy_elements(source, page)
241
+ page
242
+ end
215
243
  end
216
244
  end
217
245
 
@@ -291,7 +319,9 @@ module Alchemy
291
319
  # Instance methods
292
320
  #
293
321
 
294
- # Returns elements from page.
322
+ # Returns elements from pages public version.
323
+ #
324
+ # You can pass another page_version to load elements from in the options.
295
325
  #
296
326
  # @option options [Array<String>|String] :only
297
327
  # Returns only elements with given names
@@ -310,11 +340,14 @@ module Alchemy
310
340
  # @option options [Class] :finder (Alchemy::ElementsFinder)
311
341
  # A class that will return elements from page.
312
342
  # Use this for your custom element loading logic.
343
+ # @option options [Alchemy::PageVersion] :page_version
344
+ # A page version to load elements from.
345
+ # Uses the pages public_version by default.
313
346
  #
314
347
  # @return [ActiveRecord::Relation]
315
348
  def find_elements(options = {})
316
349
  finder = options[:finder] || Alchemy::ElementsFinder.new(options)
317
- finder.elements(page: self)
350
+ finder.elements(page_version: options[:page_version] || public_version)
318
351
  end
319
352
 
320
353
  # = The url_path for this page
@@ -423,22 +456,36 @@ module Alchemy
423
456
  end
424
457
  end
425
458
 
426
- # Publishes the page.
459
+ # Creates a public version of the page.
427
460
  #
428
- # Sets +public_on+ and the +published_at+ value to current time
429
- # and resets +public_until+ to nil
461
+ # Sets the +published_at+ value to current time
430
462
  #
431
463
  # The +published_at+ attribute is used as +cache_key+.
432
464
  #
433
- def publish!
434
- current_time = Time.current
435
- update_columns(
436
- published_at: current_time,
437
- public_on: already_public_for?(current_time) ? public_on : current_time,
438
- public_until: still_public_for?(current_time) ? public_until : nil,
439
- )
465
+ def publish!(current_time = Time.current)
466
+ update(published_at: current_time)
467
+ PublishPageJob.perform_later(self, public_on: current_time)
440
468
  end
441
469
 
470
+ # Sets the public_on date on the published version
471
+ #
472
+ # Builds a new version if none exists yet.
473
+ # Destroys public version if empty time is set
474
+ #
475
+ def public_on=(time)
476
+ if public_version && time.blank?
477
+ public_version.destroy!
478
+ # Need to reset the public version on the instance so we do not need to reload
479
+ self.public_version = nil
480
+ elsif public_version
481
+ public_version.public_on = time
482
+ elsif time.present?
483
+ versions.build(public_on: time)
484
+ end
485
+ end
486
+
487
+ delegate :public_until=, to: :public_version, allow_nil: true
488
+
442
489
  # Updates an Alchemy::Page based on a new ordering to be applied to it
443
490
  #
444
491
  # Note: Page's urls should not be updated (and a legacy URL created) if nesting is OFF
@@ -460,7 +507,7 @@ module Alchemy
460
507
 
461
508
  # Holds an instance of +FixedAttributes+
462
509
  def fixed_attributes
463
- @_fixed_attributes ||= Alchemy::Page::FixedAttributes.new(self)
510
+ @_fixed_attributes ||= FixedAttributes.new(self)
464
511
  end
465
512
 
466
513
  # True if given attribute name is defined as fixed
@@ -479,12 +526,12 @@ module Alchemy
479
526
  (editor_roles & user.alchemy_roles).any?
480
527
  end
481
528
 
482
- # Returns the value of +public_on+ attribute
529
+ # Returns the value of +public_on+ attribute from public version
483
530
  #
484
531
  # If it's a fixed attribute then the fixed value is returned instead
485
532
  #
486
533
  def public_on
487
- attribute_fixed?(:public_on) ? fixed_attributes[:public_on] : self[:public_on]
534
+ attribute_fixed?(:public_on) ? fixed_attributes[:public_on] : public_version&.public_on
488
535
  end
489
536
 
490
537
  # Returns the value of +public_until+ attribute
@@ -492,7 +539,7 @@ module Alchemy
492
539
  # If it's a fixed attribute then the fixed value is returned instead
493
540
  #
494
541
  def public_until
495
- attribute_fixed?(:public_until) ? fixed_attributes[:public_until] : self[:public_until]
542
+ attribute_fixed?(:public_until) ? fixed_attributes[:public_until] : public_version&.public_until
496
543
  end
497
544
 
498
545
  # Returns the name of the creator of this page.
@@ -556,9 +603,5 @@ module Alchemy
556
603
  def create_legacy_url
557
604
  legacy_urls.find_or_create_by(urlname: urlname_before_last_save)
558
605
  end
559
-
560
- def set_published_at
561
- self.published_at = Time.current
562
- end
563
606
  end
564
607
  end
@@ -0,0 +1,58 @@
1
+ # frozen_string_literal: true
2
+
3
+ module Alchemy
4
+ class PageVersion < BaseRecord
5
+ belongs_to :page, class_name: "Alchemy::Page", inverse_of: :versions, touch: true
6
+
7
+ has_many :elements, -> { order(:position) },
8
+ class_name: "Alchemy::Element",
9
+ inverse_of: :page_version
10
+
11
+ scope :drafts, -> { where(public_on: nil).order(updated_at: :desc) }
12
+ scope :published, -> { where.not(public_on: nil).order(public_on: :desc) }
13
+
14
+ def self.public_on(time = Time.current)
15
+ where("#{table_name}.public_on <= :time AND " \
16
+ "(#{table_name}.public_until IS NULL " \
17
+ "OR #{table_name}.public_until >= :time)", time: time)
18
+ end
19
+
20
+ before_destroy :delete_elements
21
+
22
+ # Determines if this version is public
23
+ #
24
+ # Takes the two timestamps +public_on+ and +public_until+
25
+ # and returns true if the time given (+Time.current+ per default)
26
+ # is in this timespan.
27
+ #
28
+ # @param time [DateTime] (Time.current)
29
+ # @returns Boolean
30
+ def public?(time = Time.current)
31
+ already_public_for?(time) && still_public_for?(time)
32
+ end
33
+
34
+ # Determines if this version is already public for given time
35
+ # @param time [DateTime] (Time.current)
36
+ # @returns Boolean
37
+ def already_public_for?(time = Time.current)
38
+ !public_on.nil? && public_on <= time
39
+ end
40
+
41
+ # Determines if this version is still public for given time
42
+ # @param time [DateTime] (Time.current)
43
+ # @returns Boolean
44
+ def still_public_for?(time = Time.current)
45
+ public_until.nil? || public_until >= time
46
+ end
47
+
48
+ def element_repository
49
+ ElementsRepository.new(elements.includes({ contents: :essence }, :tags))
50
+ end
51
+
52
+ private
53
+
54
+ def delete_elements
55
+ DeleteElements.new(elements).call
56
+ end
57
+ end
58
+ end
@@ -27,15 +27,9 @@ module Alchemy
27
27
  # Given a string with an x, this function returns a Hash with point
28
28
  # :width and :height.
29
29
  #
30
- def sizes_from_string(string = "0x0")
31
- string = "0x0" if string.nil? || string.empty?
30
+ def sizes_from_string(string)
31
+ width, height = string.to_s.split("x", 2).map(&:to_i)
32
32
 
33
- raise ArgumentError unless string =~ /(\d*x\d*)/
34
-
35
- width, height = string.scan(/(\d*)x(\d*)/)[0].map(&:to_i)
36
-
37
- width = 0 if width.nil?
38
- height = 0 if height.nil?
39
33
  {
40
34
  width: width,
41
35
  height: height,
@@ -16,6 +16,8 @@ module Alchemy
16
16
  def call
17
17
  max_image_size = Alchemy::Config.get(:preprocess_image_resize)
18
18
  image_file.thumb!(max_image_size) if max_image_size.present?
19
+ # Auto orient the image so EXIF orientation data is taken into account
20
+ image_file.auto_orient!
19
21
  end
20
22
 
21
23
  private
@@ -11,53 +11,16 @@ module Alchemy
11
11
  include Alchemy::Picture::Calculations
12
12
  end
13
13
 
14
- THUMBNAIL_WIDTH = 160
15
- THUMBNAIL_HEIGHT = 120
16
-
17
- # Returns the default centered image mask for a given size.
18
- # If the mask is bigger than the image, the mask is scaled down
19
- # so the largest possible part of the image is visible.
20
- #
21
- def default_mask(mask_arg)
22
- mask = mask_arg.dup
23
- mask[:width] = image_file_width if mask[:width].zero?
24
- mask[:height] = image_file_height if mask[:height].zero?
25
-
26
- crop_size = size_when_fitting({width: image_file_width, height: image_file_height}, mask)
27
- top_left = get_top_left_crop_corner(crop_size)
28
-
29
- point_and_mask_to_points(top_left, crop_size)
30
- end
31
-
32
- # Returns a size value String for the thumbnail used in essence picture editors.
33
- #
34
- def thumbnail_size(size_string = "0x0", crop = false)
35
- size = sizes_from_string(size_string)
36
-
37
- # only if crop is set do we need to actually parse the size string, otherwise
38
- # we take the base image size.
39
- if crop
40
- size[:width] = get_base_dimensions[:width] if size[:width].zero?
41
- size[:height] = get_base_dimensions[:height] if size[:height].zero?
42
- size = reduce_to_image(size)
43
- else
44
- size = get_base_dimensions
45
- end
46
-
47
- size = size_when_fitting({width: THUMBNAIL_WIDTH, height: THUMBNAIL_HEIGHT}, size)
48
- "#{size[:width]}x#{size[:height]}"
49
- end
50
-
51
14
  # Returns the rendered cropped image. Tries to use the crop_from and crop_size
52
15
  # parameters. When they can't be parsed, it just crops from the center.
53
16
  #
54
17
  def crop(size, crop_from = nil, crop_size = nil, upsample = false)
55
18
  raise "No size given!" if size.empty?
56
19
 
57
- render_to = sizes_from_string(size)
20
+ render_to = inferred_sizes_from_string(size)
58
21
  if crop_from && crop_size
59
22
  top_left = point_from_string(crop_from)
60
- crop_dimensions = sizes_from_string(crop_size)
23
+ crop_dimensions = inferred_sizes_from_string(crop_size)
61
24
  xy_crop_resize(render_to, top_left, crop_dimensions, upsample)
62
25
  else
63
26
  center_crop(render_to, upsample)
@@ -75,21 +38,30 @@ module Alchemy
75
38
  def landscape_format?
76
39
  image_file.landscape?
77
40
  end
41
+
78
42
  alias_method :landscape?, :landscape_format?
43
+ deprecate landscape_format?: "Use image_file.landscape? instead", deprecator: Alchemy::Deprecation
44
+ deprecate landscape?: "Use image_file.landscape? instead", deprecator: Alchemy::Deprecation
79
45
 
80
46
  # Returns true if picture's width is smaller than it's height
81
47
  #
82
48
  def portrait_format?
83
49
  image_file.portrait?
84
50
  end
51
+
85
52
  alias_method :portrait?, :portrait_format?
53
+ deprecate portrait_format?: "Use image_file.portrait? instead", deprecator: Alchemy::Deprecation
54
+ deprecate portrait?: "Use image_file.portrait? instead", deprecator: Alchemy::Deprecation
86
55
 
87
56
  # Returns true if picture's width and height is equal
88
57
  #
89
58
  def square_format?
90
59
  image_file.aspect_ratio == 1.0
91
60
  end
61
+
92
62
  alias_method :square?, :square_format?
63
+ deprecate square_format?: "Use image_file.aspect_ratio instead", deprecator: Alchemy::Deprecation
64
+ deprecate square?: "Use image_file.aspect_ratio instead", deprecator: Alchemy::Deprecation
93
65
 
94
66
  # Returns true if the class we're included in has a meaningful render_size attribute
95
67
  #
@@ -121,62 +93,18 @@ module Alchemy
121
93
  }
122
94
  end
123
95
 
124
- # Given dimensions for a possibly destructive crop operation,
125
- # this function returns the top left corner as a Hash
126
- # with keys :x, :y
127
- #
128
- def get_top_left_crop_corner(dimensions)
129
- {
130
- x: (image_file_width - dimensions[:width]) / 2,
131
- y: (image_file_height - dimensions[:height]) / 2,
132
- }
133
- end
96
+ def inferred_sizes_from_string(string)
97
+ sizes = sizes_from_string(string)
98
+ ratio = image_file_width.to_f / image_file_height
134
99
 
135
- # Gets the base dimensions (the dimensions of the Picture before scaling).
136
- # If anything is missing, it gets padded with zero (Integer 0).
137
- # This is the order of precedence: crop_size > image_size
138
- def get_base_dimensions
139
- if crop_size?
140
- sizes_from_string(crop_size)
141
- else
142
- image_size
100
+ if sizes[:width].zero?
101
+ sizes[:width] = image_file_width * ratio
143
102
  end
144
- end
145
-
146
- # This function takes a target and a base dimensions hash and returns
147
- # the dimensions of the image when the base dimensions hash fills
148
- # the target.
149
- #
150
- # Aspect ratio will be preserved.
151
- #
152
- def size_when_fitting(target, dimensions = get_base_dimensions)
153
- zoom = [
154
- dimensions[:width].to_f / target[:width],
155
- dimensions[:height].to_f / target[:height],
156
- ].max
157
-
158
- if zoom == 0.0
159
- width = target[:width]
160
- height = target[:height]
161
- else
162
- width = (dimensions[:width] / zoom).round
163
- height = (dimensions[:height] / zoom).round
103
+ if sizes[:height].zero?
104
+ sizes[:height] = image_file_width / ratio
164
105
  end
165
106
 
166
- {width: width.to_i, height: height.to_i}
167
- end
168
-
169
- # Given a point as a Hash with :x and :y, and a mask with
170
- # :width and :height, this function returns the area on the
171
- # underlying canvas as a Hash of two points
172
- #
173
- def point_and_mask_to_points(point, mask)
174
- {
175
- x1: point[:x],
176
- y1: point[:y],
177
- x2: point[:x] + mask[:width],
178
- y2: point[:y] + mask[:height],
179
- }
107
+ sizes
180
108
  end
181
109
 
182
110
  # Converts a dimensions hash to a string of from "20x20"
@@ -197,20 +125,20 @@ module Alchemy
197
125
  # Use imagemagick to custom crop an image. Uses -thumbnail for better performance when resizing.
198
126
  #
199
127
  def xy_crop_resize(dimensions, top_left, crop_dimensions, upsample)
200
- crop_argument = "-crop #{dimensions_to_string(crop_dimensions)}"
128
+ crop_argument = dimensions_to_string(crop_dimensions)
201
129
  crop_argument += "+#{top_left[:x]}+#{top_left[:y]}"
202
130
 
203
- resize_argument = "-resize #{dimensions_to_string(dimensions)}"
131
+ resize_argument = dimensions_to_string(dimensions)
204
132
  resize_argument += ">" unless upsample
205
- image_file.convert "#{crop_argument} #{resize_argument}"
133
+ image_file.crop_resize(crop_argument, resize_argument)
206
134
  end
207
135
 
208
136
  # Used when centercropping.
209
137
  #
210
138
  def reduce_to_image(dimensions)
211
139
  {
212
- width: [dimensions[:width], image_file_width].min,
213
- height: [dimensions[:height], image_file_height].min,
140
+ width: [dimensions[:width].to_i, image_file_width.to_i].min,
141
+ height: [dimensions[:height].to_i, image_file_height.to_i].min,
214
142
  }
215
143
  end
216
144
  end