blacklight 6.22.0 → 6.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd14b6772e7c5627ce2b623fba876af4d008965be530552de9d3b879edada1f9
-  data.tar.gz: dbc0fe7d619a9259adabe10a8a92655ec56b2c4b7f00474d89914b86e10740f5
+  metadata.gz: 7b214e0d7059ddd49b5406ed8e21d4c6b84cee26f4d0c84d626269690eff080d
+  data.tar.gz: 71a8fe0e8de23865a39746fb4fe21ac0f9bc9fa4e38b96ca216f1a846e838fc7
 SHA512:
-  metadata.gz: c4bd4e37af22eb9055ce3a6fb596f607aed1bedea8a215bebfbaf7863f16f8dac2d852528520116c1518daa0277168d92ab2599d5d8c274a2b8afe19f3d95a84
-  data.tar.gz: 7670f38bf4afe72c7697f4dbcd095aadf9cdb858659419c9f1979cf19fb25c83e0fc0736a0a55cba86a5b6fd4abec420c886f0a1f454c5db37e8a395d66a840b
+  metadata.gz: 689f552efd8be76a0c787b11028edd52552661e7da183ac3bc054275783c1ace2d2d338db88750875acf947d16576e051489e0aa3dd52827b707088b50b0705a
+  data.tar.gz: 423c4fb4cbdae0d3df70098f7e10827d9ba4ec84e8ff4faaa180e4f390f4932c3943b1ec9695a831d38f184621d6c3df201515a989655a504963f5d4ae8787a3

data/.docker/app/Dockerfile

@@ -0,0 +1,28 @@
+ARG ALPINE_RUBY_VERSION
+
+FROM ruby:${ALPINE_RUBY_VERSION}-alpine
+
+RUN apk add --update --no-cache \
+  bash \
+  build-base \
+  git \
+  libxml2-dev \
+  libxslt-dev \
+  nodejs \
+  shared-mime-info \
+  sqlite-dev \
+  tzdata \
+  yarn
+
+RUN mkdir /app
+WORKDIR /app
+
+RUN gem update --system && \
+  gem install bundler && \
+  bundle config build.nokogiri --use-system-libraries
+
+COPY . .
+
+EXPOSE 3000
+
+CMD [".docker/app/entrypoint.sh"]

data/.docker/app/entrypoint.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+set -e
+
+rm -f /app/.internal_test_app/tmp/pids/server.pid
+bundle install
+exec bundle exec rake blacklight:server["-p 3000 -b 0.0.0.0"]

data/.dockerignore

@@ -0,0 +1,3 @@
+Gemfile.lock
+.internal_test_app
+.solr_wrapper.yml

data/.env

@@ -0,0 +1,5 @@
+ALPINE_RUBY_VERSION=2.7.6
+RAILS_VERSION=5.2.8.1
+SOLR_PORT=8983
+SOLR_URL=http://solr:8983/solr/blacklight-core
+SOLR_VERSION=8

data/.github/workflows/ruby.yml

@@ -0,0 +1,61 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: CI
+
+on:
+  push:
+    branches:
+      - main
+      - 'release-*'
+  pull_request:
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: 2.7
+    - name: Install dependencies
+      run: bundle install
+    - name: Run linter
+      run: bundle exec rake rubocop
+  test:
+    runs-on: ubuntu-latest
+    name: test (ruby ${{ matrix.ruby }} / rails ${{ matrix.rails_version }} ${{ matrix.additional_name }})
+    strategy:
+      matrix:
+        ruby: [2.5, 2.6, 2.7]
+        rails_version: ['5.1.7', '5.2.8.1']
+        bootstrap_version: [null]
+        api: [null]
+        additional_engine_cart_rails_options: ['']
+        additional_name: ['']
+    env:
+      RAILS_VERSION: ${{ matrix.rails_version }}
+      BOOTSTRAP_VERSION: ${{ matrix.bootstrap_version }}
+      BLACKLIGHT_API_TEST: ${{ matrix.api }}
+      ENGINE_CART_RAILS_OPTIONS: "--skip-git --skip-listen --skip-spring --skip-keeps --skip-action-cable --skip-coffee --skip-test ${{ matrix.engine_cart_rails_options }}"
+    steps:
+    - uses: actions/checkout@v3
+    - 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
+  docker_build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - name: Build docker image
+      run: docker-compose build app

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.22.0
+6.25.0

data/app/models/search.rb

@@ -4,7 +4,8 @@ class Search < ActiveRecord::Base
 
   belongs_to :user, belongs_to_arguments
 
-  serialize :query_params
+  # use a backwards-compatible serializer until the Rails API stabilizes and we can evaluate for major-revision compatibility
+  serialize :query_params, Blacklight::SearchParamsYamlCoder
 
   attr_accessible :query_params if Blacklight::Utils.needs_attr_accessible?
 

data/app/services/blacklight/search_params_yaml_coder.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+module Blacklight
+  # This is a custom YAML coder for (de)serializing blacklight search parameters that
+  # supports deserializing HashWithIndifferentAccess parameters (as was historically done by Blacklight).
+  class SearchParamsYamlCoder
+    # Serializes an attribute value to a string that will be stored in the database.
+    def self.dump(obj)
+      # Convert HWIA to an ordinary hash so we have some hope of using the regular YAML encoder in the future
+      obj = obj.to_hash if obj.is_a?(ActiveSupport::HashWithIndifferentAccess)
+
+      YAML.dump(obj)
+    end
+
+    # Deserializes a string from the database to an attribute value.
+    def self.load(yaml)
+      return yaml unless yaml.is_a?(String) && yaml.start_with?("---")
+
+      params = yaml_load(yaml)
+
+      params.with_indifferent_access
+    end
+
+    # rubocop:disable Security/YAMLLoad
+    if YAML.respond_to?(:unsafe_load)
+      def self.yaml_load(payload)
+        if ActiveRecord.try(:use_yaml_unsafe_load) || ActiveRecord::Base.try(:use_yaml_unsafe_load)
+          YAML.unsafe_load(payload)
+        else
+          permitted_classes = (ActiveRecord.try(:yaml_column_permitted_classes) || ActiveRecord::Base.try(:yaml_column_permitted_classes) || []) +
+                              Blacklight::Engine.config.search_params_permitted_classes
+          YAML.safe_load(payload, permitted_classes, [], true)
+        end
+      end
+    else
+      def self.yaml_load(payload)
+        if ActiveRecord.try(:use_yaml_unsafe_load) || ActiveRecord::Base.try(:use_yaml_unsafe_load)
+          YAML.load(payload)
+        else
+          permitted_classes = (ActiveRecord.try(:yaml_column_permitted_classes) || ActiveRecord::Base.try(:yaml_column_permitted_classes) || []) +
+                              Blacklight::Engine.config.search_params_permitted_classes
+          YAML.safe_load(payload, permitted_classes, [], true)
+        end
+      end
+    end
+    # rubocop:enable Security/YAMLLoad
+  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/_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/_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/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

@@ -44,7 +44,6 @@ Gem::Specification.new do |s|
   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

@@ -3,12 +3,12 @@ de:
     pagination:
       first: '« Erste'
       last: 'Letzte »'
-      previous: '« Vorig'
+      previous: '« Voherige'
       next: 'Nächste »'
       truncate: '…'
 
     pagination_compact:
-      previous: '« Vorig'
+      previous: '« Voherige'
       next: 'Nächste »'
 
   blacklight:
@@ -19,12 +19,15 @@ de:
       logout: 'Ausloggen'
       bookmarks: 'Lesezeichen'
       saved_searches: 'Gespeicherte Suchen'
-      search_history: 'Geschichte'
+      search_history: 'Suchverlauf'
 
-    welcome: 'Wilkommen!'
+    welcome: 'Willkommen!'
     and: 'und'
     or: 'oder'
 
+    modal:
+      close: Schließen
+
     bookmarks:
       title: 'Lesezeichen'
       page_title: 'Lesezeichen - %{application_name}'
@@ -34,19 +37,19 @@ de:
         success:
           one: 'Lesezeichen erfolgreich hinzugefügt.'
           other: 'Lesezeichen erfolgreich hinzugefügt.'
-        failure:  'Entschuldigung, es gab ein Problem beim speichern von Lesezeichen.'
+        failure:  'Entschuldigung, es gab ein Problem beim Speichern der Lesezeichen.'
       remove:
         button: 'Lesezeichen entfernen'
         success: 'Lesezeichen erfolgreich gelöscht.'
-        failure: 'Entschuldigung, es gab ein Problem bein löschen von Lesezeichen.'
-        action_confirm: 'Entfernen dieses Lesezeichen?'
+        failure: 'Entschuldigung, es gab ein Problem beim Löschen der Lesezeichen.'
+        action_confirm: 'Dieses Lesezeichen entfernen?'
       clear:
         action_title: 'Lesezeichen löschen'
-        action_confirm: 'Löschen deine Lesezeichen?'
-        success: 'Dein Lesezeichen sind gelöscht gewesen.'
-        failure: 'Entschuldigung, es gab ein Problem beim löschen von Lesezeichen.'
-      need_login: 'Bitte melden Sie sich an, um Ihre Lesezeichen verwalten und ansehen.'
-      list_title: 'Dein Lesezeichen'
+        action_confirm: 'Ihre Lesezeichen löschen?'
+        success: 'Ihre Lesezeichen wurden gelöscht.'
+        failure: 'Entschuldigung, es gab ein Problem beim Löschen der Lesezeichen.'
+      need_login: 'Bitte melden Sie sich an, um Ihre Lesezeichen zu verwalten und anzusehen.'
+      list_title: 'Ihre Lesezeichen'
       delete: 'Löschen'
 
     saved_searches:
@@ -70,22 +73,22 @@ de:
 
     search_history:
       clear:
-        action_title: 'Löschen Suchverlauf'
-        action_confirm: 'Löschen dein Suchverlauf?'
+        action_title: 'Suchverlauf löschen'
+        action_confirm: 'Ihren Suchverlauf löschen?'
         success: 'Suchverlauf gelöscht.'
-        failure: 'Es gab ein Problem beim löschen von Suchverlauf.'
+        failure: 'Es gab ein Problem beim Löschen des Suchverlaufs.'
       title: 'Suchverlauf'
       page_title: 'Suchverlauf - %{application_name}'
-      no_history: 'Sie haben keine Suchverlauf'
-      recent: 'Deine neueste Suchen'
+      no_history: 'Sie haben keinen Suchverlauf'
+      recent: 'Ihre neuesten Suchen'
       forget: 'vergessen'
       save: 'speichern'
 
     tools:
       title: 'Werkzeuge'
-      cite: 'Zitieren'
-      email: 'Email'
-      sms: 'SMS dieses'
+      citation: 'Zitieren'
+      email: 'E-Mail'
+      sms: 'SMS'
       clear: 'Löschen'
 
     citation:
@@ -95,10 +98,10 @@ de:
 
     email:
       form:
-        title: 'Email dieses'
-        to: 'Email:'
-        message: 'Meldung:'
-        submit: 'Abgeben'
+        title: 'E-Mail'
+        to: 'E-Mail-Adresse:'
+        message: 'Nachricht:'
+        submit: 'Senden'
       text:
         default_title: 'N/A'
         title: 'Titel: %{value}'
@@ -111,34 +114,34 @@ de:
         url: 'URL: %{url}'
         message: 'Mitteilung: %{message}'
 
-      success: "Email Verschickt"
+      success: "E-Mail verschickt"
 
       errors:
         to:
-          invalid: 'Sie müssen ein gültige E-Mail-Addresse eingeben'
-          blank: 'Sie müssen ein Empfänger eingeben, um dieses Mitteilung schicken'
+          invalid: 'Sie müssen eine gültige E-Mail-Addresse eingeben'
+          blank: 'Sie müssen einen Empfänger eingeben, um diese Mitteilung zu schicken'
     sms:
       form:
-        title: 'SMS dieses'
+        title: 'SMS'
         to: 'Telefonnummer:'
-        carrier: 'Netzbetrieber'
-        carrier_prompt: 'Bitte auswählen dein Netzbetrieber'
+        carrier: 'Netzbetreiber'
+        carrier_prompt: 'Bitte wählen Sie Ihren Netzbetreiber aus'
         submit: 'Schicken'
       text:
         title: '%{value}'
         author: ' von %{value}'
         url: 'Link: %{url}'
-      success: "SMS Verschicht"
+      success: "SMS verschickt"
       errors:
         to:
-          invalid: 'Sie müssen ein gültig 10 Stelle Telefonnummer wählen'
-          blank: "Sie müssen die Telefonnummer eines Empfängers eingeben, um dieses Mitteilung schicken"
+          invalid: 'Sie müssen eine gültige Telefonnummer mit 10 Stellen wählen'
+          blank: "Sie müssen die Telefonnummer eines Empfängers eingeben, um diese Mitteilung zu schicken"
         carrier:
-          blank: 'Sie müssen ein Netzbetrieber wählen'
-          invalid: "Sie müssen ein gültig Netzbetrieber wählen"
+          blank: 'Sie müssen einen Netzbetreiber wählen'
+          invalid: "Sie müssen einen gültigen Netzbetreiber wählen"
 
-    back_to_search: 'Zurück nach suchen'
-    back_to_bookmarks: 'Zuruch nach Lesezeichen'
+    back_to_search: 'Zurück zur Suche'
+    back_to_bookmarks: 'Zurück zu Lesezeichen'
 
     search:
       # i18n key 'title' is deprecated and will be removed in Blacklight 6.0
@@ -150,20 +153,21 @@ de:
       search_results_header: 'Suchen'
       search_results: 'Suchergebnisse'
       errors:
-        request_error: "Entschuldigung, Ich habe dein Suche nicht verstanden."
-        invalid_solr_id: "Entschuldigung, Sie einen nicht vorhandenen Datensatz angefordert haben."
+        request_error: "Entschuldigung, ich habe Ihre Suche nicht verstanden."
+        invalid_solr_id: "Entschuldigung, Sie haben einen nicht vorhandenen Datensatz angefordert."
       per_page:
         label: '%{count}<span class="sr-only"> pro Seite</span>'
         button_label: '%{count} pro Seite'
-        title: 'Anzahl der Ergebnisse pro Seite angezeigt werden'
+        title: 'Anzahl der Ergebnisse, die pro Seite angezeigt werden'
         submit: 'Aktualisieren'
+        aria_label: 'Ergebnisnavigation'
       sort:
-        label: 'Ordnen bei %{field}'
+        label: 'Ordnen nach %{field}'
         submit: 'Ergebnisse ordnen'
       form:
         search_field:
           label: 'Suchen in'
-          title: 'gezeilte Suchoptionen'
+          title: 'gezielte Suchoptionen'
           post_label: 'für'
         search:
           label: 'suchen nach'
@@ -183,7 +187,7 @@ de:
       documents:
         counter: '%{counter}. '
       facets:
-        title: 'Beschränken dein Suche'
+        title: 'Suche beschränken'
         clear: 'Löschen'
         sort:
           count: 'Numerisch ordnen'
@@ -195,12 +199,12 @@ de:
       group:
         more: 'mehr »'
       filters:
-        title: 'Sie suchte nach:'
+        title: 'Sie suchten nach:'
         label: '%{label}:'
         remove:
-          value: 'Entfernen Zwang %{value}'
-          label_value: 'Entfernen Zwang %{label}: %{value}'
-      start_over: 'Wieder anfangen'
+          value: 'Filter %{value} entfernen'
+          label_value: 'Filter %{label}: %{value} entfernen'
+      start_over: 'Neu anfangen'
       index:
         label: '%{label}:'
       show:
@@ -211,20 +215,20 @@ de:
       fields:
         default: 'Stichwort'
       bookmarks:
-        present: "Im Lesezeichen"
+        present: "In Lesezeichen"
         absent: "Lesezeichen"
         inprogress: "Speichern..."
       zero_results:
-        title: "Kein Ergebnisse für Ihere Suche gefunden"
-        modify_search: "Änderen Sie Ihere Suche"
-        use_fewer_keywords: "Benutzen Sie weniger Stichworten am anfang, danach verfeinen Sie dein Suche mit die links an der Linken Seite."
-        search_fields: "Sie haben bei %{search_fields} gesucht"
-        search_everything: "Suchen Sie von allem"
-      view_title: "Anschauen Ergebnisse als: "
+        title: "Keine Ergebnisse für Ihre Suche gefunden"
+        modify_search: "Ändern Sie Ihre Suche"
+        use_fewer_keywords: "Benutzen Sie anfangs weniger Stichworte, danach verfeinern Sie Ihre Suche mit den Links auf der linken Seite."
+        search_fields: "Sie haben nach %{search_fields} gesucht"
+        search_everything: "Suchen Sie nach allem"
+      view_title: "Ergebnisse ansehen als: "
       view:
         list: "Liste"
 
     entry_name:
-      default: 'eintrag'
+      default: 'Eintrag'
 
-    did_you_mean: 'Meinten Sie geben: %{options}?'
+    did_you_mean: 'Meinten Sie: %{options}?'

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/docker-compose.yml

@@ -0,0 +1,38 @@
+version: "3.7"
+
+services:
+  app:
+    build:
+      context: .
+      dockerfile: .docker/app/Dockerfile
+      args:
+        - ALPINE_RUBY_VERSION
+    # mounting . is causing seg-fault on macosx
+    #volumes:
+      #- .:/app
+    depends_on:
+      - solr
+    ports:
+      - "3000:3000"
+    environment:
+      - SOLR_URL # Set via environment variable or use default defined in .env file
+      - RAILS_VERSION # Set via environment variable or use default defined in .env file
+      - SOLR_ENV=docker-compose
+      - ENGINE_CART_RAILS_OPTIONS=--skip-git --skip-listen --skip-spring --skip-keeps --skip-action-cable --skip-coffee --skip-test --skip-solr
+
+  solr:
+    environment:
+      - SOLR_PORT # Set via environment variable or use default defined in .env file
+      - SOLR_VERSION # Set via environment variable or use default defined in .env file
+    image: "solr:${SOLR_VERSION}"
+    volumes:
+      - $PWD/solr/conf:/opt/solr/conf
+    ports:
+      - "${SOLR_PORT}:8983"
+    entrypoint:
+      - docker-entrypoint.sh
+      - solr-precreate
+      - blacklight-core
+      - /opt/solr/conf
+      - "-Xms256m"
+      - "-Xmx512m"

data/lib/blacklight/engine.rb

@@ -45,10 +45,12 @@ module Blacklight
 
     config.routes = OpenStruct.new
     # Set identifier_constraint to enforce a format for the document identifiers
-    config.routes.identifier_constraint = /[\w-]+/
+    config.routes.identifier_constraint = /.+/
 
     config.bookmarks_http_method = :post
 
     config.email_regexp = defined?(Devise) ? Devise.email_regexp : /\A[^@\s]+@[^@\s]+\z/
+
+    Blacklight::Engine.config.search_params_permitted_classes = [ActiveSupport::HashWithIndifferentAccess, Symbol]
   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/spec/models/search_spec.rb

@@ -1,30 +1,51 @@
 # frozen_string_literal: true
 
 describe Search do
+  let(:search) { described_class.new(user: user) }
   let(:user) { User.create! email: 'xyz@example.com', password: 'xyz12345'}
+  let(:hash_params) { { q: "query", f: { facet: "filter" } } }
+  let(:query_params) { hash_params }
+
   describe "query_params" do
-    before(:each) do
-      @search = Search.new(user: user)
-      @query_params = { :q => "query", :f => "facet" }
+    shared_examples "persisting query_params" do
+      it "can save and retrieve the hash" do
+        search.query_params = query_params
+        search.save!
+        expect(described_class.find(search.id).query_params).to eq query_params.with_indifferent_access
+      end
+    end
+
+    context "are an indifferent hash" do
+      include_context "persisting query_params" do
+        let(:query_params) { hash_params.with_indifferent_access }
+      end
+    end
+
+    context "are a string-keyed hash" do
+      include_context "persisting query_params" do
+        let(:query_params) { hash_params.with_indifferent_access.to_hash }
+      end
     end
 
-    it "can save and retrieve the hash" do
-      @search.query_params = @query_params
-      @search.save!
-      expect(Search.find(@search.id).query_params).to eq @query_params
+    context "include symbol keys" do
+      include_context "persisting query_params" do
+        let(:query_params) { hash_params }
+      end
     end
   end
 
   describe "saved?" do
     it "is true when user_id is not NULL and greater than 0" do
-      @search = Search.new(user: user)
-      @search.save!
-
-      expect(@search).to be_saved
+      search.save!
+      expect(search).to be_saved
     end
-    it "is false when user_id is NULL or less than 1" do
-      @search = Search.create
-      expect(@search).not_to be_saved
+
+    context "when user_id is NULL or less than 1" do
+      let(:search) { described_class.create }
+
+      it "is false" do
+        expect(search).not_to be_saved
+      end
     end
   end
 

data/spec/routing/catalog_routing_spec.rb

@@ -19,6 +19,9 @@ describe "Routing" do
     it "maps { :controller => 'catalog', :action => 'show', :id => 666 } to /catalog/666" do
       expect(:get => "/catalog/666").to route_to(:controller => 'catalog', :action => 'show', :id => "666")
     end
+    it "maps { :controller => 'catalog', :action => 'show', :id => 666, :format => 'json' } to /catalog/666.json" do
+      expect(:get => "/catalog/666.json").to route_to(:controller => 'catalog', :action => 'show', :id => "666", :format => 'json')
+    end
   end
 
   describe 'tracking' do
@@ -35,6 +38,14 @@ describe "Routing" do
         expect(post('/catalog/gallica.bnf.fr/track')).to route_to('catalog#track', id: 'gallica.bnf.fr')
       end
     end
+
+    it "routes ids with a literal ':'" do
+      expect(post('/catalog/this:that/track')).to route_to('catalog#track', id: 'this:that')
+    end
+
+    it "routes ids with a literal ':'" do
+      expect(post('/catalog/this:that/track.json')).to route_to('catalog#track', id: 'this:that', format: 'json')
+    end
   end
 
 
@@ -62,6 +73,10 @@ describe "Routing" do
         expect(:get => solr_document_path(SolrDocument.new(:id => 'this+that'))).to route_to(:controller => 'catalog', :action => 'show', :id => 'this+that')
       end
 
+      it "routes ids with a literal ':'" do
+        expect(get: solr_document_path(SolrDocument.new(:id => 'this:that'))).to route_to(:controller => 'catalog', :action => 'show', :id => 'this:that')
+      end
+
       it "routes ids with a literal '/" do
         skip "This works if you configure your routing to have very liberal constraints on :id.. not sure how to go about testing it though"
         expect(:get => solr_document_path(SolrDocument.new(:id => 'and/or'))).to route_to(:controller => 'catalog', :action => 'show', :id => 'and/or')

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'

data/tasks/blacklight.rake

@@ -1,26 +1,54 @@
-require 'solr_wrapper'
+# frozen_string_literal: true
+
 require 'engine_cart/rake_task'
 
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec) do |t|
-  t.pattern =  'spec/**/*_spec.rb'
+  t.pattern = 'spec/**/*_spec.rb'
 end
 
 require 'rubocop/rake_task'
 RuboCop::RakeTask.new(:rubocop)
 
-desc "Run test suite"
-task ci: ['blacklight:generate'] do
-  SolrWrapper.wrap do |solr|
-    solr.with_collection do
-      within_test_app do
-        system "RAILS_ENV=test rake blacklight:index:seed"
-      end
-      Rake::Task['blacklight:coverage'].invoke
+require 'solr_wrapper'
+require 'open3'
+
+def system_with_error_handling(*args)
+  Open3.popen3(*args) do |_stdin, stdout, stderr, thread|
+    puts stdout.read
+    raise "Unable to run #{args.inspect}: #{stderr.read}" unless thread.value.success?
+  end
+end
+
+def with_solr(&block)
+  # We're being invoked by the app entrypoint script and solr is already up via docker-compose
+  if ENV['SOLR_ENV'] == 'docker-compose'
+    yield
+  elsif system('docker-compose -v')
+    # We're not running docker-compose up but still want to use a docker instance of solr.
+    begin
+      puts "Starting Solr"
+      system_with_error_handling "docker-compose up -d solr"
+      yield
+    ensure
+      puts "Stopping Solr"
+      system_with_error_handling "docker-compose stop solr"
+    end
+  else
+    SolrWrapper.wrap do |solr|
+      solr.with_collection(&block)
     end
   end
 end
 
+desc "Run test suite"
+task :ci do
+  with_solr do
+    Rake::Task['blacklight:internal:seed'].invoke
+    Rake::Task['blacklight:coverage'].invoke
+  end
+end
+
 namespace :blacklight do
   desc "Run tests with coverage"
   task :coverage do
@@ -28,35 +56,28 @@ namespace :blacklight do
     Rake::Task["spec"].invoke
   end
 
-  desc "Create the test rails app"
-  task :generate => ['engine_cart:generate'] do
-  end
-
   namespace :internal do
-    task :seed => ['engine_cart:generate'] do
+    desc 'Index seed data in test app'
+    task seed: ['engine_cart:generate'] do
       within_test_app do
-        system "bundle exec rake blacklight:index:seed"
+        system "bin/rake blacklight:index:seed"
       end
     end
   end
 
   desc 'Run Solr and Blacklight for interactive development'
-  task :server, [:rails_server_args] do |t, args|
-    if File.exist? EngineCart.destination
-      within_test_app do
-        system "bundle update"
-      end
-    else
-      Rake::Task['engine_cart:generate'].invoke
-    end
-
-    SolrWrapper.wrap do |solr|
-      solr.with_collection do
-        Rake::Task['blacklight:internal:seed'].invoke
+  task :server, [:rails_server_args] => ['engine_cart:generate'] do |_t, args|
+    with_solr do
+      Rake::Task['blacklight:internal:seed'].invoke
 
+      begin
         within_test_app do
-          system "bundle exec rails s #{args[:rails_server_args]}"
+          puts "Starting Blacklight (Rails server)"
+          system "bin/rails s #{args[:rails_server_args]}"
         end
+      rescue Interrupt
+        # We expect folks to Ctrl-c to stop the server so don't barf at them
+        puts "\nStopping Blacklight (Rails server)"
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 6.22.0
+  version: 6.25.0
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-29 00:00:00.000000000 Z
+date: 2022-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -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
@@ -356,6 +342,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".docker/app/Dockerfile"
+- ".docker/app/entrypoint.sh"
+- ".dockerignore"
+- ".env"
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".hound.yml"
 - ".jshintrc"
@@ -363,7 +354,6 @@ files:
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
 - ".solr_wrapper.yml"
-- ".travis.yml"
 - ".yardopts"
 - Gemfile
 - LICENSE
@@ -478,6 +468,7 @@ files:
 - app/presenters/blacklight/rendering/terminator.rb
 - app/presenters/blacklight/show_presenter.rb
 - app/services/blacklight/field_retriever.rb
+- app/services/blacklight/search_params_yaml_coder.rb
 - app/values/blacklight/types.rb
 - app/views/_flash_msg.html.erb
 - app/views/_user_util_links.html.erb
@@ -578,6 +569,7 @@ files:
 - db/migrate/20140202020201_create_searches.rb
 - db/migrate/20140202020202_create_bookmarks.rb
 - db/migrate/20140320000000_add_polymorphic_type_to_bookmarks.rb
+- docker-compose.yml
 - lib/blacklight.rb
 - lib/blacklight/abstract_repository.rb
 - lib/blacklight/configuration.rb
@@ -785,7 +777,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Blacklight provides a discovery interface for any Solr (http://lucene.apache.org/solr)

data/.travis.yml

@@ -1,53 +0,0 @@
-dist: bionic
-addons:
-  chrome: stable
-language: ruby
-sudo: false
-
-notifications:
-  email: false
-
-rvm:
-  - 2.5.7
-
-matrix:
-  include:
-    - rvm: 2.5.7
-      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
-
-before_install:
-  - gem update --system
-  - gem install bundler
-  - google-chrome-stable --headless --disable-gpu --remote-debugging-port=9222 http://localhost &
-
-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"
-
-notifications:
-  irc: "irc.freenode.org#blacklight"
-  email:
-      - blacklight-commits@googlegroups.com
-
-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'
-
-jdk: openjdk11