blacklight 7.19.2 → 7.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f48da02e969e0c163d09760d711066ce9c0b4d5078636c8f50e19699ec58e8e
-  data.tar.gz: 77da2b86854e93f08a79ba9e28c86c7c91116b9f6934229eb6936cc6872bfdc6
+  metadata.gz: 514bb2df051f28fda2f7b1a2f4b309bd20cf79843dbaa74b519232543f36bc70
+  data.tar.gz: 0bbb3de22863a1e3b9e0aa55d0b9e501550f955fcc2630685e78572b7baf3d05
 SHA512:
-  metadata.gz: a42155551ab05fa25e433a7aad6e40078ce7cbc2918de03f6ede94aef53ade03b4b16f4411a915b737b1233a631d9cb2baddc9d560aa70b67df237776c01e7f6
-  data.tar.gz: 6430192899c4db45277e988217aecc04e954d856645941773176e36ecefd3ddda3c2a9988caffb7bde50f8aa76702a10cd00da67216f17c6fb49a2802a678dfe
+  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.19.2
+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 () {
@@ -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;
@@ -495,3 +499,4 @@ Blacklight.handleSearchContextMethod = function (event) {
 Blacklight.onLoad(function () {
   Blacklight.doSearchContextBehavior();
 });
+

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-min(sm)) {
-      max-width: breakpoint-min(sm) / 2;
+      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;

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

@@ -83,7 +83,7 @@
   .remove {
     color: $text-muted;
     font-weight: bold;
-    padding-left: $spacer / 2;
+    padding-left: $spacer * .5;
     text-decoration: none;
 
     &:hover {
@@ -104,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/_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/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/document_component.rb

@@ -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_item_component.rb

@@ -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,7 +85,7 @@ 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 visually-hidden')
           end

data/app/components/blacklight/metadata_field_layout_component.rb

@@ -23,7 +23,7 @@ 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(Blacklight::MetadataFieldLayoutComponent, 'The `value` content area is deprecated; render from the values slot instead')
 

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/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/javascript/blacklight/core.js

@@ -38,4 +38,8 @@ Blacklight.listeners().forEach(function(listener) {
   })
 })
 
-$('.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')
+})

data/app/javascript/blacklight/search_context.js

@@ -15,6 +15,9 @@ Blacklight.doSearchContextBehavior = function() {
   })
 };
 
+Blacklight.csrfToken = () => document.querySelector('meta[name=csrf-token]')?.content
+Blacklight.csrfParam = () => document.querySelector('meta[name=csrf-param]')?.content
+
 // this is the Rails.handleMethod with a couple adjustments, described inline:
 // first, we're attaching this directly to the event handler, so we can check for meta-keys
 Blacklight.handleSearchContextMethod = function(event) {
@@ -27,8 +30,8 @@ Blacklight.handleSearchContextMethod = function(event) {
   // instead of using the normal href, we need to use the context href instead
   let href = link.getAttribute('data-context-href')
   let target = link.getAttribute('target')
-  let csrfToken = Rails.csrfToken()
-  let csrfParam = Rails.csrfParam()
+  let csrfToken = Blacklight.csrfToken()
+  let csrfParam = Blacklight.csrfParam()
   let form = document.createElement('form')
   form.method = 'post'
   form.action = href

data/app/views/catalog/_home_text.html.erb

@@ -1,11 +1,11 @@
-<div class="jumbotron text-center">
+<div class="jumbotron text-center p-5 mb-4 bg-light rounded-3">
   <h1 class="jumbotron-heading"><%= t('blacklight.welcome') %></h1>
 
   <p class="lead">Blacklight is a multi-institutional open-source collaboration building a better discovery platform framework.</p>
 
   <p>
     <%= link_to 'Read the Documentation', 'https://github.com/projectblacklight/blacklight/wiki', class: 'btn btn-primary' %>
-    <%= link_to 'See Examples', 'http://projectblacklight.org', class: 'btn btn-outline-secondary' %>
+    <%= link_to 'See Examples', 'http://projectblacklight.org', class: 'btn btn-light' %>
   </p>
 </div>
 

data/app/views/catalog/_paginate_compact.html.erb

@@ -2,5 +2,6 @@
   response: paginate_compact,
   theme: :blacklight_compact,
   page_entries_info: page_entries_info(paginate_compact),
+  role: nil,
   html: { aria: {} })
 %>

data/app/views/shared/_header_navbar.html.erb

@@ -11,8 +11,8 @@
   </div>
 </nav>
 
-<div class="navbar-search navbar navbar-light bg-light" role="navigation">
+<%= content_tag :div, class: 'navbar-search navbar navbar-light bg-light', role: 'navigation', aria: { label: t('blacklight.search.header') } do %>
   <div class="<%= container_classes %>">
     <%= render_search_bar  %>
   </div>
-</div>
+<% end %>

data/blacklight.gemspec

@@ -32,14 +32,16 @@ Gem::Specification.new do |s|
   s.add_dependency "deprecation"
   s.add_dependency "i18n", '>= 1.7.0' # added named parameters
   s.add_dependency "ostruct", '>= 0.3.2'
-  s.add_dependency "view_component", '>= 2.28.0'
+  s.add_dependency "view_component", '~> 2.42.0'
 
   s.add_development_dependency "rsolr", ">= 1.0.6", "< 3"  # Library for interacting with rSolr.
   s.add_development_dependency "rspec-rails", "~> 4.0.0.beta2"
   s.add_development_dependency "rspec-its"
   s.add_development_dependency "rspec-collection_matchers", ">= 1.0"
+  s.add_development_dependency 'axe-core-rspec'
   s.add_development_dependency "capybara", '~> 3'
-  s.add_development_dependency 'apparition'
+  s.add_development_dependency 'webdrivers'
+  s.add_development_dependency 'selenium-webdriver'
   s.add_development_dependency 'engine_cart', '~> 2.1'
   s.add_development_dependency "equivalent-xml"
   s.add_development_dependency "simplecov"

data/config/locales/blacklight.de.yml

@@ -169,7 +169,7 @@ de:
       pagination:
         title: 'Ergebnisse Navigation'
       pagination_info:
-        no_items_found: 'Kein %{entry_name} gefunden'
+        no_items_found: 'Keine %{entry_name} gefunden'
         single_item_found: '<strong>1</strong> %{entry_name} gefunden'
         pages:
           one: '<strong>%{start_num}</strong> - <strong>%{end_num}</strong> von <strong>%{total_num}</strong>'
@@ -230,7 +230,9 @@ de:
         list: "Liste"
 
     entry_name:
-      default: 'Eintrag'
+      default:
+        one: Eintrag
+        other: Enträge
       grouped:
         default: 'gruppiertes Ergebnis'
 

data/config/locales/blacklight.en.yml

@@ -230,9 +230,13 @@ en:
         list: "List"
 
     entry_name:
-      default: 'entry'
+      default:
+        one: 'entry'
+        other: 'entries'
       grouped:
-        default: 'grouped result'
+        default:
+          one: 'grouped result'
+          other: 'grouped results'
 
     did_you_mean: 'Did you mean to type: %{options}?'
 

data/config/locales/blacklight.es.yml

@@ -230,7 +230,9 @@ es:
         list: "Lista"
 
     entry_name:
-      default: 'entrada'
+      default:
+        one: 'entrada'
+        other: 'entradas'
       grouped:
         default: 'resultado agrupado'
 

data/config/locales/blacklight.fr.yml

@@ -234,7 +234,9 @@ fr:
 
 
     entry_name:
-      default: 'résultat'
+      default:
+        one: 'résultat'
+        other: 'résultats'
       grouped:
         default: 'résultat groupé'
 

data/config/locales/blacklight.it.yml

@@ -230,7 +230,9 @@ it:
         list: "Lista"
 
     entry_name:
-      default: 'termine di ricerca'
+      default:
+        one: 'termine di ricerca'
+        other: 'termini di ricerca'
       grouped:
         default: 'risultato raggruppato'
 

data/lib/blacklight/search_state/filter_field.rb

@@ -83,10 +83,19 @@ module Blacklight
           Deprecation.warn(self, 'Normalizing parameters in FilterField#remove is deprecated')
           collection = collection.values
         end
+
         params[param][key] = collection - Array(value)
         params[param].delete(key) if params[param][key].empty?
         params.delete(param) if params[param].empty?
 
+        # Handle missing field queries.
+        missing = I18n.t("blacklight.search.facets.missing")
+        if (item.respond_to?(:fq) && item.fq == "-#{key}:[* TO *]") ||
+           item == missing
+          params[param].delete("-#{key}:")
+          params[param].delete(key) if params[param][key] == [""]
+        end
+
         new_state.reset(params)
       end
 

data/lib/blacklight/solr/response/group_response.rb

@@ -45,8 +45,9 @@ class Blacklight::Solr::Response::GroupResponse
   def entry_name(options)
     I18n.t(
       "blacklight.entry_name.grouped.#{key}",
-      default: :'blacklight.entry_name.grouped.default'
-    ).pluralize(options[:count])
+      default: :'blacklight.entry_name.grouped.default',
+      count: options[:count]
+    )
   end
 
   def method_missing meth, *args, &block

data/lib/blacklight/solr/response/pagination_methods.rb

@@ -24,6 +24,6 @@ module Blacklight::Solr::Response::PaginationMethods
   ##
   # Meant to have the same signature as Kaminari::PaginatableArray#entry_name
   def entry_name(options)
-    I18n.t('blacklight.entry_name.default').pluralize(options[:count])
+    I18n.t('blacklight.entry_name.default', count: options[:count])
   end
 end

data/lib/blacklight/solr/search_builder_behavior.rb

@@ -10,6 +10,7 @@ module Blacklight::Solr
         :add_facetting_to_solr, :add_solr_fields_to_query, :add_paging_to_solr,
         :add_sorting_to_solr, :add_group_config_to_solr,
         :add_facet_paging_to_solr, :add_adv_search_clauses,
+        :add_missing_field_query,
         :add_additional_filters
       ]
     end
@@ -81,6 +82,19 @@ module Blacklight::Solr
       end
     end
 
+    ##
+    # Build and append a missing field query.
+    ##
+    def add_missing_field_query(solr_parameters)
+      return unless solr_parameters["facet.missing"]
+
+      solr_parameters[:fq] = [] if solr_parameters[:fq].blank?
+
+      solr_parameters[:fq].append(*(blacklight_params["f"] || [])
+        .select { |f| f.match(/^-/) }
+        .map { |k, _v| "#{k}[* TO *]" })
+    end
+
     def add_additional_filters(solr_parameters, additional_filters = nil)
       q = additional_filters || @additional_filters
 

data/lib/blacklight.rb

@@ -96,7 +96,11 @@ module Blacklight
     end
 
     begin
-      @blacklight_yml = YAML.safe_load(blacklight_erb)
+      @blacklight_yml = if RUBY_VERSION > '2.6'
+                          YAML.safe_load(blacklight_erb, aliases: true)
+                        else
+                          YAML.safe_load(blacklight_erb, [], [], true)
+                        end
     rescue => e
       raise("#{blacklight_config_file} was found, but could not be parsed.\n#{e.inspect}")
     end

data/lib/generators/blacklight/assets_generator.rb

@@ -3,9 +3,11 @@ module Blacklight
   class Assets < Rails::Generators::Base
     source_root File.expand_path('../templates', __FILE__)
 
+    class_option :'bootstrap-version', type: :string, default: ENV.fetch('BOOTSTRAP_VERSION', '~> 4.0'), desc: "Set the generated app's bootstrap version"
+
     # This could be skipped if you want to use webpacker
     def add_javascript_dependencies
-      gem 'bootstrap', '~> 4.0'
+      gem 'bootstrap', options[:'bootstrap-version']
       gem 'twitter-typeahead-rails', '0.11.1.pre.corejavascript'
     end
 
@@ -15,7 +17,7 @@ module Blacklight
 
       create_file 'app/assets/javascripts/application.js' do
         <<~CONTENT
-          //= require jquery
+          //= require jquery3
           //= require rails-ujs
           //= require turbolinks
         CONTENT

data/lib/generators/blacklight/install_generator.rb

@@ -10,6 +10,7 @@ module Blacklight
 
     class_option :devise, type: :boolean, default: false, aliases: "-d", desc: "Use Devise as authentication logic."
     class_option :marc, type: :boolean, default: false, aliases: "-m", desc: "Generate MARC-based demo."
+    class_option :'bootstrap-version', type: :string, default: nil, desc: "Set the generated app's bootstrap version"
     class_option :'skip-assets', type: :boolean, default: !defined?(Sprockets), desc: "Skip generating javascript and css assets into the application"
     class_option :'skip-solr', type: :boolean, default: false, desc: "Skip generating solr configurations."
 
@@ -33,7 +34,9 @@ module Blacklight
     # Call external generator in AssetsGenerator, so we can
     # leave that callable seperately too.
     def copy_public_assets
-      generate "blacklight:assets" unless options[:'skip-assets']
+      generated_options = "--bootstrap-version #{options[:'bootstrap-version']}" if options[:'bootstrap-version']
+
+      generate "blacklight:assets", generated_options unless options[:'skip-assets']
     end
 
     def bundle_install

data/lib/generators/blacklight/user_generator.rb

@@ -22,7 +22,7 @@ module Blacklight
       return unless options[:devise]
 
       gem "devise"
-      gem "devise-guests", "~> 0.6"
+      gem "devise-guests", "~> 0.8"
 
       inside destination_root do
         Bundler.with_clean_env do

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "blacklight-frontend",
-  "version": "7.10.0",
+  "version": "7.20.0",
   "description": "[![Build Status](https://travis-ci.com/projectblacklight/blacklight.png?branch=master)](https://travis-ci.com/projectblacklight/blacklight) [![Gem Version](https://badge.fury.io/rb/blacklight.png)](http://badge.fury.io/rb/blacklight) [![Coverage Status](https://coveralls.io/repos/github/projectblacklight/blacklight/badge.svg?branch=master)](https://coveralls.io/github/projectblacklight/blacklight?branch=master)",
   "main": "app/assets/javascripts/blacklight",
   "scripts": {
@@ -27,7 +27,7 @@
   },
   "dependencies": {
     "bloodhound-js": "^1.2.3",
-    "bootstrap": "^4.3.1",
+    "bootstrap": ">=4.3.1 <6.0.0",
     "jquery": "^3.5.1",
     "typeahead.js": "^0.11.1"
   }

data/spec/components/blacklight/facet_item_component_spec.rb

@@ -20,7 +20,9 @@ RSpec.describe Blacklight::FacetItemComponent, type: :component do
 
   it 'links to the facet and shows the number of hits' do
     expect(rendered).to have_selector 'li'
-    expect(rendered).to have_link 'x', href: '/catalog?f=x'
+    expect(rendered).to have_link 'x', href: '/catalog?f=x' do |link|
+      link['rel'] == 'nofollow'
+    end
     expect(rendered).to have_selector '.facet-count', text: '10'
   end
 
@@ -39,7 +41,9 @@ RSpec.describe Blacklight::FacetItemComponent, type: :component do
     it 'links to the facet and shows the number of hits' do
       expect(rendered).to have_selector 'li'
       expect(rendered).to have_selector '.selected', text: 'x'
-      expect(rendered).to have_link '[remove]', href: '/catalog'
+      expect(rendered).to have_link '[remove]', href: '/catalog' do |link|
+        link['rel'] == 'nofollow'
+      end
       expect(rendered).to have_selector '.selected.facet-count', text: '10'
     end
   end

data/spec/features/axe_spec.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+RSpec.describe 'Accessibility testing', api: false, js: true do
+  xit 'validates the home page' do
+    visit root_path
+    expect(page).to be_accessible
+  end
+
+  xit 'validates the catalog page' do
+    visit root_path
+    fill_in "q", with: 'history'
+    click_button 'search'
+
+    # aria-allowed-role doesn't like nav[role="region"]
+    expect(page).to be_accessible(skipping: ['aria-allowed-role'])
+
+    within '.card.blacklight-language_ssim' do
+      click_button 'Language'
+      click_link "Tibetan"
+    end
+
+    expect(page).to be_accessible(skipping: ['aria-allowed-role'])
+  end
+
+  xit 'validates the single results page' do
+    visit solr_document_path('2007020969')
+    expect(page).to be_accessible
+  end
+
+  def be_accessible(skipping: [])
+    # typeahead does funny things with the search bar
+    be_axe_clean.excluding('.tt-hint').skipping(skipping + [('color-contrast' if Bootstrap::VERSION < '5')])
+  end
+end

data/spec/features/facet_missing_spec.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+RSpec.describe "Facet missing" do
+  before do
+    CatalogController.blacklight_config[:default_solr_params]["facet.missing"] = true
+  end
+
+  after do
+    CatalogController.blacklight_config[:default_solr_params].delete("facet.missing")
+  end
+
+  context "selecting missing field in facets" do
+    it "adds facet missing query and constraints" do
+      visit root_path
+
+      within "#facet-subject_geo_ssim" do
+        click_link "[Missing]"
+      end
+
+      within "#facet-subject_geo_ssim" do
+        expect(page).to have_selector("span.selected", text: "[Missing")
+        expect(page).to have_selector("span.facet-count.selected", text: "13")
+      end
+
+      within "#sortAndPerPage" do
+        expect(page).to have_content "1 - 10 of 13"
+      end
+
+      expect(page).to have_css(".constraint-value", text: "Region")
+      expect(page).to have_css(".constraint-value", text: "[Missing]")
+    end
+  end
+
+  context "unselecting the facet missing facet" do
+    it "unselects the missig field facet" do
+      visit root_path + "?f[-subject_geo_ssim:[* TO *]][]=&f[subject_geo_ssim][]="
+
+      within "#facet-subject_geo_ssim" do
+        click_link "remove"
+      end
+
+      expect(page).not_to have_link "remove"
+      expect(page).to have_content("Welcome!")
+    end
+  end
+
+  context "unselecting the facet missing constraint" do
+    it "unselects the missig field facet" do
+      visit root_path + "?f[-subject_geo_ssim:[* TO *]][]=&f[subject_geo_ssim][]="
+
+      within ".filter-subject_geo_ssim" do
+        click_link "Remove constraint Region: [Missing]"
+      end
+
+      expect(page).not_to have_link "remove"
+      expect(page).to have_content("Welcome!")
+    end
+  end
+end

data/spec/features/facets_spec.rb

@@ -69,7 +69,7 @@ RSpec.describe "Facets" do
     page.find('h3.facet-field-heading button', text: 'Pivot Field').click
 
     within '#facet-example_pivot_field' do
-      expect(page).to have_css('.facet-leaf-node', text: "Book\t30")
+      expect(page).to have_css('.facet-leaf-node', text: "Book 30")
       expect(page).not_to have_css('.facet-select', text: 'Tibetan')
       page.find('.facet-toggle-handle').click
       click_link 'Tibetan'

data/spec/helpers/blacklight/facets_helper_behavior_spec.rb

@@ -314,7 +314,7 @@ RSpec.describe Blacklight::FacetsHelperBehavior do
     end
 
     describe "simple case" do
-      let(:expected_html) { '<span class="facet-label"><a class="facet-select" href="/catalog">Z</a></span><span class="facet-count">10</span>' }
+      let(:expected_html) { '<span class="facet-label"><a class="facet-select" rel="nofollow" href="/catalog">Z</a></span><span class="facet-count">10</span>' }
 
       it "uses facet_display_value" do
         result = helper.render_facet_value('simple_field', item)
@@ -323,7 +323,7 @@ RSpec.describe Blacklight::FacetsHelperBehavior do
     end
 
     describe "when :url_method is set" do
-      let(:expected_html) { '<span class="facet-label"><a class="facet-select" href="/blabla">Z</a></span><span class="facet-count">10</span>' }
+      let(:expected_html) { '<span class="facet-label"><a class="facet-select" rel="nofollow" href="/blabla">Z</a></span><span class="facet-count">10</span>' }
 
       it "uses that method" do
         allow(helper).to receive(:facet_configuration_for_field).with('simple_field').and_return(Blacklight::Configuration::FacetField.new(key: 'simple_field', query: nil, date: nil, helper_method: nil, single: false, url_method: :test_method))

data/spec/lib/blacklight/search_state/filter_field_spec.rb

@@ -159,6 +159,33 @@ RSpec.describe Blacklight::SearchState::FilterField do
         expect(new_state.filter('another_field').values).to eq ['3']
       end
     end
+
+    context "With facet.missing field" do
+      let(:params) do
+        { f: { some_field: [""], "-some_field:": [""] } }
+      end
+
+      it "removes facet.missing facet params" do
+        filter = search_state.filter("some_field")
+        new_state = filter.remove(OpenStruct.new(fq: "-some_field:[* TO *]"))
+
+        expect(new_state.params).to eq("f" => {})
+      end
+    end
+
+    context "With facet.missing field value" do
+      let(:params) do
+        { f: { some_field: [""], "-some_field:": [""] } }
+      end
+
+      it "removes facet.missing facet params" do
+        missing = I18n.t("blacklight.search.facets.missing")
+        filter = search_state.filter("some_field")
+        new_state = filter.remove(missing)
+
+        expect(new_state.params).to eq("f" => {})
+      end
+    end
   end
 
   describe '#values' do

data/spec/models/blacklight/solr/response/group_response_spec.rb

@@ -69,8 +69,9 @@ RSpec.describe Blacklight::Solr::Response::GroupResponse, api: true do
     it "accesses a custom field grouped i18n key" do
       allow(I18n).to receive(:t).with(
         'blacklight.entry_name.grouped.result_group_ssi',
-        default: :'blacklight.entry_name.grouped.default'
-      ).and_return('cool group')
+        default: :'blacklight.entry_name.grouped.default',
+        count: 2
+      ).and_return('cool groups')
       expect(group.entry_name(count: 2)).to eq 'cool groups'
     end
 

data/spec/models/blacklight/solr/search_builder_spec.rb

@@ -27,6 +27,10 @@ RSpec.describe Blacklight::Solr::SearchBuilderBehavior, api: true do
     it "uses the class-level default_processor_chain" do
       expect(subject.processor_chain).to eq search_builder_class.default_processor_chain
     end
+
+    it "appends the :add_missing_field_query processor" do
+      expect(subject.processor_chain).to include(:add_missing_field_query)
+    end
   end
 
   context 'with merged parameters from the defaults + the search field' do
@@ -822,4 +826,13 @@ RSpec.describe Blacklight::Solr::SearchBuilderBehavior, api: true do
       expect(subject.to_hash).to include q: '{!lucene}id:(1 OR 2 OR 3)'
     end
   end
+
+  describe "#add_missing_field_query" do
+    it "precesses facet.missing query" do
+      subject.with("f" => { "-hello:" => [""] })
+      solr_params = { "facet.missing" => true, fq: [] }
+
+      expect(subject.add_missing_field_query(solr_params)).to eq(["-hello:[* TO *]"])
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -19,18 +19,24 @@ EngineCart.load_application!
 require 'rspec/rails'
 require 'rspec/its'
 require 'rspec/collection_matchers'
-require 'capybara/rspec'
-require 'capybara/apparition'
+require 'capybara/rails'
+require 'webdrivers'
+require 'selenium-webdriver'
 require 'equivalent-xml'
+require 'axe-rspec'
 
-Capybara.javascript_driver = :apparition
-Capybara.disable_animation = true
-# Capybara.enable_aria_label = true
+Capybara.javascript_driver = :headless_chrome
 
-# Uncomment for a headed browser
-# Capybara.register_driver :apparition do |app|
-#   Capybara::Apparition::Driver.new(app, headless: false)
-# end
+Capybara.register_driver :headless_chrome do |app|
+  Capybara::Selenium::Driver.load_selenium
+  browser_options = ::Selenium::WebDriver::Chrome::Options.new.tap do |opts|
+    opts.args << '--headless'
+    opts.args << '--disable-gpu'
+    opts.args << '--no-sandbox'
+    opts.args << '--window-size=1280,1696'
+  end
+  Capybara::Selenium::Driver.new(app, browser: :chrome, options: browser_options)
+end
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.

data/spec/test_app_templates/lib/generators/test_app_generator.rb

@@ -17,9 +17,6 @@ class TestAppGenerator < Rails::Generators::Base
     options = '--devise'
     if ENV['BLACKLIGHT_API_TEST']
       options += ' --skip-assets'
-      inject_into_class 'app/controllers/application_controller.rb', 'ApplicationController' do
-        "  include ActionController::MimeResponds\n" # see https://github.com/projectblacklight/blacklight/issues/1894
-      end
     end
 
     generate 'blacklight:install', options

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 7.19.2
+  version: 7.20.0
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -14,10 +14,10 @@ authors:
 - Dan Funk
 - Naomi Dushay
 - Justin Coyne
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-05-25 00:00:00.000000000 Z
+date: 2021-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -127,16 +127,16 @@ dependencies:
   name: view_component
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.28.0
+        version: 2.42.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.28.0
+        version: 2.42.0
 - !ruby/object:Gem::Dependency
   name: rsolr
   requirement: !ruby/object:Gem::Requirement
@@ -199,6 +199,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: axe-core-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -214,7 +228,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
-  name: apparition
+  name: webdrivers
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -762,8 +790,10 @@ files:
 - spec/features/advanced_search_spec.rb
 - spec/features/alternate_controller_spec.rb
 - spec/features/autocomplete_spec.rb
+- spec/features/axe_spec.rb
 - spec/features/bookmarks_spec.rb
 - spec/features/did_you_mean_spec.rb
+- spec/features/facet_missing_spec.rb
 - spec/features/facets_spec.rb
 - spec/features/record_view_spec.rb
 - spec/features/search_context_spec.rb
@@ -888,7 +918,7 @@ homepage: http://projectblacklight.org/
 licenses:
 - Apache 2.0
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -903,8 +933,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
-signing_key:
+rubygems_version: 3.1.2
+signing_key: 
 specification_version: 4
 summary: Blacklight provides a discovery interface for any Solr (http://lucene.apache.org/solr)
   index.
@@ -934,8 +964,10 @@ test_files:
 - spec/features/advanced_search_spec.rb
 - spec/features/alternate_controller_spec.rb
 - spec/features/autocomplete_spec.rb
+- spec/features/axe_spec.rb
 - spec/features/bookmarks_spec.rb
 - spec/features/did_you_mean_spec.rb
+- spec/features/facet_missing_spec.rb
 - spec/features/facets_spec.rb
 - spec/features/record_view_spec.rb
 - spec/features/search_context_spec.rb