blacklight 6.25.0 → 7.0.0.rc1
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/.npmignore +23 -0
- data/.rubocop.yml +15 -3
- data/.rubocop_todo.yml +242 -379
- data/.solr_wrapper.yml +1 -1
- data/.travis.yml +40 -0
- data/Gemfile +1 -4
- data/README.md +21 -4
- data/Rakefile +1 -2
- data/VERSION +1 -1
- 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 +496 -56
- data/app/assets/stylesheets/blacklight/_balanced_list.scss +7 -12
- data/app/assets/stylesheets/blacklight/_blacklight_base.scss +3 -1
- 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 +74 -92
- data/app/assets/stylesheets/blacklight/_header.scss +35 -48
- data/app/assets/stylesheets/blacklight/_icons.scss +29 -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_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/builders/blacklight/action_builder.rb +56 -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 -37
- data/app/controllers/concerns/blacklight/catalog.rb +254 -213
- data/app/controllers/concerns/blacklight/controller.rb +117 -133
- data/app/controllers/concerns/blacklight/default_component_configuration.rb +12 -43
- data/app/controllers/concerns/blacklight/search_context.rb +10 -14
- data/app/controllers/concerns/blacklight/search_fields.rb +4 -14
- data/app/controllers/concerns/blacklight/token_based_user.rb +6 -10
- data/app/helpers/blacklight/blacklight_helper_behavior.rb +32 -118
- data/app/helpers/blacklight/catalog_helper_behavior.rb +94 -88
- data/app/helpers/blacklight/component_helper_behavior.rb +19 -19
- data/app/helpers/blacklight/configuration_helper_behavior.rb +25 -54
- data/app/helpers/blacklight/facets_helper_behavior.rb +40 -39
- data/app/helpers/blacklight/hash_as_hidden_fields_helper_behavior.rb +9 -11
- data/app/helpers/blacklight/icon_helper_behavior.rb +16 -0
- data/app/helpers/blacklight/layout_helper_behavior.rb +3 -10
- data/app/helpers/blacklight/render_constraints_helper_behavior.rb +6 -6
- data/app/helpers/blacklight/render_partials_helper_behavior.rb +195 -0
- data/app/helpers/blacklight/search_history_constraints_helper_behavior.rb +18 -11
- data/app/helpers/blacklight/suggest_helper_behavior.rb +1 -0
- data/app/helpers/blacklight/url_helper_behavior.rb +21 -27
- data/app/{assets/javascripts → javascript}/blacklight/autocomplete.js +3 -2
- data/app/javascript/blacklight/autofocus.js +20 -0
- data/app/javascript/blacklight/bookmark_toggle.js +25 -0
- data/app/javascript/blacklight/checkbox_submit.js +133 -0
- data/app/{assets/javascripts → javascript}/blacklight/collapsable.js +1 -1
- data/app/javascript/blacklight/core.js +39 -0
- data/app/{assets/javascripts → javascript}/blacklight/facet_load.js +6 -6
- data/app/{assets/javascripts/blacklight/ajax_modal.js → javascript/blacklight/modal.js} +63 -63
- data/app/{assets/javascripts → javascript}/blacklight/search_context.js +10 -2
- data/app/models/blacklight/facet_paginator.rb +3 -3
- data/app/models/blacklight/icon.rb +53 -0
- data/app/models/blacklight/solr/facet_paginator.rb +3 -3
- data/app/models/blacklight/suggest_search.rb +15 -4
- data/app/models/bookmark.rb +4 -9
- data/app/models/concerns/blacklight/configurable.rb +13 -13
- 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 +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 +8 -42
- data/app/models/concerns/blacklight/solr/document.rb +7 -8
- data/app/models/concerns/blacklight/suggest/response.rb +3 -5
- data/app/models/concerns/blacklight/user.rb +6 -6
- data/app/models/record_mailer.rb +5 -6
- data/app/models/search.rb +5 -9
- data/app/presenters/blacklight/field_presenter.rb +5 -5
- data/app/presenters/blacklight/index_presenter.rb +34 -71
- data/app/presenters/blacklight/json_presenter.rb +7 -4
- data/app/presenters/blacklight/link_alternate_presenter.rb +1 -1
- data/app/presenters/blacklight/rendering/abstract_step.rb +5 -5
- data/app/presenters/blacklight/rendering/helper_method.rb +8 -8
- data/app/presenters/blacklight/rendering/join.rb +3 -3
- data/app/presenters/blacklight/rendering/link_to_facet.rb +19 -19
- data/app/presenters/blacklight/rendering/microdata.rb +3 -3
- data/app/presenters/blacklight/rendering/pipeline.rb +5 -5
- data/app/presenters/blacklight/search_bar_presenter.rb +37 -0
- data/app/presenters/blacklight/show_presenter.rb +20 -69
- data/app/presenters/blacklight/thumbnail_presenter.rb +72 -0
- data/app/services/blacklight/document_factory.rb +11 -0
- data/app/services/blacklight/field_retriever.rb +24 -24
- data/app/services/blacklight/search_service.rb +154 -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 +2 -2
- data/app/views/catalog/_bookmark_control.html.erb +26 -10
- data/app/views/catalog/_citation.html.erb +18 -23
- data/app/views/catalog/_constraints.html.erb +5 -8
- data/app/views/catalog/_constraints_element.html.erb +6 -6
- data/app/views/catalog/{_document_default.atom.builder → _document.atom.builder} +2 -2
- data/app/views/catalog/_document.html.erb +5 -3
- data/app/views/catalog/{_document_default.rss.builder → _document.rss.builder} +0 -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 +3 -3
- data/app/views/catalog/_facet_layout.html.erb +5 -7
- data/app/views/catalog/_facet_limit.html.erb +3 -2
- data/app/views/catalog/_facet_pagination.html.erb +10 -10
- data/app/views/catalog/_facet_pivot.html.erb +2 -2
- data/app/views/catalog/_facets.html.erb +8 -12
- data/app/views/catalog/{_group_default.html.erb → _group.html.erb} +0 -0
- data/app/views/catalog/_home_text.html.erb +32 -36
- data/app/views/catalog/_index.html.erb +12 -0
- data/app/views/catalog/{_index_header_default.html.erb → _index_header.html.erb} +2 -2
- 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/_search_form.html.erb +12 -8
- data/app/views/catalog/_search_header.html.erb +0 -3
- data/app/views/catalog/_search_results.html.erb +4 -0
- data/app/views/catalog/_show.html.erb +10 -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_sidebar.html.erb +3 -3
- data/app/views/catalog/_show_tools.html.erb +9 -11
- 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/citation.html.erb +1 -1
- data/app/views/catalog/citation.js.erb +9 -1
- data/app/views/catalog/email.html.erb +5 -5
- data/app/views/catalog/email_success.html.erb +11 -9
- data/app/views/catalog/facet.html.erb +5 -6
- data/app/views/catalog/index.atom.builder +10 -15
- data/app/views/catalog/index.html.erb +9 -11
- data/app/views/catalog/index.json.jbuilder +65 -3
- data/app/views/catalog/index.rss.builder +5 -5
- data/app/views/catalog/opensearch.xml.builder +10 -10
- data/app/views/catalog/show.html.erb +11 -6
- data/app/views/catalog/sms.html.erb +2 -3
- data/app/views/catalog/sms_success.html.erb +11 -10
- 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 +4 -4
- data/app/views/kaminari/blacklight/_page.html.erb +3 -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 +43 -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/{_flash_msg.html.erb → shared/_flash_msg.html.erb} +0 -0
- 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/locales/blacklight.de.yml +56 -86
- data/config/locales/blacklight.en.yml +1 -27
- data/config/locales/blacklight.es.yml +0 -30
- data/config/locales/blacklight.fr.yml +0 -30
- data/config/locales/blacklight.hu.yml +210 -0
- data/config/locales/blacklight.it.yml +0 -30
- data/config/locales/blacklight.nl.yml +210 -0
- data/config/locales/blacklight.pt-BR.yml +6 -32
- data/config/locales/blacklight.sq.yml +1 -28
- data/config/locales/blacklight.zh.yml +0 -25
- data/config/routes.rb +3 -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 +9 -21
- data/lib/blacklight/configuration/context.rb +1 -1
- data/lib/blacklight/configuration/facet_field.rb +16 -9
- data/lib/blacklight/configuration/field.rb +32 -3
- data/lib/blacklight/configuration/fields.rb +41 -48
- 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 +82 -89
- data/lib/blacklight/engine.rb +5 -11
- data/lib/blacklight/exceptions.rb +4 -7
- data/lib/blacklight/nested_open_struct_with_hash_access.rb +107 -0
- data/lib/blacklight/open_struct_with_hash_access.rb +49 -0
- data/lib/blacklight/parameters.rb +1 -1
- data/lib/blacklight/routes/searchable.rb +1 -0
- data/lib/blacklight/search_builder.rb +26 -35
- data/lib/blacklight/search_state.rb +8 -8
- data/lib/blacklight/solr/repository.rb +3 -36
- 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 +3 -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 +4 -5
- data/lib/generators/blacklight/assets_generator.rb +8 -8
- 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 -21
- data/lib/generators/blacklight/search_builder_generator.rb +1 -1
- data/lib/generators/blacklight/{solr5_generator.rb → solr_generator.rb} +4 -6
- data/lib/generators/blacklight/templates/.solr_wrapper.yml +5 -0
- data/lib/generators/blacklight/templates/blacklight.scss +0 -2
- data/lib/generators/blacklight/templates/catalog_controller.rb +52 -51
- 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 +390 -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 +3 -6
- data/lib/railties/blacklight.rake +19 -14
- data/package-lock.json +2057 -0
- data/package.json +28 -0
- data/spec/controllers/alternate_controller_spec.rb +1 -1
- data/spec/controllers/application_controller_spec.rb +1 -1
- data/spec/controllers/blacklight/base_spec.rb +1 -1
- data/spec/controllers/blacklight/catalog/component_configuration_spec.rb +11 -7
- data/spec/controllers/blacklight/facet_spec.rb +1 -1
- data/spec/controllers/blacklight/search_fields_spec.rb +1 -13
- data/spec/controllers/bookmarks_controller_spec.rb +1 -36
- data/spec/controllers/catalog_controller_spec.rb +153 -53
- data/spec/controllers/search_history_controller_spec.rb +2 -2
- data/spec/features/alternate_controller_spec.rb +1 -1
- data/spec/features/autocomplete_spec.rb +2 -2
- data/spec/features/bookmarks_spec.rb +10 -10
- data/spec/features/did_you_mean_spec.rb +3 -9
- data/spec/features/facets_spec.rb +11 -11
- data/spec/features/record_view_spec.rb +1 -6
- data/spec/features/search_context_spec.rb +2 -2
- data/spec/features/search_filters_spec.rb +41 -41
- data/spec/features/search_formats_spec.rb +1 -1
- data/spec/features/search_history_spec.rb +1 -26
- data/spec/features/search_pagination_spec.rb +1 -1
- data/spec/features/search_results_spec.rb +3 -4
- data/spec/features/search_sort_spec.rb +2 -2
- data/spec/features/search_spec.rb +5 -10
- data/{solr → spec/fixtures}/sample_solr_documents.yml +688 -688
- data/spec/helpers/{configuration_helper_spec.rb → blacklight/configuration_helper_behavior_spec.rb} +70 -65
- data/spec/helpers/{facets_helper_spec.rb → blacklight/facets_helper_behavior_spec.rb} +7 -8
- data/spec/helpers/{hash_as_hidden_fields_spec.rb → blacklight/hash_as_hidden_fields_behavior_spec.rb} +1 -1
- data/spec/helpers/blacklight/icon_helper_behavior_spec.rb +8 -0
- data/spec/helpers/{layout_helper_spec.rb → blacklight/layout_helper_behavior_spec.rb} +5 -15
- data/spec/helpers/{render_constraints_helper_spec.rb → blacklight/render_constraints_helper_behavior_spec.rb} +2 -3
- data/spec/helpers/blacklight/render_partials_helper_behavior_spec.rb +80 -0
- data/spec/helpers/{search_history_constraints_helper_spec.rb → blacklight/search_history_constraints_helper_behavior_spec.rb} +9 -9
- data/spec/helpers/{suggest_helper_spec.rb → blacklight/suggest_helper_behavior_spec.rb} +4 -2
- data/spec/helpers/{url_helper_spec.rb → blacklight/url_helper_behavior_spec.rb} +11 -15
- data/spec/helpers/blacklight_helper_spec.rb +36 -141
- data/spec/helpers/catalog_helper_spec.rb +37 -56
- data/spec/integration/generators/blacklight/{solr5_generator_spec.rb → solr_generator_spec.rb} +3 -3
- data/spec/lib/blacklight/configuration/facet_field_spec.rb +11 -0
- data/spec/lib/blacklight/configuration/field_spec.rb +12 -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 +153 -0
- data/spec/lib/blacklight/parameters_spec.rb +1 -1
- data/spec/lib/blacklight/search_state_spec.rb +2 -2
- data/spec/lib/blacklight_spec.rb +1 -1
- data/spec/lib/tasks/blacklight_task_spec.rb +1 -1
- data/spec/models/blacklight/configurable_spec.rb +15 -16
- data/spec/models/blacklight/configuration/context_spec.rb +1 -1
- data/spec/models/blacklight/configuration_spec.rb +146 -135
- data/spec/models/blacklight/document/active_model_shim_spec.rb +11 -1
- data/spec/models/blacklight/document/cache_key_spec.rb +1 -1
- data/spec/models/blacklight/document/dublin_core_spec.rb +5 -5
- data/spec/models/blacklight/document/email_spec.rb +3 -3
- data/spec/models/blacklight/document/sms_spec.rb +3 -3
- data/spec/models/blacklight/document_spec.rb +3 -16
- data/spec/models/blacklight/facet_paginator_spec.rb +1 -1
- data/spec/models/blacklight/icon_spec.rb +34 -0
- data/spec/models/blacklight/search_builder_spec.rb +33 -27
- data/spec/models/blacklight/solr/document_spec.rb +18 -7
- data/spec/models/blacklight/solr/facet_paginator_spec.rb +1 -1
- data/spec/models/blacklight/solr/repository_spec.rb +32 -27
- data/spec/models/blacklight/solr/request_spec.rb +1 -1
- data/spec/models/blacklight/solr/response/facets_spec.rb +1 -1
- data/spec/models/blacklight/solr/response/group_response_spec.rb +1 -1
- data/spec/models/blacklight/solr/response/group_spec.rb +1 -1
- data/spec/models/blacklight/solr/response_spec.rb +9 -6
- data/spec/models/blacklight/solr/search_builder_spec.rb +35 -48
- data/spec/models/blacklight/suggest/response_spec.rb +4 -5
- data/spec/models/blacklight/suggest_search_spec.rb +14 -7
- data/spec/models/blacklight/user_spec.rb +1 -1
- data/spec/models/bookmark_spec.rb +1 -1
- data/spec/models/record_mailer_spec.rb +2 -2
- data/spec/models/search_spec.rb +15 -36
- data/spec/models/solr_document_spec.rb +3 -3
- data/spec/presenters/blacklight/search_bar_presenter_spec.rb +72 -0
- data/spec/presenters/index_presenter_spec.rb +70 -143
- data/spec/presenters/pipeline_spec.rb +4 -4
- data/spec/presenters/show_presenter_spec.rb +83 -145
- data/spec/presenters/thumbnail_presenter_spec.rb +171 -0
- data/spec/routing/catalog_routing_spec.rb +1 -32
- data/spec/services/blacklight/search_service_spec.rb +446 -0
- data/spec/spec_helper.rb +22 -9
- data/spec/test_app_templates/Gemfile.extra +2 -5
- data/spec/test_app_templates/lib/generators/test_app_generator.rb +1 -1
- data/spec/views/catalog/_constraints.html.erb_spec.rb +1 -3
- data/spec/views/catalog/_constraints_element.html.erb_spec.rb +8 -8
- data/spec/views/catalog/_document.html.erb_spec.rb +7 -7
- data/spec/views/catalog/_document_list.html.erb_spec.rb +1 -1
- data/spec/views/catalog/_facet_index_navigation.html.erb_spec.rb +1 -1
- data/spec/views/catalog/_facet_layout.html.erb_spec.rb +6 -6
- data/spec/views/catalog/_facets.html.erb_spec.rb +2 -2
- data/spec/views/catalog/{_index_default.erb_spec.rb → _index.html.erb_spec.rb} +1 -1
- data/spec/views/catalog/{_index_header_default.html.erb_spec.rb → _index_header.html.erb_spec.rb} +4 -4
- data/spec/views/catalog/_paginate_compact.html.erb_spec.rb +4 -27
- 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} +1 -1
- data/spec/views/catalog/_show_sidebar.erb_spec.rb +3 -3
- data/spec/views/catalog/_show_tools.html.erb_spec.rb +3 -3
- data/spec/views/catalog/_sort_and_per_page.html.erb_spec.rb +1 -1
- data/spec/views/catalog/{_thumbnail_default.erb_spec.rb → _thumbnail.html.erb_spec.rb} +3 -3
- data/spec/views/catalog/_view_type_group.html.erb_spec.rb +5 -1
- data/spec/views/catalog/email_success.html.erb_spec.rb +9 -0
- data/spec/views/catalog/facet.html.erb_spec.rb +1 -1
- data/spec/views/catalog/facet.json.jbuilder_spec.rb +1 -1
- data/spec/views/catalog/index.atom.builder_spec.rb +2 -2
- data/spec/views/catalog/index.html.erb_spec.rb +4 -7
- data/spec/views/catalog/index.json.jbuilder_spec.rb +66 -21
- data/spec/views/catalog/opensearch.xml.builder_spec.rb +1 -1
- data/spec/views/catalog/show.html.erb_spec.rb +2 -2
- data/spec/views/catalog/sms_success.html.erb_spec.rb +9 -0
- data/spec/views/{_user_util_links.html.erb_spec.rb → shared/_user_util_links.html.erb_spec.rb} +4 -4
- data/tasks/blacklight.rake +28 -47
- data/template.demo.rb +1 -11
- metadata +172 -196
- data/.docker/app/Dockerfile +0 -28
- data/.docker/app/entrypoint.sh +0 -6
- data/.dockerignore +0 -3
- data/.env +0 -5
- data/.github/workflows/ruby.yml +0 -61
- 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/core.js +0 -30
- 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/presenters/blacklight/document_presenter.rb +0 -153
- data/app/services/blacklight/search_params_yaml_coder.rb +0 -48
- 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/docker-compose.yml +0 -38
- data/lib/blacklight/utils.rb +0 -183
- data/lib/generators/blacklight/solr4_generator.rb +0 -31
- data/solr/conf/schema.xml +0 -627
- 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
@@ -18,7 +18,6 @@ zh:
|
|
18
18
|
login: '登陆'
|
19
19
|
logout: '注销'
|
20
20
|
bookmarks: '书签'
|
21
|
-
saved_searches: '保存的搜索'
|
22
21
|
search_history: '搜索历史'
|
23
22
|
|
24
23
|
welcome: '欢迎!'
|
@@ -52,25 +51,6 @@ zh:
|
|
52
51
|
list_title: '你的书签'
|
53
52
|
delete: '删除'
|
54
53
|
|
55
|
-
saved_searches:
|
56
|
-
add:
|
57
|
-
success: '成功保存了您的搜索。'
|
58
|
-
failure: '保存搜索时出现问题。'
|
59
|
-
remove:
|
60
|
-
success: '成功删除保存的搜索。'
|
61
|
-
failure: '删除您的搜索时出现问题。'
|
62
|
-
clear:
|
63
|
-
action_title: '清除保存的搜索'
|
64
|
-
action_confirm: '清除您保存的搜索?'
|
65
|
-
success: '清除您保存的搜索。'
|
66
|
-
failure: '清除搜索时出现问题。'
|
67
|
-
title: '保存的搜索'
|
68
|
-
page_title: '保存的搜索 - %{application_name}'
|
69
|
-
need_login: '请登录来管理和查看您保存的搜索。'
|
70
|
-
no_searches: '您没有保存的搜索'
|
71
|
-
list_title: '您保存的搜索'
|
72
|
-
delete: '删除'
|
73
|
-
|
74
54
|
search_history:
|
75
55
|
clear:
|
76
56
|
action_title: '清除搜索历史'
|
@@ -144,8 +124,6 @@ zh:
|
|
144
124
|
back_to_bookmarks: '返回书签页面'
|
145
125
|
|
146
126
|
search:
|
147
|
-
# i18n key 'title' is deprecated and will be removed in Blacklight 6.0
|
148
|
-
title: '%{application_name} 搜索结果'
|
149
127
|
page_title:
|
150
128
|
title: '%{constraints} - %{application_name} 搜索结果'
|
151
129
|
constraint: '%{label}: %{value}'
|
@@ -160,7 +138,6 @@ zh:
|
|
160
138
|
button_label: '%{count} 每页'
|
161
139
|
title: '每页显示结果数'
|
162
140
|
submit: '更新'
|
163
|
-
aria_label: '结果导航'
|
164
141
|
sort:
|
165
142
|
label: '按 %{field} 排序'
|
166
143
|
submit: '排序'
|
@@ -213,8 +190,6 @@ zh:
|
|
213
190
|
label: '%{label}:'
|
214
191
|
rss_feed: '搜索结果RSS'
|
215
192
|
atom_feed: '搜索结果Atom'
|
216
|
-
fields:
|
217
|
-
default: '关键词'
|
218
193
|
bookmarks:
|
219
194
|
present: "在书签中"
|
220
195
|
absent: "加入书签"
|
data/config/routes.rb
CHANGED
@@ -1,13 +1,6 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
Blacklight::Engine.routes.draw do
|
3
|
-
get "search_history", :
|
4
|
-
delete "search_history/clear", :
|
5
|
-
|
6
|
-
get "saved_searches", :to => "saved_searches#index", :as => "saved_searches"
|
7
|
-
put "saved_searches/save/:id", :to => "saved_searches#save", :as => "save_search"
|
8
|
-
delete "saved_searches/forget/:id", :to => "saved_searches#forget", :as => "forget_search"
|
9
|
-
post "saved_searches/forget/:id", :to => "saved_searches#forget"
|
10
|
-
post "/catalog/:id/track", to: 'catalog#track', as: 'track_search_context', constraints: { id: Blacklight::Engine.config.routes.identifier_constraint }
|
11
|
-
|
12
|
-
resources :suggest, only: :index, defaults: { format: 'json' }
|
3
|
+
get "search_history", to: "search_history#index", as: "search_history"
|
4
|
+
delete "search_history/clear", to: "search_history#clear", as: "clear_search_history"
|
5
|
+
post "/catalog/:id/track", to: 'catalog#track', as: 'track_search_context'
|
13
6
|
end
|
@@ -2,7 +2,7 @@
|
|
2
2
|
class AddPolymorphicTypeToBookmarks < ActiveRecord::Migration[4.2]
|
3
3
|
def change
|
4
4
|
add_column(:bookmarks, :document_type, :string) unless Bookmark.connection.column_exists? :bookmarks, :document_type
|
5
|
-
|
5
|
+
|
6
6
|
add_index :bookmarks, :user_id unless Bookmark.connection.index_exists? :bookmarks, :user_id
|
7
7
|
end
|
8
8
|
end
|
@@ -5,7 +5,7 @@ module Blacklight
|
|
5
5
|
attr_writer :connection
|
6
6
|
|
7
7
|
# ActiveSupport::Benchmarkable requires a logger method
|
8
|
-
|
8
|
+
attr_writer :logger
|
9
9
|
|
10
10
|
include ActiveSupport::Benchmarkable
|
11
11
|
|
@@ -21,37 +21,25 @@ module Blacklight
|
|
21
21
|
# Find a single document result by a known id
|
22
22
|
# @param [String] id document's unique key value
|
23
23
|
# @param [Hash] params additional query parameters
|
24
|
-
def find(
|
24
|
+
def find(_id, _params = {})
|
25
25
|
raise NotImplementedError
|
26
26
|
end
|
27
27
|
|
28
28
|
##
|
29
29
|
# Execute a search query against a search index
|
30
30
|
# @param [Hash] params query parameters
|
31
|
-
def search(
|
32
|
-
raise NotImplementedError
|
33
|
-
end
|
34
|
-
|
35
|
-
# Query the fields that exist from the index
|
36
|
-
# @return [Hash]
|
37
|
-
def reflect_fields
|
38
|
-
raise NotImplementedError
|
39
|
-
end
|
40
|
-
|
41
|
-
##
|
42
|
-
# Is the repository in a working state?
|
43
|
-
def ping
|
31
|
+
def search(_params = {})
|
44
32
|
raise NotImplementedError
|
45
33
|
end
|
46
34
|
|
47
35
|
private
|
48
36
|
|
49
|
-
|
50
|
-
|
51
|
-
|
37
|
+
def connection_config
|
38
|
+
blacklight_config.connection_config
|
39
|
+
end
|
52
40
|
|
53
|
-
|
54
|
-
|
55
|
-
|
41
|
+
def logger
|
42
|
+
@logger ||= Blacklight.logger
|
43
|
+
end
|
56
44
|
end
|
57
45
|
end
|
@@ -14,7 +14,7 @@ module Blacklight
|
|
14
14
|
# @param [#if,#unless] config an object that responds to if/unless
|
15
15
|
# @return [Boolean]
|
16
16
|
def evaluate_if_unless_configuration(config, *args)
|
17
|
-
return config if config == true
|
17
|
+
return config if config == true || config == false
|
18
18
|
|
19
19
|
if_value = !config.respond_to?(:if) ||
|
20
20
|
config.if.nil? ||
|
@@ -1,19 +1,26 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
module Blacklight
|
3
3
|
class Configuration::FacetField < Blacklight::Configuration::Field
|
4
|
+
extend Deprecation
|
5
|
+
|
4
6
|
def normalize! blacklight_config = nil
|
5
|
-
|
7
|
+
query.stringify_keys! if query
|
8
|
+
|
9
|
+
self.collapse = true if collapse.nil?
|
10
|
+
self.show = true if show.nil?
|
11
|
+
self.if = show if self.if.nil?
|
12
|
+
self.index_range = 'A'..'Z' if index_range == true
|
6
13
|
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
14
|
+
if link_to_search
|
15
|
+
Deprecation.warn(Blacklight::Configuration::FacetField, '`link_to_search:` is deprecated, use `link_to_facet:` instead')
|
16
|
+
self.link_to_facet = link_to_search if link_to_facet.nil?
|
17
|
+
end
|
11
18
|
|
12
19
|
super
|
13
|
-
|
14
|
-
if
|
15
|
-
self.tag = "#{
|
16
|
-
self.ex = "#{
|
20
|
+
|
21
|
+
if single && tag.blank? && ex.blank?
|
22
|
+
self.tag = "#{key}_single"
|
23
|
+
self.ex = "#{key}_single"
|
17
24
|
end
|
18
25
|
|
19
26
|
self
|
@@ -1,8 +1,8 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
module Blacklight
|
3
3
|
class Configuration::Field < OpenStructWithHashAccess
|
4
|
-
def normalize!
|
5
|
-
self.field ||=
|
4
|
+
def normalize! _blacklight_config = nil
|
5
|
+
self.field ||= key
|
6
6
|
self.key ||= self.field
|
7
7
|
|
8
8
|
self.label ||= default_label
|
@@ -14,11 +14,20 @@ module Blacklight
|
|
14
14
|
|
15
15
|
self
|
16
16
|
end
|
17
|
-
|
17
|
+
|
18
18
|
def validate!
|
19
19
|
raise ArgumentError, "Must supply a field name" if self.field.nil?
|
20
20
|
end
|
21
21
|
|
22
|
+
def display_label(context = nil)
|
23
|
+
field_label(
|
24
|
+
(:"blacklight.search.fields.#{context}.#{key}" if context),
|
25
|
+
:"blacklight.search.fields.#{key}",
|
26
|
+
label,
|
27
|
+
default_label
|
28
|
+
)
|
29
|
+
end
|
30
|
+
|
22
31
|
def default_label
|
23
32
|
if self.key.respond_to?(:titleize)
|
24
33
|
self.key.try(:titleize)
|
@@ -26,5 +35,25 @@ module Blacklight
|
|
26
35
|
self.key.to_s.titleize
|
27
36
|
end
|
28
37
|
end
|
38
|
+
|
39
|
+
private
|
40
|
+
|
41
|
+
##
|
42
|
+
# Look up the label for a solr field.
|
43
|
+
#
|
44
|
+
# @overload label
|
45
|
+
# @param [Symbol] an i18n key
|
46
|
+
#
|
47
|
+
# @overload label, i18n_key, another_i18n_key, and_another_i18n_key
|
48
|
+
# @param [String] default label to display if the i18n look up fails
|
49
|
+
# @param [Symbol] i18n keys to attempt to look up
|
50
|
+
# before falling back to the label
|
51
|
+
# @param [Symbol] any number of additional keys
|
52
|
+
# @param [Symbol] ...
|
53
|
+
def field_label *i18n_keys
|
54
|
+
first, *rest = i18n_keys.compact
|
55
|
+
|
56
|
+
I18n.t(first, default: rest)
|
57
|
+
end
|
29
58
|
end
|
30
59
|
end
|
@@ -5,19 +5,17 @@ module Blacklight
|
|
5
5
|
# solr fields configuration
|
6
6
|
module Fields
|
7
7
|
extend ActiveSupport::Concern
|
8
|
-
extend Deprecation
|
9
|
-
self.deprecation_horizon = 'blacklight version 8.0.0'
|
10
8
|
|
11
9
|
module ClassMethods
|
12
10
|
# Add a configuration block for a collection of solr fields
|
13
11
|
def define_field_access(key, options = {})
|
14
12
|
key = key.to_s if respond_to? :to_s
|
15
13
|
|
16
|
-
|
14
|
+
default_values[key.pluralize.to_sym] = ActiveSupport::OrderedHash.new
|
17
15
|
|
18
16
|
base_class_name = options.fetch(:class, Field)
|
19
17
|
|
20
|
-
unless
|
18
|
+
unless const_defined? key.camelcase
|
21
19
|
class_eval <<-END_EVAL, __FILE__, __LINE__ + 1
|
22
20
|
class #{key.camelcase} < #{base_class_name}; end
|
23
21
|
END_EVAL
|
@@ -86,17 +84,17 @@ module Blacklight
|
|
86
84
|
#
|
87
85
|
def add_blacklight_field config_key, *args, &block
|
88
86
|
field_config = case args.first
|
89
|
-
|
90
|
-
|
91
|
-
|
92
|
-
|
93
|
-
|
94
|
-
|
95
|
-
|
96
|
-
|
97
|
-
|
98
|
-
|
99
|
-
|
87
|
+
when String
|
88
|
+
field_config_from_key_and_hash(config_key, *args)
|
89
|
+
when Symbol
|
90
|
+
args[0] = args[0].to_s
|
91
|
+
field_config_from_key_and_hash(config_key, *args)
|
92
|
+
when Array
|
93
|
+
field_config_from_array(config_key, *args, &block)
|
94
|
+
return # we've iterated over the array above.
|
95
|
+
else
|
96
|
+
field_config_from_field_or_hash(config_key, *args)
|
97
|
+
end
|
100
98
|
|
101
99
|
if (field_config.field || field_config.key).to_s =~ /\*/
|
102
100
|
field_config.match = Regexp.new("^" + (field_config.field || field_config.key).to_s.gsub('*', '.+') + "$")
|
@@ -104,7 +102,24 @@ module Blacklight
|
|
104
102
|
|
105
103
|
# look up any dynamic fields
|
106
104
|
if field_config.match
|
107
|
-
|
105
|
+
|
106
|
+
salient_fields = luke_fields.select do |k, _v|
|
107
|
+
k =~ field_config.match
|
108
|
+
end
|
109
|
+
|
110
|
+
salient_fields.each_key do |field|
|
111
|
+
config = field_config.dup
|
112
|
+
config.match = nil
|
113
|
+
config.field = field
|
114
|
+
config.key = field
|
115
|
+
|
116
|
+
if self[config_key.pluralize][config.key]
|
117
|
+
self[config_key.pluralize][config.key] = config.merge(self[config_key.pluralize][config.key])
|
118
|
+
else
|
119
|
+
add_blacklight_field(config_key, config, &block)
|
120
|
+
end
|
121
|
+
end
|
122
|
+
|
108
123
|
return
|
109
124
|
end
|
110
125
|
|
@@ -117,50 +132,30 @@ module Blacklight
|
|
117
132
|
|
118
133
|
raise "A #{config_key} with the key #{field_config.key} already exists." if self[config_key.pluralize][field_config.key].present?
|
119
134
|
|
120
|
-
self[config_key.pluralize][
|
135
|
+
self[config_key.pluralize][field_config.key] = field_config
|
121
136
|
end
|
122
137
|
|
123
|
-
|
124
|
-
|
125
|
-
##
|
126
|
-
# Using reflection into the index, add any fields in the index that match the field_config
|
127
|
-
def handle_matching_fields(config_key, field_config, &block)
|
128
|
-
salient_fields = reflected_fields.select do |k, _v|
|
129
|
-
k =~ field_config.match
|
130
|
-
end
|
131
|
-
|
132
|
-
salient_fields.each_key do |field|
|
133
|
-
config = field_config.dup
|
134
|
-
config.match = nil
|
135
|
-
config.field = field
|
136
|
-
config.key = field
|
137
|
-
if self[config_key.pluralize][config.key]
|
138
|
-
self[config_key.pluralize][config.key] = config.merge(self[config_key.pluralize][config.key])
|
139
|
-
else
|
140
|
-
add_blacklight_field(config_key, config, &block)
|
141
|
-
end
|
142
|
-
end
|
143
|
-
end
|
138
|
+
private
|
144
139
|
|
145
|
-
def
|
146
|
-
if @table[:
|
140
|
+
def luke_fields
|
141
|
+
if @table[:luke_fields] == false
|
147
142
|
return nil
|
148
143
|
end
|
149
144
|
|
150
|
-
@table[:
|
145
|
+
@table[:luke_fields] ||= Rails.cache.fetch("blacklight_configuration/admin/luke", expires_in: 1.hour) do
|
151
146
|
begin
|
152
|
-
|
153
|
-
|
147
|
+
if repository_class <= Blacklight::Solr::Repository
|
148
|
+
repository = repository_class.new(self)
|
149
|
+
repository.send_and_receive('admin/luke', params: { fl: '*', 'json.nl' => 'map' })['fields']
|
150
|
+
end
|
154
151
|
rescue => e
|
155
152
|
Blacklight.logger.warn "Error retrieving field metadata: #{e}"
|
156
153
|
false
|
157
154
|
end
|
158
155
|
end
|
159
156
|
|
160
|
-
@table[:
|
157
|
+
@table[:luke_fields] || {}
|
161
158
|
end
|
162
|
-
alias luke_fields reflected_fields
|
163
|
-
deprecation_deprecate luke_fields: 'use reflected_fields instead'
|
164
159
|
|
165
160
|
# Add a solr field by a solr field name and hash
|
166
161
|
def field_config_from_key_and_hash config_key, field_name, field_or_hash = {}
|
@@ -199,8 +194,6 @@ module Blacklight
|
|
199
194
|
end
|
200
195
|
end
|
201
196
|
|
202
|
-
private
|
203
|
-
|
204
197
|
# convert a config key to the appropriate Field class
|
205
198
|
def field_class_from_key key
|
206
199
|
"Blacklight::Configuration::#{key.camelcase}".constantize
|
@@ -2,7 +2,7 @@
|
|
2
2
|
module Blacklight
|
3
3
|
class Configuration::SearchField < Blacklight::Configuration::Field
|
4
4
|
def normalize! blacklight_config = nil
|
5
|
-
self.if =
|
5
|
+
self.if = include_in_simple_select if self.if.nil?
|
6
6
|
|
7
7
|
super
|
8
8
|
self.qt ||= blacklight_config.default_solr_params[:qt] if blacklight_config && blacklight_config.default_solr_params
|
@@ -11,7 +11,7 @@ module Blacklight
|
|
11
11
|
end
|
12
12
|
|
13
13
|
def validate!
|
14
|
-
raise ArgumentError, "Must supply a search field key" if
|
14
|
+
raise ArgumentError, "Must supply a search field key" if key.nil?
|
15
15
|
end
|
16
16
|
end
|
17
17
|
end
|
@@ -3,8 +3,8 @@ module Blacklight
|
|
3
3
|
class Configuration::SortField < Blacklight::Configuration::Field
|
4
4
|
def normalize! blacklight_config = nil
|
5
5
|
super
|
6
|
-
self.field ||=
|
7
|
-
self.field ||=
|
6
|
+
self.field ||= label.try(:parameterize)
|
7
|
+
self.field ||= sort
|
8
8
|
|
9
9
|
self.sort ||= self.field
|
10
10
|
|
@@ -1,6 +1,10 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
class Blacklight::Configuration
|
3
3
|
class ViewConfig < Blacklight::OpenStructWithHashAccess
|
4
|
+
def search_bar_presenter_class
|
5
|
+
super || Blacklight::SearchBarPresenter
|
6
|
+
end
|
7
|
+
|
4
8
|
class Show < ViewConfig
|
5
9
|
def document_presenter_class
|
6
10
|
super || Blacklight::ShowPresenter
|