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
@@ -1,19 +1,19 @@
|
|
1
1
|
module Spotlight
|
2
|
+
##
|
3
|
+
# Reindex the given resources or exhibits
|
2
4
|
class ReindexJob < ActiveJob::Base
|
3
5
|
queue_as :default
|
4
6
|
|
5
7
|
def perform(exhibit_or_resources)
|
6
8
|
resources = if exhibit_or_resources.is_a? Spotlight::Exhibit
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
9
|
+
exhibit_or_resources.resources.find_each
|
10
|
+
elsif exhibit_or_resources.is_a? Enumerable
|
11
|
+
exhibit_or_resources
|
12
|
+
else
|
13
|
+
Array(exhibit_or_resources)
|
14
|
+
end
|
13
15
|
|
14
|
-
resources.each
|
15
|
-
r.reindex
|
16
|
-
end
|
16
|
+
resources.each(&:reindex)
|
17
17
|
end
|
18
18
|
end
|
19
19
|
end
|
@@ -1,10 +1,12 @@
|
|
1
1
|
module Spotlight
|
2
|
+
##
|
3
|
+
# Notify the curator that we're finished processing a
|
4
|
+
# batch upload
|
2
5
|
class IndexingCompleteMailer < ActionMailer::Base
|
3
|
-
|
4
6
|
def documents_indexed(csv_data, exhibit, user)
|
5
7
|
@number = csv_data.length
|
6
8
|
@exhibit = exhibit
|
7
|
-
mail(to: user.email, subject:
|
9
|
+
mail(to: user.email, subject: 'Document indexing complete')
|
8
10
|
end
|
9
11
|
end
|
10
12
|
end
|
data/app/models/ability.rb
CHANGED
@@ -1,4 +1,7 @@
|
|
1
1
|
module Spotlight
|
2
|
+
##
|
3
|
+
# Stub ActiveRecord methods to allow non-ActiveRecord::Base objects to
|
4
|
+
# participate in e.g. associations
|
2
5
|
module ArLight
|
3
6
|
extend ActiveSupport::Concern
|
4
7
|
include ActiveRecord::ModelSchema
|
@@ -7,6 +10,8 @@ module Spotlight
|
|
7
10
|
include ActiveRecord::Reflection
|
8
11
|
include ActiveModel::Dirty
|
9
12
|
|
13
|
+
##
|
14
|
+
# Mock activerecord class-level methods
|
10
15
|
module ClassMethods
|
11
16
|
def base_class
|
12
17
|
self
|
@@ -16,30 +21,7 @@ module Spotlight
|
|
16
21
|
def subclass_from_attributes?(_)
|
17
22
|
false
|
18
23
|
end
|
19
|
-
end
|
20
|
-
|
21
|
-
def initialize (source_doc={}, solr_response=nil)
|
22
|
-
@association_cache = {}
|
23
|
-
super
|
24
|
-
end
|
25
24
|
|
26
|
-
# Returns true if +comparison_object+ is the same exact object, or +comparison_object+
|
27
|
-
# is of the same type and +self+ has an ID and it is equal to +comparison_object.id+.
|
28
|
-
#
|
29
|
-
# Note that new records are different from any other record by definition, unless the
|
30
|
-
# other record is the receiver itself. Besides, if you fetch existing records with
|
31
|
-
# +select+ and leave the ID out, you're on your own, this predicate will return false.
|
32
|
-
#
|
33
|
-
# Note also that destroying a record preserves its ID in the model instance, so deleted
|
34
|
-
# models are still comparable.
|
35
|
-
def ==(comparison_object)
|
36
|
-
super ||
|
37
|
-
comparison_object.instance_of?(self.class) &&
|
38
|
-
id &&
|
39
|
-
comparison_object.id == id
|
40
|
-
end
|
41
|
-
|
42
|
-
module ClassMethods
|
43
25
|
def generated_feature_methods
|
44
26
|
@generated_feature_methods ||= begin
|
45
27
|
mod = const_set(:GeneratedFeatureMethods, Module.new)
|
@@ -48,16 +30,58 @@ module Spotlight
|
|
48
30
|
end
|
49
31
|
end
|
50
32
|
|
51
|
-
def before_destroy
|
33
|
+
def before_destroy(*_args)
|
52
34
|
end
|
53
35
|
|
54
36
|
def pluralize_table_names
|
55
37
|
true
|
56
38
|
end
|
57
39
|
|
58
|
-
def add_autosave_association_callbacks
|
40
|
+
def add_autosave_association_callbacks(_arg)
|
41
|
+
end
|
42
|
+
|
43
|
+
# needed for Rails 4.1 + act_as_taggable
|
44
|
+
def dangerous_attribute_method?(*_args)
|
45
|
+
false
|
46
|
+
end
|
47
|
+
|
48
|
+
# needed for Rails 4.1 + act_as_taggable
|
49
|
+
def generated_association_methods
|
50
|
+
@generated_association_methods ||= begin
|
51
|
+
mod = const_set(:GeneratedAssociationMethods, Module.new)
|
52
|
+
include mod
|
53
|
+
mod
|
54
|
+
end
|
59
55
|
end
|
60
56
|
|
57
|
+
def validators_on(*_)
|
58
|
+
[]
|
59
|
+
end
|
60
|
+
|
61
|
+
def default_scopes
|
62
|
+
[]
|
63
|
+
end
|
64
|
+
end
|
65
|
+
|
66
|
+
def initialize(source_doc = {}, solr_response = nil)
|
67
|
+
@association_cache = {}
|
68
|
+
super
|
69
|
+
end
|
70
|
+
|
71
|
+
# Returns true if +comparison_object+ is the same exact object, or +comparison_object+
|
72
|
+
# is of the same type and +self+ has an ID and it is equal to +comparison_object.id+.
|
73
|
+
#
|
74
|
+
# Note that new records are different from any other record by definition, unless the
|
75
|
+
# other record is the receiver itself. Besides, if you fetch existing records with
|
76
|
+
# +select+ and leave the ID out, you're on your own, this predicate will return false.
|
77
|
+
#
|
78
|
+
# Note also that destroying a record preserves its ID in the model instance, so deleted
|
79
|
+
# models are still comparable.
|
80
|
+
def ==(other)
|
81
|
+
super ||
|
82
|
+
(other.instance_of?(self.class) &&
|
83
|
+
id &&
|
84
|
+
other.id == id)
|
61
85
|
end
|
62
86
|
end
|
63
87
|
end
|
@@ -1,26 +1,41 @@
|
|
1
|
-
module Spotlight
|
2
|
-
|
3
|
-
|
4
|
-
|
5
|
-
|
6
|
-
|
1
|
+
module Spotlight
|
2
|
+
##
|
3
|
+
# Helpers to provide default blacklight configuration values
|
4
|
+
module BlacklightConfigurationDefaults
|
5
|
+
extend ActiveSupport::Concern
|
6
|
+
|
7
|
+
included do
|
8
|
+
before_create :setup_defaults
|
9
|
+
end
|
7
10
|
|
11
|
+
protected
|
8
12
|
|
9
|
-
protected
|
10
13
|
def setup_defaults
|
14
|
+
default_search_fields
|
11
15
|
default_sort_fields
|
12
16
|
default_view_types
|
13
17
|
set_default_per_page
|
14
18
|
end
|
15
19
|
|
20
|
+
def default_search_fields
|
21
|
+
return true unless search_fields.empty?
|
22
|
+
|
23
|
+
# can't use default_blacklight_config until after the BlacklightConfiguration
|
24
|
+
# is created or we run into a circular dependency.
|
25
|
+
default_fields = Spotlight::Engine.blacklight_config.search_fields
|
26
|
+
self.search_fields = default_fields.each_with_object({}) do |(k, _v), obj|
|
27
|
+
obj[k] = { enabled: true }
|
28
|
+
end
|
29
|
+
end
|
30
|
+
|
16
31
|
def default_sort_fields
|
17
32
|
return true unless sort_fields.empty?
|
18
33
|
|
19
34
|
# can't use default_blacklight_config until after the BlacklightConfiguration
|
20
35
|
# is created or we run into a circular dependency.
|
21
36
|
default_fields = Spotlight::Engine.blacklight_config.sort_fields
|
22
|
-
self.sort_fields = default_fields.each_with_object({}) do |(k,
|
23
|
-
obj[k] = {
|
37
|
+
self.sort_fields = default_fields.each_with_object({}) do |(k, _v), obj|
|
38
|
+
obj[k] = { enabled: true }
|
24
39
|
end
|
25
40
|
end
|
26
41
|
|
@@ -37,5 +52,5 @@ module Spotlight::BlacklightConfigurationDefaults
|
|
37
52
|
# is created or we run into a circular dependency.
|
38
53
|
self.default_per_page ||= Spotlight::Engine.blacklight_config.per_page.first
|
39
54
|
end
|
40
|
-
|
55
|
+
end
|
41
56
|
end
|
@@ -0,0 +1,28 @@
|
|
1
|
+
module Spotlight
|
2
|
+
##
|
3
|
+
# Exhibit mixin to provide analytics data
|
4
|
+
module ExhibitAnalytics
|
5
|
+
def analytics(start_date = 1.month, path = nil)
|
6
|
+
return OpenStruct.new unless analytics_provider && analytics_provider.enabled?
|
7
|
+
@analytics ||= {}
|
8
|
+
@analytics[start_date] ||= begin
|
9
|
+
analytics_provider.exhibit_data(path || self, start_date: start_date.ago)
|
10
|
+
end
|
11
|
+
end
|
12
|
+
|
13
|
+
def page_analytics(start_date = 1.month, path = nil)
|
14
|
+
return [] unless analytics_provider && analytics_provider.enabled?
|
15
|
+
|
16
|
+
@page_analytics ||= {}
|
17
|
+
@page_analytics[start_date] ||= begin
|
18
|
+
analytics_provider.page_data(path || self, start_date: start_date.ago)
|
19
|
+
end
|
20
|
+
end
|
21
|
+
|
22
|
+
private
|
23
|
+
|
24
|
+
def analytics_provider
|
25
|
+
Spotlight::Engine.config.analytics_provider
|
26
|
+
end
|
27
|
+
end
|
28
|
+
end
|
@@ -1,22 +1,21 @@
|
|
1
|
-
###
|
2
|
-
# Include Spotlight::ImageDerivatives in a class or module to get
|
3
|
-
# the derivative configurations in #spotlight_image_derivatives.
|
4
|
-
# A new derivative could theoretically be added by putting the
|
5
|
-
# following in an initializer.
|
6
|
-
# Spotlight::ImageDerivatives.spotlight_image_derivatives << {
|
7
|
-
# version: :my_version,
|
8
|
-
# field: :my_field,
|
9
|
-
# lambda: lambda {|_|
|
10
|
-
# version :my_version do
|
11
|
-
# process :resize_to_fill => [30,30]
|
12
|
-
# end
|
13
|
-
# }
|
14
|
-
# }
|
15
|
-
#
|
16
|
-
# This will then create that new CarrierWave version in any class that extends this module
|
17
|
-
# and calls the apply_spotlight_image_derivative_versions class method described below.
|
18
|
-
###
|
19
1
|
module Spotlight
|
2
|
+
###
|
3
|
+
# Include Spotlight::ImageDerivatives in a class or module to get
|
4
|
+
# the derivative configurations in #spotlight_image_derivatives.
|
5
|
+
# A new derivative could theoretically be added by putting the
|
6
|
+
# following in an initializer.
|
7
|
+
# Spotlight::ImageDerivatives.spotlight_image_derivatives << {
|
8
|
+
# version: :my_version,
|
9
|
+
# field: :my_field,
|
10
|
+
# lambda: lambda {|_|
|
11
|
+
# version :my_version do
|
12
|
+
# process :resize_to_fill => [30,30]
|
13
|
+
# end
|
14
|
+
# }
|
15
|
+
# }
|
16
|
+
#
|
17
|
+
# This will then create that new CarrierWave version in any class that extends this module
|
18
|
+
# and calls the apply_spotlight_image_derivative_versions class method described below.
|
20
19
|
module ImageDerivatives
|
21
20
|
mattr_accessor :spotlight_image_derivatives
|
22
21
|
|
@@ -25,7 +24,7 @@ module Spotlight
|
|
25
24
|
# configured versions will be available
|
26
25
|
def apply_spotlight_image_derivative_versions
|
27
26
|
spotlight_image_derivatives.each do |version_config|
|
28
|
-
if(c = version_config[:lambda]).present?
|
27
|
+
if (c = version_config[:lambda]).present?
|
29
28
|
class_eval(&c)
|
30
29
|
end
|
31
30
|
end
|
@@ -39,21 +38,21 @@ module Spotlight
|
|
39
38
|
{
|
40
39
|
version: :thumb,
|
41
40
|
field: Spotlight::Engine.config.try(:thumbnail_field),
|
42
|
-
lambda: lambda
|
41
|
+
lambda: lambda do|_|
|
43
42
|
version :thumb do
|
44
|
-
process :
|
43
|
+
process resize_to_fit: [400, 400]
|
45
44
|
end
|
46
|
-
|
45
|
+
end
|
47
46
|
},
|
48
47
|
{
|
49
48
|
version: :square,
|
50
49
|
field: Spotlight::Engine.config.try(:square_image_field),
|
51
|
-
lambda: lambda
|
50
|
+
lambda: lambda do|_|
|
52
51
|
version :square do
|
53
|
-
process :
|
52
|
+
process resize_to_fill: [100, 100]
|
54
53
|
end
|
55
|
-
|
54
|
+
end
|
56
55
|
}
|
57
|
-
].reject{|v| v[:field].blank? }
|
56
|
+
].reject { |v| v[:field].blank? }
|
58
57
|
end
|
59
58
|
end
|
@@ -1,28 +1,32 @@
|
|
1
|
-
module Spotlight
|
2
|
-
module
|
3
|
-
|
4
|
-
|
1
|
+
module Spotlight
|
2
|
+
module Resources
|
3
|
+
##
|
4
|
+
# OpenGraph metadata harvester
|
5
|
+
module OpenGraph
|
6
|
+
extend ActiveSupport::Concern
|
7
|
+
include Spotlight::Resources::Web
|
5
8
|
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
+
def opengraph
|
10
|
+
@opengraph ||= begin
|
11
|
+
page = {}
|
9
12
|
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
+
body.css('meta').select { |m| m.attribute('property') }.each do |m|
|
14
|
+
page[m.attribute('property').to_s] = m.attribute('content').to_s
|
15
|
+
end
|
13
16
|
|
14
|
-
|
17
|
+
page
|
18
|
+
end
|
15
19
|
end
|
16
|
-
end
|
17
20
|
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
21
|
+
def opengraph_properties
|
22
|
+
Hash[opengraph.map do |k, v|
|
23
|
+
["#{k.parameterize('_')}_tesim", v]
|
24
|
+
end]
|
25
|
+
end
|
23
26
|
|
24
|
-
|
25
|
-
|
27
|
+
def to_solr
|
28
|
+
super.merge(opengraph_properties)
|
29
|
+
end
|
26
30
|
end
|
27
31
|
end
|
28
32
|
end
|
@@ -1,35 +1,36 @@
|
|
1
1
|
require 'nokogiri'
|
2
2
|
|
3
|
-
module Spotlight
|
4
|
-
module
|
5
|
-
|
3
|
+
module Spotlight
|
4
|
+
module Resources
|
5
|
+
##
|
6
|
+
# Generic web resource harvester base module
|
7
|
+
module Web
|
8
|
+
extend ActiveSupport::Concern
|
6
9
|
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
+
included do
|
11
|
+
before_create do
|
12
|
+
harvest!
|
13
|
+
end
|
10
14
|
end
|
11
|
-
end
|
12
|
-
|
13
|
-
def harvest!
|
14
|
-
response = Spotlight::Resources::Web.fetch url
|
15
|
-
self.data[:headers] = response.headers
|
16
|
-
self.data[:body] = response.body
|
17
|
-
end
|
18
15
|
|
19
|
-
|
20
|
-
|
21
|
-
|
16
|
+
def harvest!
|
17
|
+
response = Spotlight::Resources::Web.fetch url
|
18
|
+
data[:headers] = response.headers
|
19
|
+
data[:body] = response.body
|
22
20
|
end
|
23
21
|
|
24
|
-
|
25
|
-
|
22
|
+
def body
|
23
|
+
harvest! if data[:body].blank?
|
26
24
|
|
27
|
-
|
28
|
-
|
29
|
-
b.use FaradayMiddleware::FollowRedirects
|
30
|
-
b.adapter :net_http
|
31
|
-
end.get
|
32
|
-
end
|
25
|
+
@body ||= Nokogiri::HTML.parse data[:body]
|
26
|
+
end
|
33
27
|
|
28
|
+
def self.fetch(url)
|
29
|
+
Faraday.new(url) do |b|
|
30
|
+
b.use FaradayMiddleware::FollowRedirects
|
31
|
+
b.adapter :net_http
|
32
|
+
end.get
|
33
|
+
end
|
34
|
+
end
|
34
35
|
end
|
35
36
|
end
|