alchemy_cms 5.3.5 → 6.0.0.b1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (300) 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 -75
  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 -30
  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 -29
  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 -8
  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/nodes_controller.rb +0 -1
  51. data/app/controllers/alchemy/api/pages_controller.rb +3 -15
  52. data/app/controllers/concerns/alchemy/admin/archive_overlay.rb +13 -3
  53. data/app/controllers/concerns/alchemy/admin/crop_action.rb +26 -0
  54. data/app/decorators/alchemy/element_editor.rb +23 -1
  55. data/app/decorators/alchemy/ingredient_editor.rb +154 -0
  56. data/app/helpers/alchemy/admin/elements_helper.rb +1 -0
  57. data/app/helpers/alchemy/admin/essences_helper.rb +1 -1
  58. data/app/helpers/alchemy/admin/ingredients_helper.rb +42 -0
  59. data/app/helpers/alchemy/elements_block_helper.rb +22 -7
  60. data/app/helpers/alchemy/elements_helper.rb +14 -7
  61. data/app/helpers/alchemy/pages_helper.rb +3 -11
  62. data/app/jobs/alchemy/base_job.rb +11 -0
  63. data/app/jobs/alchemy/publish_page_job.rb +11 -0
  64. data/app/models/alchemy/attachment.rb +1 -1
  65. data/app/models/alchemy/content/factory.rb +23 -27
  66. data/app/models/alchemy/content.rb +1 -6
  67. data/app/models/alchemy/element/definitions.rb +29 -27
  68. data/app/models/alchemy/element/element_contents.rb +131 -122
  69. data/app/models/alchemy/element/element_essences.rb +100 -98
  70. data/app/models/alchemy/element/element_ingredients.rb +176 -0
  71. data/app/models/alchemy/element/presenters.rb +89 -87
  72. data/app/models/alchemy/element.rb +40 -73
  73. data/app/models/alchemy/elements_repository.rb +126 -0
  74. data/app/models/alchemy/essence_audio.rb +12 -0
  75. data/app/models/alchemy/essence_headline.rb +40 -0
  76. data/app/models/alchemy/essence_picture.rb +4 -116
  77. data/app/models/alchemy/essence_richtext.rb +12 -0
  78. data/app/models/alchemy/essence_video.rb +12 -0
  79. data/app/models/alchemy/image_cropper_settings.rb +87 -0
  80. data/app/models/alchemy/ingredient.rb +219 -0
  81. data/app/models/alchemy/ingredient_validator.rb +97 -0
  82. data/app/models/alchemy/ingredients/audio.rb +29 -0
  83. data/app/models/alchemy/ingredients/boolean.rb +21 -0
  84. data/app/models/alchemy/ingredients/datetime.rb +20 -0
  85. data/app/models/alchemy/ingredients/file.rb +30 -0
  86. data/app/models/alchemy/ingredients/headline.rb +42 -0
  87. data/app/models/alchemy/ingredients/html.rb +19 -0
  88. data/app/models/alchemy/ingredients/link.rb +16 -0
  89. data/app/models/alchemy/ingredients/node.rb +23 -0
  90. data/app/models/alchemy/ingredients/page.rb +23 -0
  91. data/app/models/alchemy/ingredients/picture.rb +41 -0
  92. data/app/models/alchemy/ingredients/richtext.rb +57 -0
  93. data/app/models/alchemy/ingredients/select.rb +10 -0
  94. data/app/models/alchemy/ingredients/text.rb +17 -0
  95. data/app/models/alchemy/ingredients/video.rb +33 -0
  96. data/app/models/alchemy/language.rb +0 -11
  97. data/app/models/alchemy/node.rb +1 -1
  98. data/app/models/alchemy/page/fixed_attributes.rb +53 -51
  99. data/app/models/alchemy/page/page_elements.rb +186 -205
  100. data/app/models/alchemy/page/page_naming.rb +66 -64
  101. data/app/models/alchemy/page/page_natures.rb +139 -142
  102. data/app/models/alchemy/page/page_scopes.rb +113 -102
  103. data/app/models/alchemy/page/publisher.rb +50 -0
  104. data/app/models/alchemy/page/url_path.rb +1 -1
  105. data/app/models/alchemy/page.rb +69 -36
  106. data/app/models/alchemy/page_version.rb +58 -0
  107. data/app/models/alchemy/picture/calculations.rb +2 -8
  108. data/app/models/alchemy/picture/preprocessor.rb +2 -0
  109. data/app/models/alchemy/picture/transformations.rb +23 -95
  110. data/app/models/alchemy/picture.rb +5 -3
  111. data/app/models/alchemy/picture_variant.rb +1 -3
  112. data/app/models/concerns/alchemy/picture_thumbnails.rb +181 -0
  113. data/app/models/concerns/alchemy/touch_elements.rb +2 -2
  114. data/app/presenters/alchemy/picture_view.rb +88 -0
  115. data/app/serializers/alchemy/element_serializer.rb +5 -0
  116. data/app/serializers/alchemy/page_serializer.rb +1 -7
  117. data/app/serializers/alchemy/page_tree_serializer.rb +6 -5
  118. data/app/services/alchemy/delete_elements.rb +44 -0
  119. data/app/services/alchemy/duplicate_element.rb +56 -0
  120. data/app/views/alchemy/admin/attachments/_archive_overlay.html.erb +1 -2
  121. data/app/views/alchemy/admin/attachments/_file_to_assign.html.erb +3 -3
  122. data/app/views/alchemy/admin/attachments/assign.js.erb +11 -0
  123. data/app/views/alchemy/admin/crop.html.erb +36 -0
  124. data/app/views/alchemy/admin/elements/_element.html.erb +14 -10
  125. data/app/views/alchemy/admin/elements/{_element_footer.html.erb → _footer.html.erb} +0 -0
  126. data/app/views/alchemy/admin/elements/{_new_element_form.html.erb → _form.html.erb} +1 -1
  127. data/app/views/alchemy/admin/elements/{_element_header.html.erb → _header.html.erb} +1 -1
  128. data/app/views/alchemy/admin/elements/{_element_toolbar.html.erb → _toolbar.html.erb} +5 -6
  129. data/app/views/alchemy/admin/elements/{trash.js.erb → destroy.js.erb} +1 -3
  130. data/app/views/alchemy/admin/elements/new.html.erb +3 -3
  131. data/app/views/alchemy/admin/elements/order.js.erb +0 -17
  132. data/app/views/alchemy/admin/elements/update.js.erb +3 -2
  133. data/app/views/alchemy/admin/essence_audios/edit.html.erb +7 -0
  134. data/app/views/alchemy/admin/essence_pictures/update.js.erb +0 -1
  135. data/app/views/alchemy/admin/essence_videos/edit.html.erb +11 -0
  136. data/app/views/alchemy/admin/ingredients/_audio_fields.html.erb +4 -0
  137. data/app/views/alchemy/admin/ingredients/_file_fields.html.erb +18 -0
  138. data/app/views/alchemy/admin/ingredients/_picture_fields.html.erb +25 -0
  139. data/app/views/alchemy/admin/ingredients/_video_fields.html.erb +8 -0
  140. data/app/views/alchemy/admin/ingredients/edit.html.erb +4 -0
  141. data/app/views/alchemy/admin/layoutpages/edit.html.erb +0 -5
  142. data/app/views/alchemy/admin/nodes/_node.html.erb +2 -2
  143. data/app/views/alchemy/admin/pages/_anchor_link.html.erb +1 -1
  144. data/app/views/alchemy/admin/pages/_external_link.html.erb +1 -1
  145. data/app/views/alchemy/admin/pages/_file_link.html.erb +1 -1
  146. data/app/views/alchemy/admin/pages/_form.html.erb +0 -25
  147. data/app/views/alchemy/admin/pages/_internal_link.html.erb +1 -1
  148. data/app/views/alchemy/admin/pages/_new_page_form.html.erb +5 -16
  149. data/app/views/alchemy/admin/pages/_page.html.erb +133 -111
  150. data/app/views/alchemy/admin/pages/_sitemap.html.erb +16 -10
  151. data/app/views/alchemy/admin/pages/_tinymce_custom_config.html.erb +5 -2
  152. data/app/views/alchemy/admin/pages/_toolbar.html.erb +12 -0
  153. data/app/views/alchemy/admin/pages/edit.html.erb +37 -25
  154. data/app/views/alchemy/admin/pages/fold.js.erb +2 -0
  155. data/app/views/alchemy/admin/pages/index.html.erb +1 -1
  156. data/app/views/alchemy/admin/pages/sort.html.erb +19 -0
  157. data/app/views/alchemy/admin/pages/update.js.erb +0 -7
  158. data/app/views/alchemy/admin/partials/_remote_search_form.html.erb +2 -4
  159. data/app/views/alchemy/admin/partials/_routes.html.erb +8 -19
  160. data/app/views/alchemy/admin/pictures/_filter_and_size_bar.html.erb +4 -8
  161. data/app/views/alchemy/admin/pictures/_infos.html.erb +0 -1
  162. data/app/views/alchemy/admin/pictures/_picture_to_assign.html.erb +4 -4
  163. data/app/views/alchemy/admin/pictures/assign.js.erb +10 -0
  164. data/app/views/alchemy/admin/resources/_form.html.erb +1 -0
  165. data/app/views/alchemy/essences/_essence_audio_editor.html.erb +4 -0
  166. data/app/views/alchemy/essences/_essence_audio_view.html.erb +15 -0
  167. data/app/views/alchemy/essences/_essence_file_editor.html.erb +15 -6
  168. data/app/views/alchemy/essences/_essence_headline_editor.html.erb +36 -0
  169. data/app/views/alchemy/essences/_essence_headline_view.html.erb +10 -0
  170. data/app/views/alchemy/essences/_essence_link_editor.html.erb +8 -4
  171. data/app/views/alchemy/essences/_essence_node_editor.html.erb +1 -1
  172. data/app/views/alchemy/essences/_essence_page_editor.html.erb +1 -1
  173. data/app/views/alchemy/essences/_essence_picture_editor.html.erb +27 -12
  174. data/app/views/alchemy/essences/_essence_text_editor.html.erb +12 -4
  175. data/app/views/alchemy/essences/_essence_video_editor.html.erb +4 -0
  176. data/app/views/alchemy/essences/_essence_video_view.html.erb +18 -0
  177. data/app/views/alchemy/essences/shared/_essence_picture_tools.html.erb +21 -16
  178. data/app/views/alchemy/essences/shared/_linkable_essence_tools.html.erb +2 -2
  179. data/app/views/alchemy/ingredients/_audio_editor.html.erb +5 -0
  180. data/app/views/alchemy/ingredients/_audio_view.html.erb +14 -0
  181. data/app/views/alchemy/ingredients/_boolean_editor.html.erb +11 -0
  182. data/app/views/alchemy/ingredients/_boolean_view.html.erb +1 -0
  183. data/app/views/alchemy/ingredients/_datetime_editor.html.erb +17 -0
  184. data/app/views/alchemy/ingredients/_datetime_view.html.erb +9 -0
  185. data/app/views/alchemy/ingredients/_file_editor.html.erb +50 -0
  186. data/app/views/alchemy/ingredients/_file_view.html.erb +17 -0
  187. data/app/views/alchemy/ingredients/_headline_editor.html.erb +30 -0
  188. data/app/views/alchemy/ingredients/_headline_view.html.erb +9 -0
  189. data/app/views/alchemy/ingredients/_html_editor.html.erb +8 -0
  190. data/app/views/alchemy/ingredients/_html_view.html.erb +1 -0
  191. data/app/views/alchemy/ingredients/_link_editor.html.erb +24 -0
  192. data/app/views/alchemy/ingredients/_link_view.html.erb +9 -0
  193. data/app/views/alchemy/ingredients/_node_editor.html.erb +25 -0
  194. data/app/views/alchemy/ingredients/_node_view.html.erb +1 -0
  195. data/app/views/alchemy/ingredients/_page_editor.html.erb +24 -0
  196. data/app/views/alchemy/ingredients/_page_view.html.erb +4 -0
  197. data/app/views/alchemy/ingredients/_picture_editor.html.erb +59 -0
  198. data/app/views/alchemy/ingredients/_picture_view.html.erb +5 -0
  199. data/app/views/alchemy/ingredients/_richtext_editor.html.erb +12 -0
  200. data/app/views/alchemy/ingredients/_richtext_view.html.erb +3 -0
  201. data/app/views/alchemy/ingredients/_select_editor.html.erb +29 -0
  202. data/app/views/alchemy/ingredients/_select_view.html.erb +1 -0
  203. data/app/views/alchemy/ingredients/_text_editor.html.erb +19 -0
  204. data/app/views/alchemy/ingredients/_text_view.html.erb +16 -0
  205. data/app/views/alchemy/ingredients/_video_editor.html.erb +5 -0
  206. data/app/views/alchemy/ingredients/_video_view.html.erb +17 -0
  207. data/app/views/alchemy/ingredients/shared/_link_tools.html.erb +20 -0
  208. data/app/views/alchemy/ingredients/shared/_picture_tools.html.erb +57 -0
  209. data/config/alchemy/config.yml +0 -1
  210. data/config/brakeman.ignore +66 -159
  211. data/config/initializers/dragonfly.rb +2 -2
  212. data/config/locales/alchemy.en.yml +26 -15
  213. data/config/routes.rb +19 -26
  214. data/db/migrate/20201207131309_create_page_versions.rb +19 -0
  215. data/db/migrate/20201207135820_add_page_version_id_to_alchemy_elements.rb +76 -0
  216. data/db/migrate/20210205143548_rename_public_on_and_public_until_on_alchemy_pages.rb +10 -0
  217. data/db/migrate/20210326105046_add_sanitized_body_to_alchemy_essence_richtexts.rb +7 -0
  218. data/db/migrate/20210406093436_add_alchemy_essence_headlines.rb +12 -0
  219. data/db/migrate/20210506135919_create_essence_audios.rb +19 -0
  220. data/db/migrate/20210506140258_create_essence_videos.rb +23 -0
  221. data/db/migrate/20210508091432_create_alchemy_ingredients.rb +22 -0
  222. data/lib/alchemy/admin/preview_url.rb +2 -0
  223. data/lib/alchemy/deprecation.rb +1 -1
  224. data/lib/alchemy/dragonfly/processors/auto_orient.rb +18 -0
  225. data/lib/alchemy/elements_finder.rb +14 -60
  226. data/lib/alchemy/engine.rb +1 -19
  227. data/lib/alchemy/essence.rb +1 -2
  228. data/lib/alchemy/hints.rb +8 -4
  229. data/lib/alchemy/page_layout.rb +0 -13
  230. data/lib/alchemy/permissions.rb +31 -29
  231. data/lib/alchemy/resource.rb +13 -3
  232. data/lib/alchemy/tasks/tidy.rb +29 -0
  233. data/lib/alchemy/test_support/essence_shared_examples.rb +0 -1
  234. data/lib/alchemy/test_support/factories/element_factory.rb +8 -8
  235. data/lib/alchemy/test_support/factories/essence_audio_factory.rb +7 -0
  236. data/lib/alchemy/test_support/factories/essence_video_factory.rb +7 -0
  237. data/lib/alchemy/test_support/factories/ingredient_factory.rb +25 -0
  238. data/lib/alchemy/test_support/factories/page_factory.rb +20 -1
  239. data/lib/alchemy/test_support/factories/page_version_factory.rb +23 -0
  240. data/lib/alchemy/test_support/having_crop_action_examples.rb +170 -0
  241. data/lib/alchemy/test_support/having_picture_thumbnails_examples.rb +646 -0
  242. data/lib/alchemy/test_support/shared_ingredient_editor_examples.rb +21 -0
  243. data/lib/alchemy/test_support/shared_ingredient_examples.rb +57 -0
  244. data/lib/alchemy/test_support.rb +2 -11
  245. data/lib/alchemy/tinymce.rb +17 -0
  246. data/lib/alchemy/upgrader/five_point_zero.rb +0 -32
  247. data/lib/alchemy/upgrader/six_point_zero.rb +21 -0
  248. data/lib/alchemy/upgrader/tasks/add_page_versions.rb +33 -0
  249. data/lib/alchemy/upgrader/tasks/ingredients_migrator.rb +51 -0
  250. data/lib/alchemy/version.rb +1 -1
  251. data/lib/alchemy_cms.rb +0 -1
  252. data/lib/generators/alchemy/elements/elements_generator.rb +1 -0
  253. data/lib/generators/alchemy/elements/templates/view.html.erb +9 -0
  254. data/lib/generators/alchemy/elements/templates/view.html.haml +9 -0
  255. data/lib/generators/alchemy/elements/templates/view.html.slim +9 -0
  256. data/lib/generators/alchemy/ingredient/ingredient_generator.rb +38 -0
  257. data/lib/generators/alchemy/ingredient/templates/editor.html.erb +14 -0
  258. data/lib/generators/alchemy/ingredient/templates/model.rb.tt +13 -0
  259. data/lib/generators/alchemy/ingredient/templates/view.html.erb +1 -0
  260. data/lib/generators/alchemy/install/install_generator.rb +1 -2
  261. data/lib/generators/alchemy/install/templates/dragonfly.rb.tt +1 -1
  262. data/lib/generators/alchemy/menus/templates/node.html.erb +1 -1
  263. data/lib/generators/alchemy/menus/templates/node.html.haml +1 -1
  264. data/lib/generators/alchemy/menus/templates/node.html.slim +1 -1
  265. data/lib/generators/alchemy/menus/templates/wrapper.html.erb +1 -1
  266. data/lib/generators/alchemy/menus/templates/wrapper.html.haml +1 -1
  267. data/lib/generators/alchemy/menus/templates/wrapper.html.slim +1 -1
  268. data/lib/tasks/alchemy/tidy.rake +12 -0
  269. data/lib/tasks/alchemy/upgrade.rake +21 -15
  270. data/package/admin.js +8 -4
  271. data/package/src/file_editors.js +28 -0
  272. data/package/src/image_cropper.js +103 -0
  273. data/package/src/image_loader.js +58 -0
  274. data/package/src/node_tree.js +8 -8
  275. data/package/src/picture_editors.js +169 -0
  276. data/package/src/utils/__tests__/ajax.spec.js +16 -52
  277. data/package/src/utils/ajax.js +0 -12
  278. data/package.json +3 -2
  279. data/vendor/assets/javascripts/jquery_plugins/jquery.Jcrop.min.js +3 -18
  280. data/vendor/assets/javascripts/jquery_plugins/jquery.ui.nestedSortable.js +434 -0
  281. data/vendor/assets/stylesheets/jquery.Jcrop.min.scss +2 -28
  282. metadata +291 -54
  283. data/.rspec +0 -1
  284. data/app/assets/javascripts/alchemy/alchemy.image_cropper.js.coffee +0 -44
  285. data/app/assets/javascripts/alchemy/alchemy.trash_window.js.coffee +0 -30
  286. data/app/assets/javascripts/alchemy/templates/page_folder.hbs +0 -3
  287. data/app/assets/stylesheets/alchemy/trash.scss +0 -8
  288. data/app/controllers/alchemy/admin/trash_controller.rb +0 -44
  289. data/app/views/alchemy/admin/essence_files/assign.js.erb +0 -3
  290. data/app/views/alchemy/admin/essence_pictures/assign.js.erb +0 -4
  291. data/app/views/alchemy/admin/essence_pictures/crop.html.erb +0 -48
  292. data/app/views/alchemy/admin/trash/clear.js.erb +0 -4
  293. data/app/views/alchemy/admin/trash/index.html.erb +0 -31
  294. data/lib/alchemy/dragonfly/processors/thumbnail.rb +0 -27
  295. data/lib/alchemy/error_tracking/airbrake_handler.rb +0 -13
  296. data/lib/alchemy/error_tracking.rb +0 -14
  297. data/lib/alchemy/test_support/factories.rb +0 -20
  298. data/package/src/page_publication_fields.js +0 -27
  299. data/package/src/page_sorter.js +0 -62
  300. data/package/src/sitemap.js +0 -148
@@ -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
@@ -82,7 +88,7 @@ module Alchemy
82
88
 
83
89
  acts_as_nested_set(dependent: :destroy, scope: [:layoutpage, :language_id])
84
90
 
85
- stampable stamper_class_name: Alchemy.user_class.name
91
+ stampable stamper_class_name: Alchemy.user_class_name
86
92
 
87
93
  belongs_to :language
88
94
 
@@ -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
@@ -207,18 +224,20 @@ module Alchemy
207
224
  # @return [Alchemy::Page]
208
225
  #
209
226
  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
227
+ transaction do
228
+ page = Alchemy::Page.new(attributes_from_source_for_copy(source, differences))
229
+ page.tag_list = source.tag_list
230
+ if page.save!
231
+ copy_elements(source, page)
232
+ page
233
+ end
215
234
  end
216
235
  end
217
236
 
218
237
  def copy_and_paste(source, new_parent, new_name)
219
238
  page = copy(source, {
220
- parent: new_parent,
221
- language: new_parent&.language,
239
+ parent_id: new_parent.id,
240
+ language: new_parent.language,
222
241
  name: new_name,
223
242
  title: new_name,
224
243
  })
@@ -291,7 +310,9 @@ module Alchemy
291
310
  # Instance methods
292
311
  #
293
312
 
294
- # Returns elements from page.
313
+ # Returns elements from pages public version.
314
+ #
315
+ # You can pass another page_version to load elements from in the options.
295
316
  #
296
317
  # @option options [Array<String>|String] :only
297
318
  # Returns only elements with given names
@@ -310,11 +331,14 @@ module Alchemy
310
331
  # @option options [Class] :finder (Alchemy::ElementsFinder)
311
332
  # A class that will return elements from page.
312
333
  # Use this for your custom element loading logic.
334
+ # @option options [Alchemy::PageVersion] :page_version
335
+ # A page version to load elements from.
336
+ # Uses the pages public_version by default.
313
337
  #
314
338
  # @return [ActiveRecord::Relation]
315
339
  def find_elements(options = {})
316
340
  finder = options[:finder] || Alchemy::ElementsFinder.new(options)
317
- finder.elements(page: self)
341
+ finder.elements(page_version: options[:page_version] || public_version)
318
342
  end
319
343
 
320
344
  # = The url_path for this page
@@ -415,7 +439,6 @@ module Alchemy
415
439
  next if child == new_parent
416
440
 
417
441
  new_child = Page.copy(child, {
418
- parent_id: new_parent.id,
419
442
  language_id: new_parent.language_id,
420
443
  language_code: new_parent.language_code,
421
444
  })
@@ -424,22 +447,36 @@ module Alchemy
424
447
  end
425
448
  end
426
449
 
427
- # Publishes the page.
450
+ # Creates a public version of the page.
428
451
  #
429
- # Sets +public_on+ and the +published_at+ value to current time
430
- # and resets +public_until+ to nil
452
+ # Sets the +published_at+ value to current time
431
453
  #
432
454
  # The +published_at+ attribute is used as +cache_key+.
433
455
  #
434
- def publish!
435
- current_time = Time.current
436
- update_columns(
437
- published_at: current_time,
438
- public_on: already_public_for?(current_time) ? public_on : current_time,
439
- public_until: still_public_for?(current_time) ? public_until : nil,
440
- )
456
+ def publish!(current_time = Time.current)
457
+ update(published_at: current_time)
458
+ PublishPageJob.perform_later(self, public_on: current_time)
441
459
  end
442
460
 
461
+ # Sets the public_on date on the published version
462
+ #
463
+ # Builds a new version if none exists yet.
464
+ # Destroys public version if empty time is set
465
+ #
466
+ def public_on=(time)
467
+ if public_version && time.blank?
468
+ public_version.destroy!
469
+ # Need to reset the public version on the instance so we do not need to reload
470
+ self.public_version = nil
471
+ elsif public_version
472
+ public_version.public_on = time
473
+ elsif time.present?
474
+ versions.build(public_on: time)
475
+ end
476
+ end
477
+
478
+ delegate :public_until=, to: :public_version, allow_nil: true
479
+
443
480
  # Updates an Alchemy::Page based on a new ordering to be applied to it
444
481
  #
445
482
  # Note: Page's urls should not be updated (and a legacy URL created) if nesting is OFF
@@ -461,7 +498,7 @@ module Alchemy
461
498
 
462
499
  # Holds an instance of +FixedAttributes+
463
500
  def fixed_attributes
464
- @_fixed_attributes ||= Alchemy::Page::FixedAttributes.new(self)
501
+ @_fixed_attributes ||= FixedAttributes.new(self)
465
502
  end
466
503
 
467
504
  # True if given attribute name is defined as fixed
@@ -480,12 +517,12 @@ module Alchemy
480
517
  (editor_roles & user.alchemy_roles).any?
481
518
  end
482
519
 
483
- # Returns the value of +public_on+ attribute
520
+ # Returns the value of +public_on+ attribute from public version
484
521
  #
485
522
  # If it's a fixed attribute then the fixed value is returned instead
486
523
  #
487
524
  def public_on
488
- attribute_fixed?(:public_on) ? fixed_attributes[:public_on] : self[:public_on]
525
+ attribute_fixed?(:public_on) ? fixed_attributes[:public_on] : public_version&.public_on
489
526
  end
490
527
 
491
528
  # Returns the value of +public_until+ attribute
@@ -493,7 +530,7 @@ module Alchemy
493
530
  # If it's a fixed attribute then the fixed value is returned instead
494
531
  #
495
532
  def public_until
496
- attribute_fixed?(:public_until) ? fixed_attributes[:public_until] : self[:public_until]
533
+ attribute_fixed?(:public_until) ? fixed_attributes[:public_until] : public_version&.public_until
497
534
  end
498
535
 
499
536
  # Returns the name of the creator of this page.
@@ -557,9 +594,5 @@ module Alchemy
557
594
  def create_legacy_url
558
595
  legacy_urls.find_or_create_by(urlname: urlname_before_last_save)
559
596
  end
560
-
561
- def set_published_at
562
- self.published_at = Time.current
563
- end
564
597
  end
565
598
  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
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)
@@ -67,7 +30,7 @@ module Alchemy
67
30
  # Returns the rendered resized image using imagemagick directly.
68
31
  #
69
32
  def resize(size, upsample = false)
70
- image_file.thumbnail(upsample ? size : "#{size}>")
33
+ image_file.thumb(upsample ? size : "#{size}>")
71
34
  end
72
35
 
73
36
  # Returns true if picture's width is greater than it's height
@@ -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"
@@ -191,7 +119,7 @@ module Alchemy
191
119
  if is_smaller_than?(dimensions) && upsample == false
192
120
  dimensions = reduce_to_image(dimensions)
193
121
  end
194
- image_file.thumbnail("#{dimensions_to_string(dimensions)}#")
122
+ image_file.thumb("#{dimensions_to_string(dimensions)}#")
195
123
  end
196
124
 
197
125
  # Use imagemagick to custom crop an image. Uses -thumbnail for better performance when resizing.
@@ -209,8 +137,8 @@ module Alchemy
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
@@ -28,7 +28,7 @@ module Alchemy
28
28
  large: "240x180",
29
29
  }.with_indifferent_access.freeze
30
30
 
31
- CONVERTIBLE_FILE_FORMATS = %w[gif jpg jpeg png webp].freeze
31
+ CONVERTIBLE_FILE_FORMATS = %w(gif jpg jpeg png).freeze
32
32
 
33
33
  TRANSFORMATION_OPTIONS = [
34
34
  :crop,
@@ -86,7 +86,9 @@ module Alchemy
86
86
  dragonfly_accessor :image_file, app: :alchemy_pictures do
87
87
  # Preprocess after uploading the picture
88
88
  after_assign do |image|
89
- self.class.preprocessor_class.new(image).call
89
+ if has_convertible_format?
90
+ self.class.preprocessor_class.new(image).call
91
+ end
90
92
  end
91
93
  end
92
94
 
@@ -108,7 +110,7 @@ module Alchemy
108
110
  case_sensitive: false,
109
111
  message: Alchemy.t("not a valid image")
110
112
 
111
- stampable stamper_class_name: Alchemy.user_class.name
113
+ stampable stamper_class_name: Alchemy.user_class_name
112
114
 
113
115
  scope :named, ->(name) { where("#{table_name}.name LIKE ?", "%#{name}%") }
114
116
  scope :recent, -> { where("#{table_name}.created_at > ?", Time.current - 24.hours).order(:created_at) }
@@ -13,8 +13,6 @@ module Alchemy
13
13
  include Alchemy::Logger
14
14
  include Alchemy::Picture::Transformations
15
15
 
16
- ANIMATED_IMAGE_FORMATS = %w[gif webp]
17
-
18
16
  attr_reader :picture, :render_format
19
17
 
20
18
  def_delegators :@picture,
@@ -88,7 +86,7 @@ module Alchemy
88
86
  end
89
87
 
90
88
  options = {
91
- flatten: !render_format.in?(ANIMATED_IMAGE_FORMATS) && picture.image_file_format == "gif",
89
+ flatten: render_format != "gif" && picture.image_file_format == "gif",
92
90
  }.with_indifferent_access.merge(options)
93
91
 
94
92
  encoding_options = []