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
@@ -2,11 +2,10 @@ require 'spec_helper'
|
|
2
2
|
|
3
3
|
module Alchemy
|
4
4
|
describe Api::ContentsController do
|
5
|
-
|
6
5
|
describe '#index' do
|
7
|
-
let!(:page) { create(:
|
8
|
-
let!(:element) { create(:
|
9
|
-
let!(:content) { create(:
|
6
|
+
let!(:page) { create(:alchemy_page) }
|
7
|
+
let!(:element) { create(:alchemy_element, page: page) }
|
8
|
+
let!(:content) { create(:alchemy_content, element: element) }
|
10
9
|
|
11
10
|
it "returns all public contents as json objects" do
|
12
11
|
alchemy_get :index, format: :json
|
@@ -21,8 +20,8 @@ module Alchemy
|
|
21
20
|
end
|
22
21
|
|
23
22
|
context 'with element_id' do
|
24
|
-
let!(:other_element) { create(:
|
25
|
-
let!(:other_content) { create(:
|
23
|
+
let!(:other_element) { create(:alchemy_element, page: page) }
|
24
|
+
let!(:other_content) { create(:alchemy_content, element: other_element) }
|
26
25
|
|
27
26
|
it "returns only contents from this element" do
|
28
27
|
alchemy_get :index, element_id: other_element.id, format: :json
|
@@ -55,9 +54,9 @@ module Alchemy
|
|
55
54
|
|
56
55
|
describe '#show' do
|
57
56
|
context 'with no other params given' do
|
58
|
-
let(:page) { create(:
|
59
|
-
let(:element) { create(:
|
60
|
-
let(:content) { create(:
|
57
|
+
let(:page) { create(:alchemy_page) }
|
58
|
+
let(:element) { create(:alchemy_element, page: page) }
|
59
|
+
let(:content) { create(:alchemy_content, element: element) }
|
61
60
|
|
62
61
|
before do
|
63
62
|
expect(Content).to receive(:find).and_return(content)
|
@@ -75,7 +74,7 @@ module Alchemy
|
|
75
74
|
end
|
76
75
|
|
77
76
|
context 'requesting an restricted content' do
|
78
|
-
let(:page) { create(:
|
77
|
+
let(:page) { create(:alchemy_page, restricted: true) }
|
79
78
|
|
80
79
|
it "responds with 403" do
|
81
80
|
alchemy_get :show, id: content.id, format: :json
|
@@ -92,9 +91,9 @@ module Alchemy
|
|
92
91
|
end
|
93
92
|
|
94
93
|
context 'with element_id and name params given' do
|
95
|
-
let!(:page) { create(:
|
96
|
-
let!(:element) { create(:
|
97
|
-
let!(:content) { create(:
|
94
|
+
let!(:page) { create(:alchemy_page) }
|
95
|
+
let!(:element) { create(:alchemy_element, page: page) }
|
96
|
+
let!(:content) { create(:alchemy_content, element: element) }
|
98
97
|
|
99
98
|
it 'returns the named content from element with given id.' do
|
100
99
|
alchemy_get :show, element_id: element.id, name: content.name, format: :json
|
@@ -2,12 +2,11 @@ require 'spec_helper'
|
|
2
2
|
|
3
3
|
module Alchemy
|
4
4
|
describe Api::ElementsController do
|
5
|
-
|
6
5
|
describe '#index' do
|
7
|
-
let(:page) { create(:
|
6
|
+
let(:page) { create(:alchemy_page, :public) }
|
8
7
|
|
9
8
|
before do
|
10
|
-
2.times { create(:
|
9
|
+
2.times { create(:alchemy_element, page: page) }
|
11
10
|
end
|
12
11
|
|
13
12
|
it "returns all public elements as json objects" do
|
@@ -23,8 +22,8 @@ module Alchemy
|
|
23
22
|
end
|
24
23
|
|
25
24
|
context 'with page_id param' do
|
26
|
-
let!(:other_page) { create(:
|
27
|
-
let!(:other_element) { create(:
|
25
|
+
let!(:other_page) { create(:alchemy_page, :public) }
|
26
|
+
let!(:other_element) { create(:alchemy_element, page: other_page) }
|
28
27
|
|
29
28
|
it "returns only elements from this page" do
|
30
29
|
alchemy_get :index, page_id: other_page.id, format: :json
|
@@ -55,7 +54,7 @@ module Alchemy
|
|
55
54
|
end
|
56
55
|
|
57
56
|
context 'with named param' do
|
58
|
-
let!(:other_element) { create(:
|
57
|
+
let!(:other_element) { create(:alchemy_element, page: page, name: 'news') }
|
59
58
|
|
60
59
|
it "returns only elements named like this." do
|
61
60
|
alchemy_get :index, named: 'news', format: :json
|
@@ -87,8 +86,8 @@ module Alchemy
|
|
87
86
|
end
|
88
87
|
|
89
88
|
describe '#show' do
|
90
|
-
let(:page) { build_stubbed(:
|
91
|
-
let(:element) { build_stubbed(:
|
89
|
+
let(:page) { build_stubbed(:alchemy_page) }
|
90
|
+
let(:element) { build_stubbed(:alchemy_element, page: page, position: 1) }
|
92
91
|
|
93
92
|
before do
|
94
93
|
expect(Element).to receive(:find).and_return(element)
|
@@ -106,7 +105,7 @@ module Alchemy
|
|
106
105
|
end
|
107
106
|
|
108
107
|
context 'requesting an restricted element' do
|
109
|
-
let(:page) { build_stubbed(:
|
108
|
+
let(:page) { build_stubbed(:alchemy_page, restricted: true) }
|
110
109
|
|
111
110
|
it "responds with 403" do
|
112
111
|
alchemy_get :show, id: element.id, format: :json
|
@@ -2,9 +2,8 @@ require 'spec_helper'
|
|
2
2
|
|
3
3
|
module Alchemy
|
4
4
|
describe Api::PagesController do
|
5
|
-
|
6
5
|
describe '#index' do
|
7
|
-
let!(:page) { create(:
|
6
|
+
let!(:page) { create(:alchemy_page, :public) }
|
8
7
|
|
9
8
|
it "returns all public pages as json objects" do
|
10
9
|
alchemy_get :index, format: :json
|
@@ -19,7 +18,7 @@ module Alchemy
|
|
19
18
|
end
|
20
19
|
|
21
20
|
context 'with page_layout' do
|
22
|
-
let!(:other_page) { create(:
|
21
|
+
let!(:other_page) { create(:alchemy_page, :public, page_layout: 'news') }
|
23
22
|
|
24
23
|
it "returns only page with this page layout" do
|
25
24
|
alchemy_get :index, {page_layout: 'news', format: :json}
|
@@ -51,7 +50,7 @@ module Alchemy
|
|
51
50
|
|
52
51
|
describe '#show' do
|
53
52
|
context 'for existing page' do
|
54
|
-
let(:page) { build_stubbed(:
|
53
|
+
let(:page) { build_stubbed(:alchemy_page, :public, urlname: 'a-page') }
|
55
54
|
|
56
55
|
before do
|
57
56
|
expect(Page).to receive(:find_by).and_return(page)
|
@@ -69,7 +68,7 @@ module Alchemy
|
|
69
68
|
end
|
70
69
|
|
71
70
|
context 'requesting an restricted page' do
|
72
|
-
let(:page) { build_stubbed(:
|
71
|
+
let(:page) { build_stubbed(:alchemy_page, restricted: true, urlname: 'a-page') }
|
73
72
|
|
74
73
|
it "responds with 403" do
|
75
74
|
alchemy_get :show, {urlname: page.urlname, format: :json}
|
@@ -85,7 +84,7 @@ module Alchemy
|
|
85
84
|
end
|
86
85
|
|
87
86
|
context 'requesting a not public page' do
|
88
|
-
let(:page) { build_stubbed(:
|
87
|
+
let(:page) { build_stubbed(:alchemy_page, urlname: 'a-page') }
|
89
88
|
|
90
89
|
it "responds with 403" do
|
91
90
|
alchemy_get :show, {urlname: page.urlname, format: :json}
|
@@ -113,10 +112,19 @@ module Alchemy
|
|
113
112
|
expect(result).to have_key('error')
|
114
113
|
expect(result['error']).to eq("Record not found")
|
115
114
|
end
|
115
|
+
|
116
|
+
context "because of requesting not existing language" do
|
117
|
+
let(:page) { create(:alchemy_page, :public) }
|
118
|
+
|
119
|
+
it "responds with 404" do
|
120
|
+
alchemy_get :show, {urlname: page.urlname, locale: 'na', format: :json}
|
121
|
+
expect(response.status).to eq(404)
|
122
|
+
end
|
123
|
+
end
|
116
124
|
end
|
117
125
|
|
118
126
|
context 'requesting a page with id' do
|
119
|
-
let(:page) { create(:
|
127
|
+
let(:page) { create(:alchemy_page, :public) }
|
120
128
|
|
121
129
|
it "responds with json" do
|
122
130
|
alchemy_get :show, {id: page.id, format: :json}
|
@@ -129,6 +137,31 @@ module Alchemy
|
|
129
137
|
expect(result['id']).to eq(page.id)
|
130
138
|
end
|
131
139
|
end
|
140
|
+
|
141
|
+
context 'in an environment with multiple languages' do
|
142
|
+
let(:klingon) { create(:alchemy_language, :klingon) }
|
143
|
+
|
144
|
+
context 'having two pages with the same url names in different languages' do
|
145
|
+
let!(:english_page) { create(:alchemy_page, :public, language: Language.default, name: "same-name") }
|
146
|
+
let!(:klingon_page) { create(:alchemy_page, :public, language: klingon, name: "same-name") }
|
147
|
+
|
148
|
+
context 'when a locale is given' do
|
149
|
+
it 'renders the page related to its language' do
|
150
|
+
alchemy_get :show, {urlname: "same-name", locale: klingon_page.language_code, format: :json}
|
151
|
+
result = JSON.parse(response.body)
|
152
|
+
expect(result['id']).to eq(klingon_page.id)
|
153
|
+
end
|
154
|
+
end
|
155
|
+
|
156
|
+
context 'when no locale is given' do
|
157
|
+
it 'renders the page of the default language' do
|
158
|
+
alchemy_get :show, {urlname: "same-name", format: :json}
|
159
|
+
result = JSON.parse(response.body)
|
160
|
+
expect(result['id']).to eq(english_page.id)
|
161
|
+
end
|
162
|
+
end
|
163
|
+
end
|
164
|
+
end
|
132
165
|
end
|
133
166
|
end
|
134
167
|
end
|
data/spec/controllers/{attachments_controller_spec.rb → alchemy/attachments_controller_spec.rb}
RENAMED
@@ -2,7 +2,7 @@ require 'spec_helper'
|
|
2
2
|
|
3
3
|
module Alchemy
|
4
4
|
describe AttachmentsController do
|
5
|
-
let(:attachment) { build_stubbed(:
|
5
|
+
let(:attachment) { build_stubbed(:alchemy_attachment) }
|
6
6
|
|
7
7
|
it "should raise ActiveRecord::RecordNotFound for requesting not existing attachments" do
|
8
8
|
expect { alchemy_get :download, id: 0 }.to raise_error(ActiveRecord::RecordNotFound)
|
@@ -14,13 +14,13 @@ module Alchemy
|
|
14
14
|
end
|
15
15
|
|
16
16
|
it "sends download as attachment." do
|
17
|
-
alchemy_get :download, :
|
17
|
+
alchemy_get :download, id: attachment.id
|
18
18
|
expect(response.status).to eq(200)
|
19
19
|
expect(response.headers['Content-Disposition']).to match(/attachment/)
|
20
20
|
end
|
21
21
|
|
22
22
|
it "sends download inline." do
|
23
|
-
alchemy_get :show, :
|
23
|
+
alchemy_get :show, id: attachment.id
|
24
24
|
expect(response.status).to eq(200)
|
25
25
|
expect(response.headers['Content-Disposition']).to match(/inline/)
|
26
26
|
end
|
@@ -34,13 +34,13 @@ module Alchemy
|
|
34
34
|
|
35
35
|
context 'as anonymous user' do
|
36
36
|
it "should not be possible to download attachments from restricted pages" do
|
37
|
-
alchemy_get :download, :
|
37
|
+
alchemy_get :download, id: attachment.id
|
38
38
|
expect(response.status).to eq(302)
|
39
39
|
expect(response).to redirect_to(Alchemy.login_path)
|
40
40
|
end
|
41
41
|
|
42
42
|
it "should not be possible to see attachments from restricted pages" do
|
43
|
-
alchemy_get :show, :
|
43
|
+
alchemy_get :show, id: attachment.id
|
44
44
|
expect(response.status).to eq(302)
|
45
45
|
expect(response).to redirect_to(Alchemy.login_path)
|
46
46
|
end
|
@@ -50,12 +50,12 @@ module Alchemy
|
|
50
50
|
before { authorize_user(build(:alchemy_dummy_user)) }
|
51
51
|
|
52
52
|
it "should be possible to download attachments from restricted pages" do
|
53
|
-
alchemy_get :download, :
|
53
|
+
alchemy_get :download, id: attachment.id
|
54
54
|
expect(response.status).to eq(200)
|
55
55
|
end
|
56
56
|
|
57
57
|
it "should be possible to see attachments from restricted pages" do
|
58
|
-
alchemy_get :show, :
|
58
|
+
alchemy_get :show, id: attachment.id
|
59
59
|
expect(response.status).to eq(200)
|
60
60
|
end
|
61
61
|
end
|
@@ -0,0 +1,106 @@
|
|
1
|
+
require 'spec_helper'
|
2
|
+
|
3
|
+
module Alchemy
|
4
|
+
describe BaseController do
|
5
|
+
describe '#set_locale' do
|
6
|
+
context 'with Language.current set' do
|
7
|
+
let(:language) { create(:alchemy_language, :klingon) }
|
8
|
+
|
9
|
+
before { Alchemy::Language.current = language }
|
10
|
+
|
11
|
+
it "sets the ::I18n.locale to current language code" do
|
12
|
+
controller.send(:set_locale)
|
13
|
+
expect(::I18n.locale).to eq(language.code.to_sym)
|
14
|
+
end
|
15
|
+
end
|
16
|
+
|
17
|
+
context 'without Language.current set' do
|
18
|
+
before { Alchemy::Language.current = nil }
|
19
|
+
|
20
|
+
it "sets the ::I18n.locale to default language code" do
|
21
|
+
controller.send(:set_locale)
|
22
|
+
expect(::I18n.locale).to eq(Language.default.code.to_sym)
|
23
|
+
end
|
24
|
+
end
|
25
|
+
end
|
26
|
+
|
27
|
+
describe "#configuration" do
|
28
|
+
it "returns certain configuration options" do
|
29
|
+
allow(Config).to receive(:show).and_return({"some_option" => true})
|
30
|
+
expect(controller.configuration(:some_option)).to eq(true)
|
31
|
+
end
|
32
|
+
end
|
33
|
+
|
34
|
+
describe "#multi_language?" do
|
35
|
+
context "if more than one published language exists" do
|
36
|
+
it "returns true" do
|
37
|
+
allow(Alchemy::Language).to receive(:published).and_return double(count: 2)
|
38
|
+
expect(controller.multi_language?).to eq(true)
|
39
|
+
end
|
40
|
+
end
|
41
|
+
|
42
|
+
context "if less than two published languages exists" do
|
43
|
+
it "returns false" do
|
44
|
+
allow(Alchemy::Language).to receive(:published).and_return double(count: 1)
|
45
|
+
expect(controller.multi_language?).to eq(false)
|
46
|
+
end
|
47
|
+
end
|
48
|
+
end
|
49
|
+
|
50
|
+
describe "#prefix_locale?" do
|
51
|
+
subject(:prefix_locale?) { controller.prefix_locale? }
|
52
|
+
|
53
|
+
context "if multi_language? is true" do
|
54
|
+
before do
|
55
|
+
expect(controller).to receive(:multi_language?) { true }
|
56
|
+
end
|
57
|
+
|
58
|
+
context "and current language is not the default locale" do
|
59
|
+
before do
|
60
|
+
allow(Alchemy::Language).to receive(:current) { double(code: 'en') }
|
61
|
+
allow(::I18n).to receive(:default_locale) { :de }
|
62
|
+
end
|
63
|
+
|
64
|
+
it { expect(prefix_locale?).to be(true) }
|
65
|
+
end
|
66
|
+
|
67
|
+
context "and current language is the default locale" do
|
68
|
+
before do
|
69
|
+
allow(Alchemy::Language).to receive(:current) { double(code: 'de') }
|
70
|
+
allow(::I18n).to receive(:default_locale) { :de }
|
71
|
+
end
|
72
|
+
|
73
|
+
it { expect(prefix_locale?).to be(false) }
|
74
|
+
end
|
75
|
+
|
76
|
+
context "and passed in locale is not the default locale" do
|
77
|
+
subject(:prefix_locale?) { controller.prefix_locale?('en') }
|
78
|
+
|
79
|
+
before do
|
80
|
+
allow(::I18n).to receive(:default_locale) { :de }
|
81
|
+
end
|
82
|
+
|
83
|
+
it { expect(prefix_locale?).to be(true) }
|
84
|
+
end
|
85
|
+
|
86
|
+
context "and passed in locale is the default locale" do
|
87
|
+
subject(:prefix_locale?) { controller.prefix_locale?('de') }
|
88
|
+
|
89
|
+
before do
|
90
|
+
allow(::I18n).to receive(:default_locale) { :de }
|
91
|
+
end
|
92
|
+
|
93
|
+
it { expect(prefix_locale?).to be(false) }
|
94
|
+
end
|
95
|
+
end
|
96
|
+
|
97
|
+
context "if multi_language? is false" do
|
98
|
+
before do
|
99
|
+
expect(controller).to receive(:multi_language?) { false }
|
100
|
+
end
|
101
|
+
|
102
|
+
it { expect(prefix_locale?).to be(false) }
|
103
|
+
end
|
104
|
+
end
|
105
|
+
end
|
106
|
+
end
|
@@ -2,10 +2,10 @@ require 'spec_helper'
|
|
2
2
|
|
3
3
|
module Alchemy
|
4
4
|
describe ElementsController do
|
5
|
-
let(:public_page) { create(:
|
6
|
-
let(:element) { create(:
|
7
|
-
let(:restricted_page) { create(:
|
8
|
-
let(:restricted_element) { create(:
|
5
|
+
let(:public_page) { create(:alchemy_page, :public) }
|
6
|
+
let(:element) { create(:alchemy_element, page: public_page, name: 'download') }
|
7
|
+
let(:restricted_page) { create(:alchemy_page, :public, restricted: true) }
|
8
|
+
let(:restricted_element) { create(:alchemy_element, page: restricted_page, name: 'download') }
|
9
9
|
|
10
10
|
describe '#show' do
|
11
11
|
it "should render available elements" do
|
@@ -13,14 +13,14 @@ module Alchemy
|
|
13
13
|
let(:page) { mock_model('Page', {urlname: 'contact', page_layout: 'contact'}) }
|
14
14
|
|
15
15
|
it "should redirect to @page" do
|
16
|
-
expect(alchemy_get
|
16
|
+
expect(alchemy_get(:index)).to redirect_to(show_page_path(urlname: page.urlname))
|
17
17
|
end
|
18
18
|
end
|
19
19
|
|
20
20
|
describe "#new" do
|
21
21
|
it "should render the alchemy/pages/show template" do
|
22
22
|
alchemy_get :new
|
23
|
-
expect(alchemy_get
|
23
|
+
expect(alchemy_get(:new)).to render_template('alchemy/pages/show')
|
24
24
|
end
|
25
25
|
end
|
26
26
|
|
@@ -38,7 +38,6 @@ module Alchemy
|
|
38
38
|
end
|
39
39
|
|
40
40
|
context "if validation of message" do
|
41
|
-
|
42
41
|
before do
|
43
42
|
allow(Element).to receive(:find_by).and_return(element)
|
44
43
|
allow(element).to receive(:ingredient).with(:success_page).and_return('thank-you')
|
@@ -51,7 +50,7 @@ module Alchemy
|
|
51
50
|
end
|
52
51
|
|
53
52
|
it "should render 'alchemy/pages/show' template" do
|
54
|
-
expect(alchemy_post
|
53
|
+
expect(alchemy_post(:create)).to render_template('alchemy/pages/show')
|
55
54
|
end
|
56
55
|
end
|
57
56
|
|
@@ -157,7 +156,9 @@ module Alchemy
|
|
157
156
|
end
|
158
157
|
|
159
158
|
it "should redirect to the given urlname" do
|
160
|
-
expect(
|
159
|
+
expect(
|
160
|
+
alchemy_post(:create)
|
161
|
+
).to redirect_to(show_page_path(urlname: 'success-page'))
|
161
162
|
end
|
162
163
|
end
|
163
164
|
|
@@ -173,12 +174,14 @@ module Alchemy
|
|
173
174
|
end
|
174
175
|
|
175
176
|
it "redirect to the given success page" do
|
176
|
-
expect(
|
177
|
+
expect(
|
178
|
+
alchemy_post(:create)
|
179
|
+
).to redirect_to(show_page_path(urlname: 'mailer-config-success-page'))
|
177
180
|
end
|
178
181
|
end
|
179
182
|
|
180
183
|
context "and mailer_config has no instructions for success_page" do
|
181
|
-
let(:language) { mock_model('Language', code: 'en', pages: double(find_by: build_stubbed(:
|
184
|
+
let(:language) { mock_model('Language', code: 'en', locale: 'en', pages: double(find_by: build_stubbed(:alchemy_page))) }
|
182
185
|
|
183
186
|
before do
|
184
187
|
allow(controller).to receive(:mailer_config).and_return({})
|
@@ -186,8 +189,10 @@ module Alchemy
|
|
186
189
|
end
|
187
190
|
|
188
191
|
it "should redirect to the language root page" do
|
189
|
-
|
190
|
-
expect(
|
192
|
+
allow(Language).to receive(:current).and_return(language)
|
193
|
+
expect(
|
194
|
+
alchemy_post(:create)
|
195
|
+
).to redirect_to(show_page_path(urlname: 'lang-root'))
|
191
196
|
end
|
192
197
|
end
|
193
198
|
end
|