alchemy_cms 3.2.1 → 3.3.0.rc1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.codeclimate.yml +28 -0
- data/.gitignore +2 -2
- data/.travis.yml +11 -3
- data/CHANGELOG.md +100 -0
- data/CONTRIBUTING.md +1 -1
- data/Gemfile +12 -1
- data/README.md +25 -7
- data/Rakefile +1 -3
- data/alchemy_cms.gemspec +7 -15
- data/app/assets/fonts/alchemy/icons.eot +0 -0
- data/app/assets/fonts/alchemy/icons.svg +28 -66
- data/app/assets/fonts/alchemy/icons.ttf +0 -0
- data/app/assets/fonts/alchemy/icons.woff +0 -0
- data/app/assets/images/alchemy/icons.png +0 -0
- data/app/assets/javascripts/alchemy/alchemy.base.js.coffee +10 -3
- data/app/assets/javascripts/alchemy/alchemy.buttons.js.coffee +15 -6
- data/app/assets/javascripts/alchemy/alchemy.char_counter.js.coffee +1 -1
- data/app/assets/javascripts/alchemy/alchemy.datepicker.js.coffee +1 -1
- data/app/assets/javascripts/alchemy/alchemy.dialog.js.coffee +10 -4
- data/app/assets/javascripts/alchemy/alchemy.dirty.js.coffee +16 -22
- data/app/assets/javascripts/alchemy/alchemy.dragndrop.js.coffee +69 -32
- data/app/assets/javascripts/alchemy/alchemy.element_editors.js.coffee +147 -83
- data/app/assets/javascripts/alchemy/alchemy.file_progress.js.coffee +14 -14
- data/app/assets/javascripts/alchemy/alchemy.hotkeys.js.coffee +1 -1
- data/app/assets/javascripts/alchemy/alchemy.i18n.js.coffee +1 -1
- data/app/assets/javascripts/alchemy/alchemy.image_overlay.coffee +55 -0
- data/app/assets/javascripts/alchemy/alchemy.initializer.js.coffee +8 -1
- data/app/assets/javascripts/alchemy/alchemy.js +3 -1
- data/app/assets/javascripts/alchemy/alchemy.link_dialog.js.coffee +36 -31
- data/app/assets/javascripts/alchemy/alchemy.preview.js.coffee +35 -29
- data/app/assets/javascripts/alchemy/alchemy.sitemap.js.coffee +51 -5
- data/app/assets/javascripts/alchemy/alchemy.tinymce.js.coffee +26 -10
- data/app/assets/javascripts/alchemy/{alchemy.windows.js.coffee → alchemy.trash_window.js.coffee} +1 -13
- data/app/assets/javascripts/alchemy/alchemy.uploader.js.coffee +15 -17
- data/app/assets/javascripts/tinymce/plugins/alchemy_link/plugin.min.js +3 -3
- data/app/assets/stylesheets/alchemy/_extends.scss +1 -1
- data/app/assets/stylesheets/alchemy/_mixins.scss +27 -0
- data/app/assets/stylesheets/alchemy/_variables.scss +1 -0
- data/app/assets/stylesheets/alchemy/admin.scss +1 -0
- data/app/assets/stylesheets/alchemy/archive.scss +0 -57
- data/app/assets/stylesheets/alchemy/base.scss +1 -18
- data/app/assets/stylesheets/alchemy/buttons.scss +30 -25
- data/app/assets/stylesheets/alchemy/dialogs.scss +25 -9
- data/app/assets/stylesheets/alchemy/elements.scss +182 -126
- data/app/assets/stylesheets/alchemy/form_fields.scss +14 -8
- data/app/assets/stylesheets/alchemy/forms.scss +10 -1
- data/app/assets/stylesheets/alchemy/frame.scss +3 -10
- data/app/assets/stylesheets/alchemy/icon-font.scss +13 -6
- data/app/assets/stylesheets/alchemy/icons.scss +16 -0
- data/app/assets/stylesheets/alchemy/image_library.scss +269 -0
- data/app/assets/stylesheets/alchemy/selects.scss +1 -0
- data/app/assets/stylesheets/alchemy/sitemap.scss +12 -1
- data/app/assets/stylesheets/alchemy/toolbar.scss +2 -2
- data/app/assets/stylesheets/alchemy/upload.scss +97 -87
- data/app/assets/stylesheets/alchemy/welcome.sass +49 -0
- data/app/controllers/alchemy/admin/attachments_controller.rb +21 -29
- data/app/controllers/alchemy/admin/base_controller.rb +23 -4
- data/app/controllers/alchemy/admin/clipboard_controller.rb +0 -1
- data/app/controllers/alchemy/admin/contents_controller.rb +2 -4
- data/app/controllers/alchemy/admin/dashboard_controller.rb +4 -4
- data/app/controllers/alchemy/admin/elements_controller.rb +20 -11
- data/app/controllers/alchemy/admin/essence_files_controller.rb +2 -2
- data/app/controllers/alchemy/admin/essence_pictures_controller.rb +10 -9
- data/app/controllers/alchemy/admin/languages_controller.rb +0 -1
- data/app/controllers/alchemy/admin/layoutpages_controller.rb +0 -2
- data/app/controllers/alchemy/admin/legacy_page_urls_controller.rb +0 -1
- data/app/controllers/alchemy/admin/pages_controller.rb +46 -29
- data/app/controllers/alchemy/admin/pictures_controller.rb +44 -55
- data/app/controllers/alchemy/admin/resources_controller.rb +8 -75
- data/app/controllers/alchemy/admin/tags_controller.rb +10 -8
- data/app/controllers/alchemy/admin/trash_controller.rb +0 -6
- data/app/controllers/alchemy/api/contents_controller.rb +0 -1
- data/app/controllers/alchemy/api/elements_controller.rb +0 -1
- data/app/controllers/alchemy/api/pages_controller.rb +4 -1
- data/app/controllers/alchemy/attachments_controller.rb +4 -5
- data/app/controllers/alchemy/base_controller.rb +6 -5
- data/app/controllers/alchemy/elements_controller.rb +1 -1
- data/app/controllers/alchemy/messages_controller.rb +9 -4
- data/app/controllers/alchemy/pages_controller.rb +133 -137
- data/app/controllers/alchemy/pictures_controller.rb +12 -10
- data/app/controllers/concerns/alchemy/admin/uploader_responses.rb +41 -0
- data/app/controllers/concerns/alchemy/legacy_page_redirects.rb +56 -0
- data/app/controllers/concerns/alchemy/locale_redirects.rb +38 -0
- data/app/controllers/concerns/alchemy/page_redirects.rb +80 -0
- data/app/controllers/concerns/alchemy/site_redirects.rb +22 -0
- data/app/helpers/alchemy/admin/attachments_helper.rb +1 -2
- data/app/helpers/alchemy/admin/base_helper.rb +36 -62
- data/app/helpers/alchemy/admin/contents_helper.rb +6 -80
- data/app/helpers/alchemy/admin/elements_helper.rb +36 -15
- data/app/helpers/alchemy/admin/essences_helper.rb +15 -8
- data/app/helpers/alchemy/admin/form_helper.rb +6 -10
- data/app/helpers/alchemy/admin/navigation_helper.rb +4 -7
- data/app/helpers/alchemy/admin/pages_helper.rb +14 -35
- data/app/helpers/alchemy/admin/pictures_helper.rb +12 -14
- data/app/helpers/alchemy/admin/tags_helper.rb +5 -7
- data/app/helpers/alchemy/base_helper.rb +9 -17
- data/app/helpers/alchemy/elements_block_helper.rb +5 -13
- data/app/helpers/alchemy/elements_helper.rb +6 -6
- data/app/helpers/alchemy/essences_helper.rb +3 -16
- data/app/helpers/alchemy/pages_helper.rb +32 -25
- data/app/helpers/alchemy/url_helper.rb +14 -16
- data/app/mailers/alchemy/messages.rb +0 -2
- data/app/models/alchemy.rb +0 -2
- data/app/models/alchemy/attachment.rb +45 -56
- data/app/models/alchemy/cell.rb +7 -8
- data/app/models/alchemy/content.rb +39 -24
- data/app/models/alchemy/content/factory.rb +27 -44
- data/app/models/alchemy/element.rb +101 -267
- data/app/models/alchemy/element/definitions.rb +9 -8
- data/app/models/alchemy/element/element_contents.rb +150 -0
- data/app/models/alchemy/element/element_essences.rb +109 -0
- data/app/models/alchemy/element/presenters.rb +18 -7
- data/app/models/alchemy/essence_date.rb +1 -2
- data/app/models/alchemy/essence_file.rb +10 -6
- data/app/models/alchemy/essence_html.rb +0 -1
- data/app/models/alchemy/essence_picture.rb +12 -4
- data/app/models/alchemy/essence_richtext.rb +6 -3
- data/app/models/alchemy/language.rb +48 -21
- data/app/models/alchemy/language/code.rb +1 -4
- data/app/models/alchemy/page.rb +33 -35
- data/app/models/alchemy/page/page_cells.rb +6 -10
- data/app/models/alchemy/page/page_elements.rb +130 -100
- data/app/models/alchemy/page/page_naming.rb +2 -3
- data/app/models/alchemy/page/page_natures.rb +50 -16
- data/app/models/alchemy/page/page_scopes.rb +7 -7
- data/app/models/alchemy/page/page_users.rb +3 -3
- data/app/models/alchemy/picture.rb +48 -33
- data/app/models/alchemy/picture/transformations.rb +8 -9
- data/app/models/alchemy/site.rb +19 -17
- data/app/models/alchemy/site/layout.rb +9 -9
- data/app/models/alchemy/tag.rb +0 -2
- data/app/models/alchemy/tree_node.rb +5 -4
- data/app/serializers/alchemy/attachment_serializer.rb +0 -1
- data/app/serializers/alchemy/base_serializer.rb +30 -0
- data/app/serializers/alchemy/cell_serializer.rb +0 -1
- data/app/serializers/alchemy/essence_boolean_serializer.rb +0 -1
- data/app/serializers/alchemy/essence_date_serializer.rb +0 -1
- data/app/serializers/alchemy/essence_file_serializer.rb +0 -1
- data/app/serializers/alchemy/essence_html_serializer.rb +0 -1
- data/app/serializers/alchemy/essence_link_serializer.rb +0 -1
- data/app/serializers/alchemy/essence_picture_serializer.rb +0 -1
- data/app/serializers/alchemy/essence_richtext_serializer.rb +0 -1
- data/app/serializers/alchemy/essence_select_serializer.rb +0 -1
- data/app/serializers/alchemy/essence_text_serializer.rb +0 -1
- data/app/serializers/alchemy/legacy_element_serializer.rb +0 -1
- data/app/serializers/alchemy/page_serializer.rb +0 -1
- data/app/serializers/alchemy/page_tree_serializer.rb +90 -0
- data/app/serializers/alchemy/picture_serializer.rb +0 -1
- data/app/views/alchemy/_menubar.html.erb +3 -3
- data/app/views/alchemy/admin/attachments/_archive_overlay.html.erb +11 -16
- data/app/views/alchemy/admin/attachments/_attachment.html.erb +9 -9
- data/app/views/alchemy/admin/attachments/_files_list.html.erb +7 -15
- data/app/views/alchemy/admin/attachments/_overlay_file_list.html.erb +1 -1
- data/app/views/alchemy/admin/attachments/_tag_list.html.erb +2 -2
- data/app/views/alchemy/admin/attachments/edit.html.erb +3 -3
- data/app/views/alchemy/admin/attachments/index.html.erb +10 -17
- data/app/views/alchemy/admin/clipboard/clear.js.erb +1 -1
- data/app/views/alchemy/admin/clipboard/index.html.erb +3 -3
- data/app/views/alchemy/admin/clipboard/insert.js.erb +3 -3
- data/app/views/alchemy/admin/clipboard/remove.js.erb +2 -2
- data/app/views/alchemy/admin/contents/_missing.html.erb +5 -7
- data/app/views/alchemy/admin/contents/create.js.erb +1 -1
- data/app/views/alchemy/admin/contents/new.html.erb +2 -2
- data/app/views/alchemy/admin/dashboard/_locked_pages.html.erb +6 -6
- data/app/views/alchemy/admin/dashboard/_recent_pages.html.erb +2 -2
- data/app/views/alchemy/admin/dashboard/_users.html.erb +2 -2
- data/app/views/alchemy/admin/dashboard/help.html.erb +15 -15
- data/app/views/alchemy/admin/dashboard/index.html.erb +6 -6
- data/app/views/alchemy/admin/dashboard/info.html.erb +5 -5
- data/app/views/alchemy/admin/elements/_add_picture.html.erb +1 -1
- data/app/views/alchemy/admin/elements/_element.html.erb +52 -18
- data/app/views/alchemy/admin/elements/_element_footer.html.erb +11 -0
- data/app/views/alchemy/admin/elements/{_element_head.html.erb → _element_header.html.erb} +8 -8
- data/app/views/alchemy/admin/elements/_element_toolbar.html.erb +49 -0
- data/app/views/alchemy/admin/elements/_new_element_form.html.erb +7 -6
- data/app/views/alchemy/admin/elements/_picture_gallery_editor.html.erb +1 -1
- data/app/views/alchemy/admin/elements/_refresh_editor.js.erb +1 -1
- data/app/views/alchemy/admin/elements/create.js.erb +13 -8
- data/app/views/alchemy/admin/elements/fold.js.erb +12 -7
- data/app/views/alchemy/admin/elements/index.html.erb +12 -8
- data/app/views/alchemy/admin/elements/list.html.erb +3 -3
- data/app/views/alchemy/admin/elements/new.html.erb +4 -4
- data/app/views/alchemy/admin/elements/order.js.erb +3 -4
- data/app/views/alchemy/admin/elements/publish.js.erb +15 -0
- data/app/views/alchemy/admin/elements/trash.js.erb +3 -3
- data/app/views/alchemy/admin/elements/update.js.erb +7 -8
- data/app/views/alchemy/admin/essence_files/edit.html.erb +16 -13
- data/app/views/alchemy/admin/essence_pictures/crop.html.erb +3 -3
- data/app/views/alchemy/admin/essence_pictures/edit.html.erb +8 -8
- data/app/views/alchemy/admin/languages/_form.html.erb +12 -3
- data/app/views/alchemy/admin/languages/_language.html.erb +8 -2
- data/app/views/alchemy/admin/languages/_table.html.erb +11 -5
- data/app/views/alchemy/admin/languages/index.html.erb +1 -1
- data/app/views/alchemy/admin/layoutpages/_layoutpage.html.erb +8 -8
- data/app/views/alchemy/admin/layoutpages/edit.html.erb +2 -2
- data/app/views/alchemy/admin/layoutpages/index.html.erb +6 -13
- data/app/views/alchemy/admin/leave.html.erb +5 -5
- data/app/views/alchemy/admin/legacy_page_urls/_form.html.erb +1 -1
- data/app/views/alchemy/admin/legacy_page_urls/_legacy_page_url.html.erb +4 -4
- data/app/views/alchemy/admin/legacy_page_urls/_new.html.erb +1 -1
- data/app/views/alchemy/admin/pages/_create_language_form.html.erb +9 -9
- data/app/views/alchemy/admin/pages/_external_link.html.erb +6 -6
- data/app/views/alchemy/admin/pages/_file_link.html.erb +6 -6
- data/app/views/alchemy/admin/pages/_form.html.erb +6 -6
- data/app/views/alchemy/admin/pages/_internal_link.html.erb +9 -11
- data/app/views/alchemy/admin/pages/_legacy_urls.html.erb +3 -3
- data/app/views/alchemy/admin/pages/_locked_page.html.erb +4 -4
- data/app/views/alchemy/admin/pages/_new_page_form.html.erb +2 -2
- data/app/views/alchemy/admin/pages/_page.html.erb +95 -80
- data/app/views/alchemy/admin/pages/_page_for_links.html.erb +22 -22
- data/app/views/alchemy/admin/pages/_page_infos.html.erb +12 -0
- data/app/views/alchemy/admin/pages/_page_status.html.erb +7 -9
- data/app/views/alchemy/admin/pages/_sitemap.html.erb +35 -6
- data/app/views/alchemy/admin/pages/_tinymce_custom_config.html.erb +0 -3
- data/app/views/alchemy/admin/pages/configure.html.erb +1 -1
- data/app/views/alchemy/admin/pages/configure_external.html.erb +4 -4
- data/app/views/alchemy/admin/pages/edit.html.erb +39 -44
- data/app/views/alchemy/admin/pages/flush.js.erb +1 -1
- data/app/views/alchemy/admin/pages/fold.js.erb +2 -3
- data/app/views/alchemy/admin/pages/index.html.erb +15 -22
- data/app/views/alchemy/admin/pages/info.html.erb +8 -8
- data/app/views/alchemy/admin/pages/link.html.erb +3 -3
- data/app/views/alchemy/admin/pages/locked.html.erb +1 -1
- data/app/views/alchemy/admin/pages/new.html.erb +4 -4
- data/app/views/alchemy/admin/pages/sort.js.erb +1 -2
- data/app/views/alchemy/admin/pages/unlock.js.erb +1 -1
- data/app/views/alchemy/admin/pages/update.js.erb +3 -3
- data/app/views/alchemy/admin/partials/_autocomplete_tag_list.html.erb +1 -1
- data/app/views/alchemy/admin/partials/_language_tree_select.html.erb +1 -1
- data/app/views/alchemy/admin/partials/_main_navigation_entry.html.erb +1 -1
- data/app/views/alchemy/admin/partials/_remote_search_form.html.erb +9 -15
- data/app/views/alchemy/admin/partials/_search_form.html.erb +14 -13
- data/app/views/alchemy/admin/partials/_sub_navigation.html.erb +1 -1
- data/app/views/alchemy/admin/pictures/_archive.html.erb +14 -14
- data/app/views/alchemy/admin/pictures/_filter_and_size_bar.html.erb +30 -36
- data/app/views/alchemy/admin/pictures/_filter_bar.html.erb +5 -5
- data/app/views/alchemy/admin/pictures/{edit.html.erb → _form.html.erb} +7 -6
- data/app/views/alchemy/admin/pictures/_infos.html.erb +50 -0
- data/app/views/alchemy/admin/pictures/_overlay_picture_list.html.erb +1 -1
- data/app/views/alchemy/admin/pictures/_picture.html.erb +17 -51
- data/app/views/alchemy/admin/pictures/_picture_to_assign.html.erb +1 -1
- data/app/views/alchemy/admin/pictures/_tag_list.html.erb +2 -2
- data/app/views/alchemy/admin/pictures/edit_multiple.html.erb +6 -6
- data/app/views/alchemy/admin/pictures/index.html.erb +28 -36
- data/app/views/alchemy/admin/pictures/show.html.erb +46 -9
- data/app/views/alchemy/admin/pictures/update.js.erb +6 -0
- data/app/views/alchemy/admin/resources/_form.html.erb +3 -3
- data/app/views/alchemy/admin/resources/_resource.html.erb +4 -4
- data/app/views/alchemy/admin/resources/_table.html.erb +5 -6
- data/app/views/alchemy/admin/resources/index.csv.erb +12 -10
- data/app/views/alchemy/admin/resources/index.html.erb +4 -4
- data/app/views/alchemy/admin/sites/index.html.erb +1 -1
- data/app/views/alchemy/admin/tags/_tag.html.erb +4 -4
- data/app/views/alchemy/admin/tags/edit.html.erb +5 -5
- data/app/views/alchemy/admin/tags/index.html.erb +8 -8
- data/app/views/alchemy/admin/tags/new.html.erb +2 -2
- data/app/views/alchemy/admin/trash/clear.js.erb +1 -1
- data/app/views/alchemy/admin/trash/index.html.erb +8 -6
- data/app/views/alchemy/admin/uploader/_button.html.erb +39 -0
- data/app/views/alchemy/admin/uploader/_setup.html.erb +13 -0
- data/app/views/alchemy/base/500.html.erb +4 -4
- data/app/views/alchemy/elements/_editor_not_found.html.erb +1 -1
- data/app/views/alchemy/essences/_essence_boolean_editor.html.erb +3 -4
- data/app/views/alchemy/essences/_essence_boolean_view.html.erb +1 -1
- data/app/views/alchemy/essences/_essence_date_editor.html.erb +2 -6
- data/app/views/alchemy/essences/_essence_date_view.html.erb +1 -1
- data/app/views/alchemy/essences/_essence_file_editor.html.erb +9 -11
- data/app/views/alchemy/essences/_essence_file_view.html.erb +11 -5
- data/app/views/alchemy/essences/_essence_html_editor.html.erb +1 -1
- data/app/views/alchemy/essences/_essence_link_editor.html.erb +1 -1
- data/app/views/alchemy/essences/_essence_link_view.html.erb +1 -1
- data/app/views/alchemy/essences/_essence_picture_editor.html.erb +47 -52
- data/app/views/alchemy/essences/_essence_richtext_editor.html.erb +1 -1
- data/app/views/alchemy/essences/_essence_richtext_view.html.erb +1 -1
- data/app/views/alchemy/essences/_essence_select_editor.html.erb +23 -13
- data/app/views/alchemy/essences/_essence_text_editor.html.erb +1 -1
- data/app/views/alchemy/essences/_essence_text_view.html.erb +1 -1
- data/app/views/alchemy/essences/shared/_essence_picture_tools.html.erb +29 -36
- data/app/views/alchemy/essences/shared/_linkable_essence_tools.html.erb +5 -5
- data/app/views/alchemy/language_links/_language.html.erb +15 -9
- data/app/views/alchemy/messages/contact_form_mail.de.text.erb +1 -1
- data/app/views/alchemy/messages/contact_form_mail.en.text.erb +1 -1
- data/app/views/alchemy/messages/contact_form_mail.es.text.erb +1 -1
- data/app/views/alchemy/navigation/_link.html.erb +0 -1
- data/app/views/alchemy/pages/show.rss.builder +6 -4
- data/app/views/alchemy/welcome.html.erb +28 -0
- data/app/views/layouts/alchemy/admin.html.erb +14 -10
- data/bin/alchemy +3 -4
- data/bin/rspec +7 -0
- data/bin/spring +15 -0
- data/config/alchemy/config.yml +16 -17
- data/config/initializers/assets.rb +13 -0
- data/config/locales/alchemy.de.yml +27 -29
- data/config/locales/alchemy.en.yml +23 -29
- data/config/locales/alchemy.es.yml +23 -29
- data/config/locales/alchemy.fr.yml +19 -28
- data/config/locales/alchemy.nl.yml +19 -27
- data/config/locales/alchemy.ru.yml +19 -28
- data/config/routes.rb +53 -54
- data/config/spring.rb +2 -0
- data/db/migrate/20130827094554_alchemy_two_point_six.rb +1 -3
- data/db/migrate/20150608204610_add_parent_element_id_to_alchemy_elements.rb +6 -0
- data/db/migrate/20150729151825_add_link_text_to_alchemy_essence_files.rb +5 -0
- data/db/migrate/20150906195818_add_locale_to_alchemy_languages.rb +7 -0
- data/lib/alchemy/auth_accessors.rb +1 -1
- data/lib/alchemy/cache_digests/template_tracker.rb +7 -13
- data/lib/alchemy/config.rb +5 -7
- data/lib/alchemy/configuration_methods.rb +11 -1
- data/lib/alchemy/controller_actions.rb +9 -12
- data/lib/alchemy/engine.rb +11 -28
- data/lib/alchemy/errors.rb +0 -1
- data/lib/alchemy/essence.rb +20 -20
- data/lib/alchemy/filetypes.rb +1 -3
- data/lib/alchemy/forms/builder.rb +0 -2
- data/lib/alchemy/hints.rb +1 -3
- data/lib/alchemy/i18n.rb +81 -53
- data/lib/alchemy/kaminari/scoped_pagination_url_helper.rb +0 -2
- data/lib/alchemy/locale.rb +0 -1
- data/lib/alchemy/logger.rb +1 -3
- data/lib/alchemy/modules.rb +3 -3
- data/lib/alchemy/mount_point.rb +0 -2
- data/lib/alchemy/name_conversions.rb +1 -3
- data/lib/alchemy/on_page_layout.rb +37 -23
- data/lib/alchemy/on_page_layout/callbacks_runner.rb +34 -0
- data/lib/alchemy/page_layout.rb +23 -24
- data/lib/alchemy/paths.rb +32 -0
- data/lib/alchemy/permissions.rb +20 -20
- data/lib/alchemy/picture_attributes.rb +0 -3
- data/lib/alchemy/resource.rb +66 -22
- data/lib/alchemy/resources_helper.rb +48 -11
- data/lib/alchemy/routing_constraints.rb +4 -5
- data/lib/alchemy/seeder.rb +1 -4
- data/lib/alchemy/shell.rb +12 -14
- data/lib/alchemy/tasks/helpers.rb +5 -7
- data/lib/alchemy/test_support/essence_shared_examples.rb +24 -24
- data/lib/alchemy/test_support/factories.rb +2 -146
- data/lib/alchemy/test_support/factories/attachment_factory.rb +9 -0
- data/lib/alchemy/test_support/factories/cell_factory.rb +9 -0
- data/lib/alchemy/test_support/factories/content_factory.rb +10 -0
- data/lib/alchemy/test_support/factories/dummy_user_factory.rb +21 -0
- data/lib/alchemy/test_support/factories/element_factory.rb +21 -0
- data/lib/alchemy/test_support/factories/essence_file_factory.rb +8 -0
- data/lib/alchemy/test_support/factories/essence_picture_factory.rb +8 -0
- data/lib/alchemy/test_support/factories/essence_text_factory.rb +7 -0
- data/lib/alchemy/test_support/factories/language_factory.rb +28 -0
- data/lib/alchemy/test_support/factories/page_factory.rb +45 -0
- data/lib/alchemy/test_support/factories/picture_factory.rb +10 -0
- data/lib/alchemy/test_support/factories/site_factory.rb +12 -0
- data/lib/alchemy/test_support/integration_helpers.rb +0 -3
- data/lib/alchemy/tinymce.rb +24 -35
- data/lib/alchemy/touching.rb +5 -6
- data/lib/alchemy/upgrader.rb +3 -5
- data/lib/alchemy/upgrader/tasks/available_contents_upgrader.rb +155 -0
- data/lib/alchemy/upgrader/tasks/nestable_elements_migration.rb +71 -0
- data/lib/alchemy/upgrader/tasks/three_point_two_task.rb +31 -0
- data/lib/alchemy/upgrader/three_point_three.rb +50 -0
- data/lib/alchemy/upgrader/three_point_two.rb +3 -32
- data/lib/alchemy/upgrader/three_point_zero.rb +0 -1
- data/lib/alchemy/version.rb +1 -1
- data/lib/rails/generators/alchemy/base.rb +1 -1
- data/lib/rails/generators/alchemy/elements/elements_generator.rb +1 -7
- data/lib/rails/generators/alchemy/elements/templates/editor.html.erb +5 -7
- data/lib/rails/generators/alchemy/elements/templates/editor.html.haml +6 -8
- data/lib/rails/generators/alchemy/elements/templates/editor.html.slim +6 -7
- data/lib/rails/generators/alchemy/elements/templates/view.html.erb +4 -4
- data/lib/rails/generators/alchemy/elements/templates/view.html.haml +3 -3
- data/lib/rails/generators/alchemy/elements/templates/view.html.slim +3 -3
- data/lib/rails/generators/alchemy/essence/essence_generator.rb +2 -3
- data/lib/rails/generators/alchemy/essence/templates/editor.html.erb +1 -1
- data/lib/rails/generators/alchemy/install/files/alchemy.de.yml +2 -2
- data/lib/rails/generators/alchemy/install/files/alchemy.en.yml +2 -2
- data/lib/rails/generators/alchemy/install/files/alchemy.es.yml +3 -3
- data/lib/rails/generators/alchemy/install/install_generator.rb +0 -1
- data/lib/rails/generators/alchemy/install/templates/elements.yml.tt +2 -2
- data/lib/rails/generators/alchemy/install/templates/page_layouts.yml.tt +1 -1
- data/lib/rails/generators/alchemy/module/module_generator.rb +1 -1
- data/lib/rails/templates/alchemy.rb +2 -2
- data/lib/tasks/alchemy/convert.rake +4 -8
- data/lib/tasks/alchemy/db.rake +2 -3
- data/lib/tasks/alchemy/install.rake +3 -4
- data/lib/tasks/alchemy/tidy.rake +4 -5
- data/lib/tasks/alchemy/upgrade.rake +2 -4
- data/spec/controllers/{admin → alchemy/admin}/attachments_controller_spec.rb +26 -44
- data/spec/controllers/{admin → alchemy/admin}/base_controller_spec.rb +14 -1
- data/spec/controllers/{admin → alchemy/admin}/clipboard_controller_spec.rb +3 -3
- data/spec/controllers/{admin → alchemy/admin}/contents_controller_spec.rb +4 -4
- data/spec/controllers/{admin → alchemy/admin}/dashboard_controller_spec.rb +11 -6
- data/spec/controllers/{admin → alchemy/admin}/elements_controller_spec.rb +54 -31
- data/spec/controllers/{admin → alchemy/admin}/essence_files_controller_spec.rb +8 -3
- data/spec/controllers/{admin → alchemy/admin}/essence_pictures_controller_spec.rb +3 -3
- data/spec/controllers/{admin → alchemy/admin}/languages_controller_spec.rb +13 -1
- data/spec/controllers/{admin → alchemy/admin}/layoutpages_controller_spec.rb +0 -6
- data/spec/controllers/{admin → alchemy/admin}/pages_controller_spec.rb +103 -35
- data/spec/controllers/{admin → alchemy/admin}/pictures_controller_spec.rb +133 -108
- data/spec/controllers/alchemy/admin/resources_controller_spec.rb +81 -0
- data/spec/controllers/{admin → alchemy/admin}/trash_controller_spec.rb +12 -13
- data/spec/controllers/alchemy/api/contents_controller_spec.rb +12 -13
- data/spec/controllers/alchemy/api/elements_controller_spec.rb +8 -9
- data/spec/controllers/alchemy/api/pages_controller_spec.rb +40 -7
- data/spec/controllers/{attachments_controller_spec.rb → alchemy/attachments_controller_spec.rb} +7 -7
- data/spec/controllers/alchemy/base_controller_spec.rb +106 -0
- data/spec/controllers/{elements_controller_spec.rb → alchemy/elements_controller_spec.rb} +4 -4
- data/spec/controllers/{messages_controller_spec.rb → alchemy/messages_controller_spec.rb} +14 -9
- data/spec/controllers/alchemy/on_page_layout_mixin_spec.rb +330 -0
- data/spec/controllers/{pages_controller_spec.rb → alchemy/pages_controller_spec.rb} +167 -89
- data/spec/controllers/{pictures_controller_spec.rb → alchemy/pictures_controller_spec.rb} +42 -20
- data/spec/dummy/app/models/dummy_user.rb +4 -0
- data/spec/dummy/app/views/alchemy/elements/_all_you_can_eat_view.html.erb +31 -0
- data/spec/dummy/app/views/alchemy/elements/_article_editor.html.erb +6 -10
- data/spec/dummy/app/views/alchemy/elements/_article_view.html.erb +9 -24
- data/spec/dummy/app/views/alchemy/elements/_bild_editor.html.erb +3 -0
- data/spec/dummy/app/views/alchemy/elements/_bild_view.html.erb +5 -0
- data/spec/dummy/app/views/alchemy/elements/_contactform_editor.html.erb +6 -0
- data/spec/dummy/app/views/alchemy/elements/_contactform_view.html.erb +16 -0
- data/spec/dummy/app/views/alchemy/elements/_download_editor.html.erb +3 -0
- data/spec/dummy/app/views/alchemy/elements/_download_view.html.erb +5 -0
- data/spec/dummy/app/views/alchemy/elements/_erb_element_editor.html.erb +3 -0
- data/spec/dummy/app/views/alchemy/elements/_erb_element_view.html.erb +5 -0
- data/spec/dummy/app/views/alchemy/elements/_header_editor.html.erb +3 -0
- data/spec/dummy/app/views/alchemy/elements/_header_view.html.erb +5 -0
- data/spec/dummy/app/views/alchemy/elements/_news_editor.html.erb +5 -0
- data/spec/dummy/app/views/alchemy/elements/_search_editor.html.erb +1 -0
- data/spec/dummy/app/views/alchemy/elements/_search_view.html.erb +4 -0
- data/spec/dummy/app/views/alchemy/elements/_slide_editor.html.erb +3 -0
- data/spec/dummy/app/views/alchemy/elements/_slide_view.html.erb +5 -0
- data/spec/dummy/app/views/alchemy/elements/_slider_editor.html.erb +2 -0
- data/spec/dummy/app/views/alchemy/elements/_slider_view.html.erb +4 -0
- data/spec/dummy/app/views/alchemy/elements/_text_editor.html.erb +3 -0
- data/spec/dummy/app/views/alchemy/elements/_text_view.html.erb +5 -0
- data/spec/dummy/app/views/alchemy/page_layouts/_standard.html.erb +1 -0
- data/spec/dummy/config/alchemy/elements.yml +10 -13
- data/spec/dummy/config/alchemy/page_layouts.yml +1 -1
- data/spec/dummy/config/initializers/alchemy.rb +1 -0
- data/spec/dummy/config/locales/kl.yml +2 -0
- data/spec/dummy/db/migrate/20150608204610_add_parent_element_id_to_alchemy_elements.rb +1 -0
- data/spec/dummy/db/migrate/20150729151825_add_link_text_to_alchemy_essence_files.rb +1 -0
- data/spec/dummy/db/migrate/20150906195818_add_locale_to_alchemy_languages.rb +1 -0
- data/spec/dummy/db/schema.rb +10 -6
- data/spec/factories.rb +13 -0
- data/spec/features/admin/admin_layout_spec.rb +14 -0
- data/spec/features/admin/dashboard_spec.rb +1 -2
- data/spec/features/admin/edit_elements_feature_spec.rb +36 -0
- data/spec/features/admin/language_tree_feature_spec.rb +7 -8
- data/spec/features/admin/languages_features_spec.rb +65 -0
- data/spec/features/admin/legacy_page_url_management_spec.rb +3 -3
- data/spec/features/admin/link_overlay_spec.rb +16 -17
- data/spec/features/admin/locale_select_feature_spec.rb +1 -1
- data/spec/features/admin/modules_integration_spec.rb +0 -1
- data/spec/features/admin/navigation_feature_spec.rb +11 -2
- data/spec/features/admin/page_creation_feature_spec.rb +5 -5
- data/spec/features/admin/page_editing_feature_spec.rb +6 -6
- data/spec/features/admin/picture_library_integration_spec.rb +3 -3
- data/spec/features/admin/resources_integration_spec.rb +7 -12
- data/spec/features/admin/site_select_feature_spec.rb +1 -2
- data/spec/features/admin/tinymce_feature_spec.rb +0 -1
- data/spec/features/page_feature_spec.rb +57 -158
- data/spec/features/page_redirects_spec.rb +358 -0
- data/spec/features/picture_security_spec.rb +1 -7
- data/spec/fixtures/animated.gif +0 -0
- data/spec/helpers/{admin → alchemy/admin}/attachments_helper_spec.rb +0 -0
- data/spec/helpers/{admin → alchemy/admin}/base_helper_spec.rb +39 -29
- data/spec/helpers/{admin → alchemy/admin}/contents_helper_spec.rb +4 -23
- data/spec/helpers/{admin → alchemy/admin}/elements_helper_spec.rb +141 -5
- data/spec/helpers/{admin → alchemy/admin}/essences_helper_spec.rb +69 -8
- data/spec/helpers/{admin → alchemy/admin}/navigation_helper_spec.rb +43 -37
- data/spec/helpers/{admin → alchemy/admin}/pages_helper_spec.rb +6 -38
- data/spec/helpers/{admin → alchemy/admin}/pictures_helper_spec.rb +0 -1
- data/spec/helpers/{admin → alchemy/admin}/tags_helper_spec.rb +1 -3
- data/spec/helpers/{base_helper_spec.rb → alchemy/base_helper_spec.rb} +1 -2
- data/spec/helpers/{elements_block_helper_spec.rb → alchemy/elements_block_helper_spec.rb} +3 -3
- data/spec/helpers/{elements_helper_spec.rb → alchemy/elements_helper_spec.rb} +18 -19
- data/spec/helpers/alchemy/essences_helper_spec.rb +85 -0
- data/spec/helpers/{pages_helper_spec.rb → alchemy/pages_helper_spec.rb} +125 -39
- data/spec/helpers/alchemy/picture_url_helpers_spec.rb +78 -0
- data/spec/helpers/{url_helper_spec.rb → alchemy/url_helper_spec.rb} +66 -40
- data/spec/libraries/config_spec.rb +2 -3
- data/spec/libraries/controller_actions_spec.rb +18 -18
- data/spec/libraries/i18n_spec.rb +7 -0
- data/spec/libraries/page_layout_spec.rb +13 -7
- data/spec/libraries/paths_spec.rb +15 -0
- data/spec/libraries/permissions_spec.rb +6 -7
- data/spec/libraries/resource_spec.rb +48 -75
- data/spec/libraries/resources_helper_spec.rb +55 -6
- data/spec/libraries/shell_spec.rb +0 -4
- data/spec/libraries/template_tracker_spec.rb +4 -13
- data/spec/libraries/tinymce_spec.rb +53 -9
- data/spec/mailers/{messages_spec.rb → alchemy/messages_spec.rb} +0 -2
- data/spec/models/{attachment_spec.rb → alchemy/attachment_spec.rb} +43 -20
- data/spec/models/{cell_spec.rb → alchemy/cell_spec.rb} +2 -3
- data/spec/models/{content_spec.rb → alchemy/content_spec.rb} +179 -70
- data/spec/models/{element_spec.rb → alchemy/element_spec.rb} +315 -70
- data/spec/models/{element_to_page_spec.rb → alchemy/element_to_page_spec.rb} +0 -1
- data/spec/models/{essence_boolean_spec.rb → alchemy/essence_boolean_spec.rb} +0 -0
- data/spec/models/{essence_date_spec.rb → alchemy/essence_date_spec.rb} +2 -3
- data/spec/models/{essence_file_spec.rb → alchemy/essence_file_spec.rb} +2 -5
- data/spec/models/{essence_html_spec.rb → alchemy/essence_html_spec.rb} +1 -1
- data/spec/models/{essence_link_spec.rb → alchemy/essence_link_spec.rb} +0 -0
- data/spec/models/{essence_picture_spec.rb → alchemy/essence_picture_spec.rb} +101 -29
- data/spec/models/{essence_richtext_spec.rb → alchemy/essence_richtext_spec.rb} +7 -2
- data/spec/models/{essence_select_spec.rb → alchemy/essence_select_spec.rb} +0 -0
- data/spec/models/{essence_text_spec.rb → alchemy/essence_text_spec.rb} +4 -8
- data/spec/models/alchemy/language_spec.rb +243 -0
- data/spec/models/{legacy_page_url_spec.rb → alchemy/legacy_page_url_spec.rb} +1 -1
- data/spec/models/{message_spec.rb → alchemy/message_spec.rb} +0 -0
- data/spec/models/{page_spec.rb → alchemy/page_spec.rb} +460 -248
- data/spec/models/{picture_spec.rb → alchemy/picture_spec.rb} +118 -30
- data/spec/models/{site_spec.rb → alchemy/site_spec.rb} +19 -84
- data/spec/models/{tag_spec.rb → alchemy/tag_spec.rb} +1 -3
- data/spec/models/dummy_model_spec.rb +1 -2
- data/spec/requests/alchemy/admin/resources_requests_spec.rb +26 -0
- data/spec/requests/alchemy/admin/site_requests_spec.rb +19 -0
- data/spec/requests/alchemy/site_requests_spec.rb +18 -0
- data/spec/requests/alchemy/sitemap_spec.rb +56 -0
- data/spec/routing/api_routing_spec.rb +1 -1
- data/spec/routing/routing_spec.rb +121 -15
- data/spec/spec_helper.rb +2 -1
- data/spec/support/hint_examples.rb +1 -3
- data/spec/support/test_tweaks.rb +3 -3
- data/spec/support/transformation_examples.rb +6 -7
- data/spec/tasks/helpers_spec.rb +2 -4
- data/spec/views/admin/pictures/show_spec.rb +43 -0
- data/spec/views/essences/essence_boolean_editor_spec.rb +0 -1
- data/spec/views/essences/essence_boolean_view_spec.rb +2 -4
- data/spec/views/essences/essence_date_view_spec.rb +0 -1
- data/spec/views/essences/essence_file_editor_spec.rb +4 -6
- data/spec/views/essences/essence_file_view_spec.rb +56 -3
- data/spec/views/essences/essence_link_view_spec.rb +1 -1
- data/spec/views/essences/essence_picture_editor_spec.rb +80 -0
- data/spec/views/essences/essence_picture_view_spec.rb +0 -1
- data/spec/views/essences/essence_select_view_spec.rb +0 -1
- data/spec/views/essences/essence_text_view_spec.rb +0 -1
- data/vendor/assets/javascripts/handlebars.js +4608 -0
- data/vendor/assets/javascripts/tinymce/langs/de.js +19 -0
- data/vendor/assets/javascripts/tinymce/langs/es.js +19 -0
- data/vendor/assets/javascripts/tinymce/langs/fr.js +23 -4
- data/vendor/assets/javascripts/tinymce/langs/nl.js +22 -3
- data/vendor/assets/javascripts/tinymce/langs/ru.js +22 -3
- data/vendor/assets/javascripts/tinymce/plugins/paste/plugin.min.js +1 -1
- data/vendor/assets/javascripts/tinymce/plugins/table/plugin.min.js +1 -1
- data/vendor/assets/javascripts/tinymce/themes/modern/theme.min.js +1 -1
- data/vendor/assets/javascripts/tinymce/tinymce.min.js +12 -13
- metadata +274 -256
- data/app/views/alchemy/admin/attachments/create.js.erb +0 -11
- data/app/views/alchemy/admin/attachments/new.html.erb +0 -14
- data/app/views/alchemy/admin/elements/_element_foot.html.erb +0 -36
- data/app/views/alchemy/admin/partials/_upload_form.html.erb +0 -67
- data/app/views/alchemy/admin/pictures/info.html.erb +0 -38
- data/app/views/alchemy/admin/pictures/new.html.erb +0 -16
- data/lib/alchemy/middleware/rescue_old_cookies.rb +0 -27
- data/spec/controllers/admin/resources_controller_spec.rb +0 -53
- data/spec/controllers/base_controller_spec.rb +0 -51
- data/spec/helpers/essences_helper_spec.rb +0 -156
- data/spec/helpers/picture_url_helpers_spec.rb +0 -35
- data/spec/libraries/on_page_layout_spec.rb +0 -112
- data/spec/models/language_spec.rb +0 -123
@@ -23,30 +23,67 @@ module Alchemy
|
|
23
23
|
include Alchemy::Touching
|
24
24
|
include Alchemy::Hints
|
25
25
|
|
26
|
-
FORBIDDEN_DEFINITION_ATTRIBUTES =
|
27
|
-
|
26
|
+
FORBIDDEN_DEFINITION_ATTRIBUTES = [
|
27
|
+
"amount",
|
28
|
+
"nestable_elements",
|
29
|
+
"contents",
|
30
|
+
"hint",
|
31
|
+
"picture_gallery",
|
32
|
+
"taggable"
|
33
|
+
].freeze
|
34
|
+
|
35
|
+
SKIPPED_ATTRIBUTES_ON_COPY = [
|
36
|
+
"cached_tag_list",
|
37
|
+
"created_at",
|
38
|
+
"creator_id",
|
39
|
+
"id",
|
40
|
+
"folded",
|
41
|
+
"position",
|
42
|
+
"updated_at",
|
43
|
+
"updater_id"
|
44
|
+
].freeze
|
28
45
|
|
29
46
|
acts_as_taggable
|
30
47
|
|
31
|
-
# All Elements
|
32
|
-
|
48
|
+
# All Elements that share the same page id, cell id and parent element id are considered a list.
|
49
|
+
#
|
50
|
+
# If cell id and parent element id are nil (typical case for a simple page),
|
51
|
+
# then all elements on that page are still in one list,
|
52
|
+
# because acts_as_list correctly creates this statement:
|
53
|
+
#
|
54
|
+
# WHERE page_id = 1 and cell_id = NULL AND parent_element_id = NULL
|
55
|
+
#
|
56
|
+
acts_as_list scope: [:page_id, :cell_id, :parent_element_id]
|
57
|
+
|
33
58
|
stampable stamper_class_name: Alchemy.user_class_name
|
34
59
|
|
35
60
|
has_many :contents, -> { order(:position) }, dependent: :destroy
|
61
|
+
|
62
|
+
# Elements can have other elements nested inside
|
63
|
+
has_many :nested_elements,
|
64
|
+
-> { order(:position).not_trashed },
|
65
|
+
class_name: 'Alchemy::Element',
|
66
|
+
foreign_key: :parent_element_id,
|
67
|
+
dependent: :destroy
|
68
|
+
|
36
69
|
belongs_to :cell
|
37
70
|
belongs_to :page
|
71
|
+
|
72
|
+
# A nested element belongs to a parent element.
|
73
|
+
belongs_to :parent_element, class_name: 'Alchemy::Element', touch: true
|
74
|
+
|
38
75
|
has_and_belongs_to_many :touchable_pages, -> { uniq },
|
39
76
|
class_name: 'Alchemy::Page',
|
40
77
|
join_table: ElementToPage.table_name
|
41
78
|
|
42
|
-
validates_presence_of :name, :
|
43
|
-
validates_format_of :name, :
|
79
|
+
validates_presence_of :name, on: :create
|
80
|
+
validates_format_of :name, on: :create, with: /\A[a-z0-9_-]+\z/
|
44
81
|
|
45
82
|
attr_accessor :create_contents_after_create
|
46
83
|
|
47
|
-
after_create :create_contents, :
|
84
|
+
after_create :create_contents, unless: proc { |e| e.create_contents_after_create == false }
|
48
85
|
after_update :touch_pages
|
49
|
-
after_update :touch_cell, unless: -> {
|
86
|
+
after_update :touch_cell, unless: -> { cell.nil? }
|
50
87
|
|
51
88
|
scope :trashed, -> { where(position: nil).order('updated_at DESC') }
|
52
89
|
scope :not_trashed, -> { where(Element.arel_table[:position].not_eq(nil)) }
|
@@ -56,18 +93,21 @@ module Alchemy
|
|
56
93
|
scope :named, ->(names) { where(name: names) }
|
57
94
|
scope :excluded, ->(names) { where(arel_table[:name].not_in(names)) }
|
58
95
|
scope :not_in_cell, -> { where(cell_id: nil) }
|
59
|
-
scope :in_cell, -> { where("#{
|
96
|
+
scope :in_cell, -> { where("#{table_name}.cell_id IS NOT NULL") }
|
60
97
|
scope :from_current_site, -> { where(Language.table_name => {site_id: Site.current || Site.default}).joins(page: 'language') }
|
98
|
+
scope :folded, -> { where(folded: true) }
|
99
|
+
scope :expanded, -> { where(folded: false) }
|
61
100
|
|
62
101
|
delegate :restricted?, to: :page, allow_nil: true
|
63
102
|
|
64
103
|
# Concerns
|
65
104
|
include Alchemy::Element::Definitions
|
105
|
+
include Alchemy::Element::ElementContents
|
106
|
+
include Alchemy::Element::ElementEssences
|
66
107
|
include Alchemy::Element::Presenters
|
67
108
|
|
68
109
|
# class methods
|
69
110
|
class << self
|
70
|
-
|
71
111
|
# Builds a new element as described in +/config/alchemy/elements.yml+
|
72
112
|
#
|
73
113
|
# - Returns a new Alchemy::Element object if no name is given in attributes,
|
@@ -77,11 +117,9 @@ module Alchemy
|
|
77
117
|
#
|
78
118
|
def new_from_scratch(attributes = {})
|
79
119
|
attributes = attributes.dup.symbolize_keys
|
80
|
-
|
81
120
|
return new if attributes[:name].blank?
|
82
121
|
|
83
|
-
new_element_from_definition_by(attributes) ||
|
84
|
-
raise(ElementDefinitionError.new(attributes))
|
122
|
+
new_element_from_definition_by(attributes) || raise(ElementDefinitionError, attributes)
|
85
123
|
end
|
86
124
|
|
87
125
|
# Creates a new element as described in +/config/alchemy/elements.yml+
|
@@ -105,20 +143,32 @@ module Alchemy
|
|
105
143
|
#
|
106
144
|
# == Example
|
107
145
|
#
|
108
|
-
# @copy = Alchemy::Element.copy(@element, {:
|
146
|
+
# @copy = Alchemy::Element.copy(@element, {public: false})
|
109
147
|
# @copy.public? # => false
|
110
148
|
#
|
111
|
-
def copy(
|
112
|
-
|
149
|
+
def copy(source_element, differences = {})
|
150
|
+
source_element.attributes.stringify_keys!
|
113
151
|
differences.stringify_keys!
|
114
|
-
|
115
|
-
|
116
|
-
|
117
|
-
|
118
|
-
|
119
|
-
|
152
|
+
|
153
|
+
attributes = source_element.attributes
|
154
|
+
.except(*SKIPPED_ATTRIBUTES_ON_COPY)
|
155
|
+
.merge(differences)
|
156
|
+
.merge({
|
157
|
+
create_contents_after_create: false,
|
158
|
+
tag_list: source_element.tag_list
|
159
|
+
})
|
160
|
+
|
161
|
+
new_element = create!(attributes)
|
162
|
+
|
163
|
+
if source_element.contents.any?
|
164
|
+
source_element.copy_contents_to(new_element)
|
120
165
|
end
|
121
|
-
|
166
|
+
|
167
|
+
if source_element.nested_elements.any?
|
168
|
+
source_element.copy_nested_elements_to(new_element)
|
169
|
+
end
|
170
|
+
|
171
|
+
new_element
|
122
172
|
end
|
123
173
|
|
124
174
|
def all_from_clipboard(clipboard)
|
@@ -140,10 +190,10 @@ module Alchemy
|
|
140
190
|
def new_element_from_definition_by(attributes)
|
141
191
|
remove_cell_name_from_element_name!(attributes)
|
142
192
|
|
143
|
-
|
144
|
-
return if
|
193
|
+
element_definition = Element.definition_by_name(attributes[:name])
|
194
|
+
return if element_definition.nil?
|
145
195
|
|
146
|
-
new(
|
196
|
+
new(element_definition.merge(attributes).except(*FORBIDDEN_DEFINITION_ATTRIBUTES))
|
147
197
|
end
|
148
198
|
|
149
199
|
def remove_cell_name_from_element_name!(attributes)
|
@@ -170,9 +220,9 @@ module Alchemy
|
|
170
220
|
# Stores the page into +touchable_pages+ (Pages that have to be touched after updating the element).
|
171
221
|
def store_page(page)
|
172
222
|
return true if page.nil?
|
173
|
-
unless
|
174
|
-
|
175
|
-
|
223
|
+
unless touchable_pages.include? page
|
224
|
+
touchable_pages << page
|
225
|
+
save
|
176
226
|
end
|
177
227
|
end
|
178
228
|
|
@@ -180,229 +230,11 @@ module Alchemy
|
|
180
230
|
def trash!
|
181
231
|
self.public = false
|
182
232
|
self.folded = true
|
183
|
-
|
233
|
+
remove_from_list
|
184
234
|
end
|
185
235
|
|
186
236
|
def trashed?
|
187
|
-
|
188
|
-
end
|
189
|
-
|
190
|
-
def content_by_name(name)
|
191
|
-
self.contents.find_by_name(name)
|
192
|
-
end
|
193
|
-
|
194
|
-
def content_by_type(essence_type)
|
195
|
-
self.contents.find_by_essence_type(Content.normalize_essence_type(essence_type))
|
196
|
-
end
|
197
|
-
|
198
|
-
def all_contents_by_name(name)
|
199
|
-
self.contents.where(:name => name)
|
200
|
-
end
|
201
|
-
|
202
|
-
def all_contents_by_type(essence_type)
|
203
|
-
self.contents.where(:essence_type => Content.normalize_essence_type(essence_type))
|
204
|
-
end
|
205
|
-
|
206
|
-
# Returns the content that is marked as rss title.
|
207
|
-
#
|
208
|
-
# Mark a content as rss title in your +elements.yml+ file:
|
209
|
-
#
|
210
|
-
# - name: news
|
211
|
-
# contents:
|
212
|
-
# - name: headline
|
213
|
-
# type: EssenceText
|
214
|
-
# rss_title: true
|
215
|
-
#
|
216
|
-
def content_for_rss_title
|
217
|
-
content_for_rss_meta('title')
|
218
|
-
end
|
219
|
-
|
220
|
-
# Returns the content that is marked as rss description.
|
221
|
-
#
|
222
|
-
# Mark a content as rss description in your +elements.yml+ file:
|
223
|
-
#
|
224
|
-
# - name: news
|
225
|
-
# contents:
|
226
|
-
# - name: body
|
227
|
-
# type: EssenceRichtext
|
228
|
-
# rss_description: true
|
229
|
-
#
|
230
|
-
def content_for_rss_description
|
231
|
-
content_for_rss_meta('description')
|
232
|
-
end
|
233
|
-
|
234
|
-
# Returns the array with the hashes for all element contents in the elements.yml file
|
235
|
-
def content_descriptions
|
236
|
-
return nil if definition.blank?
|
237
|
-
definition['contents']
|
238
|
-
end
|
239
|
-
|
240
|
-
# Returns the definition for given content_name
|
241
|
-
def content_description_for(content_name)
|
242
|
-
if content_descriptions.blank?
|
243
|
-
log_warning "Element #{self.name} is missing the content definition for #{content_name}"
|
244
|
-
return nil
|
245
|
-
else
|
246
|
-
content_descriptions.detect { |d| d['name'] == content_name }
|
247
|
-
end
|
248
|
-
end
|
249
|
-
|
250
|
-
# Returns the definition for given content_name inside the available_contents
|
251
|
-
def available_content_description_for(content_name)
|
252
|
-
return nil if available_contents.blank?
|
253
|
-
available_contents.detect { |d| d['name'] == content_name }
|
254
|
-
end
|
255
|
-
|
256
|
-
# returns the collection of available essence_types that can be created for this element depending on its description in elements.yml
|
257
|
-
def available_contents
|
258
|
-
definition['available_contents']
|
259
|
-
end
|
260
|
-
|
261
|
-
# Returns the contents ingredient for passed content name.
|
262
|
-
def ingredient(name)
|
263
|
-
content = content_by_name(name)
|
264
|
-
return nil if content.blank?
|
265
|
-
content.ingredient
|
266
|
-
end
|
267
|
-
|
268
|
-
def has_ingredient?(name)
|
269
|
-
self.ingredient(name).present?
|
270
|
-
end
|
271
|
-
|
272
|
-
# Updates all related contents by calling +update_essence+ on each of them.
|
273
|
-
#
|
274
|
-
# @param contents_attributes [Hash]
|
275
|
-
# Hash of contents attributes.
|
276
|
-
# The keys has to be the #id of the content to update.
|
277
|
-
# The values a Hash of attribute names and values
|
278
|
-
#
|
279
|
-
# @return [Boolean]
|
280
|
-
# True if +self.errors+ are blank or +contents_attributes+ hash is nil
|
281
|
-
#
|
282
|
-
# == Example
|
283
|
-
#
|
284
|
-
# @element.update_contents({1 => {ingredient: 'Title'}, 2 => {link: 'https://google.com'}})
|
285
|
-
#
|
286
|
-
def update_contents(contents_attributes)
|
287
|
-
return true if contents_attributes.nil?
|
288
|
-
contents.each do |content|
|
289
|
-
content_hash = contents_attributes["#{content.id}"] || next
|
290
|
-
content.update_essence(content_hash) || errors.add(:base, :essence_validation_failed)
|
291
|
-
end
|
292
|
-
errors.blank?
|
293
|
-
end
|
294
|
-
|
295
|
-
def essences
|
296
|
-
return [] if contents.blank?
|
297
|
-
contents.collect(&:essence)
|
298
|
-
end
|
299
|
-
|
300
|
-
# Returns all essence_errors in the format:
|
301
|
-
#
|
302
|
-
# {
|
303
|
-
# essence.content.name => [error_message_for_validation_1, error_message_for_validation_2]
|
304
|
-
# }
|
305
|
-
#
|
306
|
-
# Get translated error messages with Element#essence_error_messages
|
307
|
-
#
|
308
|
-
def essence_errors
|
309
|
-
essence_errors = {}
|
310
|
-
essences.each do |essence|
|
311
|
-
unless essence.errors.blank?
|
312
|
-
essence_errors[essence.content.name] = essence.validation_errors
|
313
|
-
end
|
314
|
-
end
|
315
|
-
essence_errors
|
316
|
-
end
|
317
|
-
|
318
|
-
# Essence validation errors
|
319
|
-
#
|
320
|
-
# == Error messages are translated via I18n
|
321
|
-
#
|
322
|
-
# Inside your translation file add translations like:
|
323
|
-
#
|
324
|
-
# alchemy:
|
325
|
-
# content_validations:
|
326
|
-
# name_of_the_element:
|
327
|
-
# name_of_the_content:
|
328
|
-
# validation_error_type: Error Message
|
329
|
-
#
|
330
|
-
# NOTE: +validation_error_type+ has to be one of:
|
331
|
-
#
|
332
|
-
# * blank
|
333
|
-
# * taken
|
334
|
-
# * invalid
|
335
|
-
#
|
336
|
-
# === Example:
|
337
|
-
#
|
338
|
-
# de:
|
339
|
-
# alchemy:
|
340
|
-
# content_validations:
|
341
|
-
# contactform:
|
342
|
-
# email:
|
343
|
-
# invalid: 'Die Email hat nicht das richtige Format'
|
344
|
-
#
|
345
|
-
#
|
346
|
-
# == Error message translation fallbacks
|
347
|
-
#
|
348
|
-
# In order to not translate every single content for every element you can provide default error messages per content name:
|
349
|
-
#
|
350
|
-
# === Example
|
351
|
-
#
|
352
|
-
# en:
|
353
|
-
# alchemy:
|
354
|
-
# content_validations:
|
355
|
-
# fields:
|
356
|
-
# email:
|
357
|
-
# invalid: E-Mail has wrong format
|
358
|
-
# blank: E-Mail can't be blank
|
359
|
-
#
|
360
|
-
# And even further you can provide general field agnostic error messages:
|
361
|
-
#
|
362
|
-
# === Example
|
363
|
-
#
|
364
|
-
# en:
|
365
|
-
# alchemy:
|
366
|
-
# content_validations:
|
367
|
-
# errors:
|
368
|
-
# invalid: %{field} has wrong format
|
369
|
-
# blank: %{field} can't be blank
|
370
|
-
#
|
371
|
-
def essence_error_messages
|
372
|
-
messages = []
|
373
|
-
essence_errors.each do |content_name, errors|
|
374
|
-
errors.each do |error|
|
375
|
-
messages << I18n.t(
|
376
|
-
"#{self.name}.#{content_name}.#{error}",
|
377
|
-
scope: 'content_validations',
|
378
|
-
default: [
|
379
|
-
"fields.#{content_name}.#{error}".to_sym,
|
380
|
-
"errors.#{error}".to_sym
|
381
|
-
],
|
382
|
-
field: Content.translated_label_for(content_name, name)
|
383
|
-
)
|
384
|
-
end
|
385
|
-
end
|
386
|
-
messages
|
387
|
-
end
|
388
|
-
|
389
|
-
def contents_with_errors
|
390
|
-
contents.select(&:essence_validation_failed?)
|
391
|
-
end
|
392
|
-
|
393
|
-
def has_validations?
|
394
|
-
!contents.detect(&:has_validations?).blank?
|
395
|
-
end
|
396
|
-
|
397
|
-
def rtf_contents
|
398
|
-
contents.essence_richtexts
|
399
|
-
end
|
400
|
-
alias_method :richtext_contents, :rtf_contents
|
401
|
-
|
402
|
-
# Returns an array of all EssenceRichtext contents ids
|
403
|
-
#
|
404
|
-
def richtext_contents_ids
|
405
|
-
contents.essence_richtexts.pluck("#{Content.table_name}.id")
|
237
|
+
position.nil?
|
406
238
|
end
|
407
239
|
|
408
240
|
# The names of all cells from given page this element could be placed in.
|
@@ -421,6 +253,11 @@ module Alchemy
|
|
421
253
|
definition['taggable'] == true
|
422
254
|
end
|
423
255
|
|
256
|
+
# The opposite of folded?
|
257
|
+
def expanded?
|
258
|
+
!folded?
|
259
|
+
end
|
260
|
+
|
424
261
|
# The element's view partial is dependent from its name
|
425
262
|
#
|
426
263
|
# == Define elements
|
@@ -453,26 +290,24 @@ module Alchemy
|
|
453
290
|
end
|
454
291
|
end
|
455
292
|
|
456
|
-
|
457
|
-
|
458
|
-
|
459
|
-
description = content_descriptions.detect { |c| c["rss_#{type}"] }
|
460
|
-
return if description.blank?
|
461
|
-
contents.find_by(name: description['name'])
|
293
|
+
# A collection of element names that can be nested inside this element.
|
294
|
+
def nestable_elements
|
295
|
+
definition.fetch('nestable_elements', [])
|
462
296
|
end
|
463
297
|
|
464
|
-
#
|
465
|
-
def
|
466
|
-
|
467
|
-
|
468
|
-
|
469
|
-
|
470
|
-
|
471
|
-
|
472
|
-
end
|
298
|
+
# Copy all nested elements from current element to given target element.
|
299
|
+
def copy_nested_elements_to(target_element)
|
300
|
+
nested_elements.map do |nested_element|
|
301
|
+
Element.copy(nested_element, {
|
302
|
+
parent_element_id: target_element.id,
|
303
|
+
page_id: target_element.page_id,
|
304
|
+
cell_id: target_element.cell_id
|
305
|
+
})
|
473
306
|
end
|
474
307
|
end
|
475
308
|
|
309
|
+
private
|
310
|
+
|
476
311
|
# Returns previous or next public element from same page.
|
477
312
|
#
|
478
313
|
# @param [String]
|
@@ -490,7 +325,7 @@ module Alchemy
|
|
490
325
|
#
|
491
326
|
def available_page_cells(page)
|
492
327
|
page.cells.select do |cell|
|
493
|
-
cell.available_elements.include?(
|
328
|
+
cell.available_elements.include?(name)
|
494
329
|
end
|
495
330
|
end
|
496
331
|
|
@@ -506,8 +341,7 @@ module Alchemy
|
|
506
341
|
# Called after_update
|
507
342
|
#
|
508
343
|
def touch_cell
|
509
|
-
|
344
|
+
cell.touch
|
510
345
|
end
|
511
|
-
|
512
346
|
end
|
513
347
|
end
|