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
@@ -0,0 +1,85 @@
|
|
1
|
+
require 'spec_helper'
|
2
|
+
|
3
|
+
describe Alchemy::EssencesHelper do
|
4
|
+
let(:element) { build_stubbed(:alchemy_element) }
|
5
|
+
let(:content) { build_stubbed(:alchemy_content, element: element, ingredient: 'hello!') }
|
6
|
+
let(:essence) { mock_model('EssenceText', link: nil, partial_name: 'essence_text', ingredient: 'hello!') }
|
7
|
+
|
8
|
+
before do
|
9
|
+
allow_message_expectations_on_nil
|
10
|
+
allow(content).to receive(:essence).and_return(essence)
|
11
|
+
end
|
12
|
+
|
13
|
+
describe 'render_essence' do
|
14
|
+
subject { render_essence(content) }
|
15
|
+
|
16
|
+
it "renders an essence view partial" do
|
17
|
+
is_expected.to have_content 'hello!'
|
18
|
+
end
|
19
|
+
|
20
|
+
context 'with editor given as view part' do
|
21
|
+
subject { helper.render_essence(content, :editor) }
|
22
|
+
|
23
|
+
before do
|
24
|
+
allow(helper).to receive(:content_label)
|
25
|
+
allow(content).to receive(:settings).and_return({})
|
26
|
+
end
|
27
|
+
|
28
|
+
it "renders an essence editor partial" do
|
29
|
+
expect(content).to receive(:form_field_name)
|
30
|
+
is_expected.to have_selector 'input[type="text"]'
|
31
|
+
end
|
32
|
+
end
|
33
|
+
|
34
|
+
context 'if content is nil' do
|
35
|
+
let(:content) { nil }
|
36
|
+
|
37
|
+
it "returns empty string" do
|
38
|
+
is_expected.to eq('')
|
39
|
+
end
|
40
|
+
|
41
|
+
context 'editor given as part' do
|
42
|
+
subject { helper.render_essence(content, :editor) }
|
43
|
+
|
44
|
+
before { allow(Alchemy).to receive(:t).and_return('') }
|
45
|
+
|
46
|
+
it "displays warning" do
|
47
|
+
expect(helper).to receive(:warning).and_return('')
|
48
|
+
is_expected.to eq('')
|
49
|
+
end
|
50
|
+
end
|
51
|
+
end
|
52
|
+
|
53
|
+
context 'if essence is nil' do
|
54
|
+
let(:essence) { nil }
|
55
|
+
|
56
|
+
it "returns empty string" do
|
57
|
+
is_expected.to eq('')
|
58
|
+
end
|
59
|
+
|
60
|
+
context 'editor given as part' do
|
61
|
+
subject { helper.render_essence(content, :editor) }
|
62
|
+
|
63
|
+
before { allow(Alchemy).to receive(:t).and_return('') }
|
64
|
+
|
65
|
+
it "displays warning" do
|
66
|
+
expect(helper).to receive(:warning).and_return('')
|
67
|
+
is_expected.to eq('')
|
68
|
+
end
|
69
|
+
end
|
70
|
+
end
|
71
|
+
end
|
72
|
+
|
73
|
+
describe 'render_essence_view' do
|
74
|
+
it "renders an essence view partial" do
|
75
|
+
expect(render_essence_view(content)).to have_content 'hello!'
|
76
|
+
end
|
77
|
+
end
|
78
|
+
|
79
|
+
describe "render_essence_view_by_name" do
|
80
|
+
it "renders an essence view partial by content name" do
|
81
|
+
expect(element).to receive(:content_by_name).and_return(content)
|
82
|
+
expect(render_essence_view_by_name(element, 'intro')).to have_content 'hello!'
|
83
|
+
end
|
84
|
+
end
|
85
|
+
end
|
@@ -3,20 +3,19 @@ require 'spec_helper'
|
|
3
3
|
|
4
4
|
module Alchemy
|
5
5
|
describe PagesHelper do
|
6
|
-
|
7
6
|
# Fixtures
|
8
|
-
let(:language) { mock_model('Language', :
|
7
|
+
let(:language) { mock_model('Language', code: 'en') }
|
9
8
|
let(:default_language) { Language.default }
|
10
|
-
let(:language_root) {
|
11
|
-
let(:public_page) {
|
12
|
-
let(:visible_page) {
|
13
|
-
let(:restricted_page) {
|
14
|
-
let(:level_2_page) {
|
15
|
-
let(:level_3_page) {
|
16
|
-
let(:level_4_page) {
|
17
|
-
let(:
|
18
|
-
let(:
|
19
|
-
let(:
|
9
|
+
let(:language_root) { create(:alchemy_page, :language_root) }
|
10
|
+
let(:public_page) { create(:alchemy_page, :public) }
|
11
|
+
let(:visible_page) { create(:alchemy_page, :public, visible: true) }
|
12
|
+
let(:restricted_page) { create(:alchemy_page, :public, visible: true, restricted: true) }
|
13
|
+
let(:level_2_page) { create(:alchemy_page, :public, parent_id: visible_page.id, visible: true, name: 'Level 2') }
|
14
|
+
let(:level_3_page) { create(:alchemy_page, :public, parent_id: level_2_page.id, visible: true, name: 'Level 3') }
|
15
|
+
let(:level_4_page) { create(:alchemy_page, :public, parent_id: level_3_page.id, visible: true, name: 'Level 4') }
|
16
|
+
let(:klingon) { create(:alchemy_language, :klingon) }
|
17
|
+
let(:klingon_language_root) { create(:alchemy_page, :language_root, language: klingon) }
|
18
|
+
let(:klingon_public_page) { create(:alchemy_page, :public, language: klingon, parent_id: klingon_language_root.id) }
|
20
19
|
|
21
20
|
before do
|
22
21
|
helper.controller.class_eval { include Alchemy::ConfigurationMethods }
|
@@ -57,12 +56,12 @@ module Alchemy
|
|
57
56
|
end
|
58
57
|
|
59
58
|
it "should render only visible pages" do
|
60
|
-
not_visible_page =
|
59
|
+
not_visible_page = create(:alchemy_page, visible: false)
|
61
60
|
expect(helper.render_navigation).not_to match(/#{not_visible_page.name}/)
|
62
61
|
end
|
63
62
|
|
64
63
|
it "should render visible unpublished pages" do
|
65
|
-
unpublished_visible_page =
|
64
|
+
unpublished_visible_page = create(:alchemy_page, visible: true, public: false)
|
66
65
|
expect(helper.render_navigation).to match(/#{unpublished_visible_page.name}/)
|
67
66
|
end
|
68
67
|
|
@@ -87,7 +86,7 @@ module Alchemy
|
|
87
86
|
before { restricted_page }
|
88
87
|
|
89
88
|
it "should render also restricted pages" do
|
90
|
-
not_restricted_page =
|
89
|
+
not_restricted_page = create(:alchemy_page, :public, restricted: false, visible: true)
|
91
90
|
expect(helper.render_navigation).to match(/#{restricted_page.name}/)
|
92
91
|
expect(helper.render_navigation).to match(/#{not_restricted_page.name}/)
|
93
92
|
end
|
@@ -100,18 +99,18 @@ module Alchemy
|
|
100
99
|
end
|
101
100
|
|
102
101
|
it "should render nested page links" do
|
103
|
-
expect(helper.render_navigation(:
|
102
|
+
expect(helper.render_navigation(all_sub_menues: true)).to have_selector("ul li a[href=\"/#{level_3_page.urlname}\"]")
|
104
103
|
end
|
105
104
|
end
|
106
105
|
end
|
107
106
|
|
108
107
|
context "with id and class in the html options" do
|
109
108
|
it "should append id to the generated ul tag" do
|
110
|
-
expect(helper.render_navigation({}, {:
|
109
|
+
expect(helper.render_navigation({}, {id: 'foobar_id'})).to have_selector("ul[id='foobar_id']")
|
111
110
|
end
|
112
111
|
|
113
112
|
it "should replace the default css class from the generated ul tag" do
|
114
|
-
expect(helper.render_navigation({}, {:
|
113
|
+
expect(helper.render_navigation({}, {class: 'foobar_class'})).to have_selector("ul[class='foobar_class']")
|
115
114
|
end
|
116
115
|
end
|
117
116
|
|
@@ -129,7 +128,7 @@ module Alchemy
|
|
129
128
|
before { visible_page }
|
130
129
|
|
131
130
|
context "with two pages on same level" do
|
132
|
-
before {
|
131
|
+
before { create(:alchemy_page, :public, visible: true) }
|
133
132
|
|
134
133
|
it "should render the given spacer" do
|
135
134
|
expect(helper.render_navigation(spacer: '•')).to match(/•/)
|
@@ -220,15 +219,15 @@ module Alchemy
|
|
220
219
|
|
221
220
|
context "beginning with level 3" do
|
222
221
|
it "should render the navigation beginning from its parent" do
|
223
|
-
expect(helper.render_subnavigation(:
|
222
|
+
expect(helper.render_subnavigation(level: 3)).to have_selector("ul > li > ul > li > a[href='/#{level_4_page.urlname}']")
|
224
223
|
end
|
225
224
|
end
|
226
225
|
end
|
227
226
|
end
|
228
227
|
|
229
228
|
describe "#render_breadcrumb" do
|
230
|
-
let(:parent) {
|
231
|
-
let(:page) {
|
229
|
+
let(:parent) { create(:alchemy_page, :public, visible: true) }
|
230
|
+
let(:page) { create(:alchemy_page, :public, parent_id: parent.id, visible: true) }
|
232
231
|
let(:user) { nil }
|
233
232
|
|
234
233
|
before do
|
@@ -289,29 +288,79 @@ module Alchemy
|
|
289
288
|
end
|
290
289
|
|
291
290
|
describe "#render_meta_data" do
|
291
|
+
let(:page) do
|
292
|
+
mock_model('Page',
|
293
|
+
language: language,
|
294
|
+
title: 'A Public Page',
|
295
|
+
meta_keywords: '',
|
296
|
+
meta_description: '',
|
297
|
+
robot_index?: false,
|
298
|
+
robot_follow?: false,
|
299
|
+
contains_feed?: false,
|
300
|
+
updated_at: '2011-11-29-23:00:00'
|
301
|
+
)
|
302
|
+
end
|
303
|
+
|
304
|
+
let(:root_page) { Page.new }
|
305
|
+
|
306
|
+
before { helper.instance_variable_set('@page', page) }
|
307
|
+
|
308
|
+
subject { helper.render_meta_data }
|
309
|
+
|
292
310
|
context "@page is not set" do
|
311
|
+
before { helper.instance_variable_set('@page', nil) }
|
312
|
+
|
293
313
|
it "should return nil" do
|
294
314
|
expect(helper.render_meta_data).to eq(nil)
|
295
315
|
end
|
296
316
|
end
|
297
317
|
|
298
|
-
context "
|
299
|
-
|
300
|
-
before { helper.instance_variable_set('@page', page) }
|
301
|
-
subject { helper.render_meta_data }
|
318
|
+
context "when the current page's meta keywords are set" do
|
319
|
+
before { allow(page).to receive_messages(meta_keywords: 'keyword1, keyword2') }
|
302
320
|
|
303
|
-
it "should render
|
321
|
+
it "should render them" do
|
304
322
|
is_expected.to match /meta name="keywords" content="keyword1, keyword2"/
|
305
323
|
end
|
324
|
+
end
|
306
325
|
|
307
|
-
|
326
|
+
context "when the current page's meta description is set" do
|
327
|
+
before { allow(page).to receive_messages(meta_description: 'blah blah') }
|
328
|
+
|
329
|
+
it "should render it" do
|
308
330
|
is_expected.to match /meta name="description" content="blah blah"/
|
309
331
|
end
|
310
332
|
end
|
333
|
+
|
334
|
+
context 'when the current page is missing its meta description' do
|
335
|
+
before { allow(Language).to receive(:current_root_page).and_return(root_page) }
|
336
|
+
|
337
|
+
it "should use the the one from the language root's page" do
|
338
|
+
root_page.meta_description = "root page's description"
|
339
|
+
is_expected.to match /meta name="description" content="root page's description"/
|
340
|
+
end
|
341
|
+
|
342
|
+
it "should not be set when language root's page is also missing one" do
|
343
|
+
is_expected.not_to match /meta name="description"/
|
344
|
+
end
|
345
|
+
end
|
346
|
+
|
347
|
+
context 'when the current page is missing its meta keywords' do
|
348
|
+
before { allow(Language).to receive(:current_root_page).and_return(root_page) }
|
349
|
+
|
350
|
+
it "should use the the one from the language root's page" do
|
351
|
+
root_page.meta_keywords = "root page's keywords"
|
352
|
+
is_expected.to match /meta name="keywords" content="root page's keywords"/
|
353
|
+
end
|
354
|
+
|
355
|
+
it "should not be set when language root's page is also missing one" do
|
356
|
+
is_expected.not_to match /meta name="keywords"/
|
357
|
+
end
|
358
|
+
end
|
311
359
|
end
|
312
360
|
|
313
361
|
describe "#render_title_tag" do
|
314
362
|
let(:page) { mock_model('Page', title: 'A Public Page') }
|
363
|
+
|
315
364
|
before { helper.instance_variable_set('@page', page) }
|
316
365
|
|
317
366
|
it "should render a title tag for current page" do
|
@@ -326,7 +375,7 @@ module Alchemy
|
|
326
375
|
describe "#language_links" do
|
327
376
|
context "with two public languages" do
|
328
377
|
# Always create second language
|
329
|
-
before {
|
378
|
+
before { klingon }
|
330
379
|
|
331
380
|
context "with only one language root page" do
|
332
381
|
it "should return nil" do
|
@@ -335,36 +384,36 @@ module Alchemy
|
|
335
384
|
end
|
336
385
|
|
337
386
|
context "with two language root pages" do
|
338
|
-
# Always create a language root page for
|
339
|
-
before {
|
387
|
+
# Always create a language root page for klingon
|
388
|
+
before { klingon_language_root }
|
340
389
|
|
341
390
|
it "should render two language links" do
|
342
|
-
expect(helper.language_links).to have_selector('a', :
|
391
|
+
expect(helper.language_links).to have_selector('a', count: 2)
|
343
392
|
end
|
344
393
|
|
345
394
|
it "should render language links referring to their language root page" do
|
346
|
-
code =
|
347
|
-
urlname =
|
395
|
+
code = klingon_language_root.language_code
|
396
|
+
urlname = klingon_language_root.urlname
|
348
397
|
expect(helper.language_links).to have_selector("a.#{code}[href='/#{code}/#{urlname}']")
|
349
398
|
end
|
350
399
|
|
351
400
|
context "with options[:linkname]" do
|
352
401
|
context "set to 'name'" do
|
353
402
|
it "should render the name of the language" do
|
354
|
-
expect(helper.language_links(linkname: 'name')).to have_selector("span[contains('#{
|
403
|
+
expect(helper.language_links(linkname: 'name')).to have_selector("span[contains('#{klingon_language_root.language.name}')]")
|
355
404
|
end
|
356
405
|
end
|
357
406
|
|
358
407
|
context "set to 'code'" do
|
359
408
|
it "should render the code of the language" do
|
360
|
-
expect(helper.language_links(linkname: 'code')).to have_selector("span[contains('#{
|
409
|
+
expect(helper.language_links(linkname: 'code')).to have_selector("span[contains('#{klingon_language_root.language.code}')]")
|
361
410
|
end
|
362
411
|
end
|
363
412
|
end
|
364
413
|
|
365
414
|
context "spacer set to '\o/'" do
|
366
415
|
it "should render the given string as a spacer" do
|
367
|
-
expect(helper.language_links(spacer: '<span>\o/</span>')).to have_selector('span[contains("\o/")]', :
|
416
|
+
expect(helper.language_links(spacer: '<span>\o/</span>')).to have_selector('span[contains("\o/")]', count: 1)
|
368
417
|
end
|
369
418
|
end
|
370
419
|
|
@@ -385,7 +434,7 @@ module Alchemy
|
|
385
434
|
context "with options[:show_title]" do
|
386
435
|
context "set to true" do
|
387
436
|
it "should render the language links with titles" do
|
388
|
-
allow(
|
437
|
+
allow(Alchemy).to receive(:t).and_return("my title")
|
389
438
|
expect(helper.language_links(show_title: true)).to have_selector('a[title="my title"]')
|
390
439
|
end
|
391
440
|
end
|
@@ -400,6 +449,44 @@ module Alchemy
|
|
400
449
|
end
|
401
450
|
end
|
402
451
|
|
452
|
+
describe "#cell_empty" do
|
453
|
+
let(:cell) { create(:alchemy_cell, name: 'test_cell', page: public_page) }
|
454
|
+
let(:element) { create(:alchemy_element) }
|
455
|
+
|
456
|
+
before { @page = public_page }
|
457
|
+
|
458
|
+
context "with elements" do
|
459
|
+
before do
|
460
|
+
cell.elements << element
|
461
|
+
cell.save!
|
462
|
+
end
|
463
|
+
|
464
|
+
it "should return true" do
|
465
|
+
expect(helper.cell_empty?('test_cell')).to eq(false)
|
466
|
+
end
|
467
|
+
end
|
468
|
+
|
469
|
+
context "with zero elements" do
|
470
|
+
it "should return true" do
|
471
|
+
expect(helper.cell_empty?('test_cell')).to eq(true)
|
472
|
+
end
|
473
|
+
end
|
474
|
+
|
475
|
+
context "with trashed elements" do
|
476
|
+
before do
|
477
|
+
cell.elements << element
|
478
|
+
cell.save!
|
479
|
+
|
480
|
+
element.trash!
|
481
|
+
element.save!
|
482
|
+
end
|
483
|
+
|
484
|
+
it "should return true" do
|
485
|
+
expect(helper.cell_empty?('test_cell')).to eq(true)
|
486
|
+
end
|
487
|
+
end
|
488
|
+
end
|
489
|
+
|
403
490
|
describe "#picture_essence_caption" do
|
404
491
|
let(:essence) { mock_model('EssencePicture', caption: 'my caption') }
|
405
492
|
let(:content) { mock_model('Content', essence: essence) }
|
@@ -408,6 +495,5 @@ module Alchemy
|
|
408
495
|
expect(helper.picture_essence_caption(content)).to eq "my caption"
|
409
496
|
end
|
410
497
|
end
|
411
|
-
|
412
498
|
end
|
413
499
|
end
|
@@ -0,0 +1,78 @@
|
|
1
|
+
require 'spec_helper'
|
2
|
+
|
3
|
+
describe "Picture url helpers" do
|
4
|
+
describe "for cropped picture" do
|
5
|
+
let(:path) do
|
6
|
+
show_picture_path(id: 3, crop: "crop", size: "100x33", name: "kitten", format: "jpg")
|
7
|
+
end
|
8
|
+
|
9
|
+
it "should generate a url string" do
|
10
|
+
expect(path).to eq("/pictures/3/show/100x33/crop/kitten.jpg")
|
11
|
+
end
|
12
|
+
end
|
13
|
+
|
14
|
+
describe "for cropped and masked picture" do
|
15
|
+
let(:path) do
|
16
|
+
show_picture_path(
|
17
|
+
id: 3,
|
18
|
+
crop: "crop",
|
19
|
+
crop_from: "0x0",
|
20
|
+
crop_size: "900x300",
|
21
|
+
size: "100x33",
|
22
|
+
name: "kitten",
|
23
|
+
format: :jpg
|
24
|
+
)
|
25
|
+
end
|
26
|
+
|
27
|
+
it "should generate a url string" do
|
28
|
+
expect(path).to eq("/pictures/3/show/100x33/crop/0x0/900x300/kitten.jpg")
|
29
|
+
end
|
30
|
+
end
|
31
|
+
|
32
|
+
describe "for cropped thumbnail" do
|
33
|
+
let(:path) do
|
34
|
+
thumbnail_path(id: 3, crop: "crop", size: "100x33", name: "kitten", format: :jpg)
|
35
|
+
end
|
36
|
+
|
37
|
+
it "should generate a url string" do
|
38
|
+
expect(path).to eq("/pictures/3/thumbnails/100x33/crop/kitten.jpg")
|
39
|
+
end
|
40
|
+
end
|
41
|
+
|
42
|
+
describe "for thumbnail with default name and format" do
|
43
|
+
let(:path) do
|
44
|
+
thumbnail_path(id: 3, size: "100x33")
|
45
|
+
end
|
46
|
+
|
47
|
+
it "should generate a url string" do
|
48
|
+
expect(path).to eq("/pictures/3/thumbnails/100x33/thumbnail.png")
|
49
|
+
end
|
50
|
+
end
|
51
|
+
|
52
|
+
describe "for cropped and masked thumbnail" do
|
53
|
+
let(:path) do
|
54
|
+
thumbnail_path(
|
55
|
+
id: 3,
|
56
|
+
crop_from: "0x0",
|
57
|
+
crop_size: "900x300",
|
58
|
+
size: "100x33",
|
59
|
+
name: "kitten",
|
60
|
+
format: :jpg
|
61
|
+
)
|
62
|
+
end
|
63
|
+
|
64
|
+
it "should generate a url string" do
|
65
|
+
expect(path).to eq("/pictures/3/thumbnails/100x33/0x0/900x300/kitten.jpg")
|
66
|
+
end
|
67
|
+
end
|
68
|
+
|
69
|
+
describe "for zoomed image" do
|
70
|
+
let(:path) do
|
71
|
+
zoom_picture_path(id: 3, name: "kitten", format: :jpg)
|
72
|
+
end
|
73
|
+
|
74
|
+
it "should generate a url string" do
|
75
|
+
expect(path).to eq("/pictures/3/zoom/kitten.jpg")
|
76
|
+
end
|
77
|
+
end
|
78
|
+
end
|