blacklight 7.18.1 → 7.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a5a489af479cba41b095c127d35112702c19436855e558a727b9b6667455d2d
-  data.tar.gz: 199b0847364f2f8c5d5d2fd2cd86d0d969b1a802144127df77141f42da97a316
+  metadata.gz: 514bb2df051f28fda2f7b1a2f4b309bd20cf79843dbaa74b519232543f36bc70
+  data.tar.gz: 0bbb3de22863a1e3b9e0aa55d0b9e501550f955fcc2630685e78572b7baf3d05
 SHA512:
-  metadata.gz: d900379c48b0118bc87a6711989cce5cafb84fc13e4fae4c300ea9d1ec34278634fe69195179231c5c167f01170b95b493171d668e21a37bf4cf7b2e40301f3e
-  data.tar.gz: '089e1155d4a910bdc6657775cc5c4e8e0cc27b02307f36c15123f92cb55429d958d987ed202ff8a0ec9022cfc371ab0b8a769908c549ec784b11e956c25e00ba'
+  metadata.gz: c8a023e934c9d2b1365f71104047b53d60d51073f53fecf80d8e159a66edf9dbb5148db8be095b522d04e9d5939cf623fe824fa9607bfc6ed123c3e5cb08dfb7
+  data.tar.gz: e04a8a63ca946e9d31696ecc76c8da4fca3495687174dba352f613f64388a7802df446d2c902507d99f767b163acea71d2dd021f90f60f2aebe97ae8b115e0d4

data/.env

@@ -1,5 +1,5 @@
 ALPINE_RUBY_VERSION=2.6.5
-RAILS_VERSION=5.2.4.1
+RAILS_VERSION=5.2.5
 SOLR_PORT=8983
 SOLR_URL=http://solr:8983/solr/blacklight-core
 SOLR_VERSION=latest

data/.github/workflows/ruby.yml

@@ -43,6 +43,24 @@ jobs:
       run: bundle exec rake ci
       env:
         ENGINE_CART_RAILS_OPTIONS: '--skip-git --skip-listen --skip-spring --skip-keeps --skip-action-cable --skip-coffee --skip-test'
+  test_bootstrap5:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: [3.0]
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+    - name: Install dependencies
+      run: bundle install
+    - name: Run tests
+      run: bundle exec rake ci
+      env:
+        BOOTSTRAP_VERSION: '~> 5.0'
+        ENGINE_CART_RAILS_OPTIONS: '--skip-git --skip-listen --skip-spring --skip-keeps --skip-action-cable --skip-coffee --skip-test'
   test_rails6_0:
     runs-on: ubuntu-latest
     strategy:
@@ -87,7 +105,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: [2.7]
+        ruby: [2.7, 3.0]
     steps:
     - uses: actions/checkout@v2
     - name: Set up Ruby

data/.rubocop.yml

@@ -50,6 +50,10 @@ Metrics/ModuleLength:
     - 'app/controllers/concerns/blacklight/catalog.rb'
     - 'lib/blacklight/solr/search_builder_behavior.rb'
 
+Metrics/AbcSize:
+  Exclude:
+    - "lib/blacklight/search_state/filter_field.rb"
+
 Naming/HeredocDelimiterNaming:
   Enabled: false
 

data/README.md

@@ -35,7 +35,7 @@ rails generate blacklight:install
 
 * Ruby 2.2+
 * Bundler
-* Rails 5.1+
+* Rails 5.2+
 
 ## Contributing Code
 

data/VERSION

@@ -1 +1 @@
-7.18.1
+7.20.0

data/app/assets/javascripts/blacklight/blacklight.js

@@ -36,7 +36,11 @@ Blacklight.listeners().forEach(function (listener) {
     Blacklight.activate();
   });
 });
-$('.no-js').removeClass('no-js').addClass('js');
+Blacklight.onLoad(function () {
+  const elem = document.querySelector('.no-js');
+  elem.classList.remove('no-js');
+  elem.classList.add('js');
+});
 /*global Bloodhound */
 
 Blacklight.onLoad(function () {
@@ -352,7 +356,7 @@ Blacklight.modal.modalCloseSelector = '[data-blacklight-modal~=close]'; // Calle
 
 Blacklight.modal.onFailure = function (jqXHR, textStatus, errorThrown) {
   console.error('Server error:', this.url, jqXHR.status, errorThrown);
-  var contents = '<div class="modal-header">' + '<div class="modal-title">There was a problem with your request.</div>' + '<button type="button" class="blacklight-modal-close close" data-dismiss="modal" aria-label="Close">' + '  <span aria-hidden="true">&times;</span>' + '</button></div>' + ' <div class="modal-body"><p>Expected a successful response from the server, but got an error</p>' + '<pre>' + this.type + ' ' + this.url + "\n" + jqXHR.status + ': ' + errorThrown + '</pre></div>';
+  var contents = '<div class="modal-header">' + '<div class="modal-title">There was a problem with your request.</div>' + '<button type="button" class="blacklight-modal-close btn-close close" data-dismiss="modal" aria-label="Close">' + '  <span aria-hidden="true">&times;</span>' + '</button></div>' + ' <div class="modal-body"><p>Expected a successful response from the server, but got an error</p>' + '<pre>' + this.type + ' ' + this.url + "\n" + jqXHR.status + ': ' + errorThrown + '</pre></div>';
   $(Blacklight.modal.modalSelector).find('.modal-content').html(contents);
   $(Blacklight.modal.modalSelector).modal('show');
 };
@@ -460,8 +464,8 @@ Blacklight.handleSearchContextMethod = function (event) {
 
   let href = link.getAttribute('data-context-href');
   let target = link.getAttribute('target');
-  let csrfToken = Rails.csrfToken();
-  let csrfParam = Rails.csrfParam();
+  let csrfToken = document.querySelector('meta[name=csrf-token]')?.content
+  let csrfParam = document.querySelector('meta[name=csrf-param]')?.content
   let form = document.createElement('form');
   form.method = 'post';
   form.action = href;

data/app/assets/stylesheets/blacklight/_balanced_list.scss

@@ -2,11 +2,11 @@
   dt {
     font-weight: normal;
     color: $field_name_color;
-    @media (max-width: breakpoint-max(sm)) {
+    @media (max-width: breakpoint-min(md)) {
       text-align: left;
     }
 
-    @media (min-width: breakpoint-max(sm)) {
+    @media (min-width: breakpoint-min(md)) {
       text-align: right;
     }
   }

data/app/assets/stylesheets/blacklight/_bootstrap_overrides.scss

@@ -5,7 +5,7 @@
 // Facet field headings and buttons
 .facet-field-heading {
   border-bottom: 0;
-  
+
   button {
     font-weight: $headings-font-weight;
 

data/app/assets/stylesheets/blacklight/_constraints.scss

@@ -1,27 +1,30 @@
 .constraints-container {
   @extend .mb-2;
+  @extend .d-flex;
 }
 
 .applied-filter {
+  @extend .mx-1;
+
   .constraint-value {
     cursor: default;
     text-overflow: ellipsis;
     overflow: hidden;
 
-    @media (max-width: breakpoint-max(xs)) {
-      max-width: breakpoint-max(xs) / 2;
+    @media (max-width: breakpoint-min(sm)) {
+      max-width: breakpoint-min(sm) * .5;
     }
 
     @media (min-width: breakpoint-min(sm)) and (max-width: breakpoint-max(sm)) {
-      max-width: breakpoint-min(sm) / 2;
+      max-width: breakpoint-min(sm) * .5;
     }
 
     @media (min-width: breakpoint-min(md)) and (max-width: breakpoint-max(md)) {
-      max-width: breakpoint-min(md) / 2;
+      max-width: breakpoint-min(md) * .5;
     }
 
     @media (min-width: breakpoint-min(lg)) {
-      max-width: breakpoint-min(lg) / 2;
+      max-width: breakpoint-min(lg) * .5;
     }
 
     &:hover, &:active {

data/app/assets/stylesheets/blacklight/_controls.scss

@@ -1,3 +1,10 @@
+.search-widgets {
+  @extend .d-flex;
+  > * {
+    @extend .mx-1;
+  }
+}
+
 .sort-pagination,
 .pagination-search-widgets {
   border-bottom: $pagination-border-width solid $pagination-border-color;
@@ -34,7 +41,8 @@
   display: inline-block;
 
   .caption {
-    @extend .sr-only;
+    @extend .sr-only !optional;
+    @extend .visually-hidden !optional;
   }
 }
 

data/app/assets/stylesheets/blacklight/_facets.scss

@@ -3,7 +3,8 @@
     border-color: $navbar-light-toggler-border-color;
     color: $navbar-light-active-color;
 
-    @include hover-focus {
+    &:hover,
+    &:focus {
       color: $navbar-light-active-color;
     }
   }
@@ -82,7 +83,8 @@
   .remove {
     color: $text-muted;
     font-weight: bold;
-    padding-left: $spacer / 2;
+    padding-left: $spacer * .5;
+    text-decoration: none;
 
     &:hover {
       color: theme-color("danger");
@@ -102,7 +104,7 @@
     padding-right: 1em;
     text-indent: -15px;
     padding-left: 15px;
-    padding-bottom: $spacer / 2;
+    padding-bottom: $spacer * .5;
     @include hyphens-auto;
   }
 

data/app/assets/stylesheets/blacklight/_header.scss

@@ -44,7 +44,12 @@
   .submit-search-text {
     // hide 'search' label at very small screens
     @media screen and (max-width: breakpoint-max(xs)) {
-      @include sr-only();
+      @if mixin-exists(sr-only) {
+        @include sr-only();
+      }
+      @if mixin-exists(visually-hidden) {
+        @include visually-hidden();
+      }
     }
   }
 }

data/app/assets/stylesheets/blacklight/_pagination.scss

@@ -6,7 +6,7 @@
 }
 
 .record-padding {
-  margin-top: $spacer / 2;
+  margin-top: $spacer * .5;
 }
 
 .pagination {

data/app/assets/stylesheets/blacklight/_twitter_typeahead.scss

@@ -1,4 +1,5 @@
 .twitter-typeahead {
+  display: inline-flex !important;
   flex-grow: 2;
   z-index: $zindex-typeahead;
 

data/app/components/blacklight/constraint_layout_component.html.erb

@@ -10,7 +10,7 @@
   <% if @remove_path.present? %>
     <%= link_to(@remove_path, class: 'btn btn-outline-secondary remove') do %>
       <span class="remove-icon" aria-hidden="true">✖</span>
-      <span class="sr-only">
+      <span class="sr-only visually-hidden">
         <%= if @label.blank?
             t('blacklight.search.filters.remove.value', value: @value)
           else

data/app/components/blacklight/constraints_component.html.erb

@@ -1,9 +1,9 @@
 <%= content_tag :div, id: @id, class: @classes do %>
-  <h2 class="sr-only"><%= t('blacklight.search.search_constraints_header') %></h2>
+  <h2 class="sr-only visually-hidden"><%= t('blacklight.search.search_constraints_header') %></h2>
 
   <%= link_to t('blacklight.search.start_over'), start_over_path, class: "catalog_startOverLink btn btn-primary" %>
 
-  <span class="constraints-label sr-only"><%= t('blacklight.search.filters.title') %></span>
+  <span class="constraints-label sr-only visually-hidden"><%= t('blacklight.search.filters.title') %></span>
   <% if query_constraints_area.present? %>
     <% query_constraints_area.each do |constraint| %>
       <%= constraint %>

data/app/components/blacklight/constraints_component.rb

@@ -63,10 +63,14 @@ module Blacklight
 
       Deprecation.silence(Blacklight::SearchState) do
         @search_state.filters.map do |facet|
+          missing_facet = @search_state.params.dig("f", "-#{facet.key}:").present?
           facet.values.map do |val|
-            next if val.blank? # skip empty string
+            next if val.blank? && !missing_facet
 
-            if val.is_a?(Array)
+            if missing_facet && val.blank?
+              missing = I18n.t("blacklight.search.facets.missing")
+              yield facet_item_presenter(facet.config, missing, facet.key)
+            elsif val.is_a?(Array)
               yield inclusive_facet_item_presenter(facet.config, val, facet.key) if val.any?(&:present?)
             else
               yield facet_item_presenter(facet.config, val, facet.key)

data/app/components/blacklight/content_areas_shim.rb

@@ -5,7 +5,8 @@ module Blacklight
   module ContentAreasShim
     # Shim the `with` helper to write content into slots instead
     def with(slot_name, *args, **kwargs, &block)
-      Deprecation.warn('ViewComponents deprecated `with` and it will be removed in ViewComponents 3.0. content_areas. Use slots (https://viewcomponent.org/guide/slots.html) instead.')
+      Deprecation.warn(Blacklight::ContentAreasShim,
+                       'ViewComponents deprecated `with` and it will be removed in ViewComponents 3.0. content_areas. Use slots (https://viewcomponent.org/guide/slots.html) instead.')
       public_send(slot_name, *args, **kwargs, &block)
     end
   end

data/app/components/blacklight/document_component.rb

@@ -25,7 +25,7 @@ module Blacklight
       next static_content if static_content.present?
       next unless component
 
-      Deprecation.warn('Pass the presenter to the DocumentComponent') if @presenter.nil?
+      Deprecation.warn(Blacklight::DocumentComponent, 'Pass the presenter to the DocumentComponent') if @presenter.nil?
 
       component.new(*args, document: @document, presenter: @presenter, document_counter: @document_counter, **kwargs)
     end)
@@ -34,7 +34,7 @@ module Blacklight
     renders_one :metadata, (lambda do |static_content = nil, *args, component: nil, fields: nil, **kwargs|
       next static_content if static_content.present?
 
-      Deprecation.warn('Pass the presenter to the DocumentComponent') if !fields && @presenter.nil?
+      Deprecation.warn(Blacklight::DocumentComponent, 'Pass the presenter to the DocumentComponent') if !fields && @presenter.nil?
 
       component ||= Blacklight::DocumentMetadataComponent
 
@@ -48,7 +48,7 @@ module Blacklight
       next image_options_or_static_content if image_options_or_static_content.is_a? String
 
       component ||= @presenter&.view_config&.thumbnail_component || Blacklight::Document::ThumbnailComponent
-      Deprecation.warn('Pass the presenter to the DocumentComponent') if !component && @presenter.nil?
+      Deprecation.warn(Blacklight::DocumentComponent, 'Pass the presenter to the DocumentComponent') if !component && @presenter.nil?
 
       component.new(*args, document: @document, presenter: @presenter, counter: @counter, image_options: image_options_or_static_content, **kwargs)
     end)
@@ -93,13 +93,13 @@ module Blacklight
       @id = id || ('document' if show)
       @classes = classes
 
-      Deprecation.warn('Passing embed_component is deprecated') if @embed_component.present?
+      Deprecation.warn(Blacklight::DocumentComponent, 'Passing embed_component is deprecated') if @embed_component.present?
       @embed_component = embed_component
 
-      Deprecation.warn('Passing metadata_component is deprecated') if @metadata_component.present?
+      Deprecation.warn(Blacklight::DocumentComponent, 'Passing metadata_component is deprecated') if @metadata_component.present?
       @metadata_component = metadata_component || Blacklight::DocumentMetadataComponent
 
-      Deprecation.warn('Passing thumbnail_component is deprecated') if @thumbnail_component.present?
+      Deprecation.warn(Blacklight::DocumentComponent, 'Passing thumbnail_component is deprecated') if @thumbnail_component.present?
       @thumbnail_component = thumbnail_component || Blacklight::Document::ThumbnailComponent
 
       @document_counter = document_counter
@@ -121,10 +121,10 @@ module Blacklight
     end
 
     def before_render
-      set_slot(:title) unless title
-      set_slot(:thumbnail, component: @thumbnail_component || presenter.view_config&.thumbnail_component) unless thumbnail || show?
-      set_slot(:metadata, component: @metadata_component, fields: presenter.field_presenters) unless metadata
-      set_slot(:embed, component: @embed_component || presenter.view_config&.embed_component) unless embed
+      set_slot(:title, nil) unless title
+      set_slot(:thumbnail, nil, component: @thumbnail_component || presenter.view_config&.thumbnail_component) unless thumbnail || show?
+      set_slot(:metadata, nil, component: @metadata_component, fields: presenter.field_presenters) unless metadata
+      set_slot(:embed, nil, component: @embed_component || presenter.view_config&.embed_component) unless embed
     end
 
     private

data/app/components/blacklight/facet_field_component.html.erb

@@ -2,9 +2,11 @@
   <h3 class="card-header p-0 facet-field-heading" id="<%= @facet_field.html_id %>-header">
     <button
       type="button"
-      class="btn btn-block p-2 text-left collapse-toggle <%= "collapsed" if @facet_field.collapsed? %>"
+      class="btn w-100 d-block btn-block p-2 text-start text-left collapse-toggle <%= "collapsed" if @facet_field.collapsed? %>"
       data-toggle="collapse"
+      data-bs-toggle="collapse"
       data-target="#<%= @facet_field.html_id %>"
+      data-bs-target="#<%= @facet_field.html_id %>"
       aria-expanded="<%= @facet_field.collapsed? ? 'false' : 'true' %>"
     >
       <%= label %>

data/app/components/blacklight/facet_field_no_layout_component.rb

@@ -10,7 +10,7 @@ module Blacklight
     def initialize(**); end
 
     def call
-      body
+      body.to_s
     end
   end
 end

data/app/components/blacklight/facet_item_component.rb

@@ -27,7 +27,7 @@ module Blacklight
                   render_facet_value
                 end
 
-      return if content.blank?
+      return '' if content.blank?
       return content unless @wrapping_element
 
       content_tag @wrapping_element, content
@@ -72,7 +72,7 @@ module Blacklight
     # @private
     def render_facet_value
       tag.span(class: "facet-label") do
-        link_to_unless(@suppress_link, @label, @href, class: "facet-select")
+        link_to_unless(@suppress_link, @label, @href, class: "facet-select", rel: "nofollow")
       end + render_facet_count
     end
 
@@ -85,9 +85,9 @@ module Blacklight
       tag.span(class: "facet-label") do
         tag.span(@label, class: "selected") +
           # remove link
-          link_to(@href, class: "remove") do
+          link_to(@href, class: "remove", rel: "nofollow") do
             tag.span('✖', class: "remove-icon", aria: { hidden: true }) +
-              tag.span(@view_context.t(:'blacklight.search.facets.selected.remove'), class: 'sr-only')
+              tag.span(@view_context.t(:'blacklight.search.facets.selected.remove'), class: 'sr-only visually-hidden')
           end
       end + render_facet_count(classes: ["selected"])
     end

data/app/components/blacklight/facet_item_pivot_component.rb

@@ -56,7 +56,7 @@ module Blacklight
 
     def facet_toggle_button(id)
       content_tag 'button', class: 'btn facet-toggle-handle collapsed',
-                            data: { toggle: 'collapse', target: "##{id}" },
+                            data: { toggle: 'collapse', 'bs-toggle': 'collapse', target: "##{id}", 'bs-target': "##{id}" },
                             aria: { expanded: false, controls: id, describedby: "#{id}_label" } do
         concat toggle_icon(:show)
         concat toggle_icon(:hide)
@@ -66,7 +66,7 @@ module Blacklight
     def toggle_icon(type)
       content_tag 'span', class: type do
         concat @icons[type]
-        concat content_tag('span', t(type, scope: 'blacklight.search.facets.pivot'), class: 'sr-only')
+        concat content_tag('span', t(type, scope: 'blacklight.search.facets.pivot'), class: 'sr-only visually-hidden')
       end
     end
 

data/app/components/blacklight/metadata_field_layout_component.rb

@@ -23,9 +23,9 @@ module Blacklight
     end
 
     def value(*args, **kwargs, &block)
-      return set_slot(:values, *args, **kwargs, &block) if block_given?
+      return set_slot(:values, nil, *args, **kwargs, &block) if block_given?
 
-      Deprecation.warn('The `value` content area is deprecated; render from the values slot instead')
+      Deprecation.warn(Blacklight::MetadataFieldLayoutComponent, 'The `value` content area is deprecated; render from the values slot instead')
 
       values.first
     end

data/app/components/blacklight/response/facet_group_component.html.erb

@@ -9,6 +9,8 @@
       data: {
         toggle: 'collapse',
         target: "##{@panel_id}",
+        'bs-toggle': 'collapse',
+        'bs-target': "##{@panel_id}"
       },
       aria: {
         controls: @panel_id,

data/app/components/blacklight/response/pagination_component.html.erb

@@ -1,3 +1,3 @@
-<%= content_tag :nav, class: 'pagination', role: 'region', **@html_attr do %>
+<%= content_tag :section, class: 'pagination',  **@html_attr do %>
   <%= pagination %>
 <% end %>

data/app/components/blacklight/response/view_type_component.html.erb

@@ -1,5 +1,5 @@
 <div class="view-type">
-  <span class="sr-only"><%= t('blacklight.search.view_title') %></span>
+  <span class="sr-only visually-hidden"><%= t('blacklight.search.view_title') %></span>
   <div class="view-type-group btn-group">
     <% views.each do |view| %>
       <%= view %>

data/app/components/blacklight/search_bar_component.html.erb

@@ -1,7 +1,7 @@
 <%= form_tag @url, method: @method, class: @classes.join(' '), role: 'search', 'aria-label' => scoped_t('submit') do %>
   <%= render_hash_as_hidden_fields(@params) %>
   <% if @search_fields.length > 1 %>
-    <label for="search_field" class="sr-only"><%= scoped_t('search_field.label') %></label>
+    <label for="search_field" class="sr-only visually-hidden"><%= scoped_t('search_field.label') %></label>
   <% end %>
   <div class="input-group">
     <%= prepend %>
@@ -11,12 +11,12 @@
                        options_for_select(@search_fields, h(@search_field)),
                        title: scoped_t('search_field.title'),
                        id: "#{@prefix}search_field",
-                       class: "custom-select search-field") %>
+                       class: "custom-select form-select search-field") %>
     <% elsif @search_fields.length == 1 %>
       <%= hidden_field_tag :search_field, @search_fields.first.last %>
     <% end %>
 
-    <label for="<%= @prefix %><%= @query_param %>" class="sr-only"><%= scoped_t('search.label') %></label>
+    <label for="<%= @prefix %><%= @query_param %>" class="sr-only visually-hidden"><%= scoped_t('search.label') %></label>
     <%= text_field_tag @query_param, @q, placeholder: scoped_t('search.placeholder'), class: "search-q q form-control rounded-#{@search_fields.length > 1 ? '0' : 'left'}", id: "#{@prefix}q", autocomplete: autocomplete_path.present? ? "off" : "", autofocus: @autofocus, data: { autocomplete_enabled: autocomplete_path.present?, autocomplete_path: autocomplete_path }  %>
 
     <span class="input-group-append">

data/app/components/blacklight/system/dropdown_component.rb

@@ -4,7 +4,7 @@ module Blacklight
   module System
     class DropdownComponent < ViewComponent::Base
       renders_one :button, (lambda do |classes:, label:|
-        button_tag class: classes, aria: { expanded: false }, data: { toggle: 'dropdown' } do
+        button_tag class: classes, aria: { expanded: false }, data: { toggle: 'dropdown', 'bs-toggle': 'dropdown' } do
           safe_join([label, content_tag(:span, '', class: 'caret')])
         end
       end)

data/app/components/blacklight/system/flash_message_component.html.erb

@@ -1,4 +1,4 @@
 <div class="alert <%= @classes %>">
   <%= message %>
-  <a class="close" data-dismiss="alert" href="#">&times;</a>
+  <a class="btn-close close" data-dismiss="alert" href="#">&times;</a>
 </div>

data/app/components/blacklight/system/modal_component.html.erb

@@ -6,7 +6,7 @@
       <h1 class="modal-title"><%= title %></h1>
     <% end) %>
 
-    <button type="button" class="blacklight-modal-close close" data-dismiss="modal" aria-label="<%= t('blacklight.modal.close') %>">
+    <button type="button" class="blacklight-modal-close btn-close close" data-dismiss="modal" aria-label="<%= t('blacklight.modal.close') %>">
       <span aria-hidden="true">&times;</span>
     </button>
   </div>

data/app/controllers/concerns/blacklight/bookmarks.rb

@@ -48,9 +48,6 @@ module Blacklight::Bookmarks
       format.html {}
       format.rss  { render layout: false }
       format.atom { render layout: false }
-      format.json do
-        render json: render_search_results_as_json
-      end
 
       additional_response_formats(format)
       document_export_formats(format)

data/app/controllers/concerns/blacklight/catalog.rb

@@ -2,6 +2,9 @@
 module Blacklight::Catalog
   extend ActiveSupport::Concern
 
+  # MimeResponds is part of ActionController::Base, but not ActionController::API
+  include ActionController::MimeResponds
+
   include Blacklight::Base
   include Blacklight::Facet
   include Blacklight::Searchable

data/app/controllers/concerns/blacklight/controller.rb

@@ -3,6 +3,7 @@
 # as this module is mixed-in to the application controller in the hosting app on installation.
 module Blacklight::Controller
   extend ActiveSupport::Concern
+  extend Deprecation
 
   included do
     include Blacklight::SearchFields
@@ -38,11 +39,6 @@ module Blacklight::Controller
     # TODO: move to Searchable
     class_attribute :search_service_class
     self.search_service_class = Blacklight::SearchService
-
-    # This callback runs when a user first logs in
-
-    define_callbacks :logging_in_user
-    set_callback :logging_in_user, :before, :transfer_guest_user_actions_to_current_user
   end
 
   # @private
@@ -136,6 +132,13 @@ module Blacklight::Controller
 
   ##
   # When a user logs in, transfer any saved searches or bookmarks to the current_user
+  def transfer_guest_to_user
+    Deprecation.silence(Blacklight::Controller) do
+      transfer_guest_user_actions_to_current_user
+    end
+  end
+
+  # @deprecated use canonical `transfer_guest_to_user` method instead
   def transfer_guest_user_actions_to_current_user
     return unless respond_to?(:current_user) && respond_to?(:guest_user) && current_user && guest_user
 
@@ -155,6 +158,7 @@ module Blacklight::Controller
     # let guest_user know we've moved some bookmarks from under it
     guest_user.reload if guest_user.persisted?
   end
+  deprecation_deprecate :transfer_guest_user_actions_to_current_user
 
   ##
   # To handle failed authorization attempts, redirect the user to the

data/app/controllers/concerns/blacklight/search_context.rb

@@ -73,7 +73,7 @@ module Blacklight::SearchContext
   #
   def agent_is_crawler?
     crawler_proc = blacklight_config.crawler_detector
-    return false if crawler_proc.nil? || current_user.present?
+    return false if crawler_proc.nil? || (defined?(current_user) && current_user.present?)
 
     crawler_proc.call(request)
   end

data/app/helpers/blacklight/catalog_helper_behavior.rb

@@ -47,11 +47,9 @@ module Blacklight::CatalogHelperBehavior
     entry_name = if entry_name
                    entry_name.pluralize(collection.size, I18n.locale)
                  else
-                   collection.entry_name(count: collection.size).to_s.downcase
+                   collection.entry_name(count: collection.size).to_s
                  end
 
-    entry_name = entry_name.pluralize unless collection.total_count == 1
-
     # grouped response objects need special handling
     end_num = if collection.respond_to?(:groups) && render_grouped_response?(collection)
                 collection.groups.length

data/app/helpers/blacklight/component_helper_behavior.rb

@@ -14,7 +14,7 @@ module Blacklight
       if action_opts.path
         send(action_opts.path, url_opts)
       elsif url_opts[:id].class.respond_to?(:model_name)
-        url_for([action_opts.key, url_opts[:id]])
+        url_for([action_opts.key.to_sym, url_opts[:id]])
       else
         send("#{action_opts.key}_#{controller_name}_path", url_opts)
       end