blacklight 6.20.0 → 7.3.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.gitignore +1 -0
- data/.jshintrc +3 -1
- data/.npmignore +23 -0
- data/.rubocop.yml +40 -16
- data/.rubocop_todo.yml +478 -382
- data/.travis.yml +28 -31
- data/CONTRIBUTING.md +50 -0
- data/Gemfile +5 -2
- 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 +495 -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 +31 -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 +66 -92
- data/app/assets/stylesheets/blacklight/_header.scss +60 -47
- 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 +4 -13
- 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 +20 -30
- data/app/controllers/concerns/blacklight/catalog.rb +256 -210
- data/app/controllers/concerns/blacklight/controller.rb +102 -124
- data/app/controllers/concerns/blacklight/default_component_configuration.rb +12 -43
- data/app/controllers/concerns/blacklight/facet.rb +22 -8
- data/app/controllers/concerns/blacklight/search_context.rb +11 -11
- 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/searchable.rb +17 -0
- data/app/controllers/concerns/blacklight/token_based_user.rb +5 -7
- data/app/helpers/blacklight/blacklight_helper_behavior.rb +37 -119
- data/app/helpers/blacklight/catalog_helper_behavior.rb +103 -93
- data/app/helpers/blacklight/component_helper_behavior.rb +21 -21
- data/app/helpers/blacklight/configuration_helper_behavior.rb +30 -58
- data/app/helpers/blacklight/facets_helper_behavior.rb +79 -54
- 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 +207 -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 +51 -42
- data/app/{assets/javascripts → javascript}/blacklight/autocomplete.js +3 -2
- data/app/javascript/blacklight/bookmark_toggle.js +25 -0
- data/app/javascript/blacklight/button_focus.js +9 -0
- data/app/javascript/blacklight/checkbox_submit.js +134 -0
- data/app/javascript/blacklight/core.js +41 -0
- data/app/javascript/blacklight/facet_load.js +22 -0
- data/app/{assets/javascripts/blacklight/ajax_modal.js → javascript/blacklight/modal.js} +62 -64
- data/app/javascript/blacklight/search_context.js +67 -0
- data/app/models/blacklight/facet_paginator.rb +3 -3
- data/app/models/blacklight/icon.rb +79 -0
- data/app/models/blacklight/suggest_search.rb +1 -1
- data/app/models/bookmark.rb +5 -10
- data/app/models/concerns/blacklight/configurable.rb +13 -13
- data/app/models/concerns/blacklight/document.rb +23 -39
- data/app/models/concerns/blacklight/document/active_model_shim.rb +8 -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 +5 -5
- 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 +3 -3
- data/app/models/concerns/blacklight/user.rb +7 -6
- data/app/models/record_mailer.rb +8 -6
- data/app/models/search.rb +5 -7
- data/app/presenters/blacklight/document_presenter.rb +25 -140
- data/app/presenters/blacklight/field_presenter.rb +19 -14
- data/app/presenters/blacklight/index_presenter.rb +43 -71
- 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 +27 -10
- data/app/presenters/blacklight/rendering/terminator.rb +2 -0
- data/app/presenters/blacklight/search_bar_presenter.rb +41 -0
- data/app/presenters/blacklight/show_presenter.rb +26 -72
- 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 +153 -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 +27 -13
- 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} +20 -19
- 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_group.html.erb +19 -0
- data/app/views/catalog/_facet_index_navigation.html.erb +5 -4
- data/app/views/catalog/_facet_layout.html.erb +13 -8
- 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 +3 -21
- 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 +7 -8
- 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 +10 -2
- data/app/views/catalog/_show.html.erb +8 -0
- data/app/views/catalog/{_show_header_default.html.erb → _show_header.html.erb} +0 -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 +10 -8
- data/app/views/catalog/_show_tools.html.erb +10 -21
- 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 +8 -8
- 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/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 +28 -30
- 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 +8 -6
- 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.html.erb +14 -41
- data/app/views/layouts/blacklight/base.html.erb +40 -0
- data/app/views/layouts/catalog_result.html.erb +11 -0
- data/app/views/record_mailer/email_record.text.erb +6 -5
- data/app/views/search_history/index.html.erb +16 -21
- data/app/views/{_flash_msg.html.erb → shared/_flash_msg.html.erb} +5 -3
- 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 +8 -12
- data/config/i18n-tasks.yml +17 -0
- data/config/locales/blacklight.de.yml +87 -83
- data/config/locales/blacklight.en.yml +32 -29
- data/config/locales/blacklight.es.yml +31 -28
- data/config/locales/blacklight.fr.yml +33 -35
- data/config/locales/blacklight.hu.yml +226 -0
- data/config/locales/blacklight.it.yml +32 -28
- data/config/locales/blacklight.nl.yml +226 -0
- data/config/locales/blacklight.pt-BR.yml +41 -31
- data/config/locales/blacklight.sq.yml +21 -30
- data/config/locales/blacklight.zh.yml +20 -28
- 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.rb +6 -4
- data/lib/blacklight/abstract_repository.rb +9 -9
- data/lib/blacklight/configuration.rb +106 -88
- 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 +15 -17
- 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/engine.rb +10 -10
- 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.rb +2 -0
- data/{app/models/concerns → lib}/blacklight/solr/document.rb +8 -8
- data/{app/models → lib}/blacklight/solr/facet_paginator.rb +3 -3
- data/lib/blacklight/solr/repository.rb +4 -3
- data/lib/blacklight/solr/request.rb +1 -1
- data/lib/blacklight/solr/response.rb +29 -30
- data/lib/blacklight/solr/response/facets.rb +38 -31
- data/lib/blacklight/solr/response/group.rb +3 -3
- data/lib/blacklight/solr/response/group_response.rb +11 -1
- data/lib/blacklight/solr/response/more_like_this.rb +2 -2
- data/lib/blacklight/solr/response/pagination_methods.rb +12 -0
- data/lib/blacklight/solr/response/response.rb +2 -2
- data/lib/blacklight/solr/response/spelling.rb +4 -3
- data/lib/blacklight/solr/search_builder_behavior.rb +27 -31
- data/lib/blacklight/version.rb +1 -1
- data/lib/generators/blacklight/assets_generator.rb +28 -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 +15 -34
- data/lib/generators/blacklight/search_builder_generator.rb +1 -1
- data/lib/generators/blacklight/{solr5_generator.rb → solr_generator.rb} +12 -6
- data/{.solr_wrapper.yml → lib/generators/blacklight/templates/.solr_wrapper.yml} +0 -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 +57 -50
- data/lib/generators/blacklight/templates/config/blacklight.yml +1 -13
- 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/lib/generators/blacklight/templates/solr/conf/schema.xml +388 -0
- data/{solr → lib/generators/blacklight/templates/solr}/conf/scripts.conf +0 -0
- data/lib/generators/blacklight/templates/solr/conf/solrconfig.xml +195 -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/lib/generators/blacklight/test_support_generator.rb +10 -10
- data/lib/generators/blacklight/user_generator.rb +5 -6
- data/lib/railties/blacklight.rake +7 -6
- data/package-lock.json +2793 -0
- data/package.json +30 -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 +17 -13
- data/spec/controllers/catalog_controller_spec.rb +329 -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 +38 -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 +100 -80
- data/spec/features/search_formats_spec.rb +4 -5
- 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 -98
- data/spec/helpers/{facets_helper_spec.rb → blacklight/facets_helper_behavior_spec.rb} +82 -73
- 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} +61 -54
- data/spec/helpers/blacklight_helper_spec.rb +104 -151
- data/spec/helpers/catalog_helper_spec.rb +89 -105
- 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 +188 -165
- data/spec/models/blacklight/document/active_model_shim_spec.rb +15 -6
- data/spec/models/blacklight/document/cache_key_spec.rb +10 -3
- 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 +82 -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 +50 -42
- data/spec/models/blacklight/solr/request_spec.rb +17 -18
- data/spec/models/blacklight/solr/response/facets_spec.rb +97 -60
- data/spec/models/blacklight/solr/response/group_response_spec.rb +29 -22
- data/spec/models/blacklight/solr/response/group_spec.rb +18 -25
- data/spec/models/blacklight/solr/response_spec.rb +72 -68
- data/spec/models/blacklight/solr/search_builder_spec.rb +150 -164
- data/spec/models/blacklight/suggest/response_spec.rb +2 -1
- data/spec/models/blacklight/suggest_search_spec.rb +4 -4
- 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/{index_presenter_spec.rb → blacklight/index_presenter_spec.rb} +25 -62
- 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 +94 -0
- data/spec/presenters/{show_presenter_spec.rb → blacklight/show_presenter_spec.rb} +47 -62
- data/spec/presenters/pipeline_spec.rb +43 -16
- data/spec/presenters/thumbnail_presenter_spec.rb +174 -0
- data/spec/routing/catalog_routing_spec.rb +13 -31
- data/spec/services/blacklight/search_service_spec.rb +495 -0
- data/spec/spec_helper.rb +12 -24
- data/spec/support/features.rb +1 -1
- data/spec/support/features/session_helpers.rb +4 -4
- data/spec/test_app_templates/Gemfile.extra +2 -5
- 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_group.html.erb_spec.rb +82 -0
- 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 +6 -46
- 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 +7 -10
- data/spec/views/catalog/_show_tools.html.erb_spec.rb +6 -6
- 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 +9 -12
- data/template.demo.rb +4 -12
- metadata +178 -218
- 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 -139
- data/app/assets/javascripts/blacklight/collapsable.js +0 -9
- data/app/assets/javascripts/blacklight/core.js +0 -30
- data/app/assets/javascripts/blacklight/facet_load.js +0 -23
- data/app/assets/javascripts/blacklight/search_context.js +0 -42
- 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 -161
- 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 -489
- 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/support/backport_test.rb +0 -14
@@ -0,0 +1,82 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
RSpec.describe Blacklight::Icon do
|
4
|
+
subject { described_class.new(:search, classes: 'awesome', aria_hidden: true) }
|
5
|
+
|
6
|
+
describe '#svg' do
|
7
|
+
it 'returns a string' do
|
8
|
+
expect(subject.svg).to be_an String
|
9
|
+
end
|
10
|
+
it 'returns raw svg' do
|
11
|
+
expect(Capybara.string(subject.svg))
|
12
|
+
.to have_css 'svg[width="24"]'
|
13
|
+
end
|
14
|
+
it 'adds role="image"' do
|
15
|
+
expect(Capybara.string(subject.svg))
|
16
|
+
.to have_css 'svg[role="image"]'
|
17
|
+
end
|
18
|
+
it 'adds title' do
|
19
|
+
expect(Capybara.string(subject.svg))
|
20
|
+
.to have_css 'title[id^="bl-icon-search-"]', text: 'search icon'
|
21
|
+
end
|
22
|
+
it 'adds aria-labelled-by' do
|
23
|
+
expect(Capybara.string(subject.svg))
|
24
|
+
.to have_css 'svg[aria-labelled-by^="bl-icon-search-"]'
|
25
|
+
end
|
26
|
+
context 'when label is false' do
|
27
|
+
subject { described_class.new(:search, classes: 'awesome', aria_hidden: true, label: false) }
|
28
|
+
|
29
|
+
it 'does not add title' do
|
30
|
+
expect(Capybara.string(subject.svg))
|
31
|
+
.not_to have_css 'title', text: 'search icon'
|
32
|
+
end
|
33
|
+
it 'does not add aria-labelled-by' do
|
34
|
+
expect(Capybara.string(subject.svg))
|
35
|
+
.not_to have_css 'svg[aria-labelled-by^="bl-icon-search-"]'
|
36
|
+
end
|
37
|
+
end
|
38
|
+
end
|
39
|
+
|
40
|
+
describe '#options' do
|
41
|
+
it 'applies options classes and default class' do
|
42
|
+
expect(subject.options[:class]).to eq 'blacklight-icons awesome'
|
43
|
+
end
|
44
|
+
it 'applies options aria-hidden=true' do
|
45
|
+
expect(subject.options[:'aria-hidden']).to be true
|
46
|
+
end
|
47
|
+
context 'no options provided' do
|
48
|
+
subject { described_class.new(:view) }
|
49
|
+
|
50
|
+
it 'applies default class with no options' do
|
51
|
+
expect(subject.options[:class]).to eq 'blacklight-icons'
|
52
|
+
end
|
53
|
+
|
54
|
+
it 'has no aria-hidden attribute with no options' do
|
55
|
+
expect(subject.options[:'aria-hidden']).to be nil
|
56
|
+
end
|
57
|
+
end
|
58
|
+
end
|
59
|
+
|
60
|
+
describe '#path' do
|
61
|
+
it 'prepends blacklight and sufixes .svg' do
|
62
|
+
expect(subject.path).to eq 'blacklight/search.svg'
|
63
|
+
end
|
64
|
+
end
|
65
|
+
|
66
|
+
describe 'file_source' do
|
67
|
+
context 'file is not available' do
|
68
|
+
subject { described_class.new(:yolo) }
|
69
|
+
|
70
|
+
it {
|
71
|
+
expect { subject.file_source }
|
72
|
+
.to raise_error(Blacklight::Exceptions::IconNotFound)
|
73
|
+
}
|
74
|
+
end
|
75
|
+
|
76
|
+
context 'file is available' do
|
77
|
+
it 'returns the filesource' do
|
78
|
+
expect(subject.file_source).to include '<svg'
|
79
|
+
end
|
80
|
+
end
|
81
|
+
end
|
82
|
+
end
|
@@ -1,28 +1,17 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
describe Blacklight::SearchBuilder do
|
3
|
+
RSpec.describe Blacklight::SearchBuilder, api: true do
|
4
|
+
subject(:builder) { described_class.new processor_chain, scope }
|
5
|
+
|
4
6
|
let(:processor_chain) { [] }
|
5
7
|
let(:blacklight_config) { Blacklight::Configuration.new }
|
6
8
|
let(:scope) { double blacklight_config: blacklight_config }
|
7
|
-
subject { described_class.new processor_chain, scope }
|
8
9
|
|
9
10
|
context "with default processor chain" do
|
10
|
-
|
11
|
-
subject do
|
12
|
-
Deprecation.silence Blacklight::SearchBuilder do
|
13
|
-
described_class.new true, scope
|
14
|
-
end
|
15
|
-
end
|
16
|
-
it "uses the class-level default_processor_chain" do
|
17
|
-
expect(subject.processor_chain).to eq []
|
18
|
-
end
|
19
|
-
end
|
11
|
+
subject { described_class.new scope }
|
20
12
|
|
21
|
-
|
22
|
-
subject
|
23
|
-
it "uses the class-level default_processor_chain" do
|
24
|
-
expect(subject.processor_chain).to eq []
|
25
|
-
end
|
13
|
+
it "uses the class-level default_processor_chain" do
|
14
|
+
expect(subject.processor_chain).to eq []
|
26
15
|
end
|
27
16
|
end
|
28
17
|
|
@@ -44,6 +33,7 @@ describe Blacklight::SearchBuilder do
|
|
44
33
|
|
45
34
|
describe "#processor_chain" do
|
46
35
|
let(:processor_chain) { [:a, :b, :c] }
|
36
|
+
|
47
37
|
it "is mutable" do
|
48
38
|
subject.processor_chain.insert(-1, :d)
|
49
39
|
expect(subject.processor_chain).to match_array [:a, :b, :c, :d]
|
@@ -52,6 +42,7 @@ describe Blacklight::SearchBuilder do
|
|
52
42
|
|
53
43
|
describe "#append" do
|
54
44
|
let(:processor_chain) { [:a, :b, :c] }
|
45
|
+
|
55
46
|
it "provides a new search builder with the processor chain" do
|
56
47
|
builder = subject.append(:d, :e)
|
57
48
|
expect(subject.processor_chain).to eq processor_chain
|
@@ -62,6 +53,7 @@ describe Blacklight::SearchBuilder do
|
|
62
53
|
|
63
54
|
describe "#except" do
|
64
55
|
let(:processor_chain) { [:a, :b, :c, :d, :e] }
|
56
|
+
|
65
57
|
it "provide a new search builder excepting arguments" do
|
66
58
|
builder = subject.except(:b, :d, :does_not_exist)
|
67
59
|
expect(builder).not_to equal(subject)
|
@@ -82,11 +74,13 @@ describe Blacklight::SearchBuilder do
|
|
82
74
|
|
83
75
|
describe "#merge" do
|
84
76
|
let(:processor_chain) { [:pass_through] }
|
77
|
+
|
85
78
|
before do
|
86
79
|
allow(subject).to receive(:pass_through) do |req_params|
|
87
80
|
req_params.replace subject.blacklight_params
|
88
81
|
end
|
89
82
|
end
|
83
|
+
|
90
84
|
it "overwrites the processed parameters" do
|
91
85
|
actual = subject.with(q: 'abc').merge(q: 'xyz')
|
92
86
|
expect(actual[:q]).to eq 'xyz'
|
@@ -95,6 +89,7 @@ describe Blacklight::SearchBuilder do
|
|
95
89
|
|
96
90
|
describe "#reverse_merge" do
|
97
91
|
let(:processor_chain) { [:pass_through] }
|
92
|
+
|
98
93
|
before do
|
99
94
|
allow(subject).to receive(:pass_through) do |req_params|
|
100
95
|
req_params.replace subject.blacklight_params
|
@@ -176,18 +171,38 @@ describe Blacklight::SearchBuilder do
|
|
176
171
|
end
|
177
172
|
|
178
173
|
describe "#sort" do
|
179
|
-
|
180
|
-
|
181
|
-
end
|
174
|
+
context "when no sort parameter is given" do
|
175
|
+
subject(:sort) { builder.send(:sort) }
|
182
176
|
|
183
|
-
|
184
|
-
|
185
|
-
|
177
|
+
before do
|
178
|
+
blacklight_config.default_sort_field = double(sort: 'x desc')
|
179
|
+
end
|
180
|
+
|
181
|
+
it "uses the default" do
|
182
|
+
expect(sort).to eq 'x desc'
|
183
|
+
end
|
186
184
|
end
|
187
185
|
|
188
|
-
|
189
|
-
|
190
|
-
|
186
|
+
context "when the user provides an sort parameter" do
|
187
|
+
subject(:sort) { builder_with_param.send(:sort) }
|
188
|
+
|
189
|
+
let(:builder_with_param) { builder.with(sort: 'x') }
|
190
|
+
|
191
|
+
context "that is invalid" do
|
192
|
+
it "removes them" do
|
193
|
+
expect(sort).to be_nil
|
194
|
+
end
|
195
|
+
end
|
196
|
+
|
197
|
+
context "that is valid" do
|
198
|
+
before do
|
199
|
+
blacklight_config.add_sort_field 'x', sort: 'x asc'
|
200
|
+
end
|
201
|
+
|
202
|
+
it "uses the requested sort field" do
|
203
|
+
expect(sort).to eq 'x asc'
|
204
|
+
end
|
205
|
+
end
|
191
206
|
end
|
192
207
|
end
|
193
208
|
|
@@ -1,280 +1,288 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
describe "Blacklight::Solr::Document" do
|
4
|
-
|
5
|
-
|
6
|
-
|
3
|
+
RSpec.describe "Blacklight::Solr::Document", api: true do
|
4
|
+
class MockDocument
|
5
|
+
include Blacklight::Solr::Document
|
6
|
+
end
|
7
7
|
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
end
|
8
|
+
module MockExtension
|
9
|
+
def my_extension_method
|
10
|
+
"my_extension_results"
|
12
11
|
end
|
12
|
+
end
|
13
13
|
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
end
|
14
|
+
module MockSecondExtension
|
15
|
+
def my_extension_method
|
16
|
+
"override"
|
18
17
|
end
|
18
|
+
end
|
19
19
|
|
20
|
-
|
21
|
-
|
22
|
-
|
20
|
+
context "Hashy methods" do
|
21
|
+
it 'creates a doc with hashy methods' do
|
22
|
+
doc = SolrDocument.new('id' => 'SP2514N', 'inStock' => true, 'manu' => 'Samsung Electronics Co. Ltd.', 'name' => 'Samsung SpinPoint P120 SP2514N - hard drive - 250 GB - ATA-133', 'popularity' => 6, 'price' => 92.0, 'sku' => 'SP2514N', 'timestamp' => '2009-03-20T14:42:49.795Z', 'cat' => ['electronics', 'hard drive'], 'spell' => ['Samsung SpinPoint P120 SP2514N - hard drive - 250 GB - ATA-133'], 'features' => ['7200RPM, 8MB cache, IDE Ultra ATA-133', 'NoiseGuard, SilentSeek technology, Fluid Dynamic Bearing (FDB) motor'])
|
23
23
|
|
24
|
-
|
25
|
-
|
26
|
-
|
24
|
+
expect(doc.has?(:cat, /^elec/)).to eq true
|
25
|
+
expect(doc.has?(:cat, 'elec')).not_to eq true
|
26
|
+
expect(doc.has?(:cat, 'electronics')).to eq true
|
27
27
|
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
end
|
28
|
+
expect(doc.fetch(:cat)).to eq ['electronics', 'hard drive']
|
29
|
+
expect(doc.fetch(:xyz, nil)).to be_nil
|
30
|
+
expect(doc.fetch(:xyz, 'def')).to eq 'def'
|
31
|
+
expect(doc.fetch(:xyz) { |_el| 'def' }).to eq 'def'
|
32
|
+
expect { doc.fetch(:xyz) }.to raise_exception(KeyError)
|
34
33
|
end
|
34
|
+
end
|
35
35
|
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
end
|
36
|
+
context "Unique Key" do
|
37
|
+
before do
|
38
|
+
MockDocument.unique_key = 'my_unique_key'
|
39
|
+
end
|
41
40
|
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
it "should use a configuration-defined document unique key" do
|
46
|
-
@document = MockDocument.new :id => 'asdf', :my_unique_key => '1234'
|
47
|
-
expect(@document.id).to eq '1234'
|
48
|
-
end
|
41
|
+
after do
|
42
|
+
MockDocument.unique_key = 'id'
|
43
|
+
end
|
49
44
|
|
45
|
+
it "uses a configuration-defined document unique key" do
|
46
|
+
@document = MockDocument.new id: 'asdf', my_unique_key: '1234'
|
47
|
+
expect(@document.id).to eq '1234'
|
50
48
|
end
|
49
|
+
end
|
51
50
|
|
52
|
-
|
53
|
-
|
54
|
-
|
55
|
-
end
|
56
|
-
after(:each) do
|
57
|
-
MockDocument.unique_key = 'id'
|
58
|
-
end
|
59
|
-
it "should be the same as the unique key" do
|
60
|
-
expect(MockDocument.primary_key).to eq MockDocument.unique_key
|
61
|
-
end
|
51
|
+
describe "Primary key" do
|
52
|
+
before do
|
53
|
+
MockDocument.unique_key = 'my_unique_key'
|
62
54
|
end
|
63
55
|
|
64
|
-
|
65
|
-
|
66
|
-
@document = MockDocument.new :id => 1234
|
67
|
-
expect(@document.to_param).to eq '1234'
|
68
|
-
end
|
56
|
+
after do
|
57
|
+
MockDocument.unique_key = 'id'
|
69
58
|
end
|
70
59
|
|
71
|
-
|
72
|
-
|
73
|
-
|
74
|
-
|
75
|
-
end
|
76
|
-
|
77
|
-
it "should let you register an extension" do
|
78
|
-
MockDocument.use_extension(MockExtension) { |doc| true }
|
60
|
+
it "is the same as the unique key" do
|
61
|
+
expect(MockDocument.primary_key).to eq MockDocument.unique_key
|
62
|
+
end
|
63
|
+
end
|
79
64
|
|
80
|
-
|
81
|
-
|
82
|
-
|
83
|
-
|
84
|
-
|
85
|
-
|
86
|
-
it "should apply an extension whose condition is met" do
|
87
|
-
MockDocument.use_extension(MockExtension) {|doc| true}
|
88
|
-
doc = MockDocument.new()
|
65
|
+
describe "#to_param" do
|
66
|
+
it "is a string" do
|
67
|
+
@document = MockDocument.new id: 1234
|
68
|
+
expect(@document.to_param).to eq '1234'
|
69
|
+
end
|
70
|
+
end
|
89
71
|
|
90
|
-
|
91
|
-
|
92
|
-
|
93
|
-
|
94
|
-
|
72
|
+
context "Extendability" do
|
73
|
+
before do
|
74
|
+
# Clear extensions
|
75
|
+
MockDocument.registered_extensions = []
|
76
|
+
end
|
95
77
|
|
96
|
-
|
97
|
-
|
78
|
+
it "lets you register an extension" do
|
79
|
+
MockDocument.use_extension(MockExtension) { |_doc| true }
|
98
80
|
|
99
|
-
|
100
|
-
|
101
|
-
|
102
|
-
|
103
|
-
|
104
|
-
|
105
|
-
|
106
|
-
|
107
|
-
|
108
|
-
end
|
109
|
-
it "should treat a nil condition as always applyable" do
|
110
|
-
MockDocument.use_extension(MockExtension)
|
111
|
-
|
112
|
-
doc = MockDocument.new()
|
113
|
-
|
114
|
-
expect(doc.methods.find {|name | name.to_s =="my_extension_method"}).not_to be_nil
|
115
|
-
expect(doc.my_extension_method).to eq "my_extension_results"
|
116
|
-
end
|
117
|
-
it "should let last extension applied override earlier extensions" do
|
118
|
-
MockDocument.use_extension(MockExtension)
|
119
|
-
MockDocument.use_extension(MockSecondExtension)
|
81
|
+
expect(MockDocument.registered_extensions.find { |a| a[:module_obj] == MockExtension }).not_to be_nil
|
82
|
+
end
|
83
|
+
it "lets you register an extension with a nil condition proc" do
|
84
|
+
MockDocument.use_extension(MockExtension) { |_doc| true }
|
85
|
+
expect(MockDocument.registered_extensions.find { |a| a[:module_obj] == MockExtension }).not_to be_nil
|
86
|
+
end
|
87
|
+
it "applies an extension whose condition is met" do
|
88
|
+
MockDocument.use_extension(MockExtension) { |_doc| true }
|
89
|
+
doc = MockDocument.new
|
120
90
|
|
121
|
-
|
122
|
-
|
91
|
+
expect(doc.methods.find { |name| name.to_s == "my_extension_method" }).not_to be_nil
|
92
|
+
expect(doc.my_extension_method.to_s).to eq "my_extension_results"
|
93
|
+
end
|
94
|
+
it "applies an extension based on a Solr field" do
|
95
|
+
MockDocument.use_extension(MockExtension) { |doc| doc.key?(:required_key) }
|
123
96
|
|
124
|
-
|
125
|
-
|
126
|
-
|
127
|
-
|
128
|
-
|
129
|
-
|
130
|
-
it "extension_parameters should not be shared between classes" do
|
131
|
-
class_one = Class.new do
|
132
|
-
include Blacklight::Solr::Document
|
133
|
-
end
|
134
|
-
class_two = Class.new do
|
135
|
-
include Blacklight::Solr::Document
|
136
|
-
end
|
137
|
-
|
138
|
-
class_one.extension_parameters[:key] = "class_one_value"
|
139
|
-
class_two.extension_parameters[:key] = "class_two_value"
|
140
|
-
|
141
|
-
expect(class_one.extension_parameters[:key]).to eq "class_one_value"
|
142
|
-
end
|
143
|
-
end
|
144
|
-
|
97
|
+
with_extension = MockDocument.new(required_key: "value")
|
98
|
+
expect(with_extension.my_extension_method.to_s).to eq "my_extension_results"
|
99
|
+
|
100
|
+
without_extension = MockDocument.new(other_key: "value")
|
101
|
+
expect(without_extension.methods.find { |name| name.to_s == "my_extension_method" }).to be_nil
|
145
102
|
end
|
103
|
+
it "does not apply an extension whose condition is not met" do
|
104
|
+
MockDocument.use_extension(MockExtension) { |_doc| false }
|
105
|
+
doc = MockDocument.new
|
146
106
|
|
147
|
-
|
148
|
-
|
149
|
-
|
107
|
+
expect(doc.methods.find { |name| name.to_s == "my_extension_method" }).to be_nil
|
108
|
+
end
|
109
|
+
it "treats a nil condition as always applyable" do
|
110
|
+
MockDocument.use_extension(MockExtension)
|
150
111
|
|
151
|
-
|
152
|
-
"fake_marc"
|
153
|
-
end
|
154
|
-
end
|
112
|
+
doc = MockDocument.new
|
155
113
|
|
156
|
-
|
157
|
-
|
158
|
-
|
159
|
-
|
160
|
-
|
161
|
-
|
114
|
+
expect(doc.methods.find { |name| name.to_s == "my_extension_method" }).not_to be_nil
|
115
|
+
expect(doc.my_extension_method).to eq "my_extension_results"
|
116
|
+
end
|
117
|
+
it "lets last extension applied override earlier extensions" do
|
118
|
+
MockDocument.use_extension(MockExtension)
|
119
|
+
MockDocument.use_extension(MockSecondExtension)
|
120
|
+
|
121
|
+
expect(MockDocument.new.my_extension_method.to_s).to eq "override"
|
122
|
+
end
|
162
123
|
|
163
|
-
|
164
|
-
|
165
|
-
|
166
|
-
expect(
|
124
|
+
describe "extension_parameters class-level hash" do
|
125
|
+
it "provides an extension_parameters hash at the class level" do
|
126
|
+
MockDocument.extension_parameters[:key] = "value"
|
127
|
+
expect(MockDocument.extension_parameters[:key]).to eq "value"
|
167
128
|
end
|
168
129
|
|
169
|
-
|
170
|
-
|
171
|
-
|
172
|
-
@doc.will_export_as(:mock2, "application/mock2" )
|
173
|
-
# Mime::Type doesn't give us a good way to clean up our new
|
174
|
-
# registration in an after, sorry.
|
130
|
+
it "extension_parameters should not be shared between classes" do
|
131
|
+
class_one = Class.new do
|
132
|
+
include Blacklight::Solr::Document
|
175
133
|
end
|
176
|
-
|
177
|
-
|
134
|
+
class_two = Class.new do
|
135
|
+
include Blacklight::Solr::Document
|
178
136
|
end
|
179
|
-
it "registers as alias only" do
|
180
|
-
expect(Mime::Type.lookup("application/mock2")).not_to equal Mime::Type.lookup_by_extension("mock2")
|
181
|
-
end
|
182
|
-
end
|
183
137
|
|
184
|
-
|
185
|
-
|
186
|
-
|
187
|
-
expect(
|
188
|
-
end
|
189
|
-
|
190
|
-
it "should know if a document is exportable" do
|
191
|
-
doc = MockDocument.new
|
192
|
-
doc.will_export_as(:marc, "application/marc")
|
193
|
-
expect(doc.exports_as?(:marc)).to be true
|
138
|
+
class_one.extension_parameters[:key] = "class_one_value"
|
139
|
+
class_two.extension_parameters[:key] = "class_two_value"
|
140
|
+
|
141
|
+
expect(class_one.extension_parameters[:key]).to eq "class_one_value"
|
194
142
|
end
|
195
143
|
end
|
144
|
+
end
|
196
145
|
|
197
|
-
|
198
|
-
|
199
|
-
|
200
|
-
|
201
|
-
|
202
|
-
|
203
|
-
title: ["title_field", "other_title"],
|
204
|
-
author: "author_field",
|
205
|
-
something: "something_field"
|
206
|
-
)
|
207
|
-
|
208
|
-
@doc1 = MockDocument.new(
|
209
|
-
"title_field" => "doc1 title",
|
210
|
-
"other_title" => "doc1 title other",
|
211
|
-
"something_field" => ["val1", "val2"],
|
212
|
-
"not_in_list_field" => "weird stuff"
|
213
|
-
)
|
146
|
+
context "Will export as" do
|
147
|
+
class MockDocument
|
148
|
+
include Blacklight::Solr::Document
|
149
|
+
|
150
|
+
def export_as_marc
|
151
|
+
"fake_marc"
|
214
152
|
end
|
153
|
+
end
|
154
|
+
|
155
|
+
it "reports it's exportable formats properly" do
|
156
|
+
doc = MockDocument.new
|
157
|
+
doc.will_export_as(:marc, "application/marc")
|
158
|
+
expect(doc.export_formats).to have_key(:marc)
|
159
|
+
expect(doc.export_formats[:marc][:content_type]).to eq "application/marc"
|
160
|
+
end
|
215
161
|
|
216
|
-
|
217
|
-
|
218
|
-
|
219
|
-
|
220
|
-
|
221
|
-
|
222
|
-
|
162
|
+
it "looks up content-type from Mime::Type if not given in arg" do
|
163
|
+
doc = MockDocument.new
|
164
|
+
doc.will_export_as(:html)
|
165
|
+
expect(doc.export_formats).to have_key(:html)
|
166
|
+
end
|
167
|
+
|
168
|
+
context "format not registered with Mime::Type" do
|
169
|
+
before(:all) do
|
170
|
+
@doc = MockDocument.new
|
171
|
+
@doc.will_export_as(:mock2, "application/mock2")
|
172
|
+
# Mime::Type doesn't give us a good way to clean up our new
|
173
|
+
# registration in an after, sorry.
|
223
174
|
end
|
224
|
-
|
225
|
-
|
175
|
+
|
176
|
+
it "registers format" do
|
177
|
+
expect(defined?("Mime::MOCK2")).to be_truthy
|
226
178
|
end
|
227
|
-
it "
|
228
|
-
expect(
|
179
|
+
it "registers as alias only" do
|
180
|
+
expect(Mime::Type.lookup("application/mock2")).not_to equal Mime::Type.lookup_by_extension("mock2")
|
229
181
|
end
|
230
|
-
|
231
182
|
end
|
232
183
|
|
233
|
-
|
184
|
+
it "export_as(:format) by calling export_as_format" do
|
185
|
+
doc = MockDocument.new
|
186
|
+
doc.will_export_as(:marc, "application/marc")
|
187
|
+
expect(doc.export_as(:marc)).to eq "fake_marc"
|
188
|
+
end
|
234
189
|
|
235
|
-
|
236
|
-
|
190
|
+
it "knows if a document is exportable" do
|
191
|
+
doc = MockDocument.new
|
192
|
+
doc.will_export_as(:marc, "application/marc")
|
193
|
+
expect(doc.exports_as?(:marc)).to be true
|
194
|
+
end
|
195
|
+
end
|
237
196
|
|
238
|
-
|
197
|
+
context "to_semantic_fields" do
|
198
|
+
class MockDocument
|
199
|
+
include Blacklight::Solr::Document
|
200
|
+
end
|
201
|
+
before do
|
202
|
+
MockDocument.field_semantics.merge!(
|
203
|
+
title: %w[title_field other_title],
|
204
|
+
author: "author_field",
|
205
|
+
something: "something_field"
|
206
|
+
)
|
207
|
+
|
208
|
+
@doc1 = MockDocument.new(
|
209
|
+
"title_field" => "doc1 title",
|
210
|
+
"other_title" => "doc1 title other",
|
211
|
+
"something_field" => %w[val1 val2],
|
212
|
+
"not_in_list_field" => "weird stuff"
|
213
|
+
)
|
214
|
+
end
|
239
215
|
|
240
|
-
|
241
|
-
|
242
|
-
|
243
|
-
|
244
|
-
|
216
|
+
it "returns complete dictionary based on config'd fields" do
|
217
|
+
expect(@doc1.to_semantic_values)
|
218
|
+
.to eq title: ["doc1 title", "doc1 title other"], something: %w[val1 val2]
|
219
|
+
end
|
220
|
+
it "returns empty array for a key without a value" do
|
221
|
+
expect(@doc1.to_semantic_values[:author]).to be_empty
|
222
|
+
expect(@doc1.to_semantic_values[:nonexistent_token]).to be_empty
|
223
|
+
end
|
224
|
+
it "returns an array even for a single-value field" do
|
225
|
+
expect(@doc1.to_semantic_values[:title]).to be_kind_of(Array)
|
226
|
+
end
|
227
|
+
it "returns complete array for a multi-value field" do
|
228
|
+
expect(@doc1.to_semantic_values[:something]).to eq %w[val1 val2]
|
229
|
+
end
|
230
|
+
end
|
245
231
|
|
246
|
-
|
247
|
-
|
248
|
-
|
232
|
+
context "highlighting" do
|
233
|
+
before(:all) do
|
234
|
+
@document = MockDocument.new({ 'id' => 'doc1', 'title_field' => 'doc1 title' }, 'highlighting' => { 'doc1' => { 'title_tsimext' => ['doc <em>1</em>'] }, 'doc2' => { 'title_tsimext' => ['doc 2'] } })
|
235
|
+
end
|
236
|
+
|
237
|
+
describe "#has_highlight_field?" do
|
238
|
+
it "is true if the highlight field is in the solr response" do
|
239
|
+
expect(@document).to have_highlight_field 'title_tsimext'
|
240
|
+
expect(@document).to have_highlight_field :title_tsimext
|
249
241
|
end
|
250
242
|
|
251
|
-
|
252
|
-
|
253
|
-
|
254
|
-
|
243
|
+
it "is false if the highlight field isn't in the solr response" do
|
244
|
+
expect(@document).not_to have_highlight_field 'nonexisting_field'
|
245
|
+
end
|
246
|
+
end
|
255
247
|
|
248
|
+
describe "#highlight_field" do
|
249
|
+
it "returns a value" do
|
250
|
+
expect(@document.highlight_field('title_tsimext')).to include('doc <em>1</em>')
|
251
|
+
end
|
256
252
|
|
257
|
-
|
258
|
-
|
259
|
-
|
253
|
+
it "returns a value that is html safe" do
|
254
|
+
expect(@document.highlight_field('title_tsimext').first).to be_html_safe
|
255
|
+
end
|
260
256
|
|
261
|
-
|
262
|
-
|
263
|
-
end
|
257
|
+
it "returns nil when the field doesn't exist" do
|
258
|
+
expect(@document.highlight_field('nonexisting_field')).to be_nil
|
264
259
|
end
|
265
260
|
end
|
261
|
+
end
|
266
262
|
|
267
263
|
describe "#first" do
|
268
|
-
it "
|
269
|
-
doc = SolrDocument.new :
|
270
|
-
expect(doc.first
|
264
|
+
it "gets the first value from a multi-valued field" do
|
265
|
+
doc = SolrDocument.new multi: %w[a b]
|
266
|
+
expect(doc.first(:multi)).to eq("a")
|
267
|
+
end
|
268
|
+
|
269
|
+
it "gets the value from a single-valued field" do
|
270
|
+
doc = SolrDocument.new single: 'a'
|
271
|
+
expect(doc.first(:single)).to eq("a")
|
271
272
|
end
|
273
|
+
end
|
274
|
+
|
275
|
+
describe '#more_like_this' do
|
276
|
+
subject(:result) { document.more_like_this }
|
272
277
|
|
273
|
-
|
274
|
-
|
275
|
-
expect(doc.first :single).to eq("a")
|
278
|
+
let(:response) { instance_double(Blacklight::Solr::Response, more_like: [{ 'id' => 'abc' }]) }
|
279
|
+
let(:document) { MockDocument.new({ id: '123' }, response) }
|
276
280
|
|
281
|
+
it "plucks the MoreLikeThis results from the Solr Response" do
|
282
|
+
expect(result).to have(1).item
|
283
|
+
expect(result.first).to be_a_kind_of(MockDocument)
|
284
|
+
expect(result.first.id).to eq 'abc'
|
285
|
+
expect(result.first.solr_response).to eq response
|
277
286
|
end
|
278
287
|
end
|
279
|
-
|
280
288
|
end
|