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
@@ -6,7 +6,7 @@ module Alchemy
|
|
6
6
|
"action",
|
7
7
|
"controller",
|
8
8
|
"urlname",
|
9
|
-
"locale"
|
9
|
+
"locale"
|
10
10
|
]
|
11
11
|
|
12
12
|
include OnPageLayout::CallbacksRunner
|
@@ -122,7 +122,7 @@ module Alchemy
|
|
122
122
|
|
123
123
|
@page ||= Language.current.pages.contentpages.find_by(
|
124
124
|
urlname: params[:urlname],
|
125
|
-
language_code: params[:locale] || Language.current.code
|
125
|
+
language_code: params[:locale] || Language.current.code
|
126
126
|
)
|
127
127
|
end
|
128
128
|
|
@@ -142,7 +142,7 @@ module Alchemy
|
|
142
142
|
def page_locale_redirect_url(options = {})
|
143
143
|
options = {
|
144
144
|
locale: prefix_locale? ? @page.language_code : nil,
|
145
|
-
urlname: @page.urlname
|
145
|
+
urlname: @page.urlname
|
146
146
|
}.merge(options)
|
147
147
|
|
148
148
|
alchemy.show_page_path additional_params.merge(options)
|
@@ -168,7 +168,7 @@ module Alchemy
|
|
168
168
|
|
169
169
|
# == Renders the page :show template
|
170
170
|
#
|
171
|
-
# Handles html
|
171
|
+
# Handles html requests
|
172
172
|
#
|
173
173
|
# Omits the layout, if the request is a XHR request.
|
174
174
|
#
|
@@ -177,14 +177,6 @@ module Alchemy
|
|
177
177
|
format.html do
|
178
178
|
render action: :show, layout: !request.xhr?
|
179
179
|
end
|
180
|
-
|
181
|
-
format.rss do
|
182
|
-
if @page.contains_feed?
|
183
|
-
render action: :show, layout: false, handlers: [:builder]
|
184
|
-
else
|
185
|
-
render xml: { error: "Not found" }, status: 404
|
186
|
-
end
|
187
|
-
end
|
188
180
|
end
|
189
181
|
end
|
190
182
|
|
@@ -220,10 +212,12 @@ module Alchemy
|
|
220
212
|
# or the cache is stale, because it's been republished by the user.
|
221
213
|
#
|
222
214
|
def render_fresh_page?
|
223
|
-
must_not_cache? || stale?(
|
224
|
-
|
225
|
-
|
226
|
-
|
215
|
+
must_not_cache? || stale?(
|
216
|
+
etag: page_etag,
|
217
|
+
last_modified: @page.published_at,
|
218
|
+
public: !@page.restricted,
|
219
|
+
template: "pages/show"
|
220
|
+
)
|
227
221
|
end
|
228
222
|
|
229
223
|
# don't cache pages if we have flash message to display or the page has caching disabled
|
@@ -8,12 +8,11 @@ module Alchemy
|
|
8
8
|
def successful_uploader_response(file:, status: :created)
|
9
9
|
message = Alchemy.t(:upload_success,
|
10
10
|
scope: [:uploader, file.class.model_name.i18n_key],
|
11
|
-
name: file.name
|
12
|
-
)
|
11
|
+
name: file.name)
|
13
12
|
|
14
13
|
{
|
15
14
|
json: uploader_response(file: file, message: message),
|
16
|
-
status: status
|
15
|
+
status: status
|
17
16
|
}
|
18
17
|
end
|
19
18
|
|
@@ -21,12 +20,11 @@ module Alchemy
|
|
21
20
|
message = Alchemy.t(:upload_failure,
|
22
21
|
scope: [:uploader, file.class.model_name.i18n_key],
|
23
22
|
error: file.errors[:file].join,
|
24
|
-
name: file.name
|
25
|
-
)
|
23
|
+
name: file.name)
|
26
24
|
|
27
25
|
{
|
28
26
|
json: uploader_response(file: file, message: message),
|
29
|
-
status: :unprocessable_entity
|
27
|
+
status: :unprocessable_entity
|
30
28
|
}
|
31
29
|
end
|
32
30
|
|
@@ -35,7 +33,7 @@ module Alchemy
|
|
35
33
|
def uploader_response(file:, message:)
|
36
34
|
{
|
37
35
|
files: [file.to_jq_upload],
|
38
|
-
growl_message: message
|
36
|
+
growl_message: message
|
39
37
|
}
|
40
38
|
end
|
41
39
|
end
|
@@ -36,18 +36,18 @@ module Alchemy
|
|
36
36
|
|
37
37
|
alchemy.show_page_path(
|
38
38
|
locale: prefix_locale? ? page.language_code : nil,
|
39
|
-
urlname: page.urlname
|
39
|
+
urlname: page.urlname
|
40
40
|
)
|
41
41
|
end
|
42
42
|
|
43
43
|
def legacy_urls
|
44
44
|
# /slug/tree => slug/tree
|
45
|
-
urlname = (request.fullpath[1
|
45
|
+
urlname = (request.fullpath[1..] if request.fullpath[0] == "/") || request.fullpath
|
46
46
|
LegacyPageUrl.joins(:page).where(
|
47
|
-
urlname
|
47
|
+
:urlname => urlname,
|
48
48
|
Page.table_name => {
|
49
|
-
language_id: Language.current.id
|
50
|
-
}
|
49
|
+
language_id: Language.current.id
|
50
|
+
}
|
51
51
|
)
|
52
52
|
end
|
53
53
|
|
@@ -8,17 +8,6 @@ module Alchemy
|
|
8
8
|
"alchemy/admin/elements/element"
|
9
9
|
end
|
10
10
|
|
11
|
-
# Returns content editor instances for defined contents
|
12
|
-
#
|
13
|
-
# Creates contents on demand if the content is not yet present on the element
|
14
|
-
#
|
15
|
-
# @return Array<Alchemy::ContentEditor>
|
16
|
-
def contents
|
17
|
-
element.definition.fetch(:contents, []).map do |content|
|
18
|
-
Alchemy::ContentEditor.new(find_or_create_content(content[:name]))
|
19
|
-
end
|
20
|
-
end
|
21
|
-
|
22
11
|
# Returns ingredient editor instances for defined ingredients
|
23
12
|
#
|
24
13
|
# Creates ingredient on demand if the ingredient is not yet present on the element
|
@@ -36,7 +25,7 @@ module Alchemy
|
|
36
25
|
element.definition.fetch(:ingredients, []).any?
|
37
26
|
end
|
38
27
|
|
39
|
-
# Returns the translated
|
28
|
+
# Returns the translated ingredient group for displaying in admin editor group headings
|
40
29
|
#
|
41
30
|
# Translate it in your locale yml file:
|
42
31
|
#
|
@@ -55,7 +44,7 @@ module Alchemy
|
|
55
44
|
Alchemy.t(
|
56
45
|
group,
|
57
46
|
scope: "element_groups.#{element.name}",
|
58
|
-
default: Alchemy.t("element_groups.#{group}", default: group.humanize)
|
47
|
+
default: Alchemy.t("element_groups.#{group}", default: group.humanize)
|
59
48
|
)
|
60
49
|
end
|
61
50
|
|
@@ -63,14 +52,14 @@ module Alchemy
|
|
63
52
|
def css_classes
|
64
53
|
[
|
65
54
|
"element-editor",
|
66
|
-
|
55
|
+
ingredient_definitions.present? ? "with-ingredients" : "without-ingredients",
|
67
56
|
nestable_elements.any? ? "nestable" : "not-nestable",
|
68
57
|
taggable? ? "taggable" : "not-taggable",
|
69
58
|
folded ? "folded" : "expanded",
|
70
59
|
compact? ? "compact" : nil,
|
71
60
|
deprecated? ? "deprecated" : nil,
|
72
61
|
fixed? ? "is-fixed" : "not-fixed",
|
73
|
-
public? ? "visible" : "hidden"
|
62
|
+
public? ? "visible" : "hidden"
|
74
63
|
].join(" ")
|
75
64
|
end
|
76
65
|
|
@@ -78,12 +67,13 @@ module Alchemy
|
|
78
67
|
def editable?
|
79
68
|
return false if folded?
|
80
69
|
|
81
|
-
|
70
|
+
ingredient_definitions.any? || taggable?
|
82
71
|
end
|
83
72
|
|
84
73
|
# Fixes Rails partial renderer calling to_model on the object
|
85
74
|
# which reveals the delegated element instead of this decorator.
|
86
|
-
def respond_to?(
|
75
|
+
def respond_to?(*args, **kwargs)
|
76
|
+
method_name = args.first
|
87
77
|
return false if method_name == :to_model
|
88
78
|
|
89
79
|
super
|
@@ -124,31 +114,21 @@ module Alchemy
|
|
124
114
|
when String
|
125
115
|
definition["deprecated"]
|
126
116
|
when TrueClass
|
127
|
-
Alchemy.t(
|
128
|
-
|
129
|
-
|
117
|
+
Alchemy.t(
|
118
|
+
name,
|
119
|
+
scope: :element_deprecation_notices,
|
120
|
+
default: Alchemy.t(:element_deprecated)
|
121
|
+
)
|
130
122
|
end
|
131
123
|
end
|
132
124
|
|
133
125
|
private
|
134
126
|
|
135
|
-
def find_or_create_content(name)
|
136
|
-
find_content(name) || create_content(name)
|
137
|
-
end
|
138
|
-
|
139
|
-
def find_content(name)
|
140
|
-
element.contents.find { |content| content.name == name }
|
141
|
-
end
|
142
|
-
|
143
|
-
def create_content(name)
|
144
|
-
Alchemy::Content.create(element: element, name: name)
|
145
|
-
end
|
146
|
-
|
147
127
|
def find_or_create_ingredient(definition)
|
148
128
|
element.ingredients.detect { |i| i.role == definition[:role] } ||
|
149
129
|
element.ingredients.create!(
|
150
130
|
role: definition[:role],
|
151
|
-
type: Alchemy::Ingredient.normalize_type(definition[:type])
|
131
|
+
type: Alchemy::Ingredient.normalize_type(definition[:type])
|
152
132
|
)
|
153
133
|
end
|
154
134
|
end
|
@@ -27,7 +27,7 @@ module Alchemy
|
|
27
27
|
Alchemy.t(
|
28
28
|
role,
|
29
29
|
scope: "ingredient_roles.#{element.name}",
|
30
|
-
default: Alchemy.t("ingredient_roles.#{role}", default: role.humanize)
|
30
|
+
default: Alchemy.t("ingredient_roles.#{role}", default: role.humanize)
|
31
31
|
)
|
32
32
|
end
|
33
33
|
|
@@ -36,17 +36,17 @@ module Alchemy
|
|
36
36
|
"ingredient-editor",
|
37
37
|
partial_name,
|
38
38
|
deprecated? ? "deprecated" : nil,
|
39
|
-
respond_to?(:level_options) && level_options.many? ? "with-level-select" : nil,
|
40
|
-
respond_to?(:size_options) && size_options.many? ? "with-size-select" : nil,
|
39
|
+
(respond_to?(:level_options) && level_options.many?) ? "with-level-select" : nil,
|
40
|
+
(respond_to?(:size_options) && size_options.many?) ? "with-size-select" : nil,
|
41
41
|
settings[:linkable] ? "linkable" : nil,
|
42
|
-
settings[:anchor] ? "with-anchor" : nil
|
42
|
+
settings[:anchor] ? "with-anchor" : nil
|
43
43
|
].compact
|
44
44
|
end
|
45
45
|
|
46
46
|
def data_attributes
|
47
47
|
{
|
48
48
|
ingredient_id: id,
|
49
|
-
ingredient_role: role
|
49
|
+
ingredient_role: role
|
50
50
|
}
|
51
51
|
end
|
52
52
|
|
@@ -148,7 +148,7 @@ module Alchemy
|
|
148
148
|
Alchemy.t(
|
149
149
|
role,
|
150
150
|
scope: [:ingredient_deprecation_notices, element.name],
|
151
|
-
default: Alchemy.t(:ingredient_deprecated)
|
151
|
+
default: Alchemy.t(:ingredient_deprecated)
|
152
152
|
)
|
153
153
|
end
|
154
154
|
end
|
@@ -100,7 +100,7 @@ module Alchemy
|
|
100
100
|
def js_filter_field(items, options = {})
|
101
101
|
options = {
|
102
102
|
class: "js_filter_field",
|
103
|
-
data: {"alchemy-list-filter" => items}
|
103
|
+
data: {"alchemy-list-filter" => items}
|
104
104
|
}.merge(options)
|
105
105
|
content_tag(:div, class: "js_filter_field_box") do
|
106
106
|
concat text_field_tag(nil, nil, options)
|
@@ -140,10 +140,9 @@ module Alchemy
|
|
140
140
|
title: Alchemy.t(:please_confirm),
|
141
141
|
message: message,
|
142
142
|
ok_label: Alchemy.t("Yes"),
|
143
|
-
cancel_label: Alchemy.t("No")
|
144
|
-
}.to_json
|
145
|
-
)
|
146
|
-
)
|
143
|
+
cancel_label: Alchemy.t("No")
|
144
|
+
}.to_json
|
145
|
+
))
|
147
146
|
end
|
148
147
|
|
149
148
|
# Returns a form and a button that opens a modal confirm dialog.
|
@@ -170,7 +169,7 @@ module Alchemy
|
|
170
169
|
message: Alchemy.t(:confirm_to_proceed),
|
171
170
|
ok_label: Alchemy.t("Yes"),
|
172
171
|
title: Alchemy.t(:please_confirm),
|
173
|
-
cancel_label: Alchemy.t("No")
|
172
|
+
cancel_label: Alchemy.t("No")
|
174
173
|
}.merge(options)
|
175
174
|
form_tag url, {method: html_options.delete(:method), class: "button-with-confirm"} do
|
176
175
|
button_tag value, html_options.merge("data-alchemy-confirm" => options.to_json)
|
@@ -190,26 +189,26 @@ module Alchemy
|
|
190
189
|
options = {
|
191
190
|
title: Alchemy.t("Delete"),
|
192
191
|
message: Alchemy.t("Are you sure?"),
|
193
|
-
icon: :minus
|
192
|
+
icon: :minus
|
194
193
|
}.merge(options)
|
195
194
|
button_with_confirm(
|
196
195
|
render_icon(options[:icon]),
|
197
196
|
url, {
|
198
|
-
message: options[:message]
|
197
|
+
message: options[:message]
|
199
198
|
}, {
|
200
199
|
method: "delete",
|
201
200
|
title: options[:title],
|
202
|
-
class: "icon_button #{html_options.delete(:class)}".strip
|
201
|
+
class: "icon_button #{html_options.delete(:class)}".strip
|
203
202
|
}.merge(html_options)
|
204
203
|
)
|
205
204
|
end
|
206
205
|
|
207
206
|
# (internal) Renders translated Module Names for html title element.
|
208
207
|
def render_alchemy_title
|
209
|
-
if content_for?(:title)
|
210
|
-
|
208
|
+
title = if content_for?(:title)
|
209
|
+
content_for(:title)
|
211
210
|
else
|
212
|
-
|
211
|
+
Alchemy.t(controller_name, scope: :modules)
|
213
212
|
end
|
214
213
|
"Alchemy CMS - #{title}"
|
215
214
|
end
|
@@ -259,11 +258,11 @@ module Alchemy
|
|
259
258
|
active: false,
|
260
259
|
link_options: {},
|
261
260
|
dialog_options: {},
|
262
|
-
loading_indicator: false
|
261
|
+
loading_indicator: false
|
263
262
|
}.merge(options.symbolize_keys)
|
264
263
|
button = render(
|
265
264
|
"alchemy/admin/partials/toolbar_button",
|
266
|
-
options: options
|
265
|
+
options: options
|
267
266
|
)
|
268
267
|
if options[:skip_permission_check] || can?(*permission_from_options(options))
|
269
268
|
button
|
@@ -321,10 +320,10 @@ module Alchemy
|
|
321
320
|
type = html_options.delete(:type) || "date"
|
322
321
|
date = html_options.delete(:value) || object.send(method.to_sym).presence
|
323
322
|
date = Time.zone.parse(date) if date.is_a?(String)
|
324
|
-
value = date
|
323
|
+
value = date&.iso8601
|
325
324
|
|
326
325
|
text_field object.class.name.demodulize.underscore.to_sym,
|
327
|
-
method.to_sym, {type
|
326
|
+
method.to_sym, {:type => "text", :class => type, "data-datepicker-type" => type, :value => value}.merge(html_options)
|
328
327
|
end
|
329
328
|
|
330
329
|
# Render a hint icon with tooltip for given object.
|
@@ -344,17 +343,17 @@ module Alchemy
|
|
344
343
|
controller_name,
|
345
344
|
action_name,
|
346
345
|
content_for(:main_menu_style),
|
347
|
-
content_for(:alchemy_body_class)
|
346
|
+
content_for(:alchemy_body_class)
|
348
347
|
].compact
|
349
348
|
end
|
350
349
|
|
351
350
|
# (internal) Returns options for the clipboard select tag
|
352
351
|
def clipboard_select_tag_options(items)
|
353
352
|
options = items.map do |item|
|
354
|
-
if item.respond_to?(:display_name_with_preview_text)
|
355
|
-
|
353
|
+
name = if item.respond_to?(:display_name_with_preview_text)
|
354
|
+
item.display_name_with_preview_text
|
356
355
|
else
|
357
|
-
|
356
|
+
item.name
|
358
357
|
end
|
359
358
|
[name, item.id]
|
360
359
|
end
|
@@ -386,7 +385,7 @@ module Alchemy
|
|
386
385
|
# that explains the user that the page layout is missing
|
387
386
|
def page_layout_missing_warning
|
388
387
|
hint_with_tooltip(
|
389
|
-
Alchemy.t(:page_definition_missing)
|
388
|
+
Alchemy.t(:page_definition_missing)
|
390
389
|
)
|
391
390
|
end
|
392
391
|
|
@@ -404,7 +403,7 @@ module Alchemy
|
|
404
403
|
action_controller = options[:url].gsub(/\A\//, "").split("/")
|
405
404
|
[
|
406
405
|
action_controller.last.to_sym,
|
407
|
-
action_controller[0..action_controller.length - 2].join("_").to_sym
|
406
|
+
action_controller[0..action_controller.length - 2].join("_").to_sym
|
408
407
|
]
|
409
408
|
end
|
410
409
|
end
|
@@ -4,8 +4,6 @@ module Alchemy
|
|
4
4
|
module Admin
|
5
5
|
module ElementsHelper
|
6
6
|
include Alchemy::Admin::IngredientsHelper
|
7
|
-
include Alchemy::Admin::ContentsHelper
|
8
|
-
include Alchemy::Admin::EssencesHelper
|
9
7
|
|
10
8
|
# Returns an elements array for select helper.
|
11
9
|
#
|
@@ -18,7 +16,7 @@ module Alchemy
|
|
18
16
|
elements.collect do |e|
|
19
17
|
[
|
20
18
|
Element.display_name_for(e["name"]),
|
21
|
-
e["name"]
|
19
|
+
e["name"]
|
22
20
|
]
|
23
21
|
end
|
24
22
|
end
|
@@ -19,7 +19,7 @@ module Alchemy
|
|
19
19
|
options[:remote] = request.xhr?
|
20
20
|
options[:html] = {
|
21
21
|
id: options.delete(:id),
|
22
|
-
class: ["alchemy", options.delete(:class)].compact.join(" ")
|
22
|
+
class: ["alchemy", options.delete(:class)].compact.join(" ")
|
23
23
|
}
|
24
24
|
simple_form_for(object, *(args << options), &block)
|
25
25
|
end
|
@@ -14,7 +14,7 @@ module Alchemy
|
|
14
14
|
render(
|
15
15
|
"alchemy/admin/partials/main_navigation_entry",
|
16
16
|
alchemy_module: alchemy_module,
|
17
|
-
navigation: alchemy_module["navigation"]
|
17
|
+
navigation: alchemy_module["navigation"]
|
18
18
|
)
|
19
19
|
end
|
20
20
|
|
@@ -37,7 +37,7 @@ module Alchemy
|
|
37
37
|
def navigate_module(navigation)
|
38
38
|
[
|
39
39
|
navigation["action"].to_sym,
|
40
|
-
navigation["controller"].to_s.gsub(/\A\//, "").
|
40
|
+
navigation["controller"].to_s.gsub(/\A\//, "").tr("/", "_").to_sym
|
41
41
|
]
|
42
42
|
end
|
43
43
|
|
@@ -47,7 +47,7 @@ module Alchemy
|
|
47
47
|
[
|
48
48
|
"main_navi_entry",
|
49
49
|
admin_mainnavi_active?(navigation) ? "active" : nil,
|
50
|
-
navigation.key?("sub_navigation") ? "has_sub_navigation" : nil
|
50
|
+
navigation.key?("sub_navigation") ? "has_sub_navigation" : nil
|
51
51
|
].compact
|
52
52
|
end
|
53
53
|
|
@@ -75,7 +75,7 @@ module Alchemy
|
|
75
75
|
def url_for_module(alchemy_module)
|
76
76
|
route_from_engine_or_main_app(
|
77
77
|
alchemy_module["engine_name"],
|
78
|
-
url_options_for_module(alchemy_module)
|
78
|
+
url_options_for_module(alchemy_module)
|
79
79
|
)
|
80
80
|
end
|
81
81
|
|
@@ -94,7 +94,7 @@ module Alchemy
|
|
94
94
|
|
95
95
|
route_from_engine_or_main_app(
|
96
96
|
alchemy_module["engine_name"],
|
97
|
-
url_options_for_navigation_entry(navigation)
|
97
|
+
url_options_for_navigation_entry(navigation)
|
98
98
|
)
|
99
99
|
end
|
100
100
|
|
@@ -126,7 +126,7 @@ module Alchemy
|
|
126
126
|
#
|
127
127
|
def route_from_engine_or_main_app(engine_name, url_options)
|
128
128
|
if engine_name.present?
|
129
|
-
eval(engine_name).url_for(url_options)
|
129
|
+
eval(engine_name).url_for(url_options) # rubocop:disable Security/Eval
|
130
130
|
else
|
131
131
|
main_app.url_for(url_options)
|
132
132
|
end
|
@@ -151,7 +151,7 @@ module Alchemy
|
|
151
151
|
controller: entry["controller"],
|
152
152
|
action: entry["action"],
|
153
153
|
only_path: true,
|
154
|
-
params: entry["params"]
|
154
|
+
params: entry["params"]
|
155
155
|
}.delete_if { |_k, v| v.nil? }
|
156
156
|
end
|
157
157
|
|
@@ -15,7 +15,7 @@ module Alchemy
|
|
15
15
|
[Alchemy.t("480", scope: "preview_sizes"), 480],
|
16
16
|
[Alchemy.t("768", scope: "preview_sizes"), 768],
|
17
17
|
[Alchemy.t("1024", scope: "preview_sizes"), 1024],
|
18
|
-
[Alchemy.t("1280", scope: "preview_sizes"), 1280]
|
18
|
+
[Alchemy.t("1280", scope: "preview_sizes"), 1280]
|
19
19
|
])
|
20
20
|
end
|
21
21
|
|
@@ -27,7 +27,7 @@ module Alchemy
|
|
27
27
|
if page.persisted? && page.definition.blank?
|
28
28
|
[
|
29
29
|
page_layout_missing_warning,
|
30
|
-
Alchemy.t(:page_type)
|
30
|
+
Alchemy.t(:page_type)
|
31
31
|
].join(" ").html_safe
|
32
32
|
else
|
33
33
|
Alchemy.t(:page_type)
|
@@ -20,10 +20,10 @@ module Alchemy
|
|
20
20
|
"#{tag.name} (#{tag.taggings_count})",
|
21
21
|
url_for(
|
22
22
|
search_filter_params.except(:page, :tagged_with).merge(
|
23
|
-
tagged_with: tags_for_filter(current: tag).presence
|
24
|
-
)
|
23
|
+
tagged_with: tags_for_filter(current: tag).presence
|
24
|
+
)
|
25
25
|
),
|
26
|
-
remote: request.xhr
|
26
|
+
remote: request.xhr?
|
27
27
|
)
|
28
28
|
end
|
29
29
|
end.join.html_safe
|
@@ -34,7 +34,7 @@ module Alchemy
|
|
34
34
|
"fa#{options[:style].first}",
|
35
35
|
options[:size] ? "fa-#{options[:size]}" : nil,
|
36
36
|
options[:transform] ? "fa-#{options[:transform]}" : nil,
|
37
|
-
options[:class]
|
37
|
+
options[:class]
|
38
38
|
].compact
|
39
39
|
content_tag("i", nil, class: classes)
|
40
40
|
end
|
@@ -51,7 +51,7 @@ module Alchemy
|
|
51
51
|
#
|
52
52
|
def render_message(type = :info, msg = nil, &blk)
|
53
53
|
icon_class = message_icon_class(type)
|
54
|
-
if
|
54
|
+
if blk
|
55
55
|
content_tag :div, render_icon(icon_class) + capture(&blk), class: "#{type} message"
|
56
56
|
else
|
57
57
|
content_tag :div, render_icon(icon_class) + msg, class: "#{type} message"
|
@@ -24,41 +24,20 @@ module Alchemy
|
|
24
24
|
# Block-level helper class for element views.
|
25
25
|
#
|
26
26
|
class ElementViewHelper < BlockHelper
|
27
|
-
# Renders one of the element's
|
27
|
+
# Renders one of the element's ingredients.
|
28
28
|
#
|
29
29
|
# If the element uses +ingredients+ it renders the ingredient record.
|
30
30
|
#
|
31
31
|
def render(name, options = {}, html_options = {})
|
32
|
-
renderable = element.ingredient_by_role(name)
|
32
|
+
renderable = element.ingredient_by_role(name)
|
33
33
|
return if renderable.nil?
|
34
34
|
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
35
|
+
helpers.render(
|
36
|
+
renderable.as_view_component(
|
37
|
+
options: options,
|
38
|
+
html_options: html_options
|
39
39
|
)
|
40
|
-
|
41
|
-
|
42
|
-
helpers.render(renderable, {
|
43
|
-
options: options,
|
44
|
-
html_options: html_options,
|
45
|
-
})
|
46
|
-
end
|
47
|
-
|
48
|
-
# Returns one of the element's contents (ie. essence instances).
|
49
|
-
#
|
50
|
-
def content(name)
|
51
|
-
element.content_by_name(name)
|
52
|
-
end
|
53
|
-
|
54
|
-
deprecate content: "Use `ingredient_by_role` instead", deprecator: Alchemy::Deprecation
|
55
|
-
|
56
|
-
# Returns the ingredient of one of the element's contents.
|
57
|
-
#
|
58
|
-
# If the element uses +ingredients+ it returns the +value+ of the ingredient record.
|
59
|
-
#
|
60
|
-
def ingredient(name)
|
61
|
-
element.ingredient(name)
|
40
|
+
)
|
62
41
|
end
|
63
42
|
|
64
43
|
# Returns the value of one of the element's ingredients.
|
@@ -67,26 +46,12 @@ module Alchemy
|
|
67
46
|
element.value_for(name)
|
68
47
|
end
|
69
48
|
|
70
|
-
# Returns true if the given
|
49
|
+
# Returns true if the given ingredient has a value.
|
71
50
|
#
|
72
51
|
def has?(name)
|
73
|
-
|
74
|
-
element.has_value_for?(name)
|
75
|
-
else
|
76
|
-
Alchemy::Deprecation.silence do
|
77
|
-
element.has_ingredient?(name)
|
78
|
-
end
|
79
|
-
end
|
52
|
+
element.has_value_for?(name)
|
80
53
|
end
|
81
54
|
|
82
|
-
# Return's the given content's essence.
|
83
|
-
#
|
84
|
-
def essence(name)
|
85
|
-
content(name).try(:essence)
|
86
|
-
end
|
87
|
-
|
88
|
-
deprecate essence: "Use `ingredient_by_role` instead", deprecator: Alchemy::Deprecation
|
89
|
-
|
90
55
|
# Return's the ingredient record by given role.
|
91
56
|
#
|
92
57
|
def ingredient_by_role(role)
|
@@ -129,7 +94,7 @@ module Alchemy
|
|
129
94
|
# The HTML tag to be used for the wrapping element.
|
130
95
|
# @option options :id (the element's dom_id)
|
131
96
|
# The wrapper tag's DOM ID.
|
132
|
-
# @option options :class (the element's
|
97
|
+
# @option options :class (the element's name)
|
133
98
|
# The wrapper tag's DOM class.
|
134
99
|
# @option options :tags_formatter
|
135
100
|
# A lambda used for formatting the element's tags (see Alchemy::ElementsHelper::element_tags_attributes). Set to +false+ to not include tags in the wrapper element.
|
@@ -139,7 +104,7 @@ module Alchemy
|
|
139
104
|
tag: :div,
|
140
105
|
id: element.dom_id,
|
141
106
|
class: element.name,
|
142
|
-
tags_formatter: ->(tags) { tags.join(" ") }
|
107
|
+
tags_formatter: ->(tags) { tags.join(" ") }
|
143
108
|
}.merge(options)
|
144
109
|
|
145
110
|
# capture inner template block
|
@@ -148,12 +113,12 @@ module Alchemy
|
|
148
113
|
end
|
149
114
|
|
150
115
|
# wrap output in a useful DOM element
|
151
|
-
if tag = options.delete(:tag)
|
116
|
+
if (tag = options.delete(:tag))
|
152
117
|
# add preview attributes
|
153
118
|
options.merge!(element_preview_code_attributes(element))
|
154
119
|
|
155
120
|
# add tags
|
156
|
-
if tags_formatter = options.delete(:tags_formatter)
|
121
|
+
if (tags_formatter = options.delete(:tags_formatter))
|
157
122
|
options.merge!(element_tags_attributes(element, formatter: tags_formatter))
|
158
123
|
end
|
159
124
|
|