blacklight-spotlight 0.4.1 → 0.5.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.md +22 -8
- data/Rakefile +40 -39
- data/app/assets/javascripts/spotlight/blacklight_configuration.js +16 -0
- data/app/assets/javascripts/spotlight/blocks/resources_block.js +3 -1
- data/app/assets/stylesheets/spotlight/_blacklight_configuration.scss +2 -2
- data/app/assets/stylesheets/spotlight/_blacklight_overrides.scss +24 -0
- data/app/assets/stylesheets/spotlight/_header.scss +150 -47
- data/app/assets/stylesheets/spotlight/_pages.scss +62 -11
- data/app/assets/stylesheets/spotlight/_report_a_problem.scss +1 -0
- data/app/assets/stylesheets/spotlight/_spotlight.scss +1 -0
- data/app/builders/spotlight/bootstrap_breadcrumbs_builder.rb +28 -21
- data/app/controllers/spotlight/about_pages_controller.rb +25 -14
- data/app/controllers/spotlight/appearances_controller.rb +34 -30
- data/app/controllers/spotlight/application_controller.rb +2 -1
- data/app/controllers/spotlight/attachments_controller.rb +9 -7
- data/app/controllers/spotlight/browse_controller.rb +13 -9
- data/app/controllers/spotlight/catalog_controller.rb +179 -161
- data/app/controllers/spotlight/concerns/application_controller.rb +22 -20
- data/app/controllers/spotlight/concerns/catalog_search_context.rb +44 -0
- data/app/controllers/spotlight/confirmations_controller.rb +5 -2
- data/app/controllers/spotlight/contact_forms_controller.rb +13 -7
- data/app/controllers/spotlight/contacts_controller.rb +13 -4
- data/app/controllers/spotlight/custom_fields_controller.rb +48 -40
- data/app/controllers/spotlight/dashboards_controller.rb +17 -8
- data/app/controllers/spotlight/default_controller.rb +3 -1
- data/app/controllers/spotlight/exhibits_controller.rb +69 -62
- data/app/controllers/spotlight/feature_pages_controller.rb +21 -11
- data/app/controllers/spotlight/home_pages_controller.rb +6 -5
- data/app/controllers/spotlight/lock_controller.rb +3 -1
- data/app/controllers/spotlight/metadata_configurations_controller.rb +49 -0
- data/app/controllers/spotlight/pages_controller.rb +28 -18
- data/app/controllers/spotlight/resources/upload_controller.rb +53 -46
- data/app/controllers/spotlight/resources_controller.rb +9 -5
- data/app/controllers/spotlight/roles_controller.rb +26 -22
- data/app/controllers/spotlight/search_configurations_controller.rb +66 -0
- data/app/controllers/spotlight/searches_controller.rb +91 -82
- data/app/controllers/spotlight/solr_controller.rb +20 -13
- data/app/controllers/spotlight/tags_controller.rb +5 -3
- data/app/controllers/spotlight/versions_controller.rb +15 -12
- data/app/controllers/spotlight/view_configurations_controller.rb +17 -0
- data/app/helpers/spotlight/application_helper.rb +44 -32
- data/app/helpers/spotlight/browse_helper.rb +13 -1
- data/app/helpers/spotlight/crud_link_helpers.rb +22 -14
- data/app/helpers/spotlight/jcrop_helper.rb +4 -2
- data/app/helpers/spotlight/main_app_helpers.rb +45 -41
- data/app/helpers/spotlight/navbar_helper.rb +6 -0
- data/app/helpers/spotlight/pages_helper.rb +23 -15
- data/app/helpers/spotlight/roles_helper.rb +10 -4
- data/app/helpers/spotlight/search_configurations_helper.rb +22 -0
- data/app/helpers/spotlight/title_helper.rb +16 -13
- data/app/jobs/spotlight/add_uploads_from_csv.rb +13 -9
- data/app/jobs/spotlight/reindex_job.rb +9 -9
- data/app/jobs/spotlight/rename_sidecar_field_job.rb +3 -0
- data/app/mailers/spotlight/confirmation_mailer.rb +2 -0
- data/app/mailers/spotlight/indexing_complete_mailer.rb +4 -2
- data/app/models/ability.rb +3 -0
- data/app/models/concerns/spotlight/ar_light.rb +49 -25
- data/app/models/concerns/spotlight/blacklight_configuration_defaults.rb +25 -10
- data/app/models/concerns/spotlight/exhibit_analytics.rb +28 -0
- data/app/models/concerns/spotlight/image_derivatives.rb +25 -26
- data/app/models/concerns/spotlight/resources/open_graph.rb +23 -19
- data/app/models/concerns/spotlight/resources/web.rb +25 -24
- data/app/models/concerns/spotlight/solr_document.rb +40 -34
- data/app/models/concerns/spotlight/solr_document/active_model_concern.rb +29 -40
- data/app/models/concerns/spotlight/solr_document/atomic_updates.rb +22 -18
- data/app/models/concerns/spotlight/solr_document/finder.rb +23 -18
- data/app/models/concerns/spotlight/solr_document/spotlight_images.rb +43 -39
- data/app/models/concerns/spotlight/solr_document/uploaded_resource.rb +41 -29
- data/app/models/concerns/spotlight/user.rb +25 -19
- data/app/models/sir_trevor_rails/blocks/browse_block.rb +36 -30
- data/app/models/sir_trevor_rails/blocks/featured_pages_block.rb +24 -18
- data/app/models/sir_trevor_rails/blocks/oembed_block.rb +8 -4
- data/app/models/sir_trevor_rails/blocks/search_results_block.rb +29 -23
- data/app/models/sir_trevor_rails/blocks/solr_documents_block.rb +43 -42
- data/app/models/sir_trevor_rails/blocks/solr_documents_carousel_block.rb +16 -12
- data/app/models/sir_trevor_rails/blocks/solr_documents_embed_block.rb +7 -3
- data/app/models/sir_trevor_rails/blocks/solr_documents_features_block.rb +7 -3
- data/app/models/sir_trevor_rails/blocks/solr_documents_grid_block.rb +7 -3
- data/app/models/sir_trevor_rails/blocks/textable.rb +18 -18
- data/app/models/spotlight/ability.rb +32 -33
- data/app/models/spotlight/about_page.rb +3 -1
- data/app/models/spotlight/analytics/ga.rb +46 -27
- data/app/models/spotlight/attachment.rb +3 -1
- data/app/models/spotlight/blacklight_configuration.rb +146 -68
- data/app/models/spotlight/contact.rb +35 -30
- data/app/models/spotlight/contact_email.rb +6 -3
- data/app/models/spotlight/contact_form.rb +4 -3
- data/app/models/spotlight/custom_field.rb +41 -33
- data/app/models/spotlight/exhibit.rb +104 -130
- data/app/models/spotlight/feature_page.rb +9 -7
- data/app/models/spotlight/featured_image.rb +10 -10
- data/app/models/spotlight/field_metadata.rb +46 -0
- data/app/models/spotlight/home_page.rb +8 -5
- data/app/models/spotlight/lock.rb +4 -3
- data/app/models/spotlight/main_navigation.rb +9 -3
- data/app/models/spotlight/masthead.rb +17 -16
- data/app/models/spotlight/page.rb +16 -16
- data/app/models/spotlight/resource.rb +69 -22
- data/app/models/spotlight/resources/csv_upload.rb +8 -4
- data/app/models/spotlight/resources/upload.rb +68 -57
- data/app/models/spotlight/role.rb +30 -34
- data/app/models/spotlight/search.rb +74 -63
- data/app/models/spotlight/solr_document_sidecar.rb +17 -15
- data/app/serializers/spotlight/exhibit_export_serializer.rb +65 -29
- data/app/serializers/spotlight/page_representer.rb +10 -6
- data/app/uploaders/spotlight/attachment_uploader.rb +4 -6
- data/app/uploaders/spotlight/avatar_uploader.rb +4 -3
- data/app/uploaders/spotlight/featured_image_uploader.rb +15 -14
- data/app/uploaders/spotlight/item_uploader.rb +3 -1
- data/app/uploaders/spotlight/masthead_uploader.rb +4 -2
- data/app/views/catalog/_search_form.html.erb +24 -0
- data/app/views/shared/_browse_navbar.html.erb +1 -1
- data/app/views/shared/_exhibit_navbar.html.erb +1 -1
- data/app/views/spotlight/appearances/edit.html.erb +13 -45
- data/app/views/spotlight/catalog/_edit_default.html.erb +1 -1
- data/app/views/spotlight/custom_fields/_form.html.erb +1 -1
- data/app/views/spotlight/exhibits/edit.html.erb +4 -4
- data/app/views/spotlight/home_pages/_empty.html.erb +1 -3
- data/app/views/spotlight/home_pages/_page_options.html.erb +1 -1
- data/app/views/spotlight/{blacklight_configurations → metadata_configurations}/_metadata_field.html.erb +0 -0
- data/app/views/spotlight/{blacklight_configurations/edit_metadata_fields.html.erb → metadata_configurations/edit.html.erb} +1 -1
- data/app/views/spotlight/pages/show.html.erb +2 -2
- data/app/views/spotlight/search_configurations/_default_per_page.html.erb +5 -0
- data/app/views/spotlight/search_configurations/_document_index_view_types.html.erb +7 -0
- data/app/views/spotlight/search_configurations/_facets.html.erb +38 -0
- data/app/views/spotlight/search_configurations/_search_fields.html.erb +58 -0
- data/app/views/spotlight/search_configurations/_sort.html.erb +53 -0
- data/app/views/spotlight/search_configurations/edit.html.erb +46 -0
- data/app/views/spotlight/searches/_search.html.erb +1 -1
- data/app/views/spotlight/shared/_admin_sidebar.html.erb +0 -2
- data/app/views/spotlight/shared/_curation_sidebar.html.erb +2 -3
- data/app/views/spotlight/shared/_report_a_problem.html.erb +2 -2
- data/app/views/spotlight/sir_trevor/blocks/_oembed_block.html.erb +5 -1
- data/app/views/spotlight/sir_trevor/blocks/_solr_documents_block.html.erb +7 -5
- data/app/views/spotlight/sir_trevor/blocks/_solr_documents_carousel_block.html.erb +2 -2
- data/app/views/spotlight/sir_trevor/blocks/_solr_documents_embed_block.html.erb +7 -5
- data/app/views/spotlight/sir_trevor/blocks/_solr_documents_features_block.html.erb +2 -2
- data/app/views/spotlight/sir_trevor/blocks/_solr_documents_grid_block.html.erb +14 -9
- data/config/locales/spotlight.en.yml +94 -49
- data/config/routes.rb +11 -20
- data/db/migrate/20150410180014_add_taggings_counter_cache_to_tags.acts_as_taggable_on_engine.rb +15 -0
- data/db/migrate/20150410180015_add_missing_taggable_index.acts_as_taggable_on_engine.rb +10 -0
- data/db/migrate/20150410180016_change_collation_for_tag_names.acts_as_taggable_on_engine.rb +10 -0
- data/db/migrate/20150713160101_change_spotlight_searches_to_published.rb +5 -0
- data/db/migrate/20151016092343_remove_searchable_from_exhibit.rb +20 -0
- data/lib/blacklight/spotlight.rb +1 -1
- data/lib/generators/spotlight/install_generator.rb +27 -25
- data/lib/generators/spotlight/templates/catalog_controller.rb +7 -5
- data/lib/generators/spotlight/templates/jetty.rake +8 -2
- data/lib/generators/spotlight/templates/spotlight_helper.rb +3 -1
- data/lib/spotlight.rb +4 -2
- data/lib/spotlight/base.rb +21 -14
- data/lib/spotlight/catalog.rb +10 -9
- data/lib/spotlight/catalog/access_controls_enforcement.rb +30 -15
- data/lib/spotlight/config.rb +4 -2
- data/lib/spotlight/controller.rb +12 -11
- data/lib/spotlight/engine.rb +30 -22
- data/lib/spotlight/rails/routes.rb +7 -4
- data/lib/spotlight/version.rb +2 -1
- data/lib/tasks/spotlight_tasks.rake +56 -50
- data/spec/controllers/application_controller_spec.rb +13 -13
- data/spec/controllers/spotlight/about_pages_controller_spec.rb +63 -59
- data/spec/controllers/spotlight/appearances_controller_spec.rb +29 -24
- data/spec/controllers/spotlight/application_controller_spec.rb +3 -3
- data/spec/controllers/spotlight/attachments_controller_spec.rb +10 -10
- data/spec/controllers/spotlight/browse_controller_spec.rb +23 -25
- data/spec/controllers/spotlight/catalog_controller_spec.rb +82 -87
- data/spec/controllers/spotlight/confirmations_controller_spec.rb +13 -11
- data/spec/controllers/spotlight/contact_forms_controller_spec.rb +17 -12
- data/spec/controllers/spotlight/contacts_controller_spec.rb +36 -36
- data/spec/controllers/spotlight/custom_fields_controller_spec.rb +26 -26
- data/spec/controllers/spotlight/dashboards_controller_spec.rb +14 -14
- data/spec/controllers/spotlight/exhibits_controller_spec.rb +59 -54
- data/spec/controllers/spotlight/feature_pages_controller_spec.rb +59 -59
- data/spec/controllers/spotlight/home_pages_controller_spec.rb +28 -29
- data/spec/controllers/spotlight/metadata_configurations_controller_spec.rb +84 -0
- data/spec/controllers/spotlight/resources/upload_controller_spec.rb +42 -33
- data/spec/controllers/spotlight/resources_controller_spec.rb +25 -29
- data/spec/controllers/spotlight/roles_controller_spec.rb +37 -19
- data/spec/controllers/spotlight/search_configurations_controller_spec.rb +125 -0
- data/spec/controllers/spotlight/searches_controller_spec.rb +84 -63
- data/spec/controllers/spotlight/solr_controller_spec.rb +13 -14
- data/spec/controllers/spotlight/tags_controller_spec.rb +16 -16
- data/spec/controllers/spotlight/versions_controller_spec.rb +15 -18
- data/spec/controllers/spotlight/view_configurations_controller_spec.rb +31 -0
- data/spec/factories/contacts.rb +1 -3
- data/spec/factories/custom_fields.rb +2 -4
- data/spec/factories/exhibits.rb +4 -2
- data/spec/factories/pages.rb +8 -11
- data/spec/factories/resources.rb +4 -4
- data/spec/factories/searches.rb +10 -13
- data/spec/factories/tags.rb +0 -3
- data/spec/factories/users.rb +2 -4
- data/spec/features/about_page_spec.rb +19 -19
- data/spec/features/add_contacts_spec.rb +34 -34
- data/spec/features/add_custom_field_metadata_spec.rb +24 -26
- data/spec/features/add_item_bookmarklet_spec.rb +12 -12
- data/spec/features/browse_category_admin_spec.rb +39 -39
- data/spec/features/catalog_spec.rb +9 -10
- data/spec/features/confirm_email_spec.rb +10 -10
- data/spec/features/create_exhibit_spec.rb +18 -15
- data/spec/features/create_page_spec.rb +8 -8
- data/spec/features/curator_items.rb +3 -3
- data/spec/features/dashboard_spec.rb +15 -16
- data/spec/features/edit_contact_spec.rb +8 -10
- data/spec/features/edit_search_fields_spec.rb +79 -0
- data/spec/features/exhibits/add_tags_spec.rb +15 -16
- data/spec/features/exhibits/administration_spec.rb +25 -25
- data/spec/features/exhibits/custom_metadata_fields_spec.rb +41 -43
- data/spec/features/exhibits/edit_metadata_fields_spec.rb +19 -19
- data/spec/features/feature_page_spec.rb +49 -48
- data/spec/features/home_page_spec.rb +38 -38
- data/spec/features/import_exhibit_spec.rb +23 -20
- data/spec/features/item_admin_spec.rb +28 -29
- data/spec/features/javascript/about_page_admin_spec.rb +9 -9
- data/spec/features/javascript/block_controls_spec.rb +16 -18
- data/spec/features/javascript/blocks/featured_browse_categories_block_spec.rb +11 -12
- data/spec/features/javascript/blocks/featured_pages_block_spec.rb +12 -13
- data/spec/features/javascript/blocks/search_result_block_spec.rb +17 -17
- data/spec/features/javascript/blocks/solr_documents_block_spec.rb +67 -65
- data/spec/features/javascript/edit_in_place_spec.rb +30 -56
- data/spec/features/javascript/feature_page_admin_spec.rb +73 -59
- data/spec/features/javascript/home_page_edit_spec.rb +6 -6
- data/spec/features/javascript/metadata_admin_spec.rb +15 -15
- data/spec/features/javascript/multi_image_select_spec.rb +17 -18
- data/spec/features/javascript/preview_block_spec.rb +11 -12
- data/spec/features/javascript/rule_block_spec.rb +7 -7
- data/spec/features/javascript/search_config_admin_spec.rb +144 -0
- data/spec/features/javascript/search_context_spec.rb +41 -42
- data/spec/features/main_navigation_spec.rb +22 -22
- data/spec/features/metadata_admin_spec.rb +8 -8
- data/spec/features/multiple_exhibits_spec.rb +15 -17
- data/spec/features/report_a_problem_spec.rb +23 -17
- data/spec/features/site_masthead_spec.rb +46 -46
- data/spec/features/slideshow_spec.rb +8 -9
- data/spec/features/tags_admin_spec.rb +11 -11
- data/spec/features/upload_non_repository_item_spec.rb +32 -32
- data/spec/features/user_admin_spec.rb +7 -7
- data/spec/helpers/spotlight/application_helper_spec.rb +63 -56
- data/spec/helpers/spotlight/browse_helper_spec.rb +6 -6
- data/spec/helpers/spotlight/crud_link_helpers_spec.rb +58 -52
- data/spec/helpers/spotlight/main_app_helpers_spec.rb +44 -24
- data/spec/helpers/spotlight/navbar_helper_spec.rb +4 -4
- data/spec/helpers/spotlight/pages_helper_spec.rb +56 -37
- data/spec/helpers/spotlight/roles_helper_spec.rb +3 -3
- data/spec/helpers/spotlight/search_configurations_helper_spec.rb +24 -0
- data/spec/helpers/spotlight/title_helper_spec.rb +33 -35
- data/spec/jobs/spotlight/reindex_job_spec.rb +6 -6
- data/spec/jobs/spotlight/rename_sidecar_field_job_spec.rb +7 -7
- data/spec/lib/spotlight/catalog/access_controls_enforcement_spec.rb +41 -26
- data/spec/lib/spotlight/controller_spec.rb +10 -10
- data/spec/lib/spotlight/routes_spec.rb +4 -4
- data/spec/mailers/spotlight/indexing_complete_mailer_spec.rb +13 -13
- data/spec/models/sir_trevor_rails/blocks/solr_documents_block_spec.rb +8 -8
- data/spec/models/{spotlight/sir_trevor_blocks → sir_trevor_rails/blocks}/textable_spec.rb +7 -8
- data/spec/models/solr_document_spec.rb +49 -50
- data/spec/models/spotlight/ability_spec.rb +17 -20
- data/spec/models/spotlight/about_page_spec.rb +6 -6
- data/spec/models/spotlight/analytics/ga_spec.rb +2 -2
- data/spec/models/spotlight/blacklight_configuration_spec.rb +196 -133
- data/spec/models/spotlight/contact_email_spec.rb +28 -24
- data/spec/models/spotlight/contact_spec.rb +6 -7
- data/spec/models/spotlight/custom_field_spec.rb +51 -52
- data/spec/models/spotlight/exhibit_spec.rb +102 -60
- data/spec/models/spotlight/feature_page_spec.rb +32 -32
- data/spec/models/spotlight/featured_image_spec.rb +5 -5
- data/spec/models/spotlight/field_metadata_spec.rb +78 -0
- data/spec/models/spotlight/home_page_spec.rb +11 -20
- data/spec/models/spotlight/{spotlight_image_derivatives_spec.rb → image_derivatives_spec.rb} +2 -2
- data/spec/models/spotlight/main_navigation_spec.rb +7 -9
- data/spec/models/spotlight/masthead_spec.rb +6 -6
- data/spec/models/spotlight/page_spec.rb +26 -29
- data/spec/models/spotlight/resource_spec.rb +56 -26
- data/spec/models/spotlight/resources/open_graph_spec.rb +16 -18
- data/spec/models/spotlight/resources/upload_spec.rb +32 -35
- data/spec/models/spotlight/resources/web_spec.rb +9 -11
- data/spec/models/spotlight/role_spec.rb +20 -20
- data/spec/models/spotlight/search_spec.rb +32 -15
- data/spec/models/spotlight/solr_document/atomic_updates_spec.rb +34 -0
- data/spec/models/spotlight/{solr_document_images_spec.rb → solr_document/spotlight_images_spec.rb} +18 -10
- data/spec/models/spotlight/solr_document/uploaded_resource_spec.rb +52 -0
- data/spec/models/spotlight/solr_document_sidecar_spec.rb +3 -4
- data/spec/routing/spotlight/exhibit_catalog_spec.rb +5 -5
- data/spec/routing/spotlight/pages_routing_spec.rb +24 -25
- data/spec/serializers/spotlight/exhibit_export_serializer_spec.rb +88 -68
- data/spec/spec_helper.rb +13 -22
- data/spec/support/features/test_features_helpers.rb +50 -46
- data/spec/support/views/test_view_helpers.rb +1 -1
- data/spec/test_app_templates/Gemfile.extra +0 -1
- data/spec/test_app_templates/carrierwave.rb +2 -2
- data/spec/test_app_templates/catalog_controller.rb +42 -42
- data/spec/test_app_templates/lib/generators/test_app_generator.rb +20 -11
- data/spec/test_app_templates/spotlight_test.rake +3 -3
- data/spec/uploaders/spotlight/item_uploader_spec.rb +68 -0
- data/spec/views/_user_util_links.html.erb_spec.rb +14 -14
- data/spec/views/shared/_analytics.html.erb_spec.rb +4 -6
- data/spec/views/shared/_exhibit_masthead.html.erb_spec.rb +19 -20
- data/spec/views/shared/_exhibit_navbar.html.erb_spec.rb +129 -131
- data/spec/views/shared/_footer.html.erb_spec.rb +6 -7
- data/spec/views/shared/_header_navbar.html.erb_spec.rb +5 -5
- data/spec/views/spotlight/about_pages/_empty.html.erb_spec.rb +4 -4
- data/spec/views/spotlight/about_pages/_sidebar.html.erb_spec.rb +9 -11
- data/spec/views/spotlight/about_pages/index.html.erb_spec.rb +31 -28
- data/spec/views/spotlight/browse/_search.html.erb_spec.rb +6 -6
- data/spec/views/spotlight/browse/_sort_and_per_page.html.erb_spec.rb +10 -12
- data/spec/views/spotlight/browse/index.html.erb_spec.rb +6 -6
- data/spec/views/spotlight/browse/show.html.erb_spec.rb +19 -20
- data/spec/views/spotlight/catalog/_edit_default.html.erb_spec.rb +7 -7
- data/spec/views/spotlight/catalog/admin.html.erb_spec.rb +7 -7
- data/spec/views/spotlight/catalog/edit.html.erb_spec.rb +3 -6
- data/spec/views/spotlight/catalog/new.html.erb_spec.rb +8 -10
- data/spec/views/spotlight/contacts/edit.html.erb_spec.rb +8 -8
- data/spec/views/spotlight/dashboards/_analytics.html.erb_spec.rb +22 -22
- data/spec/views/spotlight/exhibits/edit.html.erb_spec.rb +7 -8
- data/spec/views/spotlight/feature_pages/_empty.html.erb_spec.rb +5 -5
- data/spec/views/spotlight/feature_pages/_sidebar.html.erb_spec.rb +24 -26
- data/spec/views/spotlight/home_pages/_empty.html.erb_spec.rb +13 -9
- data/spec/views/spotlight/home_pages/_sidebar.html.erb_spec.rb +6 -6
- data/spec/views/spotlight/metadata_configurations/_metadata_field.html.erb_spec.rb +26 -0
- data/spec/views/spotlight/metadata_configurations/edit.html.erb_spec.rb +22 -0
- data/spec/views/spotlight/pages/edit.html.erb_spec.rb +16 -16
- data/spec/views/spotlight/pages/index.html.erb_spec.rb +19 -17
- data/spec/views/spotlight/pages/new.html.erb_spec.rb +6 -6
- data/spec/views/spotlight/pages/show.html.erb_spec.rb +27 -28
- data/spec/views/spotlight/roles/index.html.erb_spec.rb +6 -6
- data/spec/views/spotlight/search_configurations/_search_fields.html.erb_spec.rb +54 -0
- data/spec/views/spotlight/search_configurations/_sort.html.erb_spec.rb +28 -0
- data/spec/views/spotlight/searches/_search.html.erb_spec.rb +20 -10
- data/spec/views/spotlight/searches/edit.html.erb_spec.rb +12 -11
- data/spec/views/spotlight/searches/index.html.erb_spec.rb +12 -7
- data/spec/views/spotlight/sir_trevor/blocks/_iframe_block.html.erb_spec.rb +7 -8
- data/spec/views/spotlight/sir_trevor/blocks/_rule_block.html.erb_spec.rb +4 -4
- data/spec/views/spotlight/sir_trevor/blocks/_solr_documents_block.html.erb_spec.rb +38 -0
- data/spec/views/spotlight/sir_trevor/blocks/_solr_documents_carousel_block.html.erb_spec.rb +7 -8
- data/spec/views/spotlight/sir_trevor/blocks/_solr_documents_embed_block.html.erb_spec.rb +18 -13
- data/spec/views/spotlight/sir_trevor/blocks/_solr_documents_features_block.html.erb_spec.rb +14 -12
- data/spec/views/spotlight/sir_trevor/blocks/_solr_documents_grid_block.html.erb_spec.rb +11 -12
- data/spec/views/spotlight/tags/index.html.erb_spec.rb +9 -9
- metadata +167 -83
- data/app/controllers/spotlight/blacklight_configurations_controller.rb +0 -101
- data/app/controllers/spotlight/resources/csv_controller.rb +0 -23
- data/app/forms/spotlight/appearance.rb +0 -86
- data/app/helpers/spotlight/attachments_helper.rb +0 -4
- data/app/helpers/spotlight/blacklight_configurations_helper.rb +0 -15
- data/app/jobs/spotlight/set_default_thumbnail_job.rb +0 -16
- data/app/models/spotlight/resources/csv.rb +0 -80
- data/app/uploaders/spotlight/csv_uploader.rb +0 -15
- data/app/views/spotlight/blacklight_configurations/edit_facet_fields.html.erb +0 -47
- data/app/views/spotlight/blacklight_configurations/edit_sort_fields.html.erb +0 -65
- data/app/views/spotlight/resources/csv/_form.html.erb +0 -17
- data/app/views/spotlight/resources/csv/new.html.erb +0 -3
- data/spec/controllers/spotlight/blacklight_configurations_controller_spec.rb +0 -167
- data/spec/features/edit_sort_fields_spec.rb +0 -42
- data/spec/features/exhibits/edit_facet_fields_spec.rb +0 -37
- data/spec/features/javascript/facet_admin_spec.rb +0 -36
- data/spec/features/search_facets_admin_spec.rb +0 -19
- data/spec/features/update_appearance_spec.rb +0 -58
- data/spec/helpers/spotlight/blacklight_configurations_helper_spec.rb +0 -12
- data/spec/models/spotlight/appearance_spec.rb +0 -33
- data/spec/models/spotlight/resources/csv_spec.rb +0 -101
- data/spec/models/spotlight/solr_document_atomic_updates_spec.rb +0 -29
- data/spec/models/spotlight/solr_document_uploaded_resource_spec.rb +0 -45
- data/spec/uploaders/item_uploader_spec.rb +0 -62
- data/spec/views/spotlight/blacklight_configuration/_metadata_field.html.erb_spec.rb +0 -27
- data/spec/views/spotlight/blacklight_configuration/edit_metadata_fields.html.erb_spec.rb +0 -23
- data/spec/views/spotlight/blacklight_configuration/edit_sort_fields.html.erb_spec.rb +0 -19
@@ -2,17 +2,17 @@ require 'spec_helper'
|
|
2
2
|
|
3
3
|
describe Spotlight::SolrController, type: :controller do
|
4
4
|
routes { Spotlight::Engine.routes }
|
5
|
-
let(:exhibit) {FactoryGirl.create(:exhibit) }
|
5
|
+
let(:exhibit) { FactoryGirl.create(:exhibit) }
|
6
6
|
|
7
|
-
describe
|
7
|
+
describe 'when user does not have access' do
|
8
8
|
before { sign_in FactoryGirl.create(:exhibit_visitor) }
|
9
|
-
it
|
9
|
+
it 'does not allow update' do
|
10
10
|
post :update, exhibit_id: exhibit
|
11
11
|
expect(response).to redirect_to main_app.root_path
|
12
12
|
end
|
13
13
|
end
|
14
|
-
|
15
|
-
describe
|
14
|
+
|
15
|
+
describe 'when user is an admin' do
|
16
16
|
let(:admin) { FactoryGirl.create(:site_admin) }
|
17
17
|
let(:role) { admin.roles.first }
|
18
18
|
let(:solr) { double }
|
@@ -21,31 +21,31 @@ describe Spotlight::SolrController, type: :controller do
|
|
21
21
|
expect(controller).to receive(:blacklight_solr).and_return(solr)
|
22
22
|
end
|
23
23
|
|
24
|
-
it
|
24
|
+
it 'passes through the request data' do
|
25
25
|
doc = {}
|
26
26
|
expect(solr).to receive(:update) do |arr|
|
27
27
|
doc = arr.first
|
28
28
|
end
|
29
29
|
|
30
|
-
post :update, {a: 1}.to_json, content_type: :json, exhibit_id: exhibit
|
30
|
+
post :update, { a: 1 }.to_json, content_type: :json, exhibit_id: exhibit
|
31
31
|
|
32
32
|
expect(response).to be_successful
|
33
|
-
expect(doc).to include
|
33
|
+
expect(doc).to include 'a' => 1
|
34
34
|
end
|
35
35
|
|
36
|
-
it
|
36
|
+
it 'enriches the request with exhibit solr data' do
|
37
37
|
doc = {}
|
38
38
|
expect(solr).to receive(:update) do |arr|
|
39
39
|
doc = arr.first
|
40
40
|
end
|
41
41
|
|
42
|
-
post :update, {a: 1}.to_json, content_type: :json, exhibit_id: exhibit
|
42
|
+
post :update, { a: 1 }.to_json, content_type: :json, exhibit_id: exhibit
|
43
43
|
|
44
44
|
expect(response).to be_successful
|
45
45
|
expect(doc).to include exhibit.solr_data
|
46
46
|
end
|
47
47
|
|
48
|
-
it
|
48
|
+
it 'enriches the request with sidecar data' do
|
49
49
|
doc = {}
|
50
50
|
expect(solr).to receive(:update) do |arr|
|
51
51
|
doc = arr.first
|
@@ -53,11 +53,10 @@ describe Spotlight::SolrController, type: :controller do
|
|
53
53
|
|
54
54
|
allow_any_instance_of(SolrDocument).to receive(:to_solr).and_return(b: 1)
|
55
55
|
|
56
|
-
post :update, {a: 1}.to_json, content_type: :json, exhibit_id: exhibit
|
56
|
+
post :update, { a: 1 }.to_json, content_type: :json, exhibit_id: exhibit
|
57
57
|
|
58
58
|
expect(response).to be_successful
|
59
59
|
expect(doc).to include b: 1
|
60
60
|
end
|
61
61
|
end
|
62
|
-
|
63
|
-
end
|
62
|
+
end
|
@@ -1,42 +1,42 @@
|
|
1
1
|
require 'spec_helper'
|
2
2
|
|
3
|
-
describe Spotlight::TagsController, :
|
3
|
+
describe Spotlight::TagsController, type: :controller do
|
4
4
|
routes { Spotlight::Engine.routes }
|
5
5
|
let(:exhibit) { FactoryGirl.create(:exhibit) }
|
6
6
|
|
7
|
-
describe
|
8
|
-
describe
|
9
|
-
it
|
7
|
+
describe 'when not signed in' do
|
8
|
+
describe 'GET index' do
|
9
|
+
it 'redirects to sign inl' do
|
10
10
|
get :index, exhibit_id: exhibit
|
11
11
|
expect(response).to redirect_to main_app.new_user_session_path
|
12
12
|
end
|
13
13
|
end
|
14
14
|
end
|
15
|
-
describe
|
16
|
-
before {sign_in FactoryGirl.create(:exhibit_curator, exhibit: exhibit)}
|
17
|
-
describe
|
18
|
-
it
|
19
|
-
expect(controller).to receive(:add_breadcrumb).with(
|
20
|
-
expect(controller).to receive(:add_breadcrumb).with(
|
21
|
-
expect(controller).to receive(:add_breadcrumb).with(
|
15
|
+
describe 'when signed in as a curator' do
|
16
|
+
before { sign_in FactoryGirl.create(:exhibit_curator, exhibit: exhibit) }
|
17
|
+
describe 'GET index' do
|
18
|
+
it 'is successful' do
|
19
|
+
expect(controller).to receive(:add_breadcrumb).with('Home', exhibit)
|
20
|
+
expect(controller).to receive(:add_breadcrumb).with('Curation', exhibit_dashboard_path(exhibit))
|
21
|
+
expect(controller).to receive(:add_breadcrumb).with('Tags', exhibit_tags_path(exhibit))
|
22
22
|
get :index, exhibit_id: exhibit
|
23
23
|
expect(response).to be_successful
|
24
24
|
expect(assigns[:tags]).to eq []
|
25
25
|
expect(assigns[:exhibit]).to eq exhibit
|
26
26
|
end
|
27
27
|
|
28
|
-
it
|
28
|
+
it 'has a json serialization' do
|
29
29
|
get :index, exhibit_id: exhibit, format: 'json'
|
30
30
|
expect(response).to be_successful
|
31
31
|
end
|
32
32
|
end
|
33
33
|
|
34
|
-
describe
|
34
|
+
describe 'DELETE destroy' do
|
35
35
|
let!(:tagging) { FactoryGirl.create(:tagging, tagger: exhibit) }
|
36
|
-
it
|
37
|
-
expect
|
36
|
+
it 'is successful' do
|
37
|
+
expect do
|
38
38
|
delete :destroy, exhibit_id: exhibit, id: tagging.tag
|
39
|
-
|
39
|
+
end.to change { ActsAsTaggableOn::Tagging.count }.by(-1)
|
40
40
|
expect(response).to redirect_to exhibit_tags_path(exhibit)
|
41
41
|
end
|
42
42
|
end
|
@@ -1,20 +1,18 @@
|
|
1
1
|
require 'spec_helper'
|
2
2
|
|
3
3
|
describe Spotlight::VersionsController, type: :controller do
|
4
|
-
|
5
|
-
routes { Spotlight::Engine.routes }
|
4
|
+
routes { Spotlight::Engine.routes }
|
6
5
|
|
7
|
-
describe
|
8
|
-
describe
|
9
|
-
it
|
6
|
+
describe 'when not logged in' do
|
7
|
+
describe 'POST revert' do
|
8
|
+
it 'does not be allowed' do
|
10
9
|
post :revert, id: 1
|
11
10
|
expect(response).to redirect_to main_app.new_user_session_path
|
12
11
|
end
|
13
12
|
end
|
14
13
|
end
|
15
|
-
|
16
|
-
describe
|
17
|
-
|
14
|
+
|
15
|
+
describe 'when not authorized for the exhibit resource' do
|
18
16
|
let(:exhibit) { FactoryGirl.create(:exhibit) }
|
19
17
|
let(:user) { FactoryGirl.create(:exhibit_visitor) }
|
20
18
|
let!(:page) { FactoryGirl.create(:feature_page, exhibit: exhibit) }
|
@@ -22,8 +20,8 @@ describe Spotlight::VersionsController, type: :controller do
|
|
22
20
|
sign_in user
|
23
21
|
end
|
24
22
|
|
25
|
-
describe
|
26
|
-
it
|
23
|
+
describe 'POST revert' do
|
24
|
+
it 'does not be allowed' do
|
27
25
|
post :revert, id: page.versions.last
|
28
26
|
expect(response).to redirect_to main_app.root_path
|
29
27
|
expect(flash[:alert]).to be_present
|
@@ -31,8 +29,7 @@ describe Spotlight::VersionsController, type: :controller do
|
|
31
29
|
end
|
32
30
|
end
|
33
31
|
|
34
|
-
describe
|
35
|
-
|
32
|
+
describe 'when logged in as a curator' do
|
36
33
|
let(:exhibit) { FactoryGirl.create(:exhibit) }
|
37
34
|
let(:user) { FactoryGirl.create(:exhibit_curator) }
|
38
35
|
let!(:page) { FactoryGirl.create(:feature_page, exhibit: exhibit) }
|
@@ -41,18 +38,18 @@ describe Spotlight::VersionsController, type: :controller do
|
|
41
38
|
sign_in user
|
42
39
|
end
|
43
40
|
|
44
|
-
describe
|
45
|
-
it
|
46
|
-
page.title =
|
41
|
+
describe 'POST revert' do
|
42
|
+
it 'reverts the change' do
|
43
|
+
page.title = 'xyz'
|
47
44
|
page.save!
|
48
45
|
|
49
46
|
post :revert, id: page.versions.last
|
50
47
|
page.reload
|
51
|
-
expect(page.title).not_to eq
|
48
|
+
expect(page.title).not_to eq 'xyz'
|
52
49
|
expect(response).to redirect_to [exhibit, page]
|
53
50
|
expect(flash[:notice]).to be_present
|
54
|
-
expect(flash[:notice]).to match
|
51
|
+
expect(flash[:notice]).to match(/Redo changes/)
|
55
52
|
end
|
56
53
|
end
|
57
54
|
end
|
58
|
-
end
|
55
|
+
end
|
@@ -0,0 +1,31 @@
|
|
1
|
+
require 'spec_helper'
|
2
|
+
describe Spotlight::ViewConfigurationsController, type: :controller do
|
3
|
+
routes { Spotlight::Engine.routes }
|
4
|
+
let(:exhibit) { FactoryGirl.create(:exhibit) }
|
5
|
+
|
6
|
+
describe 'when the user is not authorized' do
|
7
|
+
before do
|
8
|
+
sign_in FactoryGirl.create(:exhibit_visitor)
|
9
|
+
end
|
10
|
+
|
11
|
+
it 'denies access' do
|
12
|
+
get :show, exhibit_id: exhibit
|
13
|
+
expect(response).to redirect_to main_app.root_path
|
14
|
+
expect(flash[:alert]).to be_present
|
15
|
+
end
|
16
|
+
end
|
17
|
+
|
18
|
+
describe 'when signed in' do
|
19
|
+
let(:user) { FactoryGirl.create(:exhibit_admin, exhibit: exhibit) }
|
20
|
+
before { sign_in user }
|
21
|
+
|
22
|
+
describe '#show' do
|
23
|
+
it 'is successful' do
|
24
|
+
get :show, exhibit_id: exhibit, format: 'json'
|
25
|
+
expect(response).to be_successful
|
26
|
+
available = JSON.parse(response.body)
|
27
|
+
expect(available).to match_array %w(list gallery slideshow)
|
28
|
+
end
|
29
|
+
end
|
30
|
+
end
|
31
|
+
end
|
data/spec/factories/contacts.rb
CHANGED
data/spec/factories/exhibits.rb
CHANGED
data/spec/factories/pages.rb
CHANGED
@@ -1,29 +1,26 @@
|
|
1
1
|
FactoryGirl.define do
|
2
2
|
factory :feature_page, class: Spotlight::FeaturePage do
|
3
3
|
exhibit
|
4
|
-
title
|
5
|
-
published
|
6
|
-
content
|
4
|
+
title 'Page1'
|
5
|
+
published true
|
6
|
+
content '[]'
|
7
7
|
end
|
8
8
|
factory :feature_subpage, parent: :feature_page do
|
9
9
|
transient do
|
10
10
|
exhibit
|
11
11
|
end
|
12
|
-
title
|
13
|
-
content
|
12
|
+
title 'SubPage1'
|
13
|
+
content '[]'
|
14
14
|
after(:build) { |subpage, evaluator| subpage.parent_page = FactoryGirl.create(:feature_page, exhibit: evaluator.exhibit) }
|
15
15
|
end
|
16
16
|
factory :about_page, class: Spotlight::AboutPage do
|
17
17
|
exhibit
|
18
|
-
title
|
19
|
-
content
|
20
|
-
published
|
18
|
+
title 'Page1'
|
19
|
+
content '[]'
|
20
|
+
published true
|
21
21
|
end
|
22
22
|
|
23
23
|
factory :home_page, class: Spotlight::HomePage do
|
24
24
|
exhibit
|
25
|
-
title "Page1"
|
26
25
|
end
|
27
26
|
end
|
28
|
-
|
29
|
-
|
data/spec/factories/resources.rb
CHANGED
@@ -1,11 +1,11 @@
|
|
1
1
|
FactoryGirl.define do
|
2
2
|
factory :resource, class: Spotlight::Resource do
|
3
3
|
exhibit
|
4
|
-
type
|
5
|
-
url
|
4
|
+
type 'Spotlight::Resource'
|
5
|
+
url 'some url'
|
6
6
|
end
|
7
7
|
factory :uploaded_resource, class: Spotlight::Resources::Upload, parent: :resource do
|
8
|
-
type
|
9
|
-
url { Rack::Test::UploadedFile.new(File.join(FIXTURES_PATH,
|
8
|
+
type 'Spotlight::Resources::Upload'
|
9
|
+
url { Rack::Test::UploadedFile.new(File.join(FIXTURES_PATH, 'avatar.png')) }
|
10
10
|
end
|
11
11
|
end
|
data/spec/factories/searches.rb
CHANGED
@@ -1,26 +1,23 @@
|
|
1
1
|
FactoryGirl.define do
|
2
2
|
factory :search, class: Spotlight::Search do
|
3
3
|
exhibit
|
4
|
-
title
|
4
|
+
title 'Search1'
|
5
|
+
|
6
|
+
after(:build) { |search| search.thumbnail = FactoryGirl.create(:featured_image) }
|
5
7
|
end
|
6
8
|
|
7
|
-
factory :published_search,
|
8
|
-
|
9
|
-
title "Search1"
|
10
|
-
on_landing_page true
|
9
|
+
factory :published_search, parent: :search do
|
10
|
+
published true
|
11
11
|
end
|
12
12
|
|
13
13
|
factory :default_search, class: Spotlight::Search do
|
14
|
-
title
|
15
|
-
long_description
|
16
|
-
|
17
|
-
after(:build) { |search| search.thumbnail = FactoryGirl.create(:featured_image)}
|
14
|
+
title 'All Exhibit Items'
|
15
|
+
long_description 'All items in this exhibit.'
|
16
|
+
|
17
|
+
after(:build) { |search| search.thumbnail = FactoryGirl.create(:featured_image) }
|
18
18
|
end
|
19
19
|
|
20
20
|
factory :featured_image, class: Spotlight::FeaturedImage do
|
21
|
-
image { File.open(File.join(FIXTURES_PATH,
|
21
|
+
image { File.open(File.join(FIXTURES_PATH, 'avatar.png')) }
|
22
22
|
end
|
23
23
|
end
|
24
|
-
|
25
|
-
|
26
|
-
|
data/spec/factories/tags.rb
CHANGED
data/spec/factories/users.rb
CHANGED
@@ -4,10 +4,10 @@ FactoryGirl.define do
|
|
4
4
|
exhibit { FactoryGirl.create(:exhibit) }
|
5
5
|
end
|
6
6
|
sequence(:email) { |n| "user#{n}@example.com" }
|
7
|
-
password
|
7
|
+
password 'insecure'
|
8
8
|
|
9
9
|
factory :site_admin do
|
10
|
-
after(:create) do |user,
|
10
|
+
after(:create) do |user, _evaluator|
|
11
11
|
create_list(:role, 1, user: user, exhibit_id: nil, role: 'admin')
|
12
12
|
end
|
13
13
|
end
|
@@ -24,8 +24,6 @@ FactoryGirl.define do
|
|
24
24
|
end
|
25
25
|
|
26
26
|
factory :exhibit_visitor do
|
27
|
-
|
28
27
|
end
|
29
28
|
end
|
30
29
|
end
|
31
|
-
|
@@ -1,42 +1,42 @@
|
|
1
|
-
require
|
1
|
+
require 'spec_helper'
|
2
2
|
|
3
|
-
describe
|
4
|
-
let(:exhibit) { FactoryGirl.create(:
|
3
|
+
describe 'About page', type: :feature do
|
4
|
+
let(:exhibit) { FactoryGirl.create(:default_exhibit) }
|
5
5
|
let(:exhibit_curator) { FactoryGirl.create(:exhibit_curator, exhibit: exhibit) }
|
6
|
-
let!(:about_page1) { FactoryGirl.create(:about_page, title:
|
7
|
-
let!(:about_page2) { FactoryGirl.create(:about_page, title:
|
8
|
-
let(:unpublished_page) { FactoryGirl.create(:about_page, title:
|
9
|
-
describe
|
10
|
-
it
|
6
|
+
let!(:about_page1) { FactoryGirl.create(:about_page, title: 'First Page', exhibit: exhibit) }
|
7
|
+
let!(:about_page2) { FactoryGirl.create(:about_page, title: 'Second Page', exhibit: exhibit) }
|
8
|
+
let(:unpublished_page) { FactoryGirl.create(:about_page, title: 'Unpublished Page', published: false, exhibit: exhibit) }
|
9
|
+
describe 'sidebar' do
|
10
|
+
it 'displays' do
|
11
11
|
visit spotlight.exhibit_about_page_path(about_page1.exhibit, about_page1)
|
12
12
|
# the sidebar should display
|
13
|
-
within(
|
13
|
+
within('#sidebar') do
|
14
14
|
# within the sidebar navigation
|
15
|
-
within(
|
15
|
+
within('ul.sidenav') do
|
16
16
|
# the current page should be active
|
17
|
-
expect(page).to have_css(
|
17
|
+
expect(page).to have_css('li.active', text: about_page1.title)
|
18
18
|
# the other page should be linked
|
19
|
-
expect(page).to have_css(
|
19
|
+
expect(page).to have_css('li a', text: about_page2.title)
|
20
20
|
end
|
21
21
|
end
|
22
22
|
end
|
23
23
|
end
|
24
|
-
describe
|
24
|
+
describe 'page options' do
|
25
25
|
before { login_as exhibit_curator }
|
26
|
-
describe
|
27
|
-
it
|
26
|
+
describe 'publish' do
|
27
|
+
it 'is updatable from the edit page' do
|
28
28
|
expect(unpublished_page).not_to be_published
|
29
29
|
|
30
30
|
visit spotlight.edit_exhibit_about_page_path(unpublished_page.exhibit, unpublished_page)
|
31
|
-
expect(find(
|
31
|
+
expect(find('#about_page_published')).not_to be_checked
|
32
32
|
|
33
|
-
check
|
34
|
-
click_button
|
33
|
+
check 'Publish'
|
34
|
+
click_button 'Save changes'
|
35
35
|
|
36
36
|
expect(unpublished_page.reload).to be_published
|
37
37
|
|
38
38
|
visit spotlight.edit_exhibit_about_page_path(unpublished_page.exhibit, unpublished_page)
|
39
|
-
expect(find(
|
39
|
+
expect(find('#about_page_published')).to be_checked
|
40
40
|
end
|
41
41
|
end
|
42
42
|
end
|