alchemy_cms 6.1.5 → 7.0.0.pre.b
Sign up to get free protection for your applications and to get access to all the features.
- 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
@@ -1,21 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
module Alchemy
|
4
|
-
module Admin
|
5
|
-
class ContentsController < Alchemy::Admin::BaseController
|
6
|
-
helper "alchemy/admin/essences"
|
7
|
-
|
8
|
-
authorize_resource class: Alchemy::Content
|
9
|
-
|
10
|
-
def create
|
11
|
-
@content = Content.create(content_params)
|
12
|
-
end
|
13
|
-
|
14
|
-
private
|
15
|
-
|
16
|
-
def content_params
|
17
|
-
params.require(:content).permit(:element_id, :name, :ingredient)
|
18
|
-
end
|
19
|
-
end
|
20
|
-
end
|
21
|
-
end
|
@@ -1,30 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
module Alchemy
|
4
|
-
module Admin
|
5
|
-
class EssenceAudiosController < Alchemy::Admin::BaseController
|
6
|
-
authorize_resource class: Alchemy::EssenceAudio
|
7
|
-
before_action :load_essence
|
8
|
-
|
9
|
-
def update
|
10
|
-
@essence_audio.update(essence_audio_params)
|
11
|
-
end
|
12
|
-
|
13
|
-
private
|
14
|
-
|
15
|
-
def load_essence
|
16
|
-
@essence_audio = EssenceAudio.find(params[:id])
|
17
|
-
end
|
18
|
-
|
19
|
-
def essence_audio_params
|
20
|
-
params.require(:essence_audio).permit(
|
21
|
-
:autoplay,
|
22
|
-
:controls,
|
23
|
-
:loop,
|
24
|
-
:muted,
|
25
|
-
:attachment_id
|
26
|
-
)
|
27
|
-
end
|
28
|
-
end
|
29
|
-
end
|
30
|
-
end
|
@@ -1,31 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
module Alchemy
|
4
|
-
module Admin
|
5
|
-
class EssenceFilesController < Alchemy::Admin::BaseController
|
6
|
-
authorize_resource class: Alchemy::EssenceFile
|
7
|
-
|
8
|
-
before_action :load_essence_file, only: [:edit, :update]
|
9
|
-
|
10
|
-
helper "Alchemy::Admin::Contents"
|
11
|
-
|
12
|
-
def edit
|
13
|
-
@content = @essence_file.content
|
14
|
-
end
|
15
|
-
|
16
|
-
def update
|
17
|
-
@essence_file.update(essence_file_params)
|
18
|
-
end
|
19
|
-
|
20
|
-
private
|
21
|
-
|
22
|
-
def essence_file_params
|
23
|
-
params.require(:essence_file).permit(:title, :css_class, :link_text)
|
24
|
-
end
|
25
|
-
|
26
|
-
def load_essence_file
|
27
|
-
@essence_file = EssenceFile.find(params[:id])
|
28
|
-
end
|
29
|
-
end
|
30
|
-
end
|
31
|
-
end
|
@@ -1,43 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
module Alchemy
|
4
|
-
module Admin
|
5
|
-
class EssencePicturesController < Alchemy::Admin::BaseController
|
6
|
-
include CropAction
|
7
|
-
|
8
|
-
authorize_resource class: Alchemy::EssencePicture
|
9
|
-
|
10
|
-
before_action :load_essence_picture, only: [:edit, :update]
|
11
|
-
before_action :load_content, only: [:edit, :update]
|
12
|
-
|
13
|
-
helper "alchemy/admin/contents"
|
14
|
-
helper "alchemy/admin/essences"
|
15
|
-
helper "alchemy/url"
|
16
|
-
|
17
|
-
def edit
|
18
|
-
end
|
19
|
-
|
20
|
-
def update
|
21
|
-
@essence_picture.update(essence_picture_params)
|
22
|
-
end
|
23
|
-
|
24
|
-
private
|
25
|
-
|
26
|
-
def load_essence_picture
|
27
|
-
@essence_picture = EssencePicture.find(params[:id])
|
28
|
-
end
|
29
|
-
|
30
|
-
def load_croppable_resource
|
31
|
-
@croppable_resource = EssencePicture.find(params[:id])
|
32
|
-
end
|
33
|
-
|
34
|
-
def load_content
|
35
|
-
@content = Content.find(params[:content_id])
|
36
|
-
end
|
37
|
-
|
38
|
-
def essence_picture_params
|
39
|
-
params.require(:essence_picture).permit(:alt_tag, :caption, :css_class, :render_size, :title, :crop_from, :crop_size)
|
40
|
-
end
|
41
|
-
end
|
42
|
-
end
|
43
|
-
end
|
@@ -1,34 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
module Alchemy
|
4
|
-
module Admin
|
5
|
-
class EssenceVideosController < Alchemy::Admin::BaseController
|
6
|
-
authorize_resource class: Alchemy::EssenceVideo
|
7
|
-
before_action :load_essence
|
8
|
-
|
9
|
-
def update
|
10
|
-
@essence_video.update(essence_video_params)
|
11
|
-
end
|
12
|
-
|
13
|
-
private
|
14
|
-
|
15
|
-
def load_essence
|
16
|
-
@essence_video = EssenceVideo.find(params[:id])
|
17
|
-
end
|
18
|
-
|
19
|
-
def essence_video_params
|
20
|
-
params.require(:essence_video).permit(
|
21
|
-
:width,
|
22
|
-
:height,
|
23
|
-
:autoplay,
|
24
|
-
:controls,
|
25
|
-
:loop,
|
26
|
-
:muted,
|
27
|
-
:playsinline,
|
28
|
-
:preload,
|
29
|
-
:attachment_id
|
30
|
-
)
|
31
|
-
end
|
32
|
-
end
|
33
|
-
end
|
34
|
-
end
|
@@ -1,52 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
module Alchemy
|
4
|
-
class Api::ContentsController < Api::BaseController
|
5
|
-
# Returns all contents as json object
|
6
|
-
#
|
7
|
-
# You can either load all or only these for :element_id param
|
8
|
-
#
|
9
|
-
def index
|
10
|
-
# Fix for cancancan not able to merge multiple AR scopes for logged in users
|
11
|
-
if can? :manage, Alchemy::Content
|
12
|
-
@contents = Content.all
|
13
|
-
else
|
14
|
-
@contents = Content.accessible_by(current_ability, :index)
|
15
|
-
end
|
16
|
-
if params[:element_id].present?
|
17
|
-
@contents = @contents.where(element_id: params[:element_id])
|
18
|
-
end
|
19
|
-
@contents = @contents.includes(*content_includes)
|
20
|
-
|
21
|
-
render json: @contents, adapter: :json, root: "contents"
|
22
|
-
end
|
23
|
-
|
24
|
-
# Returns a json object for content
|
25
|
-
#
|
26
|
-
# You can either load it from :id param
|
27
|
-
# or even more useful via passing the element id and the name of the content
|
28
|
-
#
|
29
|
-
# $ bin/rake routes
|
30
|
-
#
|
31
|
-
# for more infos on how the url looks like.
|
32
|
-
#
|
33
|
-
def show
|
34
|
-
if params[:id]
|
35
|
-
@content = Content.where(id: params[:id]).includes(:essence).first
|
36
|
-
elsif params[:element_id] && params[:name]
|
37
|
-
@content = Content.where(
|
38
|
-
element_id: params[:element_id],
|
39
|
-
name: params[:name],
|
40
|
-
).includes(*content_includes).first || raise(ActiveRecord::RecordNotFound)
|
41
|
-
end
|
42
|
-
authorize! :show, @content
|
43
|
-
respond_with @content
|
44
|
-
end
|
45
|
-
|
46
|
-
private
|
47
|
-
|
48
|
-
def content_includes
|
49
|
-
%i[essence]
|
50
|
-
end
|
51
|
-
end
|
52
|
-
end
|
@@ -1,119 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
module Alchemy
|
4
|
-
class ContentEditor < SimpleDelegator
|
5
|
-
alias_method :content, :__getobj__
|
6
|
-
|
7
|
-
def to_partial_path
|
8
|
-
"alchemy/essences/#{essence_partial_name}_editor"
|
9
|
-
end
|
10
|
-
|
11
|
-
def css_classes
|
12
|
-
[
|
13
|
-
"content_editor",
|
14
|
-
essence_partial_name,
|
15
|
-
deprecated? ? "deprecated" : nil,
|
16
|
-
].compact
|
17
|
-
end
|
18
|
-
|
19
|
-
def data_attributes
|
20
|
-
{
|
21
|
-
content_id: id,
|
22
|
-
content_name: name,
|
23
|
-
}
|
24
|
-
end
|
25
|
-
|
26
|
-
# Returns a string to be passed to Rails form field tags to ensure we have same params layout everywhere.
|
27
|
-
#
|
28
|
-
# === Example:
|
29
|
-
#
|
30
|
-
# <%= text_field_tag content_editor.form_field_name, content_editor.ingredient %>
|
31
|
-
#
|
32
|
-
# === Options:
|
33
|
-
#
|
34
|
-
# You can pass an Essence column_name. Default is 'ingredient'
|
35
|
-
#
|
36
|
-
# ==== Example:
|
37
|
-
#
|
38
|
-
# <%= text_field_tag content_editor.form_field_name(:link), content_editor.ingredient %>
|
39
|
-
#
|
40
|
-
def form_field_name(essence_column = "ingredient")
|
41
|
-
"contents[#{id}][#{essence_column}]"
|
42
|
-
end
|
43
|
-
|
44
|
-
def form_field_id(essence_column = "ingredient")
|
45
|
-
"contents_#{id}_#{essence_column}"
|
46
|
-
end
|
47
|
-
|
48
|
-
# Fixes Rails partial renderer calling to_model on the object
|
49
|
-
# which reveals the delegated content instead of this decorator.
|
50
|
-
def respond_to?(method_name)
|
51
|
-
return false if method_name == :to_model
|
52
|
-
|
53
|
-
super
|
54
|
-
end
|
55
|
-
|
56
|
-
def has_warnings?
|
57
|
-
definition.blank? || deprecated?
|
58
|
-
end
|
59
|
-
|
60
|
-
def warnings
|
61
|
-
return unless has_warnings?
|
62
|
-
|
63
|
-
if definition.blank?
|
64
|
-
Logger.warn("Content #{name} is missing its definition", caller(1..1))
|
65
|
-
Alchemy.t(:content_definition_missing)
|
66
|
-
else
|
67
|
-
deprecation_notice
|
68
|
-
end
|
69
|
-
end
|
70
|
-
|
71
|
-
# Returns a deprecation notice for contents marked deprecated
|
72
|
-
#
|
73
|
-
# You can either use localizations or pass a String as notice
|
74
|
-
# in the content definition.
|
75
|
-
#
|
76
|
-
# == Custom deprecation notices
|
77
|
-
#
|
78
|
-
# Use general content deprecation notice
|
79
|
-
#
|
80
|
-
# - name: element_name
|
81
|
-
# contents:
|
82
|
-
# - name: old_content
|
83
|
-
# type: EssenceText
|
84
|
-
# deprecated: true
|
85
|
-
#
|
86
|
-
# Add a translation to your locale file for a per content notice.
|
87
|
-
#
|
88
|
-
# en:
|
89
|
-
# alchemy:
|
90
|
-
# content_deprecation_notices:
|
91
|
-
# element_name:
|
92
|
-
# old_content: Foo baz widget is deprecated
|
93
|
-
#
|
94
|
-
# or use the global translation that apply to all deprecated contents.
|
95
|
-
#
|
96
|
-
# en:
|
97
|
-
# alchemy:
|
98
|
-
# content_deprecation_notice: Foo baz widget is deprecated
|
99
|
-
#
|
100
|
-
# or pass string as deprecation notice.
|
101
|
-
#
|
102
|
-
# - name: element_name
|
103
|
-
# contents:
|
104
|
-
# - name: old_content
|
105
|
-
# type: EssenceText
|
106
|
-
# deprecated: This content will be removed soon.
|
107
|
-
#
|
108
|
-
def deprecation_notice
|
109
|
-
case definition["deprecated"]
|
110
|
-
when String
|
111
|
-
definition["deprecated"]
|
112
|
-
when TrueClass
|
113
|
-
Alchemy.t(name,
|
114
|
-
scope: [:content_deprecation_notices, element.name],
|
115
|
-
default: Alchemy.t(:content_deprecated))
|
116
|
-
end
|
117
|
-
end
|
118
|
-
end
|
119
|
-
end
|
@@ -1,42 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
module Alchemy
|
4
|
-
module Admin
|
5
|
-
module ContentsHelper
|
6
|
-
include Alchemy::Admin::BaseHelper
|
7
|
-
|
8
|
-
# Renders the name of elements content.
|
9
|
-
#
|
10
|
-
# Displays a warning icon if content is missing its definition.
|
11
|
-
#
|
12
|
-
# Displays a mandatory field indicator, if the content has validations.
|
13
|
-
#
|
14
|
-
def render_content_name(content)
|
15
|
-
if content.blank?
|
16
|
-
warning("Content is nil")
|
17
|
-
return
|
18
|
-
end
|
19
|
-
|
20
|
-
content_name = content.name_for_label
|
21
|
-
|
22
|
-
if content.has_warnings?
|
23
|
-
icon = hint_with_tooltip(content.warnings)
|
24
|
-
content_name = "#{icon} #{content_name}".html_safe
|
25
|
-
end
|
26
|
-
|
27
|
-
if content.has_validations?
|
28
|
-
"#{content_name}<span class='validation_indicator'>*</span>".html_safe
|
29
|
-
else
|
30
|
-
content_name
|
31
|
-
end
|
32
|
-
end
|
33
|
-
|
34
|
-
# Renders the label and a remove link for a content.
|
35
|
-
def content_label(content)
|
36
|
-
content_tag :label, for: content.form_field_id do
|
37
|
-
[render_content_name(content), render_hint_for(content)].compact.join(" ").html_safe
|
38
|
-
end
|
39
|
-
end
|
40
|
-
end
|
41
|
-
end
|
42
|
-
end
|
@@ -1,31 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
module Alchemy
|
4
|
-
module Admin
|
5
|
-
module EssencesHelper
|
6
|
-
# Renders a thumbnail for given EssencePicture content with correct cropping and size
|
7
|
-
def essence_picture_thumbnail(content)
|
8
|
-
picture = content.ingredient
|
9
|
-
essence = content.essence
|
10
|
-
|
11
|
-
return if picture.nil?
|
12
|
-
|
13
|
-
image_tag(
|
14
|
-
essence.thumbnail_url,
|
15
|
-
alt: picture.name,
|
16
|
-
class: "img_paddingtop",
|
17
|
-
title: Alchemy.t(:image_name, name: picture.name),
|
18
|
-
)
|
19
|
-
end
|
20
|
-
|
21
|
-
# Size value for edit picture dialog
|
22
|
-
def edit_picture_dialog_size(content)
|
23
|
-
if content.settings[:caption_as_textarea]
|
24
|
-
content.settings[:sizes] ? "380x320" : "380x300"
|
25
|
-
else
|
26
|
-
content.settings[:sizes] ? "380x290" : "380x255"
|
27
|
-
end
|
28
|
-
end
|
29
|
-
end
|
30
|
-
end
|
31
|
-
end
|
@@ -1,143 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
module Alchemy
|
4
|
-
# Holds everything concerning the building and creating of contents and the related essence object.
|
5
|
-
#
|
6
|
-
class Content < BaseRecord
|
7
|
-
module Factory
|
8
|
-
extend ActiveSupport::Concern
|
9
|
-
|
10
|
-
module ClassMethods
|
11
|
-
SKIPPED_ATTRIBUTES_ON_COPY = %w(position created_at updated_at creator_id updater_id element_id id)
|
12
|
-
|
13
|
-
# Builds a new content as descriped in the elements.yml file.
|
14
|
-
#
|
15
|
-
# @param [Hash]
|
16
|
-
# The content definition used for finding the content in +elements.yml+ file
|
17
|
-
#
|
18
|
-
def new(attributes = {})
|
19
|
-
element = attributes[:element] || Element.find_by(id: attributes[:element_id])
|
20
|
-
return super if attributes.empty? || element.nil?
|
21
|
-
|
22
|
-
definition = element.content_definition_for(attributes[:name])
|
23
|
-
if definition.blank? && attributes[:essence_type].nil?
|
24
|
-
raise ContentDefinitionError, "No definition found in elements.yml for #{attributes.inspect} and #{element.inspect}"
|
25
|
-
end
|
26
|
-
|
27
|
-
super(
|
28
|
-
name: attributes[:name],
|
29
|
-
essence_type: attributes[:essence_type] || normalize_essence_type(definition[:type]),
|
30
|
-
element: element,
|
31
|
-
).tap(&:build_essence)
|
32
|
-
end
|
33
|
-
|
34
|
-
# Creates a new content from elements definition in the +elements.yml+ file.
|
35
|
-
#
|
36
|
-
# 1. It builds the content
|
37
|
-
# 2. It creates the essence record (content object gets saved)
|
38
|
-
#
|
39
|
-
# @return [Alchemy::Content]
|
40
|
-
#
|
41
|
-
def create(attributes = {})
|
42
|
-
new(attributes).tap do |content|
|
43
|
-
content.essence.save && content.save
|
44
|
-
end
|
45
|
-
end
|
46
|
-
|
47
|
-
# Creates a copy of source and also copies the associated essence.
|
48
|
-
#
|
49
|
-
# You can pass a differences hash to update the attributes of the copy.
|
50
|
-
#
|
51
|
-
# === Example
|
52
|
-
#
|
53
|
-
# @copy = Alchemy::Content.copy(@content, {element_id: 3})
|
54
|
-
# @copy.element_id # => 3
|
55
|
-
#
|
56
|
-
def copy(source, differences = {})
|
57
|
-
Content.new(
|
58
|
-
source.attributes.with_indifferent_access.
|
59
|
-
except(*SKIPPED_ATTRIBUTES_ON_COPY).
|
60
|
-
merge(differences.with_indifferent_access)
|
61
|
-
).tap do |new_content|
|
62
|
-
new_content.build_essence(
|
63
|
-
source.essence.attributes.
|
64
|
-
except(*SKIPPED_ATTRIBUTES_ON_COPY)
|
65
|
-
)
|
66
|
-
new_content.save
|
67
|
-
end
|
68
|
-
end
|
69
|
-
|
70
|
-
# Returns all content definitions from elements.yml
|
71
|
-
#
|
72
|
-
def definitions
|
73
|
-
definitions = Element.definitions.flat_map { |e| e["contents"] }
|
74
|
-
definitions.compact!
|
75
|
-
definitions
|
76
|
-
end
|
77
|
-
|
78
|
-
# Returns a normalized Essence type
|
79
|
-
#
|
80
|
-
# Adds Alchemy module name in front of given essence type
|
81
|
-
# unless there is a Class with the specified name that is an essence.
|
82
|
-
#
|
83
|
-
# @param [String]
|
84
|
-
# the essence type to normalize
|
85
|
-
#
|
86
|
-
def normalize_essence_type(essence_type)
|
87
|
-
essence_type = essence_type.classify
|
88
|
-
return essence_type if is_an_essence?(essence_type)
|
89
|
-
|
90
|
-
"Alchemy::#{essence_type}"
|
91
|
-
end
|
92
|
-
|
93
|
-
private
|
94
|
-
|
95
|
-
def is_an_essence?(essence_type)
|
96
|
-
klass = Module.const_get(essence_type)
|
97
|
-
klass.is_a?(Class) && klass.new.acts_as_essence?
|
98
|
-
rescue NameError
|
99
|
-
false
|
100
|
-
end
|
101
|
-
end
|
102
|
-
|
103
|
-
# Instance Methods
|
104
|
-
|
105
|
-
# Returns the definition hash from +elements.yml+ file.
|
106
|
-
#
|
107
|
-
def definition
|
108
|
-
if element.blank?
|
109
|
-
log_warning "Content with id #{id} is missing its Element."
|
110
|
-
return {}
|
111
|
-
end
|
112
|
-
element.content_definition_for(name) || {}
|
113
|
-
end
|
114
|
-
|
115
|
-
# Build essence from definition.
|
116
|
-
#
|
117
|
-
# If an optional type is passed, this type of essence gets created.
|
118
|
-
#
|
119
|
-
def build_essence(attributes = {})
|
120
|
-
self.essence = essence_class.new(
|
121
|
-
{ content: self, ingredient: default_value }.merge(attributes)
|
122
|
-
)
|
123
|
-
end
|
124
|
-
|
125
|
-
# Creates essence from definition.
|
126
|
-
#
|
127
|
-
# If an optional type is passed, this type of essence gets created.
|
128
|
-
#
|
129
|
-
def create_essence!(attrs = {})
|
130
|
-
build_essence(attrs).save!
|
131
|
-
save!
|
132
|
-
end
|
133
|
-
|
134
|
-
private
|
135
|
-
|
136
|
-
# Returns a class constant from definition's type field or the essence_type column
|
137
|
-
#
|
138
|
-
def essence_class
|
139
|
-
(essence_type || Content.normalize_essence_type(definition["type"])).constantize
|
140
|
-
end
|
141
|
-
end
|
142
|
-
end
|
143
|
-
end
|