RubyGems - alchemy_cms - Versions diffs - 6.1.5 → 7.0.0.pre.b - Mend

alchemy_cms 6.1.5 → 7.0.0.pre.b

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (363) hide show

checksums.yaml +4 -4
data/.github/workflows/brakeman-analysis.yml +2 -2
data/.github/workflows/ci.yml +7 -10
data/.github/workflows/lint.yml +17 -0
data/.gitignore +1 -6
data/.hound.yml +2 -3
data/.rubocop.yml +4 -350
data/.standard.yml +3 -0
data/CHANGELOG.md +49 -19
data/Gemfile +4 -2
data/README.md +7 -9
data/Rakefile +12 -7
data/alchemy_cms.gemspec +3 -3
data/app/assets/javascripts/alchemy/admin.js +0 -1
data/app/assets/javascripts/alchemy/alchemy.dirty.js.coffee +1 -1
data/app/assets/javascripts/alchemy/alchemy.element_editors.js.coffee +18 -32
data/app/assets/javascripts/alchemy/alchemy.elements_window.js.coffee +2 -2
data/app/assets/javascripts/alchemy/alchemy.gui.js.coffee +2 -2
data/app/assets/javascripts/alchemy/alchemy.link_dialog.js.coffee +33 -30
data/app/assets/stylesheets/alchemy/elements.scss +16 -35
data/app/assets/stylesheets/alchemy/forms.scss +0 -4
data/app/assets/stylesheets/alchemy/node-select.scss +2 -2
data/app/components/alchemy/ingredients/audio_view.rb +37 -0
data/app/components/alchemy/ingredients/base_view.rb +38 -0
data/app/components/alchemy/ingredients/boolean_view.rb +13 -0
data/app/components/alchemy/ingredients/datetime_view.rb +22 -0
data/app/components/alchemy/ingredients/file_view.rb +40 -0
data/app/components/alchemy/ingredients/headline_view.rb +20 -0
data/app/components/alchemy/ingredients/html_view.rb +9 -0
data/app/components/alchemy/ingredients/link_view.rb +25 -0
data/app/components/alchemy/ingredients/node_view.rb +11 -0
data/app/components/alchemy/ingredients/page_view.rb +15 -0
data/app/components/alchemy/ingredients/picture_view.rb +108 -0
data/app/components/alchemy/ingredients/richtext_view.rb +22 -0
data/app/components/alchemy/ingredients/select_view.rb +6 -0
data/app/components/alchemy/ingredients/text_view.rb +41 -0
data/app/components/alchemy/ingredients/video_view.rb +39 -0
data/app/controllers/alchemy/admin/attachments_controller.rb +3 -4
data/app/controllers/alchemy/admin/base_controller.rb +7 -7
data/app/controllers/alchemy/admin/clipboard_controller.rb +2 -2
data/app/controllers/alchemy/admin/elements_controller.rb +33 -43
data/app/controllers/alchemy/admin/languages_controller.rb +1 -1
data/app/controllers/alchemy/admin/nodes_controller.rb +2 -2
data/app/controllers/alchemy/admin/pages_controller.rb +11 -11
data/app/controllers/alchemy/admin/pictures_controller.rb +15 -15
data/app/controllers/alchemy/admin/resources_controller.rb +28 -46
data/app/controllers/alchemy/admin/styleguide_controller.rb +1 -0
data/app/controllers/alchemy/admin/tags_controller.rb +11 -11
data/app/controllers/alchemy/api/base_controller.rb +2 -2
data/app/controllers/alchemy/api/elements_controller.rb +11 -13
data/app/controllers/alchemy/api/ingredients_controller.rb +1 -1
data/app/controllers/alchemy/api/nodes_controller.rb +1 -1
data/app/controllers/alchemy/api/pages_controller.rb +14 -12
data/app/controllers/alchemy/attachments_controller.rb +3 -3
data/app/controllers/alchemy/base_controller.rb +1 -1
data/app/controllers/alchemy/messages_controller.rb +18 -18
data/app/controllers/alchemy/pages_controller.rb +10 -16
data/app/controllers/concerns/alchemy/admin/archive_overlay.rb +1 -0
data/app/controllers/concerns/alchemy/admin/uploader_responses.rb +5 -7
data/app/controllers/concerns/alchemy/legacy_page_redirects.rb +5 -5
data/app/decorators/alchemy/element_editor.rb +13 -33
data/app/decorators/alchemy/ingredient_editor.rb +6 -6
data/app/helpers/alchemy/admin/attachments_helper.rb +1 -1
data/app/helpers/alchemy/admin/base_helper.rb +21 -22
data/app/helpers/alchemy/admin/elements_helper.rb +1 -3
data/app/helpers/alchemy/admin/form_helper.rb +1 -1
data/app/helpers/alchemy/admin/navigation_helper.rb +7 -7
data/app/helpers/alchemy/admin/pages_helper.rb +2 -2
data/app/helpers/alchemy/admin/tags_helper.rb +3 -3
data/app/helpers/alchemy/base_helper.rb +2 -2
data/app/helpers/alchemy/elements_block_helper.rb +13 -48
data/app/helpers/alchemy/elements_helper.rb +15 -23
data/app/helpers/alchemy/pages_helper.rb +11 -15
data/app/helpers/alchemy/url_helper.rb +1 -1
data/app/mailers/alchemy/messages_mailer.rb +1 -1
data/app/models/alchemy/attachment.rb +12 -9
data/app/models/alchemy/base_record.rb +3 -0
data/app/models/alchemy/eager_loading.rb +6 -7
data/app/models/alchemy/element/definitions.rb +1 -1
data/app/models/alchemy/element/element_ingredients.rb +4 -11
data/app/models/alchemy/element/presenters.rb +9 -25
data/app/models/alchemy/element.rb +4 -19
data/app/models/alchemy/elements_repository.rb +1 -1
data/app/models/alchemy/image_cropper_settings.rb +2 -2
data/app/models/alchemy/ingredient.rb +29 -16
data/app/models/alchemy/ingredient_validator.rb +1 -1
data/app/models/alchemy/ingredients/audio.rb +2 -0
data/app/models/alchemy/ingredients/datetime.rb +3 -1
data/app/models/alchemy/ingredients/file.rb +7 -0
data/app/models/alchemy/ingredients/headline.rb +6 -0
data/app/models/alchemy/ingredients/link.rb +2 -0
data/app/models/alchemy/ingredients/node.rb +2 -0
data/app/models/alchemy/ingredients/page.rb +2 -0
data/app/models/alchemy/ingredients/picture.rb +29 -0
data/app/models/alchemy/ingredients/richtext.rb +17 -8
data/app/models/alchemy/ingredients/select.rb +1 -0
data/app/models/alchemy/ingredients/text.rb +8 -0
data/app/models/alchemy/ingredients/video.rb +2 -0
data/app/models/alchemy/language/code.rb +1 -1
data/app/models/alchemy/language.rb +4 -4
data/app/models/alchemy/legacy_page_url.rb +1 -1
data/app/models/alchemy/node.rb +11 -8
data/app/models/alchemy/page/page_elements.rb +19 -40
data/app/models/alchemy/page/page_layouts.rb +0 -14
data/app/models/alchemy/page/page_naming.rb +4 -4
data/app/models/alchemy/page/page_natures.rb +1 -11
data/app/models/alchemy/page/page_scopes.rb +5 -5
data/app/models/alchemy/page.rb +11 -19
data/app/models/alchemy/picture/calculations.rb +2 -2
data/app/models/alchemy/picture/transformations.rb +2 -32
data/app/models/alchemy/picture/url.rb +5 -5
data/app/models/alchemy/picture.rb +22 -20
data/app/models/alchemy/picture_thumb/create.rb +7 -18
data/app/models/alchemy/picture_thumb/file_store.rb +33 -0
data/app/models/alchemy/picture_thumb.rb +11 -11
data/app/models/alchemy/picture_variant.rb +2 -3
data/app/models/alchemy/tag.rb +8 -0
data/app/models/concerns/alchemy/picture_thumbnails.rb +8 -8
data/app/serializers/alchemy/base_serializer.rb +1 -1
data/app/serializers/alchemy/element_serializer.rb +1 -6
data/app/serializers/alchemy/page_tree_serializer.rb +7 -7
data/app/services/alchemy/delete_elements.rb +1 -7
data/app/services/alchemy/duplicate_element.rb +2 -7
data/app/services/alchemy/tag_validations.rb +1 -1
data/app/views/alchemy/admin/elements/_element.html.erb +8 -22
data/app/views/alchemy/admin/elements/create.js.erb +1 -1
data/app/views/alchemy/admin/elements/fold.js.erb +2 -2
data/app/views/alchemy/admin/elements/order.js.erb +1 -1
data/app/views/alchemy/admin/elements/update.js.erb +1 -2
data/app/views/alchemy/admin/pages/_external_link.html.erb +2 -2
data/app/views/alchemy/admin/pages/_file_link.html.erb +2 -2
data/app/views/alchemy/admin/pages/_internal_link.html.erb +2 -2
data/app/views/alchemy/admin/pages/edit.html.erb +1 -4
data/app/views/alchemy/admin/pages/update.js.erb +10 -4
data/app/views/alchemy/admin/pictures/_filter_and_size_bar.html.erb +1 -3
data/app/views/alchemy/admin/pictures/_infos.html.erb +4 -6
data/app/views/alchemy/ingredients/_audio_view.html.erb +1 -14
data/app/views/alchemy/ingredients/_boolean_editor.html.erb +1 -1
data/app/views/alchemy/ingredients/_boolean_view.html.erb +1 -1
data/app/views/alchemy/ingredients/_datetime_view.html.erb +3 -9
data/app/views/alchemy/ingredients/_file_view.html.erb +3 -16
data/app/views/alchemy/ingredients/_headline_editor.html.erb +1 -1
data/app/views/alchemy/ingredients/_headline_view.html.erb +4 -10
data/app/views/alchemy/ingredients/_html_editor.html.erb +1 -1
data/app/views/alchemy/ingredients/_html_view.html.erb +1 -1
data/app/views/alchemy/ingredients/_link_view.html.erb +4 -9
data/app/views/alchemy/ingredients/_node_editor.html.erb +1 -1
data/app/views/alchemy/ingredients/_node_view.html.erb +1 -1
data/app/views/alchemy/ingredients/_page_view.html.erb +1 -4
data/app/views/alchemy/ingredients/_picture_editor.html.erb +4 -4
data/app/views/alchemy/ingredients/_picture_view.html.erb +4 -5
data/app/views/alchemy/ingredients/_richtext_editor.html.erb +11 -2
data/app/views/alchemy/ingredients/_richtext_view.html.erb +3 -3
data/app/views/alchemy/ingredients/_select_editor.html.erb +2 -2
data/app/views/alchemy/ingredients/_select_view.html.erb +1 -1
data/app/views/alchemy/ingredients/_text_editor.html.erb +1 -1
data/app/views/alchemy/ingredients/_text_view.html.erb +3 -19
data/app/views/alchemy/ingredients/_video_view.html.erb +3 -18
data/app/views/alchemy/ingredients/shared/_link_tools.html.erb +4 -3
data/app/views/alchemy/ingredients/shared/_picture_tools.html.erb +1 -0
data/app/views/alchemy/pages/_meta_data.html.erb +0 -1
data/app/views/layouts/alchemy/admin.html.erb +10 -8
data/bin/setup +37 -0
data/bin/start +17 -0
data/config/alchemy/config.yml +6 -6
data/config/brakeman.ignore +56 -57
data/config/initializers/assets.rb +1 -0
data/config/initializers/dragonfly.rb +1 -0
data/config/initializers/mime_types.rb +1 -0
data/config/initializers/mini_profiler.rb +1 -0
data/config/initializers/simple_form.rb +3 -2
data/config/locales/alchemy.en.yml +98 -112
data/config/routes.rb +22 -36
data/config/spring.rb +1 -0
data/db/migrate/20230121212637_alchemy_six_point_one.rb +248 -0
data/db/migrate/20230505132743_add_indexes_to_alchemy_pictures.rb +6 -0
data/lib/alchemy/admin/locale.rb +3 -3
data/lib/alchemy/admin/preview_url.rb +2 -2
data/lib/alchemy/auth_accessors.rb +1 -1
data/lib/alchemy/cache_digests/template_tracker.rb +6 -7
data/lib/alchemy/config.rb +3 -3
data/lib/alchemy/controller_actions.rb +4 -4
data/lib/alchemy/deprecation.rb +2 -1
data/lib/alchemy/dragonfly/processors/thumbnail.rb +1 -1
data/lib/alchemy/element_definition.rb +2 -2
data/lib/alchemy/engine.rb +2 -1
data/lib/alchemy/errors.rb +0 -11
data/lib/alchemy/filetypes.rb +7 -7
data/lib/alchemy/forms/builder.rb +4 -4
data/lib/alchemy/hints.rb +10 -10
data/lib/alchemy/i18n.rb +6 -4
data/lib/alchemy/install/tasks.rb +2 -1
data/lib/alchemy/name_conversions.rb +1 -1
data/lib/alchemy/page_layout.rb +1 -1
data/lib/alchemy/permissions.rb +5 -17
data/lib/alchemy/resource.rb +10 -10
data/lib/alchemy/resources_helper.rb +7 -7
data/lib/alchemy/routing_constraints.rb +5 -5
data/lib/alchemy/searchable_resource.rb +38 -0
data/lib/alchemy/seeder.rb +4 -3
data/lib/alchemy/shell.rb +2 -1
data/lib/alchemy/taggable.rb +3 -2
data/lib/alchemy/tasks/tidy.rb +1 -38
data/lib/alchemy/test_support/capybara_helpers.rb +69 -0
data/lib/alchemy/test_support/config_stubbing.rb +1 -0
data/lib/alchemy/test_support/factories/element_factory.rb +2 -4
data/lib/alchemy/test_support/factories/ingredient_factory.rb +1 -1
data/lib/alchemy/test_support/factories/page_factory.rb +5 -3
data/lib/alchemy/test_support/having_crop_action_examples.rb +9 -9
data/lib/alchemy/test_support/having_picture_thumbnails_examples.rb +33 -33
data/lib/alchemy/test_support/integration_helpers.rb +4 -3
data/lib/alchemy/test_support/shared_contexts.rb +2 -1
data/lib/alchemy/test_support/shared_dom_ids_examples.rb +10 -10
data/lib/alchemy/test_support/shared_ingredient_examples.rb +13 -7
data/lib/alchemy/test_support/shared_uploader_examples.rb +1 -0
data/lib/alchemy/tinymce.rb +3 -43
data/lib/alchemy/upgrader/seven_point_zero.rb +45 -0
data/lib/alchemy/upgrader/tasks/.keep +0 -0
data/lib/alchemy/upgrader.rb +9 -3
data/lib/alchemy/version.rb +1 -1
data/lib/alchemy.rb +0 -19
data/lib/alchemy_cms.rb +2 -2
data/lib/generators/alchemy/base.rb +3 -2
data/lib/generators/alchemy/elements/elements_generator.rb +2 -2
data/lib/generators/alchemy/elements/templates/view.html.erb +1 -10
data/lib/generators/alchemy/elements/templates/view.html.haml +1 -9
data/lib/generators/alchemy/elements/templates/view.html.slim +1 -9
data/lib/generators/alchemy/ingredient/ingredient_generator.rb +1 -0
data/lib/generators/alchemy/install/files/alchemy.en.yml +7 -8
data/lib/generators/alchemy/install/files/application.html.erb +1 -1
data/lib/generators/alchemy/install/install_generator.rb +20 -23
data/lib/generators/alchemy/install/templates/elements.yml.tt +12 -12
data/lib/generators/alchemy/module/module_generator.rb +1 -0
data/lib/generators/alchemy/page_layouts/page_layouts_generator.rb +1 -0
data/lib/generators/alchemy/site_layouts/site_layouts_generator.rb +1 -0
data/lib/generators/alchemy/views/views_generator.rb +2 -1
data/lib/tasks/alchemy/thumbnails.rake +6 -25
data/lib/tasks/alchemy/tidy.rake +2 -12
data/lib/tasks/alchemy/upgrade.rake +13 -49
data/package/admin.js +2 -0
data/package/dist/admin.js +16 -0
data/package/dist/admin.js.map +7 -0
data/package/src/datepicker.js +1 -0
data/package/src/tinymce.js +142 -0
data/package.json +5 -3
metadata +41 -135
data/app/assets/javascripts/alchemy/alchemy.tinymce.js.coffee +0 -93
data/app/controllers/alchemy/admin/contents_controller.rb +0 -21
data/app/controllers/alchemy/admin/essence_audios_controller.rb +0 -30
data/app/controllers/alchemy/admin/essence_files_controller.rb +0 -31
data/app/controllers/alchemy/admin/essence_pictures_controller.rb +0 -43
data/app/controllers/alchemy/admin/essence_videos_controller.rb +0 -34
data/app/controllers/alchemy/api/contents_controller.rb +0 -52
data/app/decorators/alchemy/content_editor.rb +0 -119
data/app/helpers/alchemy/admin/contents_helper.rb +0 -42
data/app/helpers/alchemy/admin/essences_helper.rb +0 -31
data/app/models/alchemy/content/factory.rb +0 -143
data/app/models/alchemy/content.rb +0 -247
data/app/models/alchemy/element/element_contents.rb +0 -200
data/app/models/alchemy/element/element_essences.rb +0 -133
data/app/models/alchemy/essence_audio.rb +0 -13
data/app/models/alchemy/essence_boolean.rb +0 -20
data/app/models/alchemy/essence_date.rb +0 -25
data/app/models/alchemy/essence_file.rb +0 -49
data/app/models/alchemy/essence_headline.rb +0 -41
data/app/models/alchemy/essence_html.rb +0 -23
data/app/models/alchemy/essence_link.rb +0 -21
data/app/models/alchemy/essence_node.rb +0 -19
data/app/models/alchemy/essence_page.rb +0 -17
data/app/models/alchemy/essence_picture.rb +0 -67
data/app/models/alchemy/essence_picture_view.rb +0 -90
data/app/models/alchemy/essence_richtext.rb +0 -44
data/app/models/alchemy/essence_select.rb +0 -19
data/app/models/alchemy/essence_text.rb +0 -23
data/app/models/alchemy/essence_video.rb +0 -13
data/app/presenters/alchemy/picture_view.rb +0 -88
data/app/serializers/alchemy/content_serializer.rb +0 -17
data/app/serializers/alchemy/essence_boolean_serializer.rb +0 -10
data/app/serializers/alchemy/essence_date_serializer.rb +0 -10
data/app/serializers/alchemy/essence_file_serializer.rb +0 -13
data/app/serializers/alchemy/essence_html_serializer.rb +0 -10
data/app/serializers/alchemy/essence_link_serializer.rb +0 -13
data/app/serializers/alchemy/essence_picture_serializer.rb +0 -28
data/app/serializers/alchemy/essence_richtext_serializer.rb +0 -11
data/app/serializers/alchemy/essence_select_serializer.rb +0 -10
data/app/serializers/alchemy/essence_text_serializer.rb +0 -22
data/app/views/alchemy/admin/contents/create.js.erb +0 -21
data/app/views/alchemy/admin/essence_audios/edit.html.erb +0 -7
data/app/views/alchemy/admin/essence_files/edit.html.erb +0 -21
data/app/views/alchemy/admin/essence_pictures/destroy.js.erb +0 -5
data/app/views/alchemy/admin/essence_pictures/edit.html.erb +0 -30
data/app/views/alchemy/admin/essence_pictures/save_link.js.erb +0 -3
data/app/views/alchemy/admin/essence_pictures/update.js.erb +0 -8
data/app/views/alchemy/admin/essence_videos/edit.html.erb +0 -12
data/app/views/alchemy/admin/pages/_tinymce_custom_config.html.erb +0 -13
data/app/views/alchemy/essences/_essence_audio_editor.html.erb +0 -4
data/app/views/alchemy/essences/_essence_audio_view.html.erb +0 -15
data/app/views/alchemy/essences/_essence_boolean_editor.html.erb +0 -11
data/app/views/alchemy/essences/_essence_boolean_view.html.erb +0 -2
data/app/views/alchemy/essences/_essence_date_editor.html.erb +0 -16
data/app/views/alchemy/essences/_essence_date_view.html.erb +0 -10
data/app/views/alchemy/essences/_essence_file_editor.html.erb +0 -54
data/app/views/alchemy/essences/_essence_file_view.html.erb +0 -18
data/app/views/alchemy/essences/_essence_headline_editor.html.erb +0 -36
data/app/views/alchemy/essences/_essence_headline_view.html.erb +0 -10
data/app/views/alchemy/essences/_essence_html_editor.html.erb +0 -10
data/app/views/alchemy/essences/_essence_html_view.html.erb +0 -2
data/app/views/alchemy/essences/_essence_link_editor.html.erb +0 -30
data/app/views/alchemy/essences/_essence_link_view.html.erb +0 -10
data/app/views/alchemy/essences/_essence_node_editor.html.erb +0 -27
data/app/views/alchemy/essences/_essence_node_view.html.erb +0 -1
data/app/views/alchemy/essences/_essence_page_editor.html.erb +0 -26
data/app/views/alchemy/essences/_essence_page_view.html.erb +0 -5
data/app/views/alchemy/essences/_essence_picture_editor.html.erb +0 -59
data/app/views/alchemy/essences/_essence_picture_view.html.erb +0 -6
data/app/views/alchemy/essences/_essence_richtext_editor.html.erb +0 -14
data/app/views/alchemy/essences/_essence_richtext_view.html.erb +0 -4
data/app/views/alchemy/essences/_essence_select_editor.html.erb +0 -28
data/app/views/alchemy/essences/_essence_select_view.html.erb +0 -2
data/app/views/alchemy/essences/_essence_text_editor.html.erb +0 -29
data/app/views/alchemy/essences/_essence_text_view.html.erb +0 -17
data/app/views/alchemy/essences/_essence_video_editor.html.erb +0 -4
data/app/views/alchemy/essences/_essence_video_view.html.erb +0 -19
data/app/views/alchemy/essences/shared/_essence_picture_tools.html.erb +0 -59
data/app/views/alchemy/essences/shared/_linkable_essence_tools.html.erb +0 -20
data/app/views/alchemy/pages/show.rss.builder +0 -21
data/db/migrate/20200226213334_alchemy_four_point_four.rb +0 -313
data/db/migrate/20200423073425_create_alchemy_essence_nodes.rb +0 -11
data/db/migrate/20200504210159_remove_site_id_from_nodes.rb +0 -28
data/db/migrate/20200505215518_add_language_id_foreign_key_to_alchemy_pages.rb +0 -8
data/db/migrate/20200511113603_add_menu_type_to_alchemy_nodes.rb +0 -27
data/db/migrate/20200514091507_make_page_layoutpage_null_false.rb +0 -6
data/db/migrate/20200519073500_remove_visible_from_alchemy_pages.rb +0 -24
data/db/migrate/20200617110713_create_alchemy_picture_thumbs.rb +0 -22
data/db/migrate/20200907111332_remove_tri_state_booleans.rb +0 -33
data/db/migrate/20201207131309_create_page_versions.rb +0 -19
data/db/migrate/20201207135820_add_page_version_id_to_alchemy_elements.rb +0 -76
data/db/migrate/20210205143548_rename_public_on_and_public_until_on_alchemy_pages.rb +0 -10
data/db/migrate/20210326105046_add_sanitized_body_to_alchemy_essence_richtexts.rb +0 -7
data/db/migrate/20210406093436_add_alchemy_essence_headlines.rb +0 -12
data/db/migrate/20210506135919_create_essence_audios.rb +0 -19
data/db/migrate/20210506140258_create_essence_videos.rb +0 -23
data/db/migrate/20210508091432_create_alchemy_ingredients.rb +0 -22
data/db/migrate/20220514072456_restrict_on_delete_page_id_foreign_key_from_alchemy_nodes.rb +0 -13
data/db/migrate/20220622130905_add_playsinline_to_alchemy_essence_videos.rb +0 -9
data/lib/alchemy/essence.rb +0 -250
data/lib/alchemy/test_support/essence_shared_examples.rb +0 -271
data/lib/alchemy/test_support/factories/content_factory.rb +0 -20
data/lib/alchemy/test_support/factories/essence_audio_factory.rb +0 -7
data/lib/alchemy/test_support/factories/essence_file_factory.rb +0 -7
data/lib/alchemy/test_support/factories/essence_page_factory.rb +0 -7
data/lib/alchemy/test_support/factories/essence_picture_factory.rb +0 -11
data/lib/alchemy/test_support/factories/essence_text_factory.rb +0 -7
data/lib/alchemy/test_support/factories/essence_video_factory.rb +0 -7
data/lib/alchemy/upgrader/five_point_zero.rb +0 -41
data/lib/alchemy/upgrader/six_point_zero.rb +0 -21
data/lib/alchemy/upgrader/tasks/add_page_versions.rb +0 -33
data/lib/alchemy/upgrader/tasks/element_views_updater.rb +0 -34
data/lib/alchemy/upgrader/tasks/harden_gutentag_migrations.rb +0 -29
data/lib/alchemy/upgrader/tasks/ingredients_migrator.rb +0 -74
data/lib/generators/alchemy/essence/essence_generator.rb +0 -49
data/lib/generators/alchemy/essence/templates/editor.html.erb +0 -17
data/lib/generators/alchemy/essence/templates/view.html.erb +0 -2

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a020fff31bc399c4927b5f6c4757d3f8ec8c24b76e42d6f352a5687e1feb0924
-  data.tar.gz: ae7367b2543dbfde31a5a7f09418e68bb94e2d40626eebd650aca7f14d5bd0cb
+  metadata.gz: 1294701d36b22b1003c708713292d905295b3a91b9caabae888c7e75555dd84c
+  data.tar.gz: 9119c835cd11c74c996466747ddf5c1ad4ba1da42bfe82a52847507a88371513
 SHA512:
-  metadata.gz: 7c572d21fa3d5adb4de20649bfe1e8fa127805a82b2852f310ed6dd850797094e7cbbac5c8d5e8061600d88e54548f14753a543c8af6dc2cd0c227bb45e22818
-  data.tar.gz: 0e75de36f74f9b1c7c37cf12785c154dc2ed987e377fe355a9b98c3821f63302a60f8ee03e06e6bc84e04703a20d8f200236f4370ecbb6f599c0c89f3bb10389
+  metadata.gz: f16b17350ebda052f7115a01ecf91274ccbb82bd0c3040701eae28d0cb793f87a62b54302e5caac4861536c0f0edb9f33bf242d6c6fa3d97388c17622aa40d52
+  data.tar.gz: 2466351d5448f8b2b304e8c7d3338443cbbae3b2df6ba5bdcf25545e3b496fd6de49ad29e6900cc5f70a22ac6585ba10e08414fe21bb734e20096ef0206c6515

data/.github/workflows/brakeman-analysis.yml CHANGED Viewed

@@ -19,7 +19,7 @@ jobs:
     steps:
       # Checkout the repository to the GitHub Actions runner
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       # Customize the ruby version depending on your needs
       - name: Set up Ruby
@@ -41,6 +41,6 @@ jobs:
       # Upload the SARIF file generated in the previous step
       - name: Upload SARIF
-        uses: github/codeql-action/upload-sarif@v1
+        uses: github/codeql-action/upload-sarif@v2
         with:
           sarif_file: output.sarif.json

data/.github/workflows/ci.yml CHANGED Viewed

@@ -12,9 +12,9 @@ jobs:
           - "6.1"
           - "7.0"
         ruby:
-          - "2.7"
           - "3.0"
           - "3.1"
+          - "3.2"
         database:
           - mysql
           - postgresql
@@ -54,7 +54,7 @@ jobs:
           MARIADB_ROOT_PASSWORD: password
         options: --health-cmd="mariadb-admin ping" --health-interval=10s --health-timeout=5s --health-retries=5
     steps:
-      - uses: actions/checkout@v2.3.4
+      - uses: actions/checkout@v3
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
@@ -62,7 +62,7 @@ jobs:
           bundler-cache: true
       - name: Restore apt cache
         id: apt-cache
-        uses: actions/cache@v2.1.3
+        uses: actions/cache@v3
         with:
           path: /home/runner/apt/cache
           key: ${{ runner.os }}-apt-${{ matrix.database }}
@@ -82,12 +82,9 @@ jobs:
           sudo apt update -qq
           sudo apt install -qq --fix-missing libmysqlclient-dev -o dir::cache::archives="/home/runner/apt/cache"
           sudo chown -R runner /home/runner/apt/cache
-      - uses: actions/setup-node@v3
-        with:
-          node-version: 16
       - name: Restore node modules cache
         id: yarn-cache
-        uses: actions/cache@v2.1.3
+        uses: actions/cache@v3
         with:
           path: spec/dummy/node_modules
           key: ${{ runner.os }}-yarn-dummy-${{ hashFiles('./package.json') }}
@@ -97,7 +94,7 @@ jobs:
         run: |
           bundle exec rake alchemy:spec:prepare
       - name: Run tests & publish code coverage
-        uses: paambaati/codeclimate-action@v2.7.5
+        uses: paambaati/codeclimate-action@v3.2.0
         env:
           CC_TEST_REPORTER_ID: bca4349e32f97919210ac8a450b04904b90683fcdd57d65a22c0f5065482bc22
         with:
@@ -112,9 +109,9 @@ jobs:
     env:
       NODE_ENV: test
     steps:
-      - uses: actions/checkout@v2.3.4
+      - uses: actions/checkout@v3
       - name: Restore node modules cache
-        uses: actions/cache@v2.1.3
+        uses: actions/cache@v3
         with:
           path: node_modules
           key: ${{ runner.os }}-yarn-${{ hashFiles('./package.json') }}

data/.github/workflows/lint.yml ADDED Viewed

@@ -0,0 +1,17 @@
+name: Lint
+on: [pull_request]
+jobs:
+  Lint:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+      - name: Install Ruby and gems
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: "3.0"
+          bundler-cache: true
+      - name: Lint Ruby files
+        run: bundle exec standardrb

data/.gitignore CHANGED Viewed

@@ -9,14 +9,9 @@ pkg
 tmp
 log
 .sass-cache
-spec/dummy/.browserslistrc
+spec/dummy/app/assets/builds/*.js*
 spec/dummy/app/javascript/
-spec/dummy/babel.config.js
-spec/dummy/bin/webpack
-spec/dummy/bin/webpack-dev-server
 spec/dummy/config/alchemy/config.yml
-spec/dummy/config/webpack/
-spec/dummy/config/webpacker.yml
 spec/dummy/db/*.sqlite3*
 spec/dummy/package.json
 spec/dummy/postcss.config.js

data/.hound.yml CHANGED Viewed

@@ -1,10 +1,9 @@
 rubocop:
-  config_file: .rubocop.yml
-  version: 1.5.2
+  enabled: false
 scss:
   enabled: false
 coffeescript:
   enabled: false
 javascript:
   enabled: false
-fail_on_violations: true
+fail_on_violations: false

data/.rubocop.yml CHANGED Viewed

@@ -1,353 +1,7 @@
-# Relaxed.Ruby.Style
+require: standard
 AllCops:
-  TargetRubyVersion: 2.5
-  Exclude:
-    - 'bin/rspec'
-    - 'vendor/**/*'
-    - 'spec/dummy/db/**/*'
-    - 'spec/dummy/config/**/*'
-    - 'alchemy_cms.gemspec'
-    - 'Rakefile'
-    - 'node_modules/**/*'
+  TargetRubyVersion: 3.0
-# Really, rubocop?
-Bundler/OrderedGems:
-  Enabled: false
-Style/EmptyLiteral:
-  Enabled: false
-# We use class vars and will have to continue doing so for compatability
-Style/ClassVars:
-  Enabled: false
-Style/FloatDivision:
-  EnforcedStyle: left_coerce
-# This has been used for customization
-Style/MutableConstant:
-  Enabled: false
-Style/ClassAndModuleChildren:
-  Enabled: false
-Style/GuardClause:
-  Enabled: false
-# We support older versions of Ruby (2.1) that do not have the %i syntax
-Style/SymbolArray:
-  Enabled: false
-Style/SymbolProc:
-  Exclude:
-    - 'lib/alchemy/permissions.rb'
-Style/WordArray:
-  Enabled: false
-Style/ConditionalAssignment:
-  Enabled: false
-Style/MixinUsage:
-  Exclude:
-    - spec/**/*
-Layout/ArgumentAlignment:
-  Enabled: false
-Layout/HashAlignment:
-  Enabled: false
-Layout/ParameterAlignment:
-  Enabled: false
-Layout/ClosingParenthesisIndentation:
-  Enabled: false
-Layout/DotPosition:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#styledotposition
-Layout/ElseAlignment:
-  Enabled: false
-Layout/EmptyLineAfterMagicComment:
-  Enabled: false
-Layout/EmptyLinesAroundAccessModifier:
-  Exclude:
-    - lib/alchemy/test_support/factories/*.rb
-Layout/FirstArrayElementIndentation:
-  Enabled: false
-Layout/FirstHashElementIndentation:
-  Enabled: false
-Layout/IndentationWidth:
-  Enabled: false
-Layout/LineLength:
-  Enabled: false
-Layout/MultilineHashBraceLayout:
-  Enabled: false
-Layout/MultilineMethodCallBraceLayout:
-  Enabled: false
-Layout/MultilineMethodCallIndentation:
-  Enabled: false
-Layout/SpaceBeforeBlockBraces:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#stylespacebeforeblockbraces
-Layout/SpaceInsideHashLiteralBraces:
-  Enabled: false
-Layout/SpaceInsideParens:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#stylespaceinsideparens
-Layout/EndAlignment:
-  Enabled: false
-Layout/RescueEnsureAlignment:
-  Enabled: false
-Lint/SuppressedException:
-  Exclude:
-    - 'config/initializers/mini_profiler.rb'
-Style/CollectionMethods:
-  Enabled: false
-Style/Alias:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#stylealias
-Style/BeginBlock:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#stylebeginblock
-Style/BlockDelimiters:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#styleblockdelimiters
-Style/Documentation:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#styledocumentation
-Style/DoubleNegation:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#styledoublenegation
-Style/EmptyMethod:
-  Enabled: false
-Style/EndBlock:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#styleendblock
-Style/FormatString:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#styleformatstring
-Style/IfUnlessModifier:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#styleifunlessmodifier
-Style/Lambda:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#stylelambda
-Style/ModuleFunction:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#stylemodulefunction
-Style/MultilineBlockChain:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#stylemultilineblockchain
-Style/NegatedIf:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#stylenegatedif
-Style/NegatedWhile:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#stylenegatedwhile
-Style/NumericLiteralPrefix:
-  Enabled: false
-Style/ParallelAssignment:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#styleparallelassignment
-Style/PercentLiteralDelimiters:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#stylepercentliteraldelimiters
-Style/PerlBackrefs:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#styleperlbackrefs
-Style/RegexpLiteral:
-  Enabled: false
-Style/Semicolon:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#stylesemicolon
-Style/SignalException:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#stylesignalexception
-Style/SingleLineBlockParams:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#stylesinglelineblockparams
-Style/SingleLineMethods:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#stylesinglelinemethods
-Style/SpecialGlobalVars:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#stylespecialglobalvars
-Style/StringLiterals:
-  EnforcedStyle: double_quotes
-Style/StringLiteralsInInterpolation:
-  EnforcedStyle: double_quotes
-Style/TrailingCommaInArguments:
-  Enabled: false
-Style/TrailingCommaInArrayLiteral:
-  EnforcedStyleForMultiline: comma
-Style/TrailingCommaInHashLiteral:
-  EnforcedStyleForMultiline: consistent_comma
-Style/WhileUntilModifier:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#stylewhileuntilmodifier
-# We use a lot of
-#
-#     expect {
-#       something
-#     }.to { happen }
-#
-# syntax in the specs files.
-Lint/AmbiguousBlockAssociation:
-  Exclude:
-    - 'spec/**/*'
-Lint/AmbiguousRegexpLiteral:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#lintambiguousregexpliteral
-Lint/AssignmentInCondition:
-  Enabled: false
-  StyleGuide: http://relaxed.ruby.style/#lintassignmentincondition
-# We use eval to get the correct url proxy object of engines in:
-# - app/helpers/alchemy/admin/navigation_helper.rb:139
-# - lib/alchemy/resources_helper.rb:24
-Security/Eval:
-  Exclude:
-    - app/helpers/alchemy/admin/navigation_helper.rb
-    - lib/alchemy/resources_helper.rb
-Metrics/AbcSize:
-  Enabled: false
-Metrics/BlockLength:
-  Enabled: false
-Metrics/BlockNesting:
-  Enabled: false
-Metrics/ClassLength:
-  Enabled: false
-Metrics/ModuleLength:
-  Enabled: false
-Metrics/CyclomaticComplexity:
-  Enabled: false
-Metrics/MethodLength:
-  Enabled: false
-Metrics/ParameterLists:
-  Enabled: false
-Metrics/PerceivedComplexity:
-  Enabled: false
-Naming/AccessorMethodName:
-  Enabled: false
-Naming/HeredocDelimiterNaming:
-    Enabled: false
-# This cop is great but has no config option to support the style `@_method_name` we are using.
-Naming/MemoizedInstanceVariableName:
-  Enabled: false
-# We need these names for backwards compatability
-Naming/PredicateName:
-  Enabled: false
-Naming/VariableNumber:
-  Enabled: false
-Lint/DuplicateBranch: # (new in 1.3)
-  Enabled: false
-Lint/DuplicateRegexpCharacterClassElement: # (new in 1.1)
-  Enabled: false
-Lint/EmptyBlock: # (new in 1.1)
-  Enabled: false
-Lint/EmptyClass: # (new in 1.3)
-  Enabled: false
-Lint/NoReturnInBeginEndBlocks: # (new in 1.2)
-  Enabled: false
-Lint/ToEnumArguments: # (new in 1.1)
-  Enabled: false
-Lint/UnexpectedBlockArity: # (new in 1.5)
-  Enabled: false
-Lint/UnmodifiedReduceAccumulator: # (new in 1.1)
-  Enabled: false
-Style/ArgumentsForwarding: # (new in 1.1)
-  Enabled: false
-Style/CollectionCompact: # (new in 1.2)
-  Enabled: false
-Style/DocumentDynamicEvalDefinition: # (new in 1.1)
-  Enabled: false
-Style/NegatedIfElseCondition: # (new in 1.2)
-  Enabled: false
-Style/NilLambda: # (new in 1.3)
-  Enabled: false
-Style/RedundantArgument: # (new in 1.4)
-  Enabled: false
-Style/SwapValues: # (new in 1.1)
-  Enabled: false
+inherit_gem:
+  standard: config/base.yml

data/.standard.yml ADDED Viewed

@@ -0,0 +1,3 @@
+parallel: true
+ignore:
+  - "spec/dummy/**/*"

data/CHANGELOG.md CHANGED Viewed

@@ -1,26 +1,56 @@
 # Changelog
-## 6.1.5 (2023-05-26)
-- [6.1] Fix page seeder [#2482](https://github.com/AlchemyCMS/alchemy_cms/pull/2482) ([tvdeyen](https://github.com/tvdeyen))
-## 6.1.4 (2023-05-18)
-- [6.1] Revert "Preload related objects in Alchemy::PagesController" [#2473](https://github.com/AlchemyCMS/alchemy_cms/pull/2473) ([tvdeyen](https://github.com/tvdeyen))
-## 6.1.3 (2023-03-29)
+## 7.0.0 (unreleased)
+- Fix TinyMCE loading behavior after page change [#2494](https://github.com/AlchemyCMS/alchemy_cms/pull/2494) ([sascha-karnatz](https://github.com/sascha-karnatz))
+- [js] Update esbuild → 0.18.4 (unknown) [#2492](https://github.com/AlchemyCMS/alchemy_cms/pull/2492) ([depfu](https://github.com/apps/depfu))
+- Add ransackable attributes to tags [#2487](https://github.com/AlchemyCMS/alchemy_cms/pull/2487) ([tvdeyen](https://github.com/tvdeyen))
+- Remove selenium-webdriver 4.9.0 [#2484](https://github.com/AlchemyCMS/alchemy_cms/pull/2484) ([depfu](https://github.com/apps/depfu))
+- Make it easier to run the dummy app locally [#2483](https://github.com/AlchemyCMS/alchemy_cms/pull/2483) ([tvdeyen](https://github.com/tvdeyen))
+- VideoView: Merge html_options onto options [#2481](https://github.com/AlchemyCMS/alchemy_cms/pull/2481) ([tvdeyen](https://github.com/tvdeyen))
+- Allow to pass level to HeadlineView component [#2480](https://github.com/AlchemyCMS/alchemy_cms/pull/2480) ([tvdeyen](https://github.com/tvdeyen))
+- Un-deprecate rendering ingredient view partials [#2479](https://github.com/AlchemyCMS/alchemy_cms/pull/2479) ([tvdeyen](https://github.com/tvdeyen))
+- Fix installer application layout template [#2478](https://github.com/AlchemyCMS/alchemy_cms/pull/2478) ([tvdeyen](https://github.com/tvdeyen))
+- Respect available locales set in application [#2477](https://github.com/AlchemyCMS/alchemy_cms/pull/2477) ([tvdeyen](https://github.com/tvdeyen))
+- Use intersection observer to init Tinymce editors [#2476](https://github.com/AlchemyCMS/alchemy_cms/pull/2476) ([sascha-karnatz](https://github.com/sascha-karnatz))
+- Revert "Preload related objects in Alchemy::PagesController" [#2472](https://github.com/AlchemyCMS/alchemy_cms/pull/2472) ([tvdeyen](https://github.com/tvdeyen))
+- Collapse all nested elements on fold [#2471](https://github.com/AlchemyCMS/alchemy_cms/pull/2471) ([tvdeyen](https://github.com/tvdeyen))
+- Do not render nested elements of element editor if folded [#2470](https://github.com/AlchemyCMS/alchemy_cms/pull/2470) ([tvdeyen](https://github.com/tvdeyen))
+- Pin selenium-webdriver to 4.9.0 [#2469](https://github.com/AlchemyCMS/alchemy_cms/pull/2469) ([tvdeyen](https://github.com/tvdeyen))
+- Add indexes to pictures table [#2466](https://github.com/AlchemyCMS/alchemy_cms/pull/2466) ([sascha-karnatz](https://github.com/sascha-karnatz))
+- Use view_component for ingredient views [#2465](https://github.com/AlchemyCMS/alchemy_cms/pull/2465) ([tvdeyen](https://github.com/tvdeyen))
+- Drop Ruby 2.x support [#2464](https://github.com/AlchemyCMS/alchemy_cms/pull/2464) ([tvdeyen](https://github.com/tvdeyen))
+- Remove defer from admin JS includes [#2463](https://github.com/AlchemyCMS/alchemy_cms/pull/2463) ([tvdeyen](https://github.com/tvdeyen))
+- Use ISO Date format in flatpickr [#2462](https://github.com/AlchemyCMS/alchemy_cms/pull/2462) ([phantomwhale](https://github.com/phantomwhale))
+- Fix layoutpages configuration [#2459](https://github.com/AlchemyCMS/alchemy_cms/pull/2459) ([oRIOnTx](https://github.com/oRIOnTx))
+- Fix picture show overlay if picture in use [#2456](https://github.com/AlchemyCMS/alchemy_cms/pull/2456) ([tvdeyen](https://github.com/tvdeyen))
+- Fix picture file format filter [#2455](https://github.com/AlchemyCMS/alchemy_cms/pull/2455) ([tvdeyen](https://github.com/tvdeyen))
+- Allow editors to switch language [#2454](https://github.com/AlchemyCMS/alchemy_cms/pull/2454) ([mamhoff](https://github.com/mamhoff))
+- Use standard.rb as code linter and formatter [#2453](https://github.com/AlchemyCMS/alchemy_cms/pull/2453) ([tvdeyen](https://github.com/tvdeyen))
+- CI: Update brakeman workflow [#2452](https://github.com/AlchemyCMS/alchemy_cms/pull/2452) ([tvdeyen](https://github.com/tvdeyen))
+- CI: Use latest version of GitHub actions [#2451](https://github.com/AlchemyCMS/alchemy_cms/pull/2451) ([tvdeyen](https://github.com/tvdeyen))
+- Send language_id (of the currently editing page) parameter to Pages API requests for page select on link overlay [#2439](https://github.com/AlchemyCMS/alchemy_cms/pull/2439) ([dbwinger](https://github.com/dbwinger))
+- Fix page seeder [#2389](https://github.com/AlchemyCMS/alchemy_cms/pull/2389) ([tvdeyen](https://github.com/tvdeyen))
+- Remove deprecations [#2450](https://github.com/AlchemyCMS/alchemy_cms/pull/2450) ([tvdeyen](https://github.com/tvdeyen))
+- Fix respond_to? overwrite in ElementEditor [#2449](https://github.com/AlchemyCMS/alchemy_cms/pull/2449) ([tvdeyen](https://github.com/tvdeyen))
 - Fix installer: Add seeds file if not exists [#2446](https://github.com/AlchemyCMS/alchemy_cms/pull/2446) ([tvdeyen](https://github.com/tvdeyen))
+- Make CapybaraHelpers requireable [#2445](https://github.com/AlchemyCMS/alchemy_cms/pull/2445) ([tvdeyen](https://github.com/tvdeyen))
+- Do not install webpacker tag for fresh apps [#2444](https://github.com/AlchemyCMS/alchemy_cms/pull/2444) ([tvdeyen](https://github.com/tvdeyen))
+- Re-add Webpacker support. [#2443](https://github.com/AlchemyCMS/alchemy_cms/pull/2443) ([tvdeyen](https://github.com/tvdeyen))
+- Add support for more link tabs [#2442](https://github.com/AlchemyCMS/alchemy_cms/pull/2442) ([tvdeyen](https://github.com/tvdeyen))
+- Add support for Ransack 4 [#2438](https://github.com/AlchemyCMS/alchemy_cms/pull/2438) ([tvdeyen](https://github.com/tvdeyen))
+- Fix non_stupid_digest_assets [#2436](https://github.com/AlchemyCMS/alchemy_cms/pull/2436) ([tvdeyen](https://github.com/tvdeyen))
+- Add PictureThumb.storage_class [#2435](https://github.com/AlchemyCMS/alchemy_cms/pull/2435) ([tvdeyen](https://github.com/tvdeyen))
+- Fix thumbnail writing for multi-concurrent and multi-db setups [#2433](https://github.com/AlchemyCMS/alchemy_cms/pull/2433) ([tvdeyen](https://github.com/tvdeyen))
 - Integrate non_stupid_digest_assets gem [#2430](https://github.com/AlchemyCMS/alchemy_cms/pull/2430) ([afdev82](https://github.com/afdev82))
-## 6.1.2 (2023-02-27)
-- [6.1] Fix thumbnail writing for multi-concurrent and multi-db setups [#2434](https://github.com/AlchemyCMS/alchemy_cms/pull/2434) ([tvdeyen](https://github.com/tvdeyen))
-## 6.1.1 (2023-01-23)
-- Re-introduce deleted methods [#2422](https://github.com/AlchemyCMS/alchemy_cms/pull/2422) ([tvdeyen](https://github.com/tvdeyen))
-- Add searchable field to page (Alchemy 6.1) [#2420](https://github.com/AlchemyCMS/alchemy_cms/pull/2420) ([kulturbande](https://github.com/kulturbande))
+- Define allowed settings in ingredients [#2425](https://github.com/AlchemyCMS/alchemy_cms/pull/2425) ([tvdeyen](https://github.com/tvdeyen))
+- Remove webpacker [#2424](https://github.com/AlchemyCMS/alchemy_cms/pull/2424) ([tvdeyen](https://github.com/tvdeyen))
+- Remove deprecated methods [#2421](https://github.com/AlchemyCMS/alchemy_cms/pull/2421) ([tvdeyen](https://github.com/tvdeyen))
+- Remove 6.0 upgrade tasks [#2418](https://github.com/AlchemyCMS/alchemy_cms/pull/2418) ([tvdeyen](https://github.com/tvdeyen))
+- Compress 6.1 migrations [#2417](https://github.com/AlchemyCMS/alchemy_cms/pull/2417) ([tvdeyen](https://github.com/tvdeyen))
+- Remove all content/essence related code [#2416](https://github.com/AlchemyCMS/alchemy_cms/pull/2416) ([tvdeyen](https://github.com/tvdeyen))
+- Remove RSS Feed feature [#2415](https://github.com/AlchemyCMS/alchemy_cms/pull/2415) ([tvdeyen](https://github.com/tvdeyen))
+- Add searchable field to page [#2414](https://github.com/AlchemyCMS/alchemy_cms/pull/2414) ([kulturbande](https://github.com/kulturbande))
 ## 6.1.0 (2023-01-19)

data/Gemfile CHANGED Viewed

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
 source "https://rubygems.org"
 gemspec
@@ -19,7 +20,9 @@ group :development, :test do
   # in our case the culprit is `handlebars-assets`. The changes between 2.7.0 and 2.8.0 are
   # minimal, but breaking.
   gem "execjs", "= 2.8.1"
-  gem "selenium-webdriver", "< 4.9.1" # until https://github.com/teamcapybara/capybara/pull/2665 got merged
+  gem "jsbundling-rails", "~> 1.1"
+  gem "rubocop", require: false
+  gem "standard", "~> 1.25", require: false
   if ENV["GITHUB_ACTIONS"]
     # Necessary because GH Actions gem cache does not have this "Bundled with Ruby" gem installed
@@ -32,7 +35,6 @@ group :development, :test do
     gem "yard"
     gem "redcarpet"
     gem "pry-byebug"
-    gem "rubocop", "1.5.2", require: false
     gem "listen"
     gem "localeapp", "~> 3.0", require: false
     gem "dotenv", "~> 2.2"

data/README.md CHANGED Viewed

@@ -1,13 +1,13 @@
 # AlchemyCMS
-[![Gem Version](https://badge.fury.io/rb/alchemy_cms.svg)](http://badge.fury.io/rb/alchemy_cms)
 [![Build Status](https://github.com/AlchemyCMS/alchemy_cms/workflows/CI/badge.svg?branch=main)](https://github.com/AlchemyCMS/alchemy_cms/actions)
+[![Brakeman Scan](https://github.com/AlchemyCMS/alchemy_cms/actions/workflows/brakeman-analysis.yml/badge.svg)](https://github.com/AlchemyCMS/alchemy_cms/actions/workflows/brakeman-analysis.yml)
+[![Gem Version](https://badge.fury.io/rb/alchemy_cms.svg)](http://badge.fury.io/rb/alchemy_cms)
 [![Maintainability](https://api.codeclimate.com/v1/badges/196c56c56568ed24a697/maintainability)](https://codeclimate.com/github/AlchemyCMS/alchemy_cms/maintainability)
 [![Test Coverage](https://api.codeclimate.com/v1/badges/196c56c56568ed24a697/test_coverage)](https://codeclimate.com/github/AlchemyCMS/alchemy_cms/test_coverage)
-[![Depfu](https://badges.depfu.com/badges/ebe56d2dd7b7044a8ae700cc81212a8e/overview.svg)](https://depfu.com/github/AlchemyCMS/alchemy_cms?project_id=4600)
-[![Slack Status](https://slackin.alchemy-cms.com/badge.svg)](https://slackin.alchemy-cms.com)
 [![Reviewed by Hound](https://img.shields.io/badge/Reviewed_by-Hound-8E64B0.svg)](https://houndci.com)
+[![Depfu](https://badges.depfu.com/badges/ebe56d2dd7b7044a8ae700cc81212a8e/overview.svg)](https://depfu.com/github/AlchemyCMS/alchemy_cms?project_id=4600)
 [![Backers on Open Collective](https://opencollective.com/alchemy_cms/backers/badge.svg?color=blue)](#backers)
 [![Sponsors on Open Collective](https://opencollective.com/alchemy_cms/sponsors/badge.svg?color=blue)](#sponsors)
@@ -302,7 +302,7 @@ If you want to contribute to Alchemy ([and we encourage you to do so](CONTRIBUTI
 First of all you need to clone your fork to your local development machine. Then you need to install the dependencies with bundler.
 ```bash
-$ bundle install
+$ bin/setup
 ```
 To prepare the tests of your Alchemy fork please make sure to run the preparation task:
@@ -316,7 +316,7 @@ to set up the database for testing.
 ### Run your tests with:
 ```bash
-$ bundle exec rspec
+$ bin/rspec
 ```
 **Alternatively** you can just run*:
@@ -332,9 +332,7 @@ $ bundle exec rake
 You can even start the dummy app and use it to manually test your changes with:
 ```bash
-$ cd spec/dummy
-$ bin/setup
-$ bin/rails s
+$ bin/start
 ```