blacklight 6.19.2 → 6.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29725d7ac098fe4dfcdadceabf7b03066f14c680a9af21afa54191d643e87e7a
-  data.tar.gz: e36bfb2a98c4eccdd1368f8a06a7a377e5fa5f1d3282a48384e31470148b3c50
+  metadata.gz: 57d198c6aed6d4e2cca7c1945904e4b13139ba1788acd6363d427aa30d436c14
+  data.tar.gz: 92364314b9bbb7fcb9afc3f229a641afcd05ba43e1df4b19c8512e0e256523f9
 SHA512:
-  metadata.gz: f00f3c5c21af357d7c695888835a92a7ca63ca361fdb670fee07254f69a444fca4bc6d7d0ccd396bb871346eabc6ef6015c82d4dbadd81c1a3e7ccb584f56545
-  data.tar.gz: 4f06db656530cb3b32364815ae24fff6c4ddcd8fe12373e08d6088b263025b9acb292c616ac45377ba43f96dbb6230875e98553fe4c7bd87b5f18f5819557a92
+  metadata.gz: 11048e0150ec7619375f56771faf38d1bdd0797f0f19cf67c8d8926f9f1e26adab9caf1a0f4fae084be28807aa0ab4e7320c149f688181f49eea8dedfd73d7c7
+  data.tar.gz: ece97e66b4d5a6c1f91b5ea9491811d06983435e592936e973de5e253fcf8405351b601999480340384ef229affa3e703b261a628a41286975b20a83e789ea2e

data/.travis.yml

@@ -1,34 +1,15 @@
-dist: trusty
+dist: bionic
 addons:
   chrome: stable
 language: ruby
-sudo: false
 
 notifications:
   email: false
 
 rvm:
-  - 2.5.0
-
-matrix:
-  include:
-    - rvm: 2.5.0
-      env: "RAILS_VERSION=5.2.0"
-    - rvm: 2.4.4
-      env: "RAILS_VERSION=4.2.10"
-    - rvm: 2.2.10
-      env: "RAILS_VESION=5.0.7"
-    - rvm: 2.3.7
-      env: "RAILS_VERSION=5.1.6"
-    - rvm: jruby-9.1.17.0
-      env: "RAILS_VERSION=5.2.0 JRUBY_OPTS=\"-J-Xms512m -J-Xmx1024m\""
-  allow_failures:
-    - rvm: jruby-9.1.17.0
-    - rvm: 2.4.4
-      env: "RAILS_VERSION=4.2.10"
-    - rvm: 2.2.10
-      env: "RAILS_VESION=5.0.7"
-  fast_finish: true
+  - 2.5.7
+  - 2.6.5
+  - 2.7.0
 
 before_install:
   - gem update --system
@@ -39,7 +20,9 @@ before_script:
   - if [[ "${RAILS_VERSION}" =~ ^4.2.* ]]; then perl -pi -e "s/ActiveRecord::Migration\[[\d\.]+\]/ActiveRecord::Migration/" db/migrate/*; fi
 
 env:
- - "RAILS_VERSION=5.1.1"
+ - "RAILS_VERSION=5.1.7"
+ - "RAILS_VERSION=5.2.0"
+
 
 notifications:
   irc: "irc.freenode.org#blacklight"
@@ -49,5 +32,13 @@ notifications:
 global_env:
   - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
   - ENGINE_CART_RAILS_OPTIONS='--skip-git --skip-bundle --skip-listen --skip-spring --skip-yarn --skip-keeps --skip-action-cable --skip-coffee --skip-test'
+  - CC_TEST_REPORTER_ID=5042c7358c96b0b926088a4cda3e132fffe7a66ce8047cdb1dc6f0b4b6676b79
+
+jdk: openjdk11
 
-jdk: oraclejdk8
+before_script:
+  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+  - chmod +x ./cc-test-reporter
+  - ./cc-test-reporter before-build
+after_script:
+  - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT

data/Gemfile

@@ -32,6 +32,8 @@ else
   end
 
   case ENV['RAILS_VERSION']
+  when /^5.[12]/
+    gem 'sass-rails', '~> 5.0'
   when /^4.2/
     gem 'responders', '~> 2.0'
     gem 'sass-rails', '>= 5.0'

data/README.md

@@ -1,6 +1,6 @@
 # Blacklight
 
-[![Build Status](https://travis-ci.org/projectblacklight/blacklight.png?branch=master)](https://travis-ci.org/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)
+[![Build Status](https://travis-ci.org/projectblacklight/blacklight.png?branch=master)](https://travis-ci.org/projectblacklight/blacklight) [![Gem Version](https://badge.fury.io/rb/blacklight.png)](http://badge.fury.io/rb/blacklight) [![Test Coverage](https://api.codeclimate.com/v1/badges/83fd270492c136594e59/test_coverage)](https://codeclimate.com/github/projectblacklight/blacklight/test_coverage)
 
 Blacklight is an open source Solr user interface discovery platform.
 You can use Blacklight to enable searching and browsing of your collections.

data/VERSION

@@ -1 +1 @@
-6.19.2
+6.24.0

data/app/helpers/blacklight/layout_helper_behavior.rb

@@ -11,6 +11,13 @@ module Blacklight
       "#{main_content_classes} show-document"
     end
 
+    ##
+    # Attributes to add to the <html> tag (e.g. lang and dir)
+    # @return [Hash]
+    def html_tag_attributes
+      { lang: I18n.locale }
+    end
+
     ##
     # Classes added to a document's sidebar div
     # @return [String]

data/app/models/concerns/blacklight/document.rb

@@ -144,6 +144,22 @@ module Blacklight::Document
     def unique_key
       @unique_key ||= 'id'
     end
+
+    # Define an attribute reader on a document model
+    # @Example
+    #   class SolrDocument
+    #     include Blacklight::Solr::Document
+    #     attribute :title, Blacklight::Types::String, 'title_tesim'
+    #   end
+    #
+    #   doc = SolrDocument.new(title_tesim: ["One flew over the cuckoo's nest"])
+    #   doc.title
+    #   #=> "One flew over the cuckoo's nest"
+    def attribute(name, type, field)
+      define_method name do
+        type.coerce(self[field])
+      end
+    end
   end
 
   private

data/app/values/blacklight/types.rb

@@ -0,0 +1,28 @@
+module Blacklight
+  # These are data types that blacklight can use to coerce values from the index
+  module Types
+    class Array
+      def self.coerce(input)
+        ::Array.wrap(input)
+      end
+    end
+
+    class String
+      def self.coerce(input)
+        ::Array.wrap(input).first
+      end
+    end
+
+    class Date
+      def self.coerce(input)
+        field = String.coerce(input)
+        return if field.blank?
+        begin
+          ::Date.parse(field)
+        rescue ArgumentError
+          Rails.logger.info "Unable to parse date: #{field.first.inspect}"
+        end
+      end
+    end
+  end
+end

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

@@ -1,10 +1,10 @@
 <div class="prev_next_links btn-group pull-left">
   <%= link_to_previous_page @pagination, raw(t('views.pagination.previous')), params: search_state.to_h, param_name: blacklight_config.facet_paginator_class.request_keys[:page], class: 'btn btn-link', data: { ajax_modal: "preserve" } do %>
-    <span class="disabled btn btn-disabled"><%= raw(t('views.pagination.previous')) %></span>
+    <%= content_tag :span, raw(t('views.pagination.previous')), class: 'disabled btn btn-disabled' %>
   <% end %>
 
   <%= link_to_next_page @pagination, raw(t('views.pagination.next')), params: search_state.to_h, param_name: blacklight_config.facet_paginator_class.request_keys[:page], class: 'btn btn-link',  data: { ajax_modal: "preserve" } do %>
-    <span class="disabled btn  btn-disabled"><%= raw(t('views.pagination.next')) %></span>
+    <%= content_tag :span, raw(t('views.pagination.next')), class: 'disabled btn btn-disabled' %>
   <% end %>
 </div>
 

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

@@ -7,7 +7,7 @@
   </button>
   <ul class="dropdown-menu" role="menu">
     <%- per_page_options_for_select.each do |(label, count)| %>
-      <li><%= link_to(label, url_for(search_state.params_for_search(per_page: count))) %></li>
+      <li role="menuitem"><%= link_to(label, url_for(search_state.params_for_search(per_page: count))) %></li>
     <%- end -%>
   </ul>
 </div>

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

@@ -1,4 +1,4 @@
-<%= form_tag search_action_url, method: :get, class: 'search-query-form clearfix navbar-form', role: 'search' do %>
+<%= form_tag search_action_url, method: :get, class: 'search-query-form clearfix navbar-form', role: 'search', 'aria-label' => t('blacklight.search.form.submit') do %>
   <%= render_hash_as_hidden_fields(search_state.params_for_search.except(:q, :search_field, :qt, :page, :utf8)) %>
   <div class="input-group">
     <% if search_fields.length > 1 %>

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

@@ -1,4 +1,4 @@
-<div id="sortAndPerPage" class="clearfix">
+<div id="sortAndPerPage" class="clearfix" role="navigation" aria-label="<%= t('blacklight.search.per_page.aria_label')%>">
   <%= render :partial => "paginate_compact", :object => @response if show_pagination? %>
   <%= render_results_collection_tools wrapping_class: "search-widgets pull-right" %>
 </div>

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

@@ -6,7 +6,7 @@
 
   <ul class="dropdown-menu" role="menu">
       <%- active_sort_fields.each do |sort_key, field_config| %>
-        <li><%= link_to(sort_field_label(sort_key), url_for(search_state.params_for_search(sort: sort_key))) %></li>
+        <li role="menuitem"><%= link_to(sort_field_label(sort_key), url_for(search_state.params_for_search(sort: sort_key))) %></li>
       <%- end -%>
   </ul>
 </div>

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

@@ -1,5 +1,5 @@
-<%- if has_thumbnail?(document) && tn = render_thumbnail_tag(document, {}, :counter => document_counter_with_offset(document_counter)) %>
+<%- if has_thumbnail?(document) && tn = render_thumbnail_tag(document, { alt: '' }, 'aria-hidden': true, tabindex: -1, counter: document_counter_with_offset(document_counter)) %>
 <div class="document-thumbnail">
   <%= tn %>
-</div>  
-<%- end %>
+</div>
+<%- end %>

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

@@ -1,5 +1,7 @@
 <div class="modal-header">
-<button type="button" class="ajax-modal-close close" data-dismiss="modal" aria-hidden="true">×</button>
+<button type="button" class="ajax-modal-close close" data-dismiss="modal" aria-label="<%= t('blacklight.modal.close') %>">
+  <span aria-hidden="true">&times;</span>
+</button>
 <h1 class="modal-title"><%= t('blacklight.email.form.title') %></h1>
   </div>
 <%= render :partial => 'email_form' %>

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

@@ -1,9 +1,11 @@
 <div class="modal-header">
-  <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+  <button type="button" class="ajax-modal-close close" data-dismiss="modal" aria-label="<%= t('blacklight.modal.close') %>">
+    <span aria-hidden="true">&times;</span>
+  </button>
   <h1><%= t('blacklight.email.form.title') %></h1>
 </div>
 
 <div class="modal-body">
   <%= render :partial=>'/flash_msg' %>
   <span class="ajax-close-modal"></span>
-</div>
+</div>

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

@@ -3,7 +3,9 @@
 </div>
 
 <div class="modal-header">
-  <button type="button" class="ajax-modal-close close" data-dismiss="modal" aria-hidden="true">×</button>
+  <button type="button" class="ajax-modal-close close" data-dismiss="modal" aria-label="<%= t('blacklight.modal.close') %>">
+    <span aria-hidden="true">&times;</span>
+  </button>
 
   <h3 class="modal-title"><%= facet_field_label(@facet.key) %></h3>
   <%= render partial: 'facet_index_navigation' if @facet.index_range && @display_facet.index? %>

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

@@ -1,5 +1,8 @@
 <div class="modal-header">
-	<button type="button" class="ajax-modal-close close" data-dismiss="modal" aria-hidden="true">×</button>
+  <button type="button" class="ajax-modal-close close" data-dismiss="modal" aria-label="<%= t('blacklight.modal.close') %>">
+    <span aria-hidden="true">&times;</span>
+  </button>
+
 	<h1 class="modal-title"><%= t('blacklight.sms.form.title') %></h1>
 </div>
 <%= render :partial => 'sms_form' %>

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

@@ -1,9 +1,12 @@
 <div class="modal-header">
-  <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+  <button type="button" class="ajax-modal-close close" data-dismiss="modal" aria-label="<%= t('blacklight.modal.close') %>">
+    <span aria-hidden="true">&times;</span>
+  </button>
+
   <h1 class="modal-title"><%= t('blacklight.sms.form.title') %></h1>
 </div>
 
 <div class="modal-body">
   <%= render :partial=>'/flash_msg' %>
   <span class="ajax-close-modal"></span>
-</div>
+</div>

data/app/views/layouts/blacklight.html.erb

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en" class="no-js">
+<%= content_tag :html, class: 'no-js', **html_tag_attributes do %>
   <head>
     <meta charset="utf-8">
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
@@ -41,4 +41,4 @@
 
   <%= render :partial => 'shared/footer' %>
   </body>
-</html>
+<% end %>

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

@@ -1,5 +1,5 @@
-<div id="ajax-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="modal menu" aria-hidden="true">
-  <div class="modal-dialog">
+<div id="ajax-modal" class="modal fade" tabindex="-1" role="dialog" aria-hidden="true">
+  <div class="modal-dialog" role="document">
     <div class="modal-content">
     </div>
   </div>

data/blacklight.gemspec

@@ -40,11 +40,10 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rspec-its"
   s.add_development_dependency "rspec-collection_matchers", ">= 1.0"
   s.add_development_dependency "capybara", '>= 2', '< 4'
-  s.add_development_dependency 'chromedriver-helper', '< 2.0.0' # 2.1.0 is causing "Unable to find chromedriver" on Travis
+  s.add_development_dependency 'webdrivers', '~> 3.0'
   s.add_development_dependency "selenium-webdriver", '>= 3.13.1'
   s.add_development_dependency 'engine_cart', '~> 2.1'
   s.add_development_dependency "equivalent-xml"
-  s.add_development_dependency "coveralls"
   s.add_development_dependency "simplecov"
   s.add_development_dependency "rubocop", '~> 0.47.0' # pending release of 0.48.1
   s.add_development_dependency "rubocop-rspec", '~> 1.8.0'

data/config/locales/blacklight.de.yml

@@ -25,6 +25,9 @@ de:
     and: 'und'
     or: 'oder'
 
+    modal:
+      close: Schließen
+
     bookmarks:
       title: 'Lesezeichen'
       page_title: 'Lesezeichen - %{application_name}'
@@ -157,6 +160,7 @@ de:
         button_label: '%{count} pro Seite'
         title: 'Anzahl der Ergebnisse pro Seite angezeigt werden'
         submit: 'Aktualisieren'
+        aria_label: 'Ergebnisnavigation'
       sort:
         label: 'Ordnen bei %{field}'
         submit: 'Ergebnisse ordnen'

data/config/locales/blacklight.en.yml

@@ -25,6 +25,9 @@ en:
     and: 'and'
     or: 'or'
 
+    modal:
+      close: "Close"
+
     bookmarks:
       title: 'Bookmarks'
       page_title: 'Bookmarks - %{application_name}'
@@ -157,6 +160,7 @@ en:
         button_label: '%{count} per page'
         title: 'Number of results to display per page'
         submit: 'Update'
+        aria_label: 'Results navigation'
       sort:
         label: 'Sort by %{field}'
         submit: 'sort results'

data/config/locales/blacklight.es.yml

@@ -25,6 +25,9 @@ es:
     and: 'y'
     or: 'o'
 
+    modal:
+      close: cerca
+
     bookmarks:
       title: 'Favoritos'
       page_title: 'Favoritos - %{application_name}'
@@ -157,6 +160,7 @@ es:
         button_label: '%{count} por página'
         title: 'El número de resultados a mostrar por página'
         submit: 'Actualización'
+        aria_label: 'Navegación de resultados'
       sort:
         label: 'Ordenar por %{field}'
         submit: 'Resultados de ordenación'

data/config/locales/blacklight.fr.yml

@@ -25,6 +25,9 @@ fr:
     and: 'et'
     or: 'ou'
 
+    modal:
+      close: Fermer
+
     bookmarks:
       title: 'Favoris'
       page_title: 'Favoris - %{application_name}'
@@ -162,6 +165,7 @@ fr:
         button_label: '%{count} par page'
         title: 'Nombre de résultats à afficher par page'
         submit: 'mettre à jour'
+        aria_label: 'Navigation dans les résultats'
       sort:
         label: 'Trier par %{field}'
         submit: 'trier les résultats'

data/config/locales/blacklight.it.yml

@@ -25,6 +25,9 @@ it:
     and: 'e'
     or: 'o'
 
+    modal:
+      close: Vicino
+
     bookmarks:
       title: 'Preferiti'
       page_title: 'Preferiti - %{application_name}'
@@ -157,6 +160,7 @@ it:
         button_label: '%{count} per pagina'
         title: 'Risultati per pagina'
         submit: 'Aggiorna'
+        aria_label: 'Navigazione dei risultati'
       sort:
         label: 'Ordina per %{field}'
         submit: 'Ordina i risultati'

data/config/locales/blacklight.pt-BR.yml

@@ -25,6 +25,9 @@ pt-BR:
     and: 'e'
     or: 'ou'
 
+    modal:
+      close: Fechar
+
     bookmarks:
       title: 'Favoritos'
       page_title: 'Favoritos - %{application_name}'
@@ -156,6 +159,7 @@ pt-BR:
         button_label: '%{count} por página'
         title: 'Número de resultados para mostrar por página'
         submit: 'Atualizar'
+        aria_label: 'Navegação de resultados'
       sort:
         label: 'Ordenar por %{field}'
         submit: 'ordenar resultados'

data/config/locales/blacklight.sq.yml

@@ -160,6 +160,7 @@ sq:
         button_label: '%{count} për faqe'
         title: 'Numri i rezultateve që do të shfaqen për faqe'
         submit: 'Përditëso'
+        aria_label: 'Rezultatet e lundrimit'
       sort:
         label: 'Klasifikoj sipas %{field}'
         submit: 'klasifiko rezultatet'

data/config/locales/blacklight.zh.yml

@@ -160,6 +160,7 @@ zh:
         button_label: '%{count} 每页'
         title: '每页显示结果数'
         submit: '更新'
+        aria_label: '结果导航'
       sort:
         label: '按 %{field} 排序'
         submit: '排序'

data/config/routes.rb

@@ -7,7 +7,7 @@ Blacklight::Engine.routes.draw do
   put "saved_searches/save/:id",    :to => "saved_searches#save",    :as => "save_search"
   delete "saved_searches/forget/:id",  :to => "saved_searches#forget",  :as => "forget_search"
   post "saved_searches/forget/:id",  :to => "saved_searches#forget"
-  post "/catalog/:id/track", to: 'catalog#track', as: 'track_search_context'
+  post "/catalog/:id/track", to: 'catalog#track', as: 'track_search_context', constraints: { id: Blacklight::Engine.config.routes.identifier_constraint }
 
   resources :suggest, only: :index, defaults: { format: 'json' }
 end

data/lib/blacklight/engine.rb

@@ -7,7 +7,7 @@ module Blacklight
     require 'twitter-typeahead-rails'
 
     # BlacklightHelper is needed by all helpers, so we inject it
-    # into action view base here. 
+    # into action view base here.
     initializer 'blacklight.helpers' do |app|
       ActionView::Base.send :include, BlacklightHelper
     end
@@ -43,8 +43,12 @@ module Blacklight
       'Cricket' => 'mms.mycricket.com'
     }
 
+    config.routes = OpenStruct.new
+    # Set identifier_constraint to enforce a format for the document identifiers
+    config.routes.identifier_constraint = /[\w-]+/
+
     config.bookmarks_http_method = :post
-    
+
     config.email_regexp = defined?(Devise) ? Devise.email_regexp : /\A[^@\s]+@[^@\s]+\z/
   end
 end

data/lib/blacklight/utils.rb

@@ -22,7 +22,7 @@ module Blacklight
     def to_h
       @table
     end
-    
+
     def select *args, &block
       self.class.new to_h.select(*args, &block)
     end
@@ -58,7 +58,7 @@ module Blacklight
   end
 
   ##
-  # An OpenStruct refinement that converts any hash-keys into  
+  # An OpenStruct refinement that converts any hash-keys into
   # additional instances of NestedOpenStructWithHashAccess
   class NestedOpenStructWithHashAccess < OpenStructWithHashAccess
     attr_reader :nested_class
@@ -161,7 +161,11 @@ module Blacklight
       len = args.length
 
       if len.zero?
-        new_ostruct_member(mid)
+        if respond_to?(:new_ostruct_member!, true)
+          new_ostruct_member!(mid)
+        else
+          new_ostruct_member(mid)
+        end
         @table[mid]
       else
         super

data/solr/conf/schema.xml

@@ -308,7 +308,6 @@
       <analyzer>
         <tokenizer class="solr.StandardTokenizerFactory"/>
         <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords.txt"/>
-        <filter class="solr.StandardFilterFactory"/>
         <filter class="solr.LowerCaseFilterFactory"/>
         <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
       </analyzer>
@@ -317,7 +316,6 @@
     <fieldType class="solr.TextField" name="textSuggest" positionIncrementGap="100">
        <analyzer>
           <tokenizer class="solr.KeywordTokenizerFactory"/>
-          <filter class="solr.StandardFilterFactory"/>
           <filter class="solr.LowerCaseFilterFactory"/>
           <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
        </analyzer>

data/spec/features/search_spec.rb

@@ -1,6 +1,11 @@
 # frozen_string_literal: true
 
-describe "Search Page" do
+RSpec.describe "Search Page" do
+  it 'declares the page language in the html lang attribute' do
+    visit root_path
+    expect(page).to have_selector('html[lang=en]')
+  end
+
   it "shows welcome" do
     visit root_path
     expect(page).to have_selector("input#q")
@@ -116,4 +121,3 @@ describe "Search Page" do
     expect(page).to have_content "No results found for your search"
   end
 end
-

data/spec/helpers/layout_helper_spec.rb

@@ -35,4 +35,14 @@ describe LayoutHelper do
       expect(helper.container_classes).to eq 'container'
     end
   end
+
+  describe '#html_tag_attributes' do
+    before do
+      allow(I18n).to receive(:locale).and_return('x')
+    end
+
+    it 'returns the current locale as the lang' do
+      expect(helper.html_tag_attributes).to include lang: 'x'
+    end
+  end
 end

data/spec/models/solr_document_spec.rb

@@ -18,10 +18,34 @@ RSpec.describe SolrDocument do
         it { is_expected.to eq ['Book'] }
       end
     end
-    
+
     describe "#id" do
       subject { solrdoc.id }
       it { is_expected.to eq '00282214' }
     end
   end
+
+  describe '.attribute' do
+    subject(:title) { document.title }
+    let(:doc_class) do
+      Class.new(SolrDocument) do
+        attribute :title, Blacklight::Types::String, 'title_tesim'
+        attribute :author, Blacklight::Types::Array, 'author_tesim'
+        attribute :date, Blacklight::Types::Date, 'date_dtsi'
+
+      end
+    end
+    let(:document) do
+      doc_class.new(id: '123',
+                    title_tesim: ['Good Omens'],
+                    author_tesim: ['Neil Gaiman', 'Terry Pratchett'],
+                    date_dtsi: '1990-01-01T00:00:00Z')
+    end
+
+    it "casts the attributes" do
+      expect(document.title).to eq 'Good Omens'
+      expect(document.author).to eq ['Neil Gaiman', 'Terry Pratchett']
+      expect(document.date).to eq Date.new(1990)
+    end
+  end
 end

data/spec/routing/catalog_routing_spec.rb

@@ -21,6 +21,22 @@ describe "Routing" do
     end
   end
 
+  describe 'tracking' do
+    context 'when the routing constraint is set to allow periods' do
+      before do
+        if Rails.version < '5.2.0'
+          skip 'requires https://github.com/rails/rails/pull/22435'
+        end
+        allow(Blacklight::Engine.config.routes).to receive(:identifier_constraint).and_return(%r{[^/]+})
+        Rails.application.reload_routes!
+      end
+
+      it 'routes to #track' do
+        expect(post('/catalog/gallica.bnf.fr/track')).to route_to('catalog#track', id: 'gallica.bnf.fr')
+      end
+    end
+  end
+
 
   describe "solr_document_path for SolrDocument", :test => true do
     it "routes correctly" do

data/spec/spec_helper.rb

@@ -5,14 +5,9 @@
 
 ENV["RAILS_ENV"] ||= 'test'
 
-if ENV["COVERAGE"] or ENV["CI"]
-  require 'simplecov'
-  require 'coveralls'
-
-  SimpleCov.formatter = Coveralls::SimpleCov::Formatter
-  SimpleCov.start do
-    add_filter "/spec/"
-  end
+require 'simplecov'
+SimpleCov.start do
+  add_filter "/spec/"
 end
 
 require 'rsolr'
@@ -25,20 +20,10 @@ require 'rspec/rails'
 require 'rspec/its'
 require 'rspec/collection_matchers'
 require 'capybara/rspec'
-require 'selenium-webdriver'
+require 'webdrivers'
 require 'equivalent-xml'
 
-Capybara.javascript_driver = :headless_chrome
-
-Capybara.register_driver :headless_chrome do |app|
-  capabilities = Selenium::WebDriver::Remote::Capabilities.chrome(
-    chromeOptions: { args: %w[headless disable-gpu] }
-  )
-
-  Capybara::Selenium::Driver.new(app,
-                                 browser: :chrome,
-                                 desired_capabilities: capabilities)
-end
+Capybara.javascript_driver = :selenium_chrome_headless
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 6.19.2
+  version: 6.24.0
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-11 00:00:00.000000000 Z
+date: 2021-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -234,19 +234,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4'
 - !ruby/object:Gem::Dependency
-  name: chromedriver-helper
+  name: webdrivers
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
@@ -289,20 +289,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: coveralls
-  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: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -478,6 +464,7 @@ files:
 - app/presenters/blacklight/rendering/terminator.rb
 - app/presenters/blacklight/show_presenter.rb
 - app/services/blacklight/field_retriever.rb
+- app/values/blacklight/types.rb
 - app/views/_flash_msg.html.erb
 - app/views/_user_util_links.html.erb
 - app/views/blacklight/nav/_bookmark.html.erb
@@ -784,8 +771,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Blacklight provides a discovery interface for any Solr (http://lucene.apache.org/solr)