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,19 @@
|
|
1
|
+
require 'spec_helper'
|
2
|
+
|
3
|
+
RSpec.describe 'Site requests' do
|
4
|
+
before do
|
5
|
+
authorize_user(:as_admin)
|
6
|
+
end
|
7
|
+
|
8
|
+
context 'a site with host' do
|
9
|
+
let!(:site) { create(:alchemy_site, :public, host: 'alchemy-cms.com') }
|
10
|
+
let(:another_site) { Alchemy::Site.default }
|
11
|
+
|
12
|
+
context 'in params' do
|
13
|
+
it 'loads dashboard of another site by id' do
|
14
|
+
get "http://#{site.host}/admin/dashboard?site_id=#{another_site.id}"
|
15
|
+
expect(assigns(:current_alchemy_site).id).to eq(another_site.id)
|
16
|
+
end
|
17
|
+
end
|
18
|
+
end
|
19
|
+
end
|
@@ -0,0 +1,18 @@
|
|
1
|
+
require 'spec_helper'
|
2
|
+
|
3
|
+
RSpec.describe 'Site requests' do
|
4
|
+
context 'a site with host' do
|
5
|
+
let!(:site) { create(:alchemy_site, :public, host: 'alchemy-cms.com') }
|
6
|
+
|
7
|
+
let(:page) do
|
8
|
+
Alchemy::Site.current = site
|
9
|
+
root = create(:alchemy_page, :language_root, language: site.languages.last)
|
10
|
+
create(:alchemy_page, :public, parent: root)
|
11
|
+
end
|
12
|
+
|
13
|
+
it 'loads this site by host' do
|
14
|
+
get "http://#{site.host}/#{page.urlname}"
|
15
|
+
expect(assigns(:current_alchemy_site).host).to eq(site.host)
|
16
|
+
end
|
17
|
+
end
|
18
|
+
end
|
@@ -0,0 +1,56 @@
|
|
1
|
+
require 'spec_helper'
|
2
|
+
|
3
|
+
RSpec.describe 'Requests for PagesController#sitemap' do
|
4
|
+
let!(:page) { create(:alchemy_page, :public, sitemap: true) }
|
5
|
+
|
6
|
+
it 'renders valid xml sitemap' do
|
7
|
+
get '/sitemap.xml'
|
8
|
+
expect(response.content_type).to eq(:xml)
|
9
|
+
xml_doc = Nokogiri::XML(response.body)
|
10
|
+
expect(xml_doc.namespaces).to have_key('xmlns')
|
11
|
+
expect(xml_doc.namespaces['xmlns']).to eq('http://www.sitemaps.org/schemas/sitemap/0.9')
|
12
|
+
expect(xml_doc.css('urlset url loc').length).to eq(2)
|
13
|
+
end
|
14
|
+
|
15
|
+
it 'lastmod dates are ISO 8601 timestamps' do
|
16
|
+
get '/sitemap.xml'
|
17
|
+
expect(response.content_type).to eq(:xml)
|
18
|
+
xml_doc = Nokogiri::XML(response.body)
|
19
|
+
xml_doc.css('urlset url lastmod').each do |timestamps|
|
20
|
+
expect(timestamps.text).to match(/\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}Z/)
|
21
|
+
end
|
22
|
+
end
|
23
|
+
|
24
|
+
context 'in multi language mode' do
|
25
|
+
let!(:root) { page.parent }
|
26
|
+
let!(:pages) { [root, page] }
|
27
|
+
|
28
|
+
before do
|
29
|
+
allow_any_instance_of(Alchemy::BaseController).to receive('prefix_locale?') { true }
|
30
|
+
end
|
31
|
+
|
32
|
+
it 'links in sitemap has locale code included' do
|
33
|
+
get '/sitemap.xml'
|
34
|
+
xml_doc = Nokogiri::XML(response.body)
|
35
|
+
xml_doc.css('urlset url').each_with_index do |node, i|
|
36
|
+
page = pages[i]
|
37
|
+
expect(node.css('loc').text).to match(/\/#{page.language_code}\//)
|
38
|
+
end
|
39
|
+
end
|
40
|
+
|
41
|
+
context 'if the default locale is the page locale' do
|
42
|
+
before do
|
43
|
+
allow_any_instance_of(Alchemy::BaseController).to receive('prefix_locale?') { false }
|
44
|
+
end
|
45
|
+
|
46
|
+
it 'links in sitemap has no locale code included' do
|
47
|
+
get '/sitemap.xml'
|
48
|
+
xml_doc = Nokogiri::XML(response.body)
|
49
|
+
xml_doc.css('urlset url').each_with_index do |node, i|
|
50
|
+
page = pages[i]
|
51
|
+
expect(node.css('loc').text).to_not match(/\/#{page.language_code}\//)
|
52
|
+
end
|
53
|
+
end
|
54
|
+
end
|
55
|
+
end
|
56
|
+
end
|
@@ -3,6 +3,41 @@ require 'spec_helper'
|
|
3
3
|
describe "The Routing" do
|
4
4
|
routes { Alchemy::Engine.routes }
|
5
5
|
|
6
|
+
describe "root url" do
|
7
|
+
it "routes to pages_controller#index" do
|
8
|
+
expect({
|
9
|
+
get: "/"
|
10
|
+
}).to route_to(
|
11
|
+
controller: "alchemy/pages",
|
12
|
+
action: "index"
|
13
|
+
)
|
14
|
+
end
|
15
|
+
|
16
|
+
context 'with locale parameter' do
|
17
|
+
it 'routes to pages_controller#index' do
|
18
|
+
expect({
|
19
|
+
get: '/en'
|
20
|
+
}).to route_to(
|
21
|
+
controller: 'alchemy/pages',
|
22
|
+
action: 'index',
|
23
|
+
locale: 'en'
|
24
|
+
)
|
25
|
+
end
|
26
|
+
|
27
|
+
context 'that contains uppercase country code' do
|
28
|
+
it 'routes to pages_controller#index' do
|
29
|
+
expect({
|
30
|
+
get: '/en-UK'
|
31
|
+
}).to route_to(
|
32
|
+
controller: 'alchemy/pages',
|
33
|
+
action: 'index',
|
34
|
+
locale: 'en-UK'
|
35
|
+
)
|
36
|
+
end
|
37
|
+
end
|
38
|
+
end
|
39
|
+
end
|
40
|
+
|
6
41
|
context "for downloads" do
|
7
42
|
it "should have a named route" do
|
8
43
|
expect({
|
@@ -123,9 +158,9 @@ describe "The Routing" do
|
|
123
158
|
end
|
124
159
|
|
125
160
|
it "should route to cropped mask show action" do
|
126
|
-
expect(
|
127
|
-
"/pictures/3/show/300x300/crop/200x50/100x100/kitten.jpg"
|
128
|
-
)
|
161
|
+
expect(
|
162
|
+
get("/pictures/3/show/300x300/crop/200x50/100x100/kitten.jpg")
|
163
|
+
).to route_to(
|
129
164
|
controller: "alchemy/pictures",
|
130
165
|
action: "show",
|
131
166
|
id: "3",
|
@@ -139,9 +174,9 @@ describe "The Routing" do
|
|
139
174
|
end
|
140
175
|
|
141
176
|
it "should route to thumbnail action" do
|
142
|
-
expect(
|
143
|
-
"/pictures/3/thumbnails/small/kitten.jpg"
|
144
|
-
)
|
177
|
+
expect(
|
178
|
+
get("/pictures/3/thumbnails/small/kitten.jpg")
|
179
|
+
).to route_to(
|
145
180
|
controller: "alchemy/pictures",
|
146
181
|
action: "thumbnail",
|
147
182
|
id: "3",
|
@@ -152,9 +187,9 @@ describe "The Routing" do
|
|
152
187
|
end
|
153
188
|
|
154
189
|
it "should route to cropped thumbnail action" do
|
155
|
-
expect(
|
156
|
-
"/pictures/3/thumbnails/small/crop/kitten.jpg"
|
157
|
-
)
|
190
|
+
expect(
|
191
|
+
get("/pictures/3/thumbnails/small/crop/kitten.jpg")
|
192
|
+
).to route_to(
|
158
193
|
controller: "alchemy/pictures",
|
159
194
|
action: "thumbnail",
|
160
195
|
id: "3",
|
@@ -166,9 +201,9 @@ describe "The Routing" do
|
|
166
201
|
end
|
167
202
|
|
168
203
|
it "should route to cropped and masked thumbnail" do
|
169
|
-
expect(
|
170
|
-
"/pictures/3/thumbnails/small/0x0/200x200/kitten.jpg"
|
171
|
-
)
|
204
|
+
expect(
|
205
|
+
get("/pictures/3/thumbnails/small/0x0/200x200/kitten.jpg")
|
206
|
+
).to route_to(
|
172
207
|
controller: "alchemy/pictures",
|
173
208
|
action: "thumbnail",
|
174
209
|
id: "3",
|
@@ -181,9 +216,9 @@ describe "The Routing" do
|
|
181
216
|
end
|
182
217
|
|
183
218
|
it "should route to zoomed picture" do
|
184
|
-
expect(
|
185
|
-
"/pictures/3/zoom/kitten.jpg"
|
186
|
-
)
|
219
|
+
expect(
|
220
|
+
get("/pictures/3/zoom/kitten.jpg")
|
221
|
+
).to route_to(
|
187
222
|
controller: "alchemy/pictures",
|
188
223
|
action: "zoom",
|
189
224
|
id: "3",
|
@@ -201,6 +236,19 @@ describe "The Routing" do
|
|
201
236
|
end
|
202
237
|
end
|
203
238
|
|
239
|
+
describe "rss feed requests" do
|
240
|
+
it "should be handled by alchemy/pages controller" do
|
241
|
+
expect({
|
242
|
+
get: "/news.rss"
|
243
|
+
}).to route_to(
|
244
|
+
controller: "alchemy/pages",
|
245
|
+
action: "show",
|
246
|
+
urlname: "news",
|
247
|
+
format: "rss"
|
248
|
+
)
|
249
|
+
end
|
250
|
+
end
|
251
|
+
|
204
252
|
describe "unknown formats" do
|
205
253
|
it "should be handled by alchemy/pages controller" do
|
206
254
|
expect({
|
@@ -231,4 +279,62 @@ describe "The Routing" do
|
|
231
279
|
}).not_to be_routable
|
232
280
|
end
|
233
281
|
end
|
282
|
+
|
283
|
+
context "for admin interface" do
|
284
|
+
context "default" do
|
285
|
+
it "should route to admin dashboard" do
|
286
|
+
expect({
|
287
|
+
get: "/admin/dashboard"
|
288
|
+
}).to route_to(
|
289
|
+
controller: "alchemy/admin/dashboard",
|
290
|
+
action: "index"
|
291
|
+
)
|
292
|
+
end
|
293
|
+
|
294
|
+
it "should route to page preview" do
|
295
|
+
expect({
|
296
|
+
get: "/admin/pages/3/preview"
|
297
|
+
}).to route_to(
|
298
|
+
controller: "alchemy/admin/pages",
|
299
|
+
action: "preview",
|
300
|
+
id: "3"
|
301
|
+
)
|
302
|
+
end
|
303
|
+
end
|
304
|
+
|
305
|
+
context "customized" do
|
306
|
+
before(:all) do
|
307
|
+
Alchemy.admin_path = "/backend"
|
308
|
+
Alchemy.admin_constraints = {subdomain: "hidden"}
|
309
|
+
Rails.application.reload_routes!
|
310
|
+
end
|
311
|
+
|
312
|
+
it "should route to admin dashboard" do
|
313
|
+
expect({
|
314
|
+
get: "http://hidden.example.org/backend/dashboard"
|
315
|
+
}).to route_to(
|
316
|
+
controller: "alchemy/admin/dashboard",
|
317
|
+
action: "index",
|
318
|
+
subdomain: "hidden"
|
319
|
+
)
|
320
|
+
end
|
321
|
+
|
322
|
+
it "should route to page preview" do
|
323
|
+
expect({
|
324
|
+
get: "http://hidden.example.org/backend/pages/3/preview"
|
325
|
+
}).to route_to(
|
326
|
+
controller: "alchemy/admin/pages",
|
327
|
+
action: "preview",
|
328
|
+
id: "3",
|
329
|
+
subdomain: "hidden"
|
330
|
+
)
|
331
|
+
end
|
332
|
+
|
333
|
+
after(:all) do
|
334
|
+
Alchemy.admin_path = "/admin"
|
335
|
+
Alchemy.admin_constraints = {}
|
336
|
+
Rails.application.reload_routes!
|
337
|
+
end
|
338
|
+
end
|
339
|
+
end
|
234
340
|
end
|
data/spec/spec_helper.rb
CHANGED
@@ -24,6 +24,7 @@ require 'alchemy/test_support/essence_shared_examples'
|
|
24
24
|
require 'alchemy/test_support/integration_helpers'
|
25
25
|
require 'alchemy/test_support/factories'
|
26
26
|
|
27
|
+
require_relative 'factories'
|
27
28
|
require_relative "support/hint_examples.rb"
|
28
29
|
require_relative "support/transformation_examples.rb"
|
29
30
|
|
@@ -52,7 +53,7 @@ RSpec.configure do |config|
|
|
52
53
|
config.include ActiveSupport::Testing::TimeHelpers
|
53
54
|
config.include Alchemy::Engine.routes.url_helpers
|
54
55
|
config.include Alchemy::TestSupport::ControllerRequests, type: :controller
|
55
|
-
[:controller, :feature].each do |type|
|
56
|
+
[:controller, :feature, :request].each do |type|
|
56
57
|
config.include Alchemy::TestSupport::IntegrationHelpers, type: type
|
57
58
|
end
|
58
59
|
config.include FactoryGirl::Syntax::Methods
|
@@ -2,7 +2,6 @@ require 'spec_helper'
|
|
2
2
|
|
3
3
|
module Alchemy
|
4
4
|
shared_examples_for "having a hint" do
|
5
|
-
|
6
5
|
describe '#hint' do
|
7
6
|
context 'with hint as text' do
|
8
7
|
before do
|
@@ -17,7 +16,7 @@ module Alchemy
|
|
17
16
|
context 'with hint set to true' do
|
18
17
|
before do
|
19
18
|
expect(subject).to receive(:definition).and_return({'hint' => true})
|
20
|
-
expect(
|
19
|
+
expect(Alchemy).to receive(:t).and_return('The hint')
|
21
20
|
end
|
22
21
|
|
23
22
|
it "returns the hint from translation" do
|
@@ -25,6 +24,5 @@ module Alchemy
|
|
25
24
|
end
|
26
25
|
end
|
27
26
|
end
|
28
|
-
|
29
27
|
end
|
30
28
|
end
|
data/spec/support/test_tweaks.rb
CHANGED
@@ -5,7 +5,7 @@ class ActiveRecord::Base
|
|
5
5
|
@@shared_connection = nil
|
6
6
|
|
7
7
|
def self.connection
|
8
|
-
@@shared_connection || ConnectionPool::Wrapper.new(:
|
8
|
+
@@shared_connection || ConnectionPool::Wrapper.new(size: 1) { retrieve_connection }
|
9
9
|
end
|
10
10
|
end
|
11
11
|
ActiveRecord::Base.shared_connection = ActiveRecord::Base.connection
|
@@ -19,9 +19,9 @@ def truncate_all_tables
|
|
19
19
|
connection.tables.each do |table_name|
|
20
20
|
next if connection.select_value("SELECT count(*) FROM #{table_name}") == 0
|
21
21
|
case config["adapter"]
|
22
|
-
|
22
|
+
when "mysql2", "postgresql"
|
23
23
|
connection.execute("TRUNCATE #{table_name}")
|
24
|
-
|
24
|
+
when "sqlite3"
|
25
25
|
connection.execute("DELETE FROM #{table_name}")
|
26
26
|
connection.execute("DELETE FROM sqlite_sequence where name='#{table_name}'")
|
27
27
|
end
|
@@ -1,15 +1,14 @@
|
|
1
1
|
require 'spec_helper'
|
2
2
|
|
3
3
|
module Alchemy
|
4
|
-
shared_examples_for "has image transformations"
|
5
|
-
|
4
|
+
shared_examples_for "has image transformations" do
|
6
5
|
describe "#thumbnail_size" do
|
7
6
|
context "picture is 300x400 and has no crop size" do
|
8
7
|
it "should return the correct recalculated size value" do
|
9
8
|
allow(picture).to receive(:image_file_width) { 400 }
|
10
9
|
allow(picture).to receive(:image_file_height) { 300 }
|
11
10
|
|
12
|
-
expect(picture.thumbnail_size
|
11
|
+
expect(picture.thumbnail_size).to eq('111x83')
|
13
12
|
end
|
14
13
|
end
|
15
14
|
|
@@ -18,21 +17,21 @@ module Alchemy
|
|
18
17
|
allow(picture).to receive(:image_file_width) { 300 }
|
19
18
|
allow(picture).to receive(:image_file_height) { 400 }
|
20
19
|
|
21
|
-
expect(picture.thumbnail_size
|
20
|
+
expect(picture.thumbnail_size).to eq('70x93')
|
22
21
|
end
|
23
22
|
end
|
24
23
|
|
25
24
|
context "picture has crop_size of 400x300" do
|
26
25
|
it "scales to 400x300 if that is the size of the cropped image" do
|
27
26
|
allow(picture).to receive(:crop_size) { "400x300" }
|
28
|
-
expect(picture.thumbnail_size
|
27
|
+
expect(picture.thumbnail_size).to eq('111x83')
|
29
28
|
end
|
30
29
|
end
|
31
30
|
|
32
31
|
context "picture has crop_size of 0x0" do
|
33
32
|
it "returns default thumbnail size" do
|
34
33
|
allow(picture).to receive(:crop_size) { "0x0" }
|
35
|
-
expect(picture.thumbnail_size
|
34
|
+
expect(picture.thumbnail_size).to eq('111x93')
|
36
35
|
end
|
37
36
|
end
|
38
37
|
end
|
@@ -112,7 +111,7 @@ module Alchemy
|
|
112
111
|
end
|
113
112
|
|
114
113
|
it "should return a Hash where all values are Integer" do
|
115
|
-
expect(picture.default_mask({ width: 13, height: 13 }).all? do |
|
114
|
+
expect(picture.default_mask({ width: 13, height: 13 }).all? do |_k, v|
|
116
115
|
v.is_a? Integer
|
117
116
|
end).to be_truthy
|
118
117
|
end
|
data/spec/tasks/helpers_spec.rb
CHANGED
@@ -2,7 +2,6 @@ require 'spec_helper'
|
|
2
2
|
require 'alchemy/tasks/helpers'
|
3
3
|
|
4
4
|
module Alchemy
|
5
|
-
|
6
5
|
class Foo
|
7
6
|
extend Tasks::Helpers
|
8
7
|
end
|
@@ -19,7 +18,7 @@ module Alchemy
|
|
19
18
|
end
|
20
19
|
|
21
20
|
before do
|
22
|
-
allow(File).to receive(:
|
21
|
+
allow(File).to receive(:exist?) { true }
|
23
22
|
allow(File).to receive(:read) do
|
24
23
|
<<-END
|
25
24
|
test:
|
@@ -207,13 +206,12 @@ END
|
|
207
206
|
end
|
208
207
|
|
209
208
|
context 'for missing database config file' do
|
210
|
-
before { allow(File).to receive(:
|
209
|
+
before { allow(File).to receive(:exist?).and_return( false) }
|
211
210
|
|
212
211
|
it "raises error" do
|
213
212
|
expect { Foo.database_config }.to raise_error(RuntimeError)
|
214
213
|
end
|
215
214
|
end
|
216
215
|
end
|
217
|
-
|
218
216
|
end
|
219
217
|
end
|
@@ -0,0 +1,43 @@
|
|
1
|
+
require "spec_helper"
|
2
|
+
|
3
|
+
describe "alchemy/admin/pictures/show.html.erb" do
|
4
|
+
let(:image) do
|
5
|
+
fixture_file_upload(
|
6
|
+
File.expand_path('../../../../fixtures/animated.gif', __FILE__),
|
7
|
+
'image/gif'
|
8
|
+
)
|
9
|
+
end
|
10
|
+
|
11
|
+
let(:picture) do
|
12
|
+
build_stubbed(:alchemy_picture, {
|
13
|
+
image_file: image,
|
14
|
+
name: 'animated',
|
15
|
+
image_file_name: 'animated.gif'
|
16
|
+
})
|
17
|
+
end
|
18
|
+
|
19
|
+
before do
|
20
|
+
allow(view).to receive(:admin_picture_path).and_return("/path")
|
21
|
+
allow(view).to receive(:render_message) {}
|
22
|
+
view.extend Alchemy::Admin::FormHelper
|
23
|
+
end
|
24
|
+
|
25
|
+
it "displays picture in original format" do
|
26
|
+
assign(:picture, picture)
|
27
|
+
assign(:pages, [])
|
28
|
+
|
29
|
+
render
|
30
|
+
|
31
|
+
expect(rendered).to have_selector('img[src*="gif"]')
|
32
|
+
end
|
33
|
+
|
34
|
+
it "separates the tags with a comma" do
|
35
|
+
allow(picture).to receive(:tag_list).and_return(["one", "two", "three"])
|
36
|
+
assign(:picture, picture)
|
37
|
+
assign(:pages, [])
|
38
|
+
|
39
|
+
render
|
40
|
+
|
41
|
+
expect(rendered).to have_selector('input[value*="one,two,three"]')
|
42
|
+
end
|
43
|
+
end
|