blacklight 6.14.0 → 7.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +5 -5
- data/.gitignore +1 -0
- data/.npmignore +23 -0
- data/.rubocop.yml +40 -16
- data/.rubocop_todo.yml +479 -375
- data/.solr_wrapper.yml +9 -2
- data/.travis.yml +27 -20
- data/Gemfile +3 -1
- data/README.md +22 -5
- data/Rakefile +3 -2
- data/VERSION +1 -1
- data/Vagrantfile +2 -0
- data/app/assets/images/blacklight/list.svg +1 -0
- data/app/assets/images/blacklight/search.svg +1 -0
- data/app/assets/javascripts/blacklight/blacklight.js +497 -57
- data/app/assets/stylesheets/blacklight/_balanced_list.scss +7 -12
- data/app/assets/stylesheets/blacklight/_blacklight_base.scss +18 -15
- data/app/assets/stylesheets/blacklight/_bookmark.scss +1 -13
- data/app/assets/stylesheets/blacklight/_bootstrap_overrides.scss +27 -0
- data/app/assets/stylesheets/blacklight/_constraints.scss +17 -25
- data/app/assets/stylesheets/blacklight/_controls.scss +8 -16
- data/app/assets/stylesheets/blacklight/_facets.scss +64 -93
- data/app/assets/stylesheets/blacklight/_header.scss +35 -48
- data/app/assets/stylesheets/blacklight/_icons.scss +35 -0
- data/app/assets/stylesheets/blacklight/_layout.scss +0 -10
- data/app/assets/stylesheets/blacklight/_mixins.scss +15 -0
- data/app/assets/stylesheets/blacklight/_modal.scss +9 -17
- data/app/assets/stylesheets/blacklight/_pagination.scss +2 -17
- data/app/assets/stylesheets/blacklight/_search_form.scss +7 -0
- data/app/assets/stylesheets/blacklight/_search_history.scss +5 -13
- data/app/assets/stylesheets/blacklight/_search_results.scss +9 -8
- data/app/assets/stylesheets/blacklight/_twitter_typeahead.scss +1 -2
- data/app/assets/stylesheets/blacklight/blacklight.scss +1 -1
- data/app/builders/blacklight/action_builder.rb +57 -0
- data/app/controllers/bookmarks_controller.rb +2 -2
- data/app/controllers/catalog_controller.rb +2 -2
- data/app/controllers/concerns/blacklight/base.rb +0 -33
- data/app/controllers/concerns/blacklight/bookmarks.rb +36 -33
- data/app/controllers/concerns/blacklight/catalog.rb +266 -210
- data/app/controllers/concerns/blacklight/controller.rb +111 -126
- data/app/controllers/concerns/blacklight/default_component_configuration.rb +12 -43
- data/app/controllers/concerns/blacklight/facet.rb +3 -0
- data/app/controllers/concerns/blacklight/search_context.rb +16 -14
- data/app/controllers/concerns/blacklight/search_fields.rb +4 -14
- data/app/controllers/concerns/blacklight/search_history.rb +1 -6
- data/app/controllers/concerns/blacklight/token_based_user.rb +24 -9
- data/app/helpers/blacklight/blacklight_helper_behavior.rb +39 -119
- data/app/helpers/blacklight/catalog_helper_behavior.rb +94 -88
- data/app/helpers/blacklight/component_helper_behavior.rb +21 -19
- data/app/helpers/blacklight/configuration_helper_behavior.rb +30 -57
- data/app/helpers/blacklight/facets_helper_behavior.rb +55 -51
- data/app/helpers/blacklight/hash_as_hidden_fields_helper_behavior.rb +9 -11
- data/app/helpers/blacklight/icon_helper_behavior.rb +18 -0
- data/app/helpers/blacklight/layout_helper_behavior.rb +3 -3
- data/app/helpers/blacklight/render_constraints_helper_behavior.rb +8 -6
- data/app/helpers/blacklight/render_partials_helper_behavior.rb +195 -0
- data/app/helpers/blacklight/search_history_constraints_helper_behavior.rb +19 -11
- data/app/helpers/blacklight/suggest_helper_behavior.rb +1 -0
- data/app/helpers/blacklight/url_helper_behavior.rb +50 -41
- data/app/{assets/javascripts → javascript}/blacklight/autocomplete.js +3 -2
- data/app/javascript/blacklight/bookmark_toggle.js +25 -0
- data/app/javascript/blacklight/checkbox_submit.js +134 -0
- data/app/{assets/javascripts → javascript}/blacklight/collapsable.js +1 -1
- data/app/{assets/javascripts → javascript}/blacklight/core.js +10 -8
- data/app/{assets/javascripts → javascript}/blacklight/facet_load.js +6 -6
- data/app/{assets/javascripts/blacklight/ajax_modal.js → javascript/blacklight/modal.js} +62 -64
- data/app/{assets/javascripts → javascript}/blacklight/search_context.js +10 -3
- data/app/models/blacklight/facet_paginator.rb +3 -3
- data/app/models/blacklight/icon.rb +56 -0
- data/app/models/blacklight/solr/facet_paginator.rb +3 -3
- data/app/models/blacklight/suggest_search.rb +4 -15
- data/app/models/bookmark.rb +5 -10
- data/app/models/concerns/blacklight/configurable.rb +13 -13
- data/app/models/concerns/blacklight/document/active_model_shim.rb +13 -11
- data/app/models/concerns/blacklight/document/cache_key.rb +1 -1
- data/app/models/concerns/blacklight/document/dublin_core.rb +2 -2
- data/app/models/concerns/blacklight/document/email.rb +1 -1
- data/app/models/concerns/blacklight/document/extensions.rb +5 -5
- data/app/models/concerns/blacklight/document/semantic_fields.rb +9 -9
- data/app/models/concerns/blacklight/document/sms.rb +1 -1
- data/app/models/concerns/blacklight/document.rb +26 -40
- data/app/models/concerns/blacklight/solr/document.rb +8 -8
- data/app/models/concerns/blacklight/suggest/response.rb +5 -3
- data/app/models/concerns/blacklight/user.rb +7 -6
- data/app/models/record_mailer.rb +5 -6
- data/app/models/search.rb +5 -7
- data/app/presenters/blacklight/document_presenter.rb +25 -140
- data/app/presenters/blacklight/field_presenter.rb +7 -5
- data/app/presenters/blacklight/index_presenter.rb +41 -58
- data/app/presenters/blacklight/json_presenter.rb +10 -14
- data/app/presenters/blacklight/link_alternate_presenter.rb +3 -1
- data/app/presenters/blacklight/rendering/abstract_step.rb +7 -5
- data/app/presenters/blacklight/rendering/helper_method.rb +10 -8
- data/app/presenters/blacklight/rendering/join.rb +5 -3
- data/app/presenters/blacklight/rendering/link_to_facet.rb +23 -19
- data/app/presenters/blacklight/rendering/microdata.rb +6 -3
- data/app/presenters/blacklight/rendering/pipeline.rb +7 -5
- data/app/presenters/blacklight/rendering/terminator.rb +2 -0
- data/app/presenters/blacklight/search_bar_presenter.rb +39 -0
- data/app/presenters/blacklight/show_presenter.rb +26 -63
- data/app/presenters/blacklight/thumbnail_presenter.rb +74 -0
- data/app/services/blacklight/document_factory.rb +13 -0
- data/app/services/blacklight/field_retriever.rb +26 -24
- data/app/services/blacklight/search_service.rb +152 -0
- data/app/values/blacklight/types.rb +31 -0
- data/app/views/blacklight/nav/_bookmark.html.erb +2 -2
- data/app/views/blacklight/nav/_search_history.html.erb +1 -1
- data/app/views/bookmarks/_tools.html.erb +2 -2
- data/app/views/bookmarks/index.html.erb +12 -13
- data/app/views/catalog/_bookmark_control.html.erb +26 -10
- data/app/views/catalog/_citation.html.erb +4 -4
- data/app/views/catalog/_constraints.html.erb +6 -7
- data/app/views/catalog/_constraints_element.html.erb +6 -6
- data/app/views/catalog/_did_you_mean.html.erb +1 -1
- data/app/views/catalog/{_document_default.atom.builder → _document.atom.builder} +19 -18
- data/app/views/catalog/_document.html.erb +5 -3
- data/app/views/catalog/{_document_default.rss.builder → _document.rss.builder} +2 -0
- data/app/views/catalog/_document_action.html.erb +2 -1
- data/app/views/catalog/_email_form.html.erb +8 -4
- data/app/views/catalog/_facet_index_navigation.html.erb +5 -4
- data/app/views/catalog/_facet_layout.html.erb +6 -10
- data/app/views/catalog/_facet_limit.html.erb +3 -2
- data/app/views/catalog/_facet_pagination.html.erb +8 -8
- data/app/views/catalog/_facet_pivot.html.erb +2 -2
- data/app/views/catalog/_facets.html.erb +9 -12
- data/app/views/catalog/_field.json.jbuilder +10 -0
- data/app/views/catalog/{_group_default.html.erb → _group.html.erb} +1 -1
- data/app/views/catalog/_home_text.html.erb +32 -36
- data/app/views/catalog/_index.html.erb +10 -0
- data/app/views/catalog/{_index_header_default.html.erb → _index_header.html.erb} +3 -3
- data/app/views/catalog/_per_page_widget.html.erb +6 -7
- data/app/views/catalog/_previous_next_doc.html.erb +6 -14
- data/app/views/catalog/_results_pagination.html.erb +2 -2
- data/app/views/catalog/_search_form.html.erb +12 -8
- data/app/views/catalog/_search_header.html.erb +0 -3
- data/app/views/catalog/_search_results.html.erb +6 -2
- data/app/views/catalog/_show.html.erb +8 -0
- data/app/views/catalog/_show_main_content.html.erb +4 -4
- data/app/views/catalog/_show_more_like_this.html.erb +1 -1
- data/app/views/catalog/_show_sidebar.html.erb +3 -3
- data/app/views/catalog/_show_tools.html.erb +10 -12
- data/app/views/catalog/_sms_form.html.erb +8 -4
- data/app/views/catalog/_sort_and_per_page.html.erb +3 -3
- data/app/views/catalog/_sort_widget.html.erb +7 -7
- data/app/views/catalog/_thumbnail.html.erb +5 -0
- data/app/views/catalog/_view_type_group.html.erb +2 -2
- data/app/views/catalog/_zero_results.html.erb +1 -1
- data/app/views/catalog/citation.js.erb +4 -2
- data/app/views/catalog/email.html.erb +5 -3
- data/app/views/catalog/email_success.html.erb +12 -8
- data/app/views/catalog/facet.html.erb +10 -8
- data/app/views/catalog/facet.json.jbuilder +2 -0
- data/app/views/catalog/index.atom.builder +13 -16
- data/app/views/catalog/index.html.erb +9 -11
- data/app/views/catalog/index.json.jbuilder +84 -3
- data/app/views/catalog/index.rss.builder +7 -5
- data/app/views/catalog/opensearch.xml.builder +12 -10
- data/app/views/catalog/show.html.erb +11 -6
- data/app/views/catalog/show.json.jbuilder +21 -0
- data/app/views/catalog/sms.html.erb +3 -1
- data/app/views/catalog/sms_success.html.erb +12 -8
- data/app/views/kaminari/blacklight/_first_page.html.erb +2 -2
- data/app/views/kaminari/blacklight/_gap.html.erb +2 -2
- data/app/views/kaminari/blacklight/_last_page.html.erb +2 -2
- data/app/views/kaminari/blacklight/_next_page.html.erb +5 -5
- data/app/views/kaminari/blacklight/_page.html.erb +5 -3
- data/app/views/kaminari/blacklight/_prev_page.html.erb +4 -4
- data/app/views/kaminari/blacklight_compact/_paginator.html.erb +4 -4
- data/app/views/layouts/blacklight/base.html.erb +35 -0
- data/app/views/layouts/blacklight.html.erb +14 -41
- data/app/views/layouts/catalog_result.html.erb +11 -0
- data/app/views/search_history/index.html.erb +16 -21
- data/app/views/shared/_header_navbar.html.erb +8 -13
- data/app/views/shared/_modal.html.erb +6 -0
- data/app/views/shared/_user_util_links.html.erb +22 -0
- data/blacklight.gemspec +10 -11
- data/config/i18n-tasks.yml +17 -0
- data/config/locales/blacklight.de.yml +71 -82
- data/config/locales/blacklight.en.yml +15 -27
- data/config/locales/blacklight.es.yml +14 -26
- data/config/locales/blacklight.fr.yml +16 -33
- data/config/locales/blacklight.hu.yml +212 -0
- data/config/locales/blacklight.it.yml +15 -26
- data/config/locales/blacklight.nl.yml +212 -0
- data/config/locales/blacklight.pt-BR.yml +24 -29
- data/config/locales/blacklight.sq.yml +4 -28
- data/config/locales/blacklight.zh.yml +3 -25
- data/config/routes.rb +2 -10
- data/db/migrate/20140202020202_create_bookmarks.rb +0 -1
- data/db/migrate/20140320000000_add_polymorphic_type_to_bookmarks.rb +1 -1
- data/lib/blacklight/abstract_repository.rb +22 -10
- data/lib/blacklight/configuration/context.rb +12 -1
- data/lib/blacklight/configuration/facet_field.rb +16 -9
- data/lib/blacklight/configuration/field.rb +32 -3
- data/lib/blacklight/configuration/fields.rb +61 -58
- data/lib/blacklight/configuration/null_field.rb +2 -0
- data/lib/blacklight/configuration/search_field.rb +2 -2
- data/lib/blacklight/configuration/sort_field.rb +2 -2
- data/lib/blacklight/configuration/view_config.rb +4 -0
- data/lib/blacklight/configuration.rb +101 -88
- data/lib/blacklight/engine.rb +11 -7
- data/lib/blacklight/exceptions.rb +4 -7
- data/lib/blacklight/{utils.rb → nested_open_struct_with_hash_access.rb} +9 -81
- data/lib/blacklight/open_struct_with_hash_access.rb +49 -0
- data/lib/blacklight/parameters.rb +1 -1
- data/lib/blacklight/routes/exportable.rb +1 -3
- data/lib/blacklight/routes/searchable.rb +3 -3
- data/lib/blacklight/runtime_registry.rb +2 -0
- data/lib/blacklight/search_builder.rb +28 -35
- data/lib/blacklight/search_state.rb +10 -8
- data/lib/blacklight/solr/repository.rb +40 -6
- data/lib/blacklight/solr/request.rb +1 -1
- data/lib/blacklight/solr/response/facets.rb +29 -31
- data/lib/blacklight/solr/response/group.rb +3 -3
- data/lib/blacklight/solr/response/group_response.rb +1 -1
- data/lib/blacklight/solr/response/more_like_this.rb +2 -2
- data/lib/blacklight/solr/response/response.rb +2 -2
- data/lib/blacklight/solr/response/spelling.rb +4 -3
- data/lib/blacklight/solr/response.rb +29 -30
- data/lib/blacklight/solr/search_builder_behavior.rb +25 -29
- data/lib/blacklight/version.rb +1 -1
- data/lib/blacklight.rb +10 -8
- data/lib/generators/blacklight/assets_generator.rb +18 -12
- data/lib/generators/blacklight/controller_generator.rb +4 -5
- data/lib/generators/blacklight/document_generator.rb +1 -1
- data/lib/generators/blacklight/install_generator.rb +18 -28
- data/lib/generators/blacklight/search_builder_generator.rb +1 -1
- data/lib/generators/blacklight/{solr5_generator.rb → solr_generator.rb} +12 -6
- data/lib/generators/blacklight/templates/.solr_wrapper.yml +5 -0
- data/lib/generators/blacklight/templates/alternate_controller.rb +4 -4
- data/lib/generators/blacklight/templates/blacklight.scss +0 -2
- data/lib/generators/blacklight/templates/catalog_controller.rb +59 -49
- data/lib/generators/blacklight/templates/config/blacklight.yml +1 -13
- data/lib/generators/blacklight/templates/solr/conf/schema.xml +388 -0
- data/lib/generators/blacklight/templates/solr/conf/solrconfig.xml +195 -0
- data/lib/generators/blacklight/test_support_generator.rb +10 -10
- data/lib/generators/blacklight/user_generator.rb +5 -6
- data/lib/railties/blacklight.rake +17 -21
- data/package-lock.json +2195 -0
- data/package.json +29 -0
- data/spec/controllers/alternate_controller_spec.rb +5 -4
- data/spec/controllers/application_controller_spec.rb +1 -5
- data/spec/controllers/blacklight/base_spec.rb +6 -3
- data/spec/controllers/blacklight/catalog/component_configuration_spec.rb +11 -7
- data/spec/controllers/blacklight/facet_spec.rb +1 -2
- data/spec/controllers/blacklight/search_fields_spec.rb +25 -34
- data/spec/controllers/bookmarks_controller_spec.rb +46 -11
- data/spec/controllers/catalog_controller_spec.rb +334 -161
- data/spec/controllers/search_history_controller_spec.rb +6 -6
- data/spec/features/alternate_controller_spec.rb +4 -4
- data/spec/features/autocomplete_spec.rb +4 -2
- data/spec/features/bookmarks_spec.rb +10 -10
- data/spec/features/did_you_mean_spec.rb +7 -12
- data/spec/features/facets_spec.rb +29 -17
- data/spec/features/record_view_spec.rb +12 -18
- data/spec/features/search_context_spec.rb +6 -7
- data/spec/features/search_crawler_spec.rb +3 -5
- data/spec/features/search_filters_spec.rb +80 -80
- data/spec/features/search_formats_spec.rb +1 -1
- data/spec/features/search_history_spec.rb +6 -29
- data/spec/features/search_pagination_spec.rb +4 -2
- data/spec/features/search_results_spec.rb +14 -12
- data/spec/features/search_sort_spec.rb +2 -2
- data/spec/features/search_spec.rb +8 -9
- data/spec/features/sitelinks_search_box.rb +4 -4
- data/{solr → spec/fixtures}/sample_solr_documents.yml +688 -688
- data/spec/helpers/{configuration_helper_spec.rb → blacklight/configuration_helper_behavior_spec.rb} +97 -92
- data/spec/helpers/{facets_helper_spec.rb → blacklight/facets_helper_behavior_spec.rb} +72 -67
- data/spec/helpers/{hash_as_hidden_fields_spec.rb → blacklight/hash_as_hidden_fields_behavior_spec.rb} +2 -2
- data/spec/helpers/blacklight/icon_helper_behavior_spec.rb +10 -0
- data/spec/helpers/{layout_helper_spec.rb → blacklight/layout_helper_behavior_spec.rb} +5 -5
- data/spec/helpers/{render_constraints_helper_spec.rb → blacklight/render_constraints_helper_behavior_spec.rb} +10 -6
- data/spec/helpers/blacklight/render_partials_helper_behavior_spec.rb +92 -0
- data/spec/helpers/{search_history_constraints_helper_spec.rb → blacklight/search_history_constraints_helper_behavior_spec.rb} +29 -30
- data/spec/helpers/{suggest_helper_spec.rb → blacklight/suggest_helper_behavior_spec.rb} +9 -2
- data/spec/helpers/{url_helper_spec.rb → blacklight/url_helper_behavior_spec.rb} +56 -54
- data/spec/helpers/blacklight_helper_spec.rb +65 -150
- data/spec/helpers/catalog_helper_spec.rb +80 -96
- data/spec/i18n_spec.rb +18 -0
- data/spec/integration/generators/blacklight/{solr5_generator_spec.rb → solr_generator_spec.rb} +21 -13
- data/spec/lib/blacklight/configuration/facet_field_spec.rb +13 -0
- data/spec/lib/blacklight/configuration/field_spec.rb +15 -0
- data/spec/lib/blacklight/nested_open_struct_with_hash_access_spec.rb +17 -0
- data/spec/lib/blacklight/open_struct_with_hash_access_spec.rb +148 -0
- data/spec/lib/blacklight/parameters_spec.rb +4 -2
- data/spec/lib/blacklight/search_state_spec.rb +53 -36
- data/spec/lib/blacklight_spec.rb +14 -15
- data/spec/lib/tasks/blacklight_task_spec.rb +4 -6
- data/spec/models/blacklight/configurable_spec.rb +24 -27
- data/spec/models/blacklight/configuration/context_spec.rb +9 -10
- data/spec/models/blacklight/configuration_spec.rb +248 -223
- data/spec/models/blacklight/document/active_model_shim_spec.rb +15 -6
- data/spec/models/blacklight/document/cache_key_spec.rb +9 -2
- data/spec/models/blacklight/document/dublin_core_spec.rb +17 -20
- data/spec/models/blacklight/document/email_spec.rb +10 -10
- data/spec/models/blacklight/document/sms_spec.rb +10 -10
- data/spec/models/blacklight/document_spec.rb +10 -22
- data/spec/models/blacklight/facet_paginator_spec.rb +40 -30
- data/spec/models/blacklight/icon_spec.rb +44 -0
- data/spec/models/blacklight/search_builder_spec.rb +41 -26
- data/spec/models/blacklight/solr/document_spec.rb +224 -216
- data/spec/models/blacklight/solr/facet_paginator_spec.rb +6 -4
- data/spec/models/blacklight/solr/repository_spec.rb +61 -46
- data/spec/models/blacklight/solr/request_spec.rb +17 -18
- data/spec/models/blacklight/solr/response/facets_spec.rb +58 -58
- data/spec/models/blacklight/solr/response/group_response_spec.rb +16 -22
- data/spec/models/blacklight/solr/response/group_spec.rb +18 -25
- data/spec/models/blacklight/solr/response_spec.rb +56 -55
- data/spec/models/blacklight/solr/search_builder_spec.rb +150 -164
- data/spec/models/blacklight/suggest/response_spec.rb +6 -4
- data/spec/models/blacklight/suggest_search_spec.rb +9 -16
- data/spec/models/blacklight/user_spec.rb +9 -11
- data/spec/models/bookmark_spec.rb +7 -6
- data/spec/models/record_mailer_spec.rb +23 -21
- data/spec/models/search_spec.rb +19 -18
- data/spec/models/solr_document_spec.rb +33 -5
- data/spec/presenters/blacklight/document_presenter_spec.rb +86 -0
- data/spec/presenters/blacklight/index_presenter_spec.rb +186 -0
- data/spec/presenters/blacklight/json_presenter_spec.rb +59 -0
- data/spec/presenters/blacklight/link_alternate_presenter_spec.rb +3 -0
- data/spec/presenters/blacklight/search_bar_presenter_spec.rb +79 -0
- data/spec/presenters/blacklight/show_presenter_spec.rb +333 -0
- data/spec/presenters/pipeline_spec.rb +18 -11
- data/spec/presenters/thumbnail_presenter_spec.rb +174 -0
- data/spec/routing/catalog_routing_spec.rb +13 -15
- data/spec/services/blacklight/search_service_spec.rb +488 -0
- data/spec/spec_helper.rb +20 -19
- data/spec/support/features/session_helpers.rb +4 -4
- data/spec/support/features.rb +1 -1
- data/spec/test_app_templates/Gemfile.extra +2 -4
- data/spec/test_app_templates/lib/generators/test_app_generator.rb +12 -13
- data/spec/views/catalog/_constraints.html.erb_spec.rb +3 -6
- data/spec/views/catalog/_constraints_element.html.erb_spec.rb +17 -13
- data/spec/views/catalog/_document.html.erb_spec.rb +11 -11
- data/spec/views/catalog/_document_list.html.erb_spec.rb +2 -1
- data/spec/views/catalog/_facet_index_navigation.html.erb_spec.rb +5 -5
- data/spec/views/catalog/_facet_layout.html.erb_spec.rb +6 -6
- data/spec/views/catalog/_facets.html.erb_spec.rb +10 -12
- data/spec/views/catalog/{_index_default.erb_spec.rb → _index.html.erb_spec.rb} +14 -15
- data/spec/views/catalog/{_index_header_default.html.erb_spec.rb → _index_header.html.erb_spec.rb} +6 -9
- data/spec/views/catalog/_paginate_compact.html.erb_spec.rb +7 -30
- data/spec/views/catalog/_search_header.erb_spec.rb +1 -3
- data/spec/views/catalog/{_show_default.erb_spec.rb → _show.html.erb_spec.rb} +13 -14
- data/spec/views/catalog/_show_sidebar.erb_spec.rb +6 -9
- data/spec/views/catalog/_show_tools.html.erb_spec.rb +5 -5
- data/spec/views/catalog/_sort_and_per_page.html.erb_spec.rb +1 -2
- data/spec/views/catalog/_sort_widget.html.erb_spec.rb +3 -1
- data/spec/views/catalog/{_thumbnail_default.erb_spec.rb → _thumbnail.html.erb_spec.rb} +7 -9
- data/spec/views/catalog/_view_type_group.html.erb_spec.rb +12 -10
- data/spec/views/catalog/email_success.html.erb_spec.rb +8 -0
- data/spec/views/catalog/facet.html.erb_spec.rb +4 -3
- data/spec/views/catalog/facet.json.jbuilder_spec.rb +3 -2
- data/spec/views/catalog/index.atom.builder_spec.rb +11 -6
- data/spec/views/catalog/index.html.erb_spec.rb +6 -8
- data/spec/views/catalog/index.json.jbuilder_spec.rb +119 -26
- data/spec/views/catalog/opensearch.xml.builder_spec.rb +1 -1
- data/spec/views/catalog/show.html.erb_spec.rb +8 -8
- data/spec/views/catalog/show.json.jbuilder_spec.rb +40 -0
- data/spec/views/catalog/sms_success.html.erb_spec.rb +8 -0
- data/spec/views/{_user_util_links.html.erb_spec.rb → shared/_user_util_links.html.erb_spec.rb} +4 -7
- data/tasks/blacklight.rake +10 -8
- data/template.demo.rb +3 -11
- metadata +188 -189
- data/app/assets/javascripts/blacklight/autofocus.js +0 -16
- data/app/assets/javascripts/blacklight/bookmark_toggle.js +0 -23
- data/app/assets/javascripts/blacklight/checkbox_submit.js +0 -135
- data/app/controllers/concerns/blacklight/request_builders.rb +0 -77
- data/app/controllers/concerns/blacklight/saved_searches.rb +0 -70
- data/app/controllers/concerns/blacklight/search_helper.rb +0 -155
- data/app/controllers/concerns/blacklight/suggest.rb +0 -25
- data/app/controllers/saved_searches_controller.rb +0 -4
- data/app/controllers/suggest_controller.rb +0 -4
- data/app/helpers/blacklight/deprecated_url_helper_behavior.rb +0 -57
- data/app/helpers/blacklight/render_partials_helper.rb +0 -205
- data/app/helpers/blacklight_configuration_helper.rb +0 -4
- data/app/helpers/blacklight_url_helper.rb +0 -4
- data/app/helpers/component_helper.rb +0 -4
- data/app/helpers/facets_helper.rb +0 -4
- data/app/helpers/hash_as_hidden_fields_helper.rb +0 -4
- data/app/helpers/layout_helper.rb +0 -4
- data/app/helpers/render_constraints_helper.rb +0 -4
- data/app/helpers/search_history_constraints_helper.rb +0 -4
- data/app/helpers/suggest_helper.rb +0 -4
- data/app/models/concerns/blacklight/solr/document/more_like_this.rb +0 -6
- data/app/views/_user_util_links.html.erb +0 -26
- data/app/views/blacklight/nav/_saved_searches.html.erb +0 -1
- data/app/views/catalog/_index_default.html.erb +0 -12
- data/app/views/catalog/_show_default.html.erb +0 -10
- data/app/views/catalog/_thumbnail_default.html.erb +0 -5
- data/app/views/saved_searches/index.html.erb +0 -32
- data/app/views/shared/_ajax_modal.html.erb +0 -6
- data/lib/generators/blacklight/solr4_generator.rb +0 -31
- data/lib/generators/blacklight/templates/config/jetty.yml +0 -13
- data/solr/conf/schema.xml +0 -629
- data/solr/conf/solrconfig.xml +0 -411
- data/spec/controllers/blacklight/search_helper_spec.rb +0 -470
- data/spec/controllers/saved_searches_controller_spec.rb +0 -32
- data/spec/controllers/suggest_controller_spec.rb +0 -17
- data/spec/features/saved_searches_spec.rb +0 -47
- data/spec/helpers/deprecated_url_helper_behavior_spec.rb +0 -101
- data/spec/lib/blacklight/utils_spec.rb +0 -167
- data/spec/models/blacklight/solr/document/more_like_this_spec.rb +0 -18
- data/spec/presenters/document_presenter_spec.rb +0 -438
- data/spec/presenters/index_presenter_spec.rb +0 -173
- data/spec/presenters/show_presenter_spec.rb +0 -313
- data/spec/support/backport_test.rb +0 -14
- /data/app/views/catalog/{_show_header_default.html.erb → _show_header.html.erb} +0 -0
- /data/app/views/{_flash_msg.html.erb → shared/_flash_msg.html.erb} +0 -0
- /data/{solr → lib/generators/blacklight/templates/solr}/conf/_rest_managed.json +0 -0
- /data/{solr → lib/generators/blacklight/templates/solr}/conf/admin-extra.html +0 -0
- /data/{solr → lib/generators/blacklight/templates/solr}/conf/elevate.xml +0 -0
- /data/{solr → lib/generators/blacklight/templates/solr}/conf/mapping-ISOLatin1Accent.txt +0 -0
- /data/{solr → lib/generators/blacklight/templates/solr}/conf/protwords.txt +0 -0
- /data/{solr → lib/generators/blacklight/templates/solr}/conf/scripts.conf +0 -0
- /data/{solr → lib/generators/blacklight/templates/solr}/conf/spellings.txt +0 -0
- /data/{solr → lib/generators/blacklight/templates/solr}/conf/stopwords.txt +0 -0
- /data/{solr → lib/generators/blacklight/templates/solr}/conf/stopwords_en.txt +0 -0
- /data/{solr → lib/generators/blacklight/templates/solr}/conf/synonyms.txt +0 -0
- /data/{solr → lib/generators/blacklight/templates/solr}/conf/xslt/example.xsl +0 -0
- /data/{solr → lib/generators/blacklight/templates/solr}/conf/xslt/example_atom.xsl +0 -0
- /data/{solr → lib/generators/blacklight/templates/solr}/conf/xslt/example_rss.xsl +0 -0
- /data/{solr → lib/generators/blacklight/templates/solr}/conf/xslt/luke.xsl +0 -0
data/spec/helpers/{configuration_helper_spec.rb → blacklight/configuration_helper_behavior_spec.rb}
RENAMED
|
@@ -1,36 +1,31 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
2
|
|
|
3
|
-
describe
|
|
3
|
+
RSpec.describe Blacklight::ConfigurationHelperBehavior do
|
|
4
4
|
let(:blacklight_config) { Blacklight::Configuration.new }
|
|
5
|
-
let(:config_value) { double
|
|
5
|
+
let(:config_value) { double }
|
|
6
6
|
|
|
7
|
-
before
|
|
7
|
+
before do
|
|
8
8
|
allow(helper).to receive_messages(blacklight_config: blacklight_config)
|
|
9
9
|
end
|
|
10
10
|
|
|
11
11
|
describe "#index_fields" do
|
|
12
12
|
it "passes through the configuration" do
|
|
13
|
+
allow(Deprecation).to receive(:warn)
|
|
13
14
|
allow(blacklight_config).to receive_messages(index_fields: config_value)
|
|
14
15
|
expect(helper.index_fields).to eq config_value
|
|
15
16
|
end
|
|
16
17
|
end
|
|
17
18
|
|
|
18
|
-
describe "#sort_fields" do
|
|
19
|
-
it "converts the sort fields to select-ready values" do
|
|
20
|
-
allow(blacklight_config).to receive_messages(sort_fields: { 'a' => double(key: 'a', label: 'a'), 'b' => double(key: 'b', label: 'b'), c: double(key: 'c', if: false) })
|
|
21
|
-
expect(helper.sort_fields).to eq [['a', 'a'], ['b', 'b']]
|
|
22
|
-
end
|
|
23
|
-
end
|
|
24
|
-
|
|
25
19
|
describe "#active_sort_fields" do
|
|
26
20
|
it "restricts the configured sort fields to only those that should be displayed" do
|
|
27
|
-
allow(blacklight_config).to receive_messages(sort_fields: { a: double(if: false, unless: false), b: double(if:true, unless: true) })
|
|
21
|
+
allow(blacklight_config).to receive_messages(sort_fields: { a: double(if: false, unless: false), b: double(if: true, unless: true) })
|
|
28
22
|
expect(helper.active_sort_fields).to be_empty
|
|
29
23
|
end
|
|
30
24
|
end
|
|
31
25
|
|
|
32
26
|
describe "#document_show_fields" do
|
|
33
27
|
it "passes through the configuration" do
|
|
28
|
+
allow(Deprecation).to receive(:warn)
|
|
34
29
|
allow(blacklight_config).to receive_messages(show_fields: config_value)
|
|
35
30
|
expect(helper.document_show_fields).to eq config_value
|
|
36
31
|
end
|
|
@@ -43,13 +38,13 @@ describe BlacklightConfigurationHelper do
|
|
|
43
38
|
blacklight_config.view.b.default = true
|
|
44
39
|
expect(helper.default_document_index_view_type).to eq :b
|
|
45
40
|
end
|
|
46
|
-
|
|
41
|
+
|
|
47
42
|
it "defaults to the first configured index view" do
|
|
48
|
-
allow(blacklight_config).to receive_messages(view: { a: true, b: true})
|
|
43
|
+
allow(blacklight_config).to receive_messages(view: { a: true, b: true })
|
|
49
44
|
expect(helper.default_document_index_view_type).to eq :a
|
|
50
45
|
end
|
|
51
46
|
end
|
|
52
|
-
|
|
47
|
+
|
|
53
48
|
describe "#document_index_views" do
|
|
54
49
|
before do
|
|
55
50
|
blacklight_config.view.abc = false
|
|
@@ -59,9 +54,9 @@ describe BlacklightConfigurationHelper do
|
|
|
59
54
|
|
|
60
55
|
it "filters views using :if/:unless configuration" do
|
|
61
56
|
expect(helper.document_index_views).to have_key :list
|
|
62
|
-
expect(helper.document_index_views).
|
|
63
|
-
expect(helper.document_index_views).
|
|
64
|
-
expect(helper.document_index_views).
|
|
57
|
+
expect(helper.document_index_views).not_to have_key :abc
|
|
58
|
+
expect(helper.document_index_views).not_to have_key :def
|
|
59
|
+
expect(helper.document_index_views).not_to have_key :xyz
|
|
65
60
|
end
|
|
66
61
|
end
|
|
67
62
|
|
|
@@ -78,9 +73,14 @@ describe BlacklightConfigurationHelper do
|
|
|
78
73
|
end
|
|
79
74
|
|
|
80
75
|
describe "#has_alternative_views?" do
|
|
81
|
-
subject { helper.has_alternative_views?}
|
|
76
|
+
subject { helper.has_alternative_views? }
|
|
77
|
+
|
|
78
|
+
before do
|
|
79
|
+
blacklight_config.view.clear
|
|
80
|
+
end
|
|
81
|
+
|
|
82
82
|
describe "with a single view defined" do
|
|
83
|
-
it {
|
|
83
|
+
it { is_expected.to be false }
|
|
84
84
|
end
|
|
85
85
|
|
|
86
86
|
describe "with multiple views defined" do
|
|
@@ -89,7 +89,7 @@ describe BlacklightConfigurationHelper do
|
|
|
89
89
|
blacklight_config.view.xyz
|
|
90
90
|
end
|
|
91
91
|
|
|
92
|
-
it {
|
|
92
|
+
it { is_expected.to be true }
|
|
93
93
|
end
|
|
94
94
|
end
|
|
95
95
|
|
|
@@ -108,7 +108,7 @@ describe BlacklightConfigurationHelper do
|
|
|
108
108
|
f = helper.document_show_link_field document
|
|
109
109
|
expect(f).to eq :a
|
|
110
110
|
end
|
|
111
|
-
|
|
111
|
+
|
|
112
112
|
it "retrieves the first field with data" do
|
|
113
113
|
blacklight_config.index.title_field = [:zzz, :b]
|
|
114
114
|
f = helper.document_show_link_field document
|
|
@@ -122,36 +122,9 @@ describe BlacklightConfigurationHelper do
|
|
|
122
122
|
end
|
|
123
123
|
end
|
|
124
124
|
|
|
125
|
-
describe "#index_field_label" do
|
|
126
|
-
let(:document) { instance_double(SolrDocument) }
|
|
127
|
-
it "looks up the label to display for the given document and field" do
|
|
128
|
-
allow(helper).to receive(:index_fields).and_return({ "my_field" => double(label: "some label") })
|
|
129
|
-
allow(helper).to receive(:field_label).with(:"blacklight.search.fields.index.my_field", :"blacklight.search.fields.my_field", "some label", "My field")
|
|
130
|
-
helper.index_field_label document, "my_field"
|
|
131
|
-
end
|
|
132
|
-
end
|
|
133
|
-
|
|
134
|
-
describe "#document_show_field_label" do
|
|
135
|
-
let(:document) { instance_double(SolrDocument) }
|
|
136
|
-
it "looks up the label to display for the given document and field" do
|
|
137
|
-
allow(helper).to receive(:document_show_fields).and_return({ "my_field" => double(label: "some label") })
|
|
138
|
-
allow(helper).to receive(:field_label).with(:"blacklight.search.fields.show.my_field", :"blacklight.search.fields.my_field", "some label", "My field")
|
|
139
|
-
helper.document_show_field_label document, "my_field"
|
|
140
|
-
end
|
|
141
|
-
end
|
|
142
|
-
|
|
143
|
-
describe "#facet_field_label" do
|
|
144
|
-
let(:document) { instance_double(SolrDocument) }
|
|
145
|
-
it "looks up the label to display for the given document and field" do
|
|
146
|
-
allow(blacklight_config).to receive(:facet_fields).and_return({ "my_field" => double(label: "some label") })
|
|
147
|
-
allow(helper).to receive(:field_label).with(:"blacklight.search.fields.facet.my_field", :"blacklight.search.fields.my_field", "some label", "My field")
|
|
148
|
-
helper.facet_field_label "my_field"
|
|
149
|
-
end
|
|
150
|
-
end
|
|
151
|
-
|
|
152
125
|
describe "#view_label" do
|
|
153
126
|
it "looks up the label to display for the view" do
|
|
154
|
-
allow(blacklight_config).to receive(:view).and_return(
|
|
127
|
+
allow(blacklight_config).to receive(:view).and_return("my_view" => double(label: "some label", title: nil))
|
|
155
128
|
allow(helper).to receive(:field_label).with(:"blacklight.search.view_title.my_view", :"blacklight.search.view.my_view", "some label", nil, "My view")
|
|
156
129
|
|
|
157
130
|
helper.view_label "my_view"
|
|
@@ -160,50 +133,68 @@ describe BlacklightConfigurationHelper do
|
|
|
160
133
|
|
|
161
134
|
describe "#field_label" do
|
|
162
135
|
it "looks up the label as an i18n string" do
|
|
163
|
-
|
|
136
|
+
expect(helper).to receive(:t).with(:some_key, default: []).and_return "my label"
|
|
164
137
|
label = helper.field_label :some_key
|
|
165
138
|
|
|
166
139
|
expect(label).to eq "my label"
|
|
167
140
|
end
|
|
168
141
|
|
|
169
142
|
it "passes the provided i18n keys to I18n.t" do
|
|
170
|
-
|
|
143
|
+
expect(helper).to receive(:t).with(:key_a, default: [:key_b, "default text"])
|
|
171
144
|
|
|
172
|
-
|
|
145
|
+
helper.field_label :key_a, :key_b, "default text"
|
|
173
146
|
end
|
|
174
147
|
|
|
175
148
|
it "compacts nil keys (fixes rails/rails#19419)" do
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
label = helper.field_label :key_a, nil, :key_b
|
|
149
|
+
expect(helper).to receive(:t).with(:key_a, default: [:key_b])
|
|
179
150
|
|
|
151
|
+
helper.field_label :key_a, nil, :key_b
|
|
180
152
|
end
|
|
181
153
|
end
|
|
182
|
-
|
|
154
|
+
|
|
183
155
|
describe "#default_per_page" do
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
156
|
+
before do
|
|
157
|
+
expect(Deprecation).to receive(:warn)
|
|
158
|
+
end
|
|
159
|
+
|
|
160
|
+
context "when default_per_page is configured" do
|
|
161
|
+
before do
|
|
162
|
+
blacklight_config.default_per_page = 42
|
|
163
|
+
end
|
|
164
|
+
|
|
165
|
+
it "is the configured value" do
|
|
166
|
+
expect(helper.default_per_page).to eq 42
|
|
167
|
+
end
|
|
187
168
|
end
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
169
|
+
|
|
170
|
+
context "when default_per_page is not configured" do
|
|
171
|
+
before do
|
|
172
|
+
blacklight_config.per_page = [11, 22]
|
|
173
|
+
end
|
|
174
|
+
|
|
175
|
+
it "is the first per-page value if a default isn't set" do
|
|
176
|
+
expect(helper.default_per_page).to eq 11
|
|
177
|
+
end
|
|
192
178
|
end
|
|
193
179
|
end
|
|
194
|
-
|
|
180
|
+
|
|
195
181
|
describe "#default_sort_field" do
|
|
196
182
|
it "is the configured default field" do
|
|
197
183
|
allow(helper).to receive_messages(blacklight_config: double(sort_fields: { a: double(default: nil), b: double(key: 'b', default: true) }))
|
|
198
184
|
expect(helper.default_sort_field.key).to eq 'b'
|
|
199
185
|
end
|
|
200
|
-
|
|
201
|
-
it "is the first
|
|
186
|
+
|
|
187
|
+
it "is the first active sort field value if a default isn't set" do
|
|
202
188
|
allow(helper).to receive_messages(blacklight_config: double(sort_fields: { a: double(key: 'a', default: nil), b: double(key: 'b', default: nil) }))
|
|
203
189
|
expect(helper.default_sort_field.key).to eq 'a'
|
|
204
190
|
end
|
|
191
|
+
|
|
192
|
+
it "is the first active sort field value if the configured default field is not active" do
|
|
193
|
+
allow(helper).to receive_messages(blacklight_config: double(sort_fields: { a: double(default: nil, key: 'a'), b: double(key: 'b', default: true, if: false) }))
|
|
194
|
+
expect(helper.default_sort_field.key).to eq 'a'
|
|
195
|
+
end
|
|
205
196
|
end
|
|
206
|
-
|
|
197
|
+
|
|
207
198
|
describe "#per_page_options_for_select" do
|
|
208
199
|
it "is the per-page values formatted as options_for_select" do
|
|
209
200
|
allow(helper).to receive_messages(blacklight_config: double(per_page: [11, 22, 33]))
|
|
@@ -212,23 +203,24 @@ describe BlacklightConfigurationHelper do
|
|
|
212
203
|
expect(helper.per_page_options_for_select).to include ["33<span class=\"sr-only\"> per page</span>", 33]
|
|
213
204
|
end
|
|
214
205
|
end
|
|
215
|
-
|
|
206
|
+
|
|
216
207
|
describe "#should_render_field?" do
|
|
217
208
|
let(:field_config) { double('field config', if: true, unless: false) }
|
|
218
|
-
|
|
209
|
+
|
|
219
210
|
before do
|
|
211
|
+
allow(Deprecation).to receive(:warn)
|
|
220
212
|
allow(helper).to receive_messages(document_has_value?: true)
|
|
221
213
|
end
|
|
222
214
|
|
|
223
215
|
it "is true" do
|
|
224
216
|
expect(helper.should_render_field?(field_config)).to be true
|
|
225
217
|
end
|
|
226
|
-
|
|
218
|
+
|
|
227
219
|
it "is false if the :if condition is false" do
|
|
228
220
|
allow(field_config).to receive_messages(if: false)
|
|
229
221
|
expect(helper.should_render_field?(field_config)).to be false
|
|
230
222
|
end
|
|
231
|
-
|
|
223
|
+
|
|
232
224
|
it "is false if the :unless condition is true" do
|
|
233
225
|
allow(field_config).to receive_messages(unless: true)
|
|
234
226
|
expect(helper.should_render_field?(field_config)).to be false
|
|
@@ -236,32 +228,29 @@ describe BlacklightConfigurationHelper do
|
|
|
236
228
|
end
|
|
237
229
|
|
|
238
230
|
describe "#search_field_options_for_select" do
|
|
239
|
-
|
|
240
231
|
before do
|
|
241
|
-
|
|
242
232
|
@config = Blacklight::Configuration.new do |config|
|
|
243
|
-
config.default_solr_params = { :
|
|
244
|
-
|
|
245
|
-
config.add_search_field 'all_fields', :
|
|
246
|
-
config.add_search_field 'title', :
|
|
247
|
-
config.add_search_field 'author', :
|
|
248
|
-
config.add_search_field 'subject', :
|
|
249
|
-
config.add_search_field 'no_display', :
|
|
233
|
+
config.default_solr_params = { qt: 'search' }
|
|
234
|
+
|
|
235
|
+
config.add_search_field 'all_fields', label: 'All Fields'
|
|
236
|
+
config.add_search_field 'title', qt: 'title_search'
|
|
237
|
+
config.add_search_field 'author', qt: 'author_search'
|
|
238
|
+
config.add_search_field 'subject', qt: 'subject_search'
|
|
239
|
+
config.add_search_field 'no_display', qt: 'something', include_in_simple_select: false
|
|
250
240
|
end
|
|
251
241
|
|
|
252
242
|
allow(helper).to receive_messages(blacklight_config: @config)
|
|
253
243
|
end
|
|
254
|
-
|
|
255
|
-
it "returns proper options_for_select arguments" do
|
|
256
244
|
|
|
245
|
+
it "returns proper options_for_select arguments" do
|
|
257
246
|
select_arguments = helper.search_field_options_for_select
|
|
258
247
|
|
|
259
248
|
select_arguments.each do |(label, key)|
|
|
260
|
-
|
|
249
|
+
config_hash = @config.search_fields[key]
|
|
261
250
|
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
end
|
|
251
|
+
expect(label).to eq config_hash.label
|
|
252
|
+
expect(key).to eq config_hash.key
|
|
253
|
+
end
|
|
265
254
|
end
|
|
266
255
|
|
|
267
256
|
it "does not include fields in select if :display_in_simple_search=>false" do
|
|
@@ -271,17 +260,33 @@ describe BlacklightConfigurationHelper do
|
|
|
271
260
|
end
|
|
272
261
|
end
|
|
273
262
|
|
|
274
|
-
|
|
263
|
+
context 'labels' do
|
|
264
|
+
let(:field_config) { { 'my-key' => double('field', display_label: 'My Field') } }
|
|
265
|
+
|
|
275
266
|
before do
|
|
276
|
-
|
|
267
|
+
allow(helper).to receive_messages(blacklight_config: config)
|
|
277
268
|
end
|
|
278
269
|
|
|
279
|
-
|
|
280
|
-
|
|
270
|
+
describe '#label_for_search_field' do
|
|
271
|
+
let(:config) { double('Blacklight configuration', search_fields: field_config) }
|
|
272
|
+
|
|
273
|
+
it 'handles a found key' do
|
|
274
|
+
expect(helper.label_for_search_field('my-key')).to eq 'My Field'
|
|
275
|
+
end
|
|
276
|
+
it 'handles a missing key' do
|
|
277
|
+
expect(helper.label_for_search_field('not-found')).to eq 'Not Found'
|
|
278
|
+
end
|
|
281
279
|
end
|
|
282
280
|
|
|
283
|
-
|
|
284
|
-
|
|
281
|
+
describe '#sort_field_label' do
|
|
282
|
+
let(:config) { double('Blacklight configuration', sort_fields: field_config) }
|
|
283
|
+
|
|
284
|
+
it 'handles a found key' do
|
|
285
|
+
expect(helper.sort_field_label('my-key')).to eq 'My Field'
|
|
286
|
+
end
|
|
287
|
+
it 'handles a missing key' do
|
|
288
|
+
expect(helper.sort_field_label('not-found')).to eq 'Not Found'
|
|
289
|
+
end
|
|
285
290
|
end
|
|
286
291
|
end
|
|
287
292
|
end
|