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,41 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
module Alchemy
|
4
|
-
# @deprecated
|
5
|
-
class EssenceHeadline < BaseRecord
|
6
|
-
acts_as_essence
|
7
|
-
|
8
|
-
after_initialize :set_level_and_size
|
9
|
-
|
10
|
-
def preview_text(maxlength = 30)
|
11
|
-
"H#{level}: #{body}"[0..maxlength - 1]
|
12
|
-
end
|
13
|
-
|
14
|
-
def level_options
|
15
|
-
levels.map { |level| ["H#{level}", level] }
|
16
|
-
end
|
17
|
-
|
18
|
-
def size_options
|
19
|
-
sizes.map { |size| ["H#{size}", size] }
|
20
|
-
end
|
21
|
-
|
22
|
-
private
|
23
|
-
|
24
|
-
def content_settings
|
25
|
-
content&.settings || {}
|
26
|
-
end
|
27
|
-
|
28
|
-
def levels
|
29
|
-
content_settings.fetch(:levels, (1..6))
|
30
|
-
end
|
31
|
-
|
32
|
-
def sizes
|
33
|
-
content_settings.fetch(:sizes, [])
|
34
|
-
end
|
35
|
-
|
36
|
-
def set_level_and_size
|
37
|
-
self.level ||= levels.first
|
38
|
-
self.size ||= sizes.first
|
39
|
-
end
|
40
|
-
end
|
41
|
-
end
|
@@ -1,23 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
# == Schema Information
|
4
|
-
#
|
5
|
-
# Table name: alchemy_essence_htmls
|
6
|
-
#
|
7
|
-
# id :integer not null, primary key
|
8
|
-
# source :text
|
9
|
-
# created_at :datetime not null
|
10
|
-
# updated_at :datetime not null
|
11
|
-
#
|
12
|
-
|
13
|
-
module Alchemy
|
14
|
-
# @deprecated
|
15
|
-
class EssenceHtml < BaseRecord
|
16
|
-
acts_as_essence ingredient_column: "source"
|
17
|
-
|
18
|
-
# Returns the first x (default = 30) (HTML escaped) characters from self.source for the Element#preview_text method.
|
19
|
-
def preview_text(maxlength = 30)
|
20
|
-
::CGI.escapeHTML(source.to_s)[0..maxlength]
|
21
|
-
end
|
22
|
-
end
|
23
|
-
end
|
@@ -1,21 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
# == Schema Information
|
4
|
-
#
|
5
|
-
# Table name: alchemy_essence_links
|
6
|
-
#
|
7
|
-
# id :integer not null, primary key
|
8
|
-
# link :string
|
9
|
-
# link_title :string
|
10
|
-
# link_target :string
|
11
|
-
# link_class_name :string
|
12
|
-
# created_at :datetime not null
|
13
|
-
# updated_at :datetime not null
|
14
|
-
#
|
15
|
-
|
16
|
-
module Alchemy
|
17
|
-
# @deprecated
|
18
|
-
class EssenceLink < BaseRecord
|
19
|
-
acts_as_essence ingredient_column: "link"
|
20
|
-
end
|
21
|
-
end
|
@@ -1,19 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
module Alchemy
|
4
|
-
# @deprecated
|
5
|
-
class EssenceNode < BaseRecord
|
6
|
-
acts_as_essence(
|
7
|
-
ingredient_column: :node,
|
8
|
-
preview_text_column: :node_name,
|
9
|
-
belongs_to: {
|
10
|
-
class_name: "Alchemy::Node",
|
11
|
-
foreign_key: :node_id,
|
12
|
-
inverse_of: :essence_nodes,
|
13
|
-
optional: true,
|
14
|
-
},
|
15
|
-
)
|
16
|
-
|
17
|
-
delegate :name, to: :node, prefix: true, allow_nil: true
|
18
|
-
end
|
19
|
-
end
|
@@ -1,17 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
module Alchemy
|
4
|
-
# @deprecated
|
5
|
-
class EssencePage < BaseRecord
|
6
|
-
acts_as_essence(
|
7
|
-
ingredient_column: :page,
|
8
|
-
preview_text_method: :name,
|
9
|
-
belongs_to: {
|
10
|
-
class_name: "Alchemy::Page",
|
11
|
-
foreign_key: :page_id,
|
12
|
-
inverse_of: :essence_pages,
|
13
|
-
optional: true,
|
14
|
-
},
|
15
|
-
)
|
16
|
-
end
|
17
|
-
end
|
@@ -1,67 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
# == Schema Information
|
4
|
-
#
|
5
|
-
# Table name: alchemy_essence_pictures
|
6
|
-
#
|
7
|
-
# id :integer not null, primary key
|
8
|
-
# picture_id :integer
|
9
|
-
# caption :string
|
10
|
-
# title :string
|
11
|
-
# alt_tag :string
|
12
|
-
# link :string
|
13
|
-
# link_class_name :string
|
14
|
-
# link_title :string
|
15
|
-
# css_class :string
|
16
|
-
# link_target :string
|
17
|
-
# created_at :datetime not null
|
18
|
-
# updated_at :datetime not null
|
19
|
-
# crop_from :string
|
20
|
-
# crop_size :string
|
21
|
-
# render_size :string
|
22
|
-
#
|
23
|
-
|
24
|
-
module Alchemy
|
25
|
-
# @deprecated
|
26
|
-
class EssencePicture < BaseRecord
|
27
|
-
include Alchemy::PictureThumbnails
|
28
|
-
|
29
|
-
acts_as_essence ingredient_column: :picture, belongs_to: {
|
30
|
-
class_name: "Alchemy::Picture",
|
31
|
-
foreign_key: :picture_id,
|
32
|
-
inverse_of: :essence_pictures,
|
33
|
-
optional: true,
|
34
|
-
}
|
35
|
-
|
36
|
-
delegate :settings, to: :content
|
37
|
-
|
38
|
-
before_save :replace_newlines
|
39
|
-
|
40
|
-
# The name of the picture used as preview text in element editor views.
|
41
|
-
#
|
42
|
-
# @param max [Integer]
|
43
|
-
# The maximum length of the text returned.
|
44
|
-
#
|
45
|
-
# @return [String]
|
46
|
-
def preview_text(max = 30)
|
47
|
-
return "" if picture.nil?
|
48
|
-
|
49
|
-
picture.name.to_s[0..max - 1]
|
50
|
-
end
|
51
|
-
|
52
|
-
# Returns a serialized ingredient value for json api
|
53
|
-
#
|
54
|
-
# @return [String]
|
55
|
-
def serialized_ingredient
|
56
|
-
picture_url(content.settings)
|
57
|
-
end
|
58
|
-
|
59
|
-
private
|
60
|
-
|
61
|
-
def replace_newlines
|
62
|
-
return nil if caption.nil?
|
63
|
-
|
64
|
-
caption.gsub!(/(\r\n|\r|\n)/, "<br/>")
|
65
|
-
end
|
66
|
-
end
|
67
|
-
end
|
@@ -1,90 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
module Alchemy
|
4
|
-
# Renders an essence picture view
|
5
|
-
# @deprecated
|
6
|
-
class EssencePictureView
|
7
|
-
include ActionView::Helpers::AssetTagHelper
|
8
|
-
include ActionView::Helpers::UrlHelper
|
9
|
-
include Rails.application.routes.url_helpers
|
10
|
-
|
11
|
-
attr_reader :content, :essence, :html_options, :options, :picture
|
12
|
-
|
13
|
-
DEFAULT_OPTIONS = {
|
14
|
-
show_caption: true,
|
15
|
-
disable_link: false,
|
16
|
-
srcset: [],
|
17
|
-
sizes: [],
|
18
|
-
}.with_indifferent_access
|
19
|
-
|
20
|
-
def initialize(content, options = {}, html_options = {})
|
21
|
-
@content = content
|
22
|
-
@options = DEFAULT_OPTIONS.merge(content.settings).merge(options)
|
23
|
-
@html_options = html_options
|
24
|
-
@essence = content.essence
|
25
|
-
@picture = essence.picture
|
26
|
-
end
|
27
|
-
|
28
|
-
def render
|
29
|
-
return if picture.blank?
|
30
|
-
|
31
|
-
output = caption ? img_tag + caption : img_tag
|
32
|
-
|
33
|
-
if is_linked?
|
34
|
-
output = link_to(output, url_for(essence.link), {
|
35
|
-
title: essence.link_title.presence,
|
36
|
-
target: essence.link_target == "blank" ? "_blank" : nil,
|
37
|
-
data: { link_target: essence.link_target.presence },
|
38
|
-
})
|
39
|
-
end
|
40
|
-
|
41
|
-
if caption
|
42
|
-
content_tag(:figure, output, { class: essence.css_class.presence }.merge(html_options))
|
43
|
-
else
|
44
|
-
output
|
45
|
-
end
|
46
|
-
end
|
47
|
-
|
48
|
-
def caption
|
49
|
-
return unless show_caption?
|
50
|
-
|
51
|
-
@_caption ||= content_tag(:figcaption, essence.caption)
|
52
|
-
end
|
53
|
-
|
54
|
-
def src
|
55
|
-
essence.picture_url(options.except(*DEFAULT_OPTIONS.keys))
|
56
|
-
end
|
57
|
-
|
58
|
-
def img_tag
|
59
|
-
@_img_tag ||= image_tag(
|
60
|
-
src, {
|
61
|
-
alt: alt_text,
|
62
|
-
title: essence.title.presence,
|
63
|
-
class: caption ? nil : essence.css_class.presence,
|
64
|
-
srcset: srcset.join(", ").presence,
|
65
|
-
sizes: options[:sizes].join(", ").presence,
|
66
|
-
}.merge(caption ? {} : html_options)
|
67
|
-
)
|
68
|
-
end
|
69
|
-
|
70
|
-
def show_caption?
|
71
|
-
options[:show_caption] && essence.caption.present?
|
72
|
-
end
|
73
|
-
|
74
|
-
def is_linked?
|
75
|
-
!options[:disable_link] && essence.link.present?
|
76
|
-
end
|
77
|
-
|
78
|
-
def srcset
|
79
|
-
options[:srcset].map do |size|
|
80
|
-
url = essence.picture_url(size: size)
|
81
|
-
width, height = size.split("x")
|
82
|
-
width.present? ? "#{url} #{width}w" : "#{url} #{height}h"
|
83
|
-
end
|
84
|
-
end
|
85
|
-
|
86
|
-
def alt_text
|
87
|
-
essence.alt_tag.presence || html_options.delete(:alt) || essence.picture.name&.humanize
|
88
|
-
end
|
89
|
-
end
|
90
|
-
end
|
@@ -1,44 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
# == Schema Information
|
4
|
-
#
|
5
|
-
# Table name: alchemy_essence_richtexts
|
6
|
-
#
|
7
|
-
# id :integer not null, primary key
|
8
|
-
# body :text
|
9
|
-
# stripped_body :text
|
10
|
-
# public :boolean
|
11
|
-
# created_at :datetime not null
|
12
|
-
# updated_at :datetime not null
|
13
|
-
#
|
14
|
-
|
15
|
-
module Alchemy
|
16
|
-
# @deprecated
|
17
|
-
class EssenceRichtext < BaseRecord
|
18
|
-
acts_as_essence preview_text_column: "stripped_body"
|
19
|
-
|
20
|
-
before_save :strip_content
|
21
|
-
before_save :sanitize_content
|
22
|
-
|
23
|
-
def has_tinymce?
|
24
|
-
true
|
25
|
-
end
|
26
|
-
|
27
|
-
private
|
28
|
-
|
29
|
-
def strip_content
|
30
|
-
self.stripped_body = Rails::Html::FullSanitizer.new.sanitize(body)
|
31
|
-
end
|
32
|
-
|
33
|
-
def sanitize_content
|
34
|
-
self.sanitized_body = Rails::Html::SafeListSanitizer.new.sanitize(
|
35
|
-
body,
|
36
|
-
content_sanitizer_settings
|
37
|
-
)
|
38
|
-
end
|
39
|
-
|
40
|
-
def content_sanitizer_settings
|
41
|
-
content&.settings&.fetch(:sanitizer, {}) || {}
|
42
|
-
end
|
43
|
-
end
|
44
|
-
end
|
@@ -1,19 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
# == Schema Information
|
4
|
-
#
|
5
|
-
# Table name: alchemy_essence_selects
|
6
|
-
#
|
7
|
-
# id :integer not null, primary key
|
8
|
-
# value :string
|
9
|
-
# created_at :datetime not null
|
10
|
-
# updated_at :datetime not null
|
11
|
-
#
|
12
|
-
|
13
|
-
# Provides a select box that stores string values.
|
14
|
-
module Alchemy
|
15
|
-
# @deprecated
|
16
|
-
class EssenceSelect < BaseRecord
|
17
|
-
acts_as_essence ingredient_column: "value"
|
18
|
-
end
|
19
|
-
end
|
@@ -1,23 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
# == Schema Information
|
4
|
-
#
|
5
|
-
# Table name: alchemy_essence_texts
|
6
|
-
#
|
7
|
-
# id :integer not null, primary key
|
8
|
-
# body :text
|
9
|
-
# link :string
|
10
|
-
# link_title :string
|
11
|
-
# link_class_name :string
|
12
|
-
# public :boolean default(FALSE)
|
13
|
-
# link_target :string
|
14
|
-
# created_at :datetime not null
|
15
|
-
# updated_at :datetime not null
|
16
|
-
#
|
17
|
-
|
18
|
-
module Alchemy
|
19
|
-
# @deprecated
|
20
|
-
class EssenceText < BaseRecord
|
21
|
-
acts_as_essence
|
22
|
-
end
|
23
|
-
end
|
@@ -1,88 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
module Alchemy
|
4
|
-
# Renders a picture ingredient view
|
5
|
-
class PictureView
|
6
|
-
include ActionView::Helpers::AssetTagHelper
|
7
|
-
include ActionView::Helpers::UrlHelper
|
8
|
-
include Rails.application.routes.url_helpers
|
9
|
-
|
10
|
-
attr_reader :ingredient, :html_options, :options, :picture
|
11
|
-
|
12
|
-
DEFAULT_OPTIONS = {
|
13
|
-
show_caption: true,
|
14
|
-
disable_link: false,
|
15
|
-
srcset: [],
|
16
|
-
sizes: [],
|
17
|
-
}.with_indifferent_access
|
18
|
-
|
19
|
-
def initialize(ingredient, options = {}, html_options = {})
|
20
|
-
@ingredient = ingredient
|
21
|
-
@options = DEFAULT_OPTIONS.merge(ingredient.settings).merge(options || {})
|
22
|
-
@html_options = html_options || {}
|
23
|
-
@picture = ingredient.picture
|
24
|
-
end
|
25
|
-
|
26
|
-
def render
|
27
|
-
return if picture.blank?
|
28
|
-
|
29
|
-
output = caption ? img_tag + caption : img_tag
|
30
|
-
|
31
|
-
if is_linked?
|
32
|
-
output = link_to(output, url_for(ingredient.link), {
|
33
|
-
title: ingredient.link_title.presence,
|
34
|
-
target: ingredient.link_target == "blank" ? "_blank" : nil,
|
35
|
-
data: { link_target: ingredient.link_target.presence },
|
36
|
-
})
|
37
|
-
end
|
38
|
-
|
39
|
-
if caption
|
40
|
-
content_tag(:figure, output, { class: ingredient.css_class.presence }.merge(html_options))
|
41
|
-
else
|
42
|
-
output
|
43
|
-
end
|
44
|
-
end
|
45
|
-
|
46
|
-
def caption
|
47
|
-
return unless show_caption?
|
48
|
-
|
49
|
-
@_caption ||= content_tag(:figcaption, ingredient.caption)
|
50
|
-
end
|
51
|
-
|
52
|
-
def src
|
53
|
-
ingredient.picture_url(options.except(*DEFAULT_OPTIONS.keys))
|
54
|
-
end
|
55
|
-
|
56
|
-
def img_tag
|
57
|
-
@_img_tag ||= image_tag(
|
58
|
-
src, {
|
59
|
-
alt: alt_text,
|
60
|
-
title: ingredient.title.presence,
|
61
|
-
class: caption ? nil : ingredient.css_class.presence,
|
62
|
-
srcset: srcset.join(", ").presence,
|
63
|
-
sizes: options[:sizes].join(", ").presence,
|
64
|
-
}.merge(caption ? {} : html_options)
|
65
|
-
)
|
66
|
-
end
|
67
|
-
|
68
|
-
def show_caption?
|
69
|
-
options[:show_caption] && ingredient.caption.present?
|
70
|
-
end
|
71
|
-
|
72
|
-
def is_linked?
|
73
|
-
!options[:disable_link] && ingredient.link.present?
|
74
|
-
end
|
75
|
-
|
76
|
-
def srcset
|
77
|
-
options[:srcset].map do |size|
|
78
|
-
url = ingredient.picture_url(size: size)
|
79
|
-
width, height = size.split("x")
|
80
|
-
width.present? ? "#{url} #{width}w" : "#{url} #{height}h"
|
81
|
-
end
|
82
|
-
end
|
83
|
-
|
84
|
-
def alt_text
|
85
|
-
ingredient.alt_tag.presence || html_options.delete(:alt) || ingredient.picture.name&.humanize
|
86
|
-
end
|
87
|
-
end
|
88
|
-
end
|
@@ -1,17 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
module Alchemy
|
4
|
-
class ContentSerializer < ActiveModel::Serializer
|
5
|
-
attributes :id,
|
6
|
-
:name,
|
7
|
-
:ingredient,
|
8
|
-
:element_id,
|
9
|
-
:settings
|
10
|
-
|
11
|
-
has_one :essence, polymorphic: true
|
12
|
-
|
13
|
-
def ingredient
|
14
|
-
object.serialized_ingredient
|
15
|
-
end
|
16
|
-
end
|
17
|
-
end
|
@@ -1,28 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
module Alchemy
|
4
|
-
class EssencePictureSerializer < ActiveModel::Serializer
|
5
|
-
attributes(
|
6
|
-
:id,
|
7
|
-
:picture_id,
|
8
|
-
:caption,
|
9
|
-
:title,
|
10
|
-
:alt_tag,
|
11
|
-
:css_class,
|
12
|
-
:link,
|
13
|
-
)
|
14
|
-
|
15
|
-
has_one :picture
|
16
|
-
|
17
|
-
def link
|
18
|
-
return if object.link.blank?
|
19
|
-
|
20
|
-
{
|
21
|
-
url: object.link,
|
22
|
-
css_class: object.link_class_name,
|
23
|
-
title: object.link_title,
|
24
|
-
target: object.link_target,
|
25
|
-
}
|
26
|
-
end
|
27
|
-
end
|
28
|
-
end
|
@@ -1,22 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
module Alchemy
|
4
|
-
class EssenceTextSerializer < ActiveModel::Serializer
|
5
|
-
attributes(
|
6
|
-
:id,
|
7
|
-
:body,
|
8
|
-
:link,
|
9
|
-
)
|
10
|
-
|
11
|
-
def link
|
12
|
-
return if object.link.blank?
|
13
|
-
|
14
|
-
{
|
15
|
-
url: object.link,
|
16
|
-
title: object.link_title,
|
17
|
-
css_class: object.link_class_name,
|
18
|
-
target: object.link_target,
|
19
|
-
}
|
20
|
-
end
|
21
|
-
end
|
22
|
-
end
|
@@ -1,21 +0,0 @@
|
|
1
|
-
var editor_html = '<%= j render(Alchemy::ContentEditor.new(@content)) %>';
|
2
|
-
|
3
|
-
$("[data-element-<%= @content.element_id %>-missing-content=\"<%= @content.name %>\"]").replaceWith(editor_html);
|
4
|
-
|
5
|
-
<% if @content.essence_type == "Alchemy::EssencePicture" && @content.ingredient %>
|
6
|
-
|
7
|
-
$('#picture_to_assign_<%= @content.ingredient.id %> a').attr('href', '#').off('click');
|
8
|
-
|
9
|
-
<% elsif @content.essence_type == "Alchemy::EssenceDate" %>
|
10
|
-
|
11
|
-
Alchemy.Datepicker('#element_<%= @content.element_id %>');
|
12
|
-
|
13
|
-
<% elsif @content.essence_type == "Alchemy::EssenceRichtext" %>
|
14
|
-
|
15
|
-
Alchemy.Tinymce.initEditor(<%= @content.id %>);
|
16
|
-
|
17
|
-
<% end %>
|
18
|
-
|
19
|
-
Alchemy.reloadPreview();
|
20
|
-
Alchemy.closeCurrentDialog();
|
21
|
-
Alchemy.SelectBox("#element_<%= @content.element_id %>");
|
@@ -1,21 +0,0 @@
|
|
1
|
-
<% css_classes = @content.settings[:css_classes] %>
|
2
|
-
|
3
|
-
<%= alchemy_form_for [:admin, @essence_file] do |f| %>
|
4
|
-
<%= f.input :link_text %>
|
5
|
-
<%= f.input :title %>
|
6
|
-
<%- if css_classes.present? -%>
|
7
|
-
<%= f.input :css_class,
|
8
|
-
collection: css_classes,
|
9
|
-
include_blank: Alchemy.t('None'),
|
10
|
-
input_html: {class: 'alchemy_selectbox'} %>
|
11
|
-
<%- else -%>
|
12
|
-
<%= f.input :css_class,
|
13
|
-
label: Alchemy.t(:position_in_text),
|
14
|
-
collection: [
|
15
|
-
[Alchemy.t(:above), "no_float"],
|
16
|
-
[Alchemy.t(:left), "left"],
|
17
|
-
[Alchemy.t(:right), "right"]
|
18
|
-
], include_blank: Alchemy.t('Layout default'), input_html: {class: 'alchemy_selectbox'} %>
|
19
|
-
<%- end -%>
|
20
|
-
<%= f.submit Alchemy.t(:save) %>
|
21
|
-
<% end %>
|