alchemy_cms 5.1.4 → 6.0.0.b1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (284) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/ci.yml +7 -14
  3. data/.gitignore +0 -1
  4. data/.hound.yml +1 -1
  5. data/.rubocop.yml +46 -4
  6. data/CHANGELOG.md +112 -5
  7. data/Gemfile +5 -2
  8. data/README.md +5 -2
  9. data/alchemy_cms.gemspec +78 -65
  10. data/app/assets/javascripts/alchemy/admin.js +0 -2
  11. data/app/assets/javascripts/alchemy/alchemy.base.js.coffee +0 -27
  12. data/app/assets/javascripts/alchemy/alchemy.confirm_dialog.js.coffee +2 -1
  13. data/app/assets/javascripts/alchemy/alchemy.dialog.js.coffee +1 -1
  14. data/app/assets/javascripts/alchemy/alchemy.dragndrop.js.coffee +0 -25
  15. data/app/assets/javascripts/alchemy/alchemy.element_editors.js.coffee +1 -1
  16. data/app/assets/javascripts/alchemy/alchemy.elements_window.js.coffee +2 -0
  17. data/app/assets/javascripts/alchemy/alchemy.fixed_elements.js +1 -1
  18. data/app/assets/javascripts/alchemy/alchemy.gui.js.coffee +3 -1
  19. data/app/assets/javascripts/alchemy/alchemy.image_overlay.coffee +1 -1
  20. data/app/assets/javascripts/alchemy/alchemy.link_dialog.js.coffee +40 -27
  21. data/app/assets/javascripts/alchemy/templates/node_folder.hbs +1 -1
  22. data/app/assets/stylesheets/alchemy/_variables.scss +2 -0
  23. data/app/assets/stylesheets/alchemy/admin.scss +1 -1
  24. data/app/assets/stylesheets/alchemy/archive.scss +4 -4
  25. data/app/assets/stylesheets/alchemy/buttons.scss +0 -4
  26. data/app/assets/stylesheets/alchemy/elements.scss +111 -66
  27. data/app/assets/stylesheets/alchemy/images.scss +8 -0
  28. data/app/assets/stylesheets/alchemy/node-select.scss +4 -3
  29. data/app/assets/stylesheets/alchemy/page-select.scss +1 -0
  30. data/app/controllers/alchemy/admin/attachments_controller.rb +6 -2
  31. data/app/controllers/alchemy/admin/base_controller.rb +5 -6
  32. data/app/controllers/alchemy/admin/elements_controller.rb +58 -34
  33. data/app/controllers/alchemy/admin/essence_audios_controller.rb +30 -0
  34. data/app/controllers/alchemy/admin/essence_files_controller.rb +0 -14
  35. data/app/controllers/alchemy/admin/essence_pictures_controller.rb +8 -79
  36. data/app/controllers/alchemy/admin/essence_videos_controller.rb +33 -0
  37. data/app/controllers/alchemy/admin/ingredients_controller.rb +30 -0
  38. data/app/controllers/alchemy/admin/layoutpages_controller.rb +0 -1
  39. data/app/controllers/alchemy/admin/pages_controller.rb +6 -13
  40. data/app/controllers/alchemy/admin/pictures_controller.rb +35 -9
  41. data/app/controllers/alchemy/api/elements_controller.rb +10 -5
  42. data/app/controllers/alchemy/api/pages_controller.rb +3 -4
  43. data/app/controllers/concerns/alchemy/admin/archive_overlay.rb +13 -3
  44. data/app/controllers/concerns/alchemy/admin/crop_action.rb +26 -0
  45. data/app/decorators/alchemy/content_editor.rb +64 -0
  46. data/app/decorators/alchemy/element_editor.rb +24 -1
  47. data/app/decorators/alchemy/ingredient_editor.rb +154 -0
  48. data/app/helpers/alchemy/admin/contents_helper.rb +3 -8
  49. data/app/helpers/alchemy/admin/elements_helper.rb +1 -0
  50. data/app/helpers/alchemy/admin/essences_helper.rb +1 -1
  51. data/app/helpers/alchemy/admin/ingredients_helper.rb +42 -0
  52. data/app/helpers/alchemy/elements_block_helper.rb +22 -7
  53. data/app/helpers/alchemy/elements_helper.rb +12 -23
  54. data/app/helpers/alchemy/pages_helper.rb +3 -9
  55. data/app/jobs/alchemy/base_job.rb +11 -0
  56. data/app/jobs/alchemy/publish_page_job.rb +11 -0
  57. data/app/models/alchemy/attachment.rb +4 -0
  58. data/app/models/alchemy/content.rb +5 -3
  59. data/app/models/alchemy/content/factory.rb +23 -27
  60. data/app/models/alchemy/element.rb +72 -67
  61. data/app/models/alchemy/element/definitions.rb +26 -41
  62. data/app/models/alchemy/element/element_contents.rb +131 -122
  63. data/app/models/alchemy/element/element_essences.rb +100 -98
  64. data/app/models/alchemy/element/element_ingredients.rb +176 -0
  65. data/app/models/alchemy/element/presenters.rb +89 -87
  66. data/app/models/alchemy/elements_repository.rb +126 -0
  67. data/app/models/alchemy/essence_audio.rb +12 -0
  68. data/app/models/alchemy/essence_headline.rb +40 -0
  69. data/app/models/alchemy/essence_picture.rb +4 -116
  70. data/app/models/alchemy/essence_richtext.rb +12 -0
  71. data/app/models/alchemy/essence_video.rb +12 -0
  72. data/app/models/alchemy/image_cropper_settings.rb +87 -0
  73. data/app/models/alchemy/ingredient.rb +219 -0
  74. data/app/models/alchemy/ingredient_validator.rb +97 -0
  75. data/app/models/alchemy/ingredients/audio.rb +29 -0
  76. data/app/models/alchemy/ingredients/boolean.rb +21 -0
  77. data/app/models/alchemy/ingredients/datetime.rb +20 -0
  78. data/app/models/alchemy/ingredients/file.rb +30 -0
  79. data/app/models/alchemy/ingredients/headline.rb +42 -0
  80. data/app/models/alchemy/ingredients/html.rb +19 -0
  81. data/app/models/alchemy/ingredients/link.rb +16 -0
  82. data/app/models/alchemy/ingredients/node.rb +23 -0
  83. data/app/models/alchemy/ingredients/page.rb +23 -0
  84. data/app/models/alchemy/ingredients/picture.rb +41 -0
  85. data/app/models/alchemy/ingredients/richtext.rb +57 -0
  86. data/app/models/alchemy/ingredients/select.rb +10 -0
  87. data/app/models/alchemy/ingredients/text.rb +17 -0
  88. data/app/models/alchemy/ingredients/video.rb +33 -0
  89. data/app/models/alchemy/language.rb +0 -11
  90. data/app/models/alchemy/page.rb +66 -32
  91. data/app/models/alchemy/page/fixed_attributes.rb +53 -51
  92. data/app/models/alchemy/page/page_elements.rb +187 -199
  93. data/app/models/alchemy/page/page_naming.rb +66 -64
  94. data/app/models/alchemy/page/page_natures.rb +139 -142
  95. data/app/models/alchemy/page/page_scopes.rb +113 -102
  96. data/app/models/alchemy/page/publisher.rb +50 -0
  97. data/app/models/alchemy/page/url_path.rb +1 -1
  98. data/app/models/alchemy/page_version.rb +58 -0
  99. data/app/models/alchemy/picture.rb +3 -1
  100. data/app/models/alchemy/picture/calculations.rb +2 -8
  101. data/app/models/alchemy/picture/preprocessor.rb +2 -0
  102. data/app/models/alchemy/picture/transformations.rb +24 -96
  103. data/app/models/alchemy/picture_variant.rb +1 -1
  104. data/app/models/concerns/alchemy/picture_thumbnails.rb +181 -0
  105. data/app/models/concerns/alchemy/touch_elements.rb +2 -2
  106. data/app/presenters/alchemy/picture_view.rb +88 -0
  107. data/app/serializers/alchemy/element_serializer.rb +5 -0
  108. data/app/serializers/alchemy/page_tree_serializer.rb +3 -2
  109. data/app/services/alchemy/delete_elements.rb +44 -0
  110. data/app/services/alchemy/duplicate_element.rb +56 -0
  111. data/app/views/alchemy/admin/attachments/_archive_overlay.html.erb +1 -2
  112. data/app/views/alchemy/admin/attachments/_file_to_assign.html.erb +3 -3
  113. data/app/views/alchemy/admin/attachments/assign.js.erb +11 -0
  114. data/app/views/alchemy/admin/crop.html.erb +36 -0
  115. data/app/views/alchemy/admin/elements/_element.html.erb +14 -10
  116. data/app/views/alchemy/admin/elements/{_element_footer.html.erb → _footer.html.erb} +0 -0
  117. data/app/views/alchemy/admin/elements/{_new_element_form.html.erb → _form.html.erb} +1 -1
  118. data/app/views/alchemy/admin/elements/{_element_header.html.erb → _header.html.erb} +3 -1
  119. data/app/views/alchemy/admin/elements/{_element_toolbar.html.erb → _toolbar.html.erb} +5 -6
  120. data/app/views/alchemy/admin/elements/{trash.js.erb → destroy.js.erb} +1 -3
  121. data/app/views/alchemy/admin/elements/new.html.erb +3 -3
  122. data/app/views/alchemy/admin/elements/order.js.erb +0 -17
  123. data/app/views/alchemy/admin/elements/update.js.erb +3 -2
  124. data/app/views/alchemy/admin/essence_audios/edit.html.erb +7 -0
  125. data/app/views/alchemy/admin/essence_pictures/update.js.erb +0 -1
  126. data/app/views/alchemy/admin/essence_videos/edit.html.erb +11 -0
  127. data/app/views/alchemy/admin/ingredients/_audio_fields.html.erb +4 -0
  128. data/app/views/alchemy/admin/ingredients/_file_fields.html.erb +18 -0
  129. data/app/views/alchemy/admin/ingredients/_picture_fields.html.erb +25 -0
  130. data/app/views/alchemy/admin/ingredients/_video_fields.html.erb +8 -0
  131. data/app/views/alchemy/admin/ingredients/edit.html.erb +4 -0
  132. data/app/views/alchemy/admin/layoutpages/edit.html.erb +0 -5
  133. data/app/views/alchemy/admin/nodes/_node.html.erb +2 -2
  134. data/app/views/alchemy/admin/pages/_anchor_link.html.erb +1 -1
  135. data/app/views/alchemy/admin/pages/_external_link.html.erb +1 -1
  136. data/app/views/alchemy/admin/pages/_file_link.html.erb +1 -1
  137. data/app/views/alchemy/admin/pages/_form.html.erb +0 -6
  138. data/app/views/alchemy/admin/pages/_internal_link.html.erb +1 -1
  139. data/app/views/alchemy/admin/pages/_tinymce_custom_config.html.erb +5 -2
  140. data/app/views/alchemy/admin/pages/edit.html.erb +36 -24
  141. data/app/views/alchemy/admin/partials/_remote_search_form.html.erb +2 -4
  142. data/app/views/alchemy/admin/partials/_routes.html.erb +7 -11
  143. data/app/views/alchemy/admin/pictures/_filter_and_size_bar.html.erb +4 -8
  144. data/app/views/alchemy/admin/pictures/_infos.html.erb +0 -1
  145. data/app/views/alchemy/admin/pictures/_picture_to_assign.html.erb +4 -4
  146. data/app/views/alchemy/admin/pictures/assign.js.erb +10 -0
  147. data/app/views/alchemy/admin/resources/_form.html.erb +1 -0
  148. data/app/views/alchemy/essences/_essence_audio_editor.html.erb +4 -0
  149. data/app/views/alchemy/essences/_essence_audio_view.html.erb +15 -0
  150. data/app/views/alchemy/essences/_essence_file_editor.html.erb +15 -6
  151. data/app/views/alchemy/essences/_essence_headline_editor.html.erb +36 -0
  152. data/app/views/alchemy/essences/_essence_headline_view.html.erb +10 -0
  153. data/app/views/alchemy/essences/_essence_link_editor.html.erb +8 -4
  154. data/app/views/alchemy/essences/_essence_picture_editor.html.erb +27 -12
  155. data/app/views/alchemy/essences/_essence_picture_view.html.erb +3 -3
  156. data/app/views/alchemy/essences/_essence_text_editor.html.erb +12 -4
  157. data/app/views/alchemy/essences/_essence_video_editor.html.erb +4 -0
  158. data/app/views/alchemy/essences/_essence_video_view.html.erb +18 -0
  159. data/app/views/alchemy/essences/shared/_essence_picture_tools.html.erb +21 -16
  160. data/app/views/alchemy/essences/shared/_linkable_essence_tools.html.erb +2 -2
  161. data/app/views/alchemy/ingredients/_audio_editor.html.erb +5 -0
  162. data/app/views/alchemy/ingredients/_audio_view.html.erb +14 -0
  163. data/app/views/alchemy/ingredients/_boolean_editor.html.erb +11 -0
  164. data/app/views/alchemy/ingredients/_boolean_view.html.erb +1 -0
  165. data/app/views/alchemy/ingredients/_datetime_editor.html.erb +17 -0
  166. data/app/views/alchemy/ingredients/_datetime_view.html.erb +9 -0
  167. data/app/views/alchemy/ingredients/_file_editor.html.erb +50 -0
  168. data/app/views/alchemy/ingredients/_file_view.html.erb +17 -0
  169. data/app/views/alchemy/ingredients/_headline_editor.html.erb +30 -0
  170. data/app/views/alchemy/ingredients/_headline_view.html.erb +9 -0
  171. data/app/views/alchemy/ingredients/_html_editor.html.erb +8 -0
  172. data/app/views/alchemy/ingredients/_html_view.html.erb +1 -0
  173. data/app/views/alchemy/ingredients/_link_editor.html.erb +24 -0
  174. data/app/views/alchemy/ingredients/_link_view.html.erb +9 -0
  175. data/app/views/alchemy/ingredients/_node_editor.html.erb +25 -0
  176. data/app/views/alchemy/ingredients/_node_view.html.erb +1 -0
  177. data/app/views/alchemy/ingredients/_page_editor.html.erb +24 -0
  178. data/app/views/alchemy/ingredients/_page_view.html.erb +4 -0
  179. data/app/views/alchemy/ingredients/_picture_editor.html.erb +59 -0
  180. data/app/views/alchemy/ingredients/_picture_view.html.erb +5 -0
  181. data/app/views/alchemy/ingredients/_richtext_editor.html.erb +12 -0
  182. data/app/views/alchemy/ingredients/_richtext_view.html.erb +3 -0
  183. data/app/views/alchemy/ingredients/_select_editor.html.erb +29 -0
  184. data/app/views/alchemy/ingredients/_select_view.html.erb +1 -0
  185. data/app/views/alchemy/ingredients/_text_editor.html.erb +19 -0
  186. data/app/views/alchemy/ingredients/_text_view.html.erb +16 -0
  187. data/app/views/alchemy/ingredients/_video_editor.html.erb +5 -0
  188. data/app/views/alchemy/ingredients/_video_view.html.erb +17 -0
  189. data/app/views/alchemy/ingredients/shared/_link_tools.html.erb +20 -0
  190. data/app/views/alchemy/ingredients/shared/_picture_tools.html.erb +57 -0
  191. data/config/brakeman.ignore +212 -17
  192. data/config/initializers/dragonfly.rb +10 -0
  193. data/config/locales/alchemy.en.yml +63 -39
  194. data/config/routes.rb +17 -22
  195. data/db/migrate/20201207131309_create_page_versions.rb +19 -0
  196. data/db/migrate/20201207135820_add_page_version_id_to_alchemy_elements.rb +76 -0
  197. data/db/migrate/20210205143548_rename_public_on_and_public_until_on_alchemy_pages.rb +10 -0
  198. data/db/migrate/20210326105046_add_sanitized_body_to_alchemy_essence_richtexts.rb +7 -0
  199. data/db/migrate/20210406093436_add_alchemy_essence_headlines.rb +12 -0
  200. data/db/migrate/20210506135919_create_essence_audios.rb +19 -0
  201. data/db/migrate/20210506140258_create_essence_videos.rb +23 -0
  202. data/db/migrate/20210508091432_create_alchemy_ingredients.rb +22 -0
  203. data/lib/alchemy/admin/preview_url.rb +2 -0
  204. data/lib/alchemy/deprecation.rb +1 -1
  205. data/lib/alchemy/dragonfly/processors/auto_orient.rb +18 -0
  206. data/lib/alchemy/dragonfly/processors/crop_resize.rb +35 -0
  207. data/lib/alchemy/element_definition.rb +70 -0
  208. data/lib/alchemy/elements_finder.rb +14 -56
  209. data/lib/alchemy/essence.rb +5 -6
  210. data/lib/alchemy/filetypes.rb +13 -0
  211. data/lib/alchemy/forms/builder.rb +1 -1
  212. data/lib/alchemy/hints.rb +8 -4
  213. data/lib/alchemy/i18n.rb +4 -5
  214. data/lib/alchemy/page_layout.rb +0 -12
  215. data/lib/alchemy/permissions.rb +30 -29
  216. data/lib/alchemy/resource.rb +13 -3
  217. data/lib/alchemy/tasks/tidy.rb +29 -0
  218. data/lib/alchemy/test_support.rb +9 -0
  219. data/lib/alchemy/test_support/essence_shared_examples.rb +0 -4
  220. data/lib/alchemy/test_support/factories/attachment_factory.rb +0 -2
  221. data/lib/alchemy/test_support/factories/content_factory.rb +0 -6
  222. data/lib/alchemy/test_support/factories/dummy_user_factory.rb +0 -2
  223. data/lib/alchemy/test_support/factories/element_factory.rb +8 -11
  224. data/lib/alchemy/test_support/factories/essence_audio_factory.rb +7 -0
  225. data/lib/alchemy/test_support/factories/essence_file_factory.rb +0 -3
  226. data/lib/alchemy/test_support/factories/essence_page_factory.rb +0 -3
  227. data/lib/alchemy/test_support/factories/essence_picture_factory.rb +0 -4
  228. data/lib/alchemy/test_support/factories/essence_text_factory.rb +0 -2
  229. data/lib/alchemy/test_support/factories/essence_video_factory.rb +7 -0
  230. data/lib/alchemy/test_support/factories/ingredient_factory.rb +25 -0
  231. data/lib/alchemy/test_support/factories/language_factory.rb +0 -3
  232. data/lib/alchemy/test_support/factories/node_factory.rb +0 -4
  233. data/lib/alchemy/test_support/factories/page_factory.rb +20 -4
  234. data/lib/alchemy/test_support/factories/page_version_factory.rb +23 -0
  235. data/lib/alchemy/test_support/factories/picture_factory.rb +0 -2
  236. data/lib/alchemy/test_support/factories/picture_thumb_factory.rb +0 -3
  237. data/lib/alchemy/test_support/factories/site_factory.rb +0 -2
  238. data/lib/alchemy/test_support/having_crop_action_examples.rb +170 -0
  239. data/lib/alchemy/test_support/having_picture_thumbnails_examples.rb +646 -0
  240. data/lib/alchemy/test_support/integration_helpers.rb +5 -5
  241. data/lib/alchemy/test_support/shared_ingredient_editor_examples.rb +21 -0
  242. data/lib/alchemy/test_support/shared_ingredient_examples.rb +57 -0
  243. data/lib/alchemy/tinymce.rb +17 -0
  244. data/lib/alchemy/upgrader/six_point_zero.rb +21 -0
  245. data/lib/alchemy/upgrader/tasks/add_page_versions.rb +33 -0
  246. data/lib/alchemy/upgrader/tasks/ingredients_migrator.rb +51 -0
  247. data/lib/alchemy/version.rb +1 -1
  248. data/lib/alchemy_cms.rb +1 -0
  249. data/lib/generators/alchemy/elements/elements_generator.rb +1 -0
  250. data/lib/generators/alchemy/elements/templates/view.html.erb +9 -0
  251. data/lib/generators/alchemy/elements/templates/view.html.haml +9 -0
  252. data/lib/generators/alchemy/elements/templates/view.html.slim +9 -0
  253. data/lib/generators/alchemy/ingredient/ingredient_generator.rb +38 -0
  254. data/lib/generators/alchemy/ingredient/templates/editor.html.erb +14 -0
  255. data/lib/generators/alchemy/ingredient/templates/model.rb.tt +13 -0
  256. data/lib/generators/alchemy/ingredient/templates/view.html.erb +1 -0
  257. data/lib/generators/alchemy/install/templates/dragonfly.rb.tt +1 -1
  258. data/lib/tasks/alchemy/thumbnails.rake +2 -0
  259. data/lib/tasks/alchemy/tidy.rake +12 -0
  260. data/lib/tasks/alchemy/upgrade.rake +26 -0
  261. data/package.json +2 -1
  262. data/package/admin.js +11 -1
  263. data/package/src/__tests__/i18n.spec.js +23 -0
  264. data/package/src/file_editors.js +28 -0
  265. data/package/src/i18n.js +1 -3
  266. data/package/src/image_cropper.js +103 -0
  267. data/package/src/image_loader.js +58 -0
  268. data/package/src/node_tree.js +5 -5
  269. data/package/src/picture_editors.js +169 -0
  270. data/package/src/utils/__tests__/ajax.spec.js +20 -12
  271. data/package/src/utils/ajax.js +8 -3
  272. data/vendor/assets/javascripts/jquery_plugins/jquery.Jcrop.min.js +3 -18
  273. data/vendor/assets/stylesheets/jquery.Jcrop.min.scss +2 -28
  274. metadata +290 -52
  275. data/app/assets/javascripts/alchemy/alchemy.image_cropper.js.coffee +0 -44
  276. data/app/assets/javascripts/alchemy/alchemy.trash_window.js.coffee +0 -30
  277. data/app/assets/stylesheets/alchemy/trash.scss +0 -8
  278. data/app/controllers/alchemy/admin/trash_controller.rb +0 -42
  279. data/app/views/alchemy/admin/essence_files/assign.js.erb +0 -3
  280. data/app/views/alchemy/admin/essence_pictures/assign.js.erb +0 -4
  281. data/app/views/alchemy/admin/essence_pictures/crop.html.erb +0 -48
  282. data/app/views/alchemy/admin/trash/clear.js.erb +0 -4
  283. data/app/views/alchemy/admin/trash/index.html.erb +0 -31
  284. data/lib/alchemy/test_support/factories.rb +0 -5
@@ -1,9 +1,6 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  require "shoulda-matchers"
4
- require "alchemy/test_support/factories/page_factory"
5
- require "alchemy/test_support/factories/element_factory"
6
- require "alchemy/test_support/factories/content_factory"
7
4
 
8
5
  RSpec.shared_examples_for "an essence" do
9
6
  let(:element) { Alchemy::Element.new }
@@ -268,7 +265,6 @@ RSpec.shared_examples_for "an essence" do
268
265
 
269
266
  context "delegations" do
270
267
  it { should delegate_method(:restricted?).to(:page) }
271
- it { should delegate_method(:trashed?).to(:element) }
272
268
  it { should delegate_method(:public?).to(:element) }
273
269
  end
274
270
 
@@ -1,7 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require "factory_bot"
4
-
5
3
  FactoryBot.define do
6
4
  factory :alchemy_attachment, class: "Alchemy::Attachment" do
7
5
  file do
@@ -1,11 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require "factory_bot"
4
- require "alchemy/test_support/factories/element_factory"
5
- require "alchemy/test_support/factories/essence_file_factory"
6
- require "alchemy/test_support/factories/essence_picture_factory"
7
- require "alchemy/test_support/factories/essence_text_factory"
8
-
9
3
  FactoryBot.define do
10
4
  factory :alchemy_content, class: "Alchemy::Content" do
11
5
  name { "text" }
@@ -1,7 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require "factory_bot"
4
-
5
3
  FactoryBot.define do
6
4
  factory :alchemy_dummy_user, class: "DummyUser" do
7
5
  sequence(:email) { |n| "john.#{n}@doe.com" }
@@ -1,13 +1,11 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require "factory_bot"
4
- require "alchemy/test_support/factories/page_factory"
5
-
6
3
  FactoryBot.define do
7
4
  factory :alchemy_element, class: "Alchemy::Element" do
8
5
  name { "article" }
9
6
  autogenerate_contents { false }
10
- association :page, factory: :alchemy_page
7
+ autogenerate_ingredients { false }
8
+ association :page_version, factory: :alchemy_page_version
11
9
 
12
10
  trait :fixed do
13
11
  fixed { true }
@@ -19,23 +17,22 @@ FactoryBot.define do
19
17
  name { "header" }
20
18
  end
21
19
 
22
- trait :trashed do
23
- after(:create) do |element|
24
- element.update_column(:position, :null)
25
- end
26
- end
27
-
28
20
  trait :with_nestable_elements do
29
21
  name { "slider" }
30
22
  end
31
23
 
32
24
  trait :nested do
33
- association :parent_element, factory: :alchemy_element, name: "slider"
25
+ parent_element { build(:alchemy_element, name: "slider", page_version: page_version) }
34
26
  name { "slide" }
35
27
  end
36
28
 
37
29
  trait :with_contents do
38
30
  autogenerate_contents { true }
39
31
  end
32
+
33
+ trait :with_ingredients do
34
+ name { "element_with_ingredients" }
35
+ autogenerate_ingredients { true }
36
+ end
40
37
  end
41
38
  end
@@ -0,0 +1,7 @@
1
+ # frozen_string_literal: true
2
+
3
+ FactoryBot.define do
4
+ factory :alchemy_essence_audio, class: "Alchemy::EssenceAudio" do
5
+ attachment factory: :alchemy_attachment
6
+ end
7
+ end
@@ -1,8 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require "factory_bot"
4
- require "alchemy/test_support/factories/attachment_factory"
5
-
6
3
  FactoryBot.define do
7
4
  factory :alchemy_essence_file, class: "Alchemy::EssenceFile" do
8
5
  attachment factory: :alchemy_attachment
@@ -1,8 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require "factory_bot"
4
- require "alchemy/test_support/factories/page_factory"
5
-
6
3
  FactoryBot.define do
7
4
  factory :alchemy_essence_page, class: "Alchemy::EssencePage" do
8
5
  page factory: :alchemy_page
@@ -1,9 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require "factory_bot"
4
- require "alchemy/test_support/factories/content_factory"
5
- require "alchemy/test_support/factories/picture_factory"
6
-
7
3
  FactoryBot.define do
8
4
  factory :alchemy_essence_picture, class: "Alchemy::EssencePicture" do
9
5
  picture factory: :alchemy_picture
@@ -1,7 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require "factory_bot"
4
-
5
3
  FactoryBot.define do
6
4
  factory :alchemy_essence_text, class: "Alchemy::EssenceText" do
7
5
  body { "This is a headline" }
@@ -0,0 +1,7 @@
1
+ # frozen_string_literal: true
2
+
3
+ FactoryBot.define do
4
+ factory :alchemy_essence_video, class: "Alchemy::EssenceVideo" do
5
+ attachment factory: :alchemy_attachment
6
+ end
7
+ end
@@ -0,0 +1,25 @@
1
+ # frozen_string_literal: true
2
+
3
+ FactoryBot.define do
4
+ %w[
5
+ audio
6
+ boolean
7
+ datetime
8
+ file
9
+ headline
10
+ html
11
+ link
12
+ node
13
+ page
14
+ picture
15
+ richtext
16
+ select
17
+ text
18
+ ].each do |ingredient|
19
+ factory :"alchemy_ingredient_#{ingredient}", class: "Alchemy::Ingredients::#{ingredient.classify}" do
20
+ role { ingredient }
21
+ type { "Alchemy::Ingredients::#{ingredient.classify}" }
22
+ association :element, name: "all_you_can_eat_ingredients", factory: :alchemy_element
23
+ end
24
+ end
25
+ end
@@ -1,8 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require "factory_bot"
4
- require "alchemy/test_support/factories/site_factory"
5
-
6
3
  FactoryBot.define do
7
4
  factory :alchemy_language, class: "Alchemy::Language" do
8
5
  name { "Your Language" }
@@ -1,9 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require "factory_bot"
4
- require "alchemy/test_support/factories/language_factory"
5
- require "alchemy/test_support/factories/page_factory"
6
-
7
3
  FactoryBot.define do
8
4
  factory :alchemy_node, class: "Alchemy::Node" do
9
5
  language { Alchemy::Language.default || create(:alchemy_language) }
@@ -1,8 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require "factory_bot"
4
- require "alchemy/test_support/factories/language_factory"
5
-
6
3
  FactoryBot.define do
7
4
  factory :alchemy_page, class: "Alchemy::Page" do
8
5
  language do
@@ -32,7 +29,26 @@ FactoryBot.define do
32
29
 
33
30
  trait :public do
34
31
  sequence(:name) { |n| "A Public Page #{n}" }
35
- public_on { Time.current }
32
+ transient do
33
+ public_on { Time.current }
34
+ public_until { nil }
35
+ end
36
+ after(:build) do |page, evaluator|
37
+ page.build_public_version(
38
+ public_on: evaluator.public_on,
39
+ public_until: evaluator.public_until,
40
+ )
41
+ end
42
+ after(:create) do |page|
43
+ if page.autogenerate_elements
44
+ page.definition["autogenerate"].each do |name|
45
+ create(:alchemy_element,
46
+ name: name,
47
+ page_version: page.public_version,
48
+ autogenerate_contents: true)
49
+ end
50
+ end
51
+ end
36
52
  end
37
53
 
38
54
  trait :layoutpage do
@@ -0,0 +1,23 @@
1
+ # frozen_string_literal: true
2
+
3
+ FactoryBot.define do
4
+ factory :alchemy_page_version, class: "Alchemy::PageVersion" do
5
+ association :page, factory: :alchemy_page
6
+
7
+ trait :published do
8
+ public_on { Time.current }
9
+ end
10
+
11
+ transient do
12
+ element_count { 1 }
13
+ end
14
+
15
+ trait :with_elements do
16
+ after(:build) do |page_version, evaluator|
17
+ evaluator.element_count.times do
18
+ page_version.elements.build(name: "article")
19
+ end
20
+ end
21
+ end
22
+ end
23
+ end
@@ -1,7 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require "factory_bot"
4
-
5
3
  FactoryBot.define do
6
4
  factory :alchemy_picture, class: "Alchemy::Picture" do
7
5
  image_file do
@@ -1,8 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require "factory_bot"
4
- require "securerandom"
5
-
6
3
  FactoryBot.define do
7
4
  factory :alchemy_picture_thumb, class: "Alchemy::PictureThumb" do
8
5
  picture { create(:alchemy_picture) }
@@ -1,7 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require "factory_bot"
4
-
5
3
  FactoryBot.define do
6
4
  factory :alchemy_site, class: "Alchemy::Site" do
7
5
  name { "A Site" }
@@ -0,0 +1,170 @@
1
+ # frozen_string_literal: true
2
+
3
+ RSpec.shared_examples_for "having crop action" do |args|
4
+ describe "#crop" do
5
+ let(:picture) { Alchemy::Picture.new }
6
+
7
+ before do
8
+ expect(args[:model_class]).to receive(:find).and_return(croppable_resource)
9
+ end
10
+
11
+ context "with no picture assigned" do
12
+ it "renders error message" do
13
+ get :crop, params: { id: 1 }
14
+ expect(assigns(:no_image_notice)).to eq(Alchemy.t(:no_image_for_cropper_found))
15
+ end
16
+ end
17
+
18
+ context "with picture assigned" do
19
+ subject { get :crop, params: { id: 1, picture_id: picture.id } }
20
+
21
+ let(:default_mask) do
22
+ [
23
+ 0,
24
+ 0,
25
+ 300,
26
+ 250,
27
+ ]
28
+ end
29
+
30
+ let(:settings) { {} }
31
+
32
+ before do
33
+ picture.image_file_width = 300
34
+ picture.image_file_height = 250
35
+ allow(croppable_resource).to receive(:settings) { settings }
36
+ expect(Alchemy::Picture).to receive(:find_by) { picture }
37
+ end
38
+
39
+ context "with no render_size present in croppable_resource" do
40
+ before do
41
+ expect(croppable_resource).to receive(:render_size).at_least(:once).and_return(nil)
42
+ end
43
+
44
+ context "with sizes in settings" do
45
+ let(:settings) do
46
+ { size: "300x250" }
47
+ end
48
+
49
+ it "sets sizes to given values" do
50
+ subject
51
+ expect(assigns(:settings)[:min_size]).to eq([300, 250])
52
+ end
53
+ end
54
+
55
+ context "with no sizes in settings" do
56
+ it "sets sizes to zero" do
57
+ subject
58
+ expect(assigns(:settings)[:min_size]).to eq([0, 0])
59
+ end
60
+ end
61
+ end
62
+
63
+ context "with render_size present in croppable_resource" do
64
+ it "sets sizes from these values" do
65
+ expect(croppable_resource).to receive(:render_size).at_least(:once).and_return("30x25")
66
+
67
+ subject
68
+ expect(assigns(:settings)[:min_size]).to eq([30, 25])
69
+ end
70
+
71
+ context "when width or height is not fixed" do
72
+ it "infers the height from the image file preserving the aspect ratio" do
73
+ expect(croppable_resource).to receive(:render_size).at_least(:once).and_return("30x")
74
+
75
+ subject
76
+ expect(assigns(:settings)[:min_size]).to eq([30, 25])
77
+ end
78
+
79
+ context "and aspect ratio set on the settings" do
80
+ let(:settings) do
81
+ { fixed_ratio: "2" }
82
+ end
83
+
84
+ it "does not infer the height from the image file preserving the aspect ratio" do
85
+ expect(croppable_resource).to receive(:render_size).at_least(:once).and_return("x25")
86
+
87
+ subject
88
+ expect(assigns(:settings)[:min_size]).to eq([50, 25])
89
+ end
90
+ end
91
+ end
92
+
93
+ context "when width or height is not fixed and an aspect ratio is given" do
94
+ context "and aspect ratio set on the settings" do
95
+ let(:settings) do
96
+ { fixed_ratio: "0.5" }
97
+ end
98
+
99
+ it "width is given, it infers the height from width and ratio" do
100
+ expect(croppable_resource).to receive(:render_size).at_least(:once).and_return("30x")
101
+
102
+ subject
103
+ expect(assigns(:settings)[:min_size]).to eq([30, 60])
104
+ end
105
+ end
106
+
107
+ it "infers the height from the image file preserving the aspect ratio" do
108
+ expect(croppable_resource).to receive(:render_size).at_least(:once).and_return("x25")
109
+
110
+ subject
111
+ expect(assigns(:settings)[:min_size]).to eq([30, 25])
112
+ end
113
+ end
114
+ end
115
+
116
+ context "no crop sizes present in croppable_resource" do
117
+ it "assigns default mask boxes" do
118
+ subject
119
+ expect(assigns(:settings)[:default_box]).to eq(default_mask)
120
+ end
121
+ end
122
+
123
+ context "crop sizes present in croppable_resource" do
124
+ let(:mask) { [0, 0, 120, 160] }
125
+
126
+ before do
127
+ allow(croppable_resource).to receive(:crop_from).and_return("0x0")
128
+ allow(croppable_resource).to receive(:crop_size).and_return("120x160")
129
+ end
130
+
131
+ it "assigns cropping boxes" do
132
+ subject
133
+ expect(assigns(:settings)[:default_box]).to eq(default_mask)
134
+ end
135
+ end
136
+
137
+ context "with fixed_ratio set to false" do
138
+ let(:settings) do
139
+ { fixed_ratio: false }
140
+ end
141
+
142
+ it "sets ratio to false" do
143
+ subject
144
+ expect(assigns(:settings)[:ratio]).to eq(false)
145
+ end
146
+ end
147
+
148
+ context "with fixed_ratio set to a non float string" do
149
+ let(:settings) do
150
+ { fixed_ratio: "123,45" }
151
+ end
152
+
153
+ it "raises error" do
154
+ expect { subject }.to raise_error(ArgumentError)
155
+ end
156
+ end
157
+
158
+ context "with no fixed_ratio set" do
159
+ let(:settings) do
160
+ { size: "80x60" }
161
+ end
162
+
163
+ it "sets a fixed ratio from sizes" do
164
+ subject
165
+ expect(assigns(:settings)[:ratio]).to eq(80.0 / 60.0)
166
+ end
167
+ end
168
+ end
169
+ end
170
+ end