blacklight 7.1.0 → 7.2.0

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

@@ -22,6 +22,10 @@ pt-BR:
 
   blacklight:
     application_name: 'Blacklight'
+    skip_links:
+      main_content: 'Ir para o conteúdo principal'
+      search_field: 'Ir para a pesquisa'
+      first_result: 'Ir para o primeiro resultado da pesquisa'
     header_links:
       login: 'Acessar'
       logout: 'Sair'
@@ -144,11 +148,13 @@ pt-BR:
         invalid_solr_id: "Desculpe, você solicitou um cadastro que não existe."
       per_page:
         label: '%{count}<span class="hide-text"> por página</span>'
-        button_label: '%{count} por página'
+        button_label: '%{count} por página' # TODO: Remove during major release
+        button_label_html: '%{count}<span class="d-none d-sm-inline"> por página</span>'
         title: 'Número de resultados para mostrar por página'
         submit: 'Atualizar'
       sort:
-        label: 'Ordenar por %{field}'
+        label: 'Ordenar por %{field}' # TODO: Remove during major release
+        label_html: 'Ordenar<span class="d-none d-sm-inline"> por %{field}</span>'
         submit: 'ordenar resultados'
       form:
         search_field:
@@ -171,6 +177,9 @@ pt-BR:
         one: '<strong>1 de 1</strong>'
         other: '<strong>%{current}</strong> de <strong>%{total}</strong>'
       documents:
+        aria:
+          search_results: 'Resultados da Busca'
+          limit_search: 'Filtre sua busca'
         counter: '%{counter}. '
       facets:
         title: 'Filtre sua busca'
@@ -217,5 +226,11 @@ pt-BR:
 
     entry_name:
       default: 'registro'
+      grouped:
+        default: 'resultado agrupado'
 
     did_you_mean: 'Você quis dizer: %{options}?'
+
+    main:
+      aria:
+        main_container: 'Conteúdo principal'

data/config/locales/blacklight.sq.yml

@@ -12,6 +12,10 @@ sq:
       next: 'Tjetra »'
 
   blacklight:
+    skip_links:
+      main_content: 'Shkoni tek përmbajtja kryesore'
+      search_field: 'Shkoni në kërkim'
+      first_result: 'Shkoni te rezultati i parë i kërkimit'
     header_links:
       login: 'Hyr'
       logout: 'Dil'
@@ -134,11 +138,13 @@ sq:
         invalid_solr_id: "Na vjen keq, ju keni kërkuar një të dhënë që nuk ekziston."
       per_page:
         label: '%{count}<span class="sr-only"> për faqe</span>'
-        button_label: '%{count} për faqe'
+        button_label: '%{count} për faqe' # TODO: Remove during major release
+        button_label_html: '%{count}<span class="d-none d-sm-inline"> për faqe</span>'
         title: 'Numri i rezultateve që do të shfaqen për faqe'
         submit: 'Përditëso'
       sort:
-        label: 'Klasifikoj sipas %{field}'
+        label: 'Klasifikoj sipas %{field}' # TODO: Remove during major release
+        label_html: 'Klasifikoj<span class="d-none d-sm-inline"> sipas %{field}</span>'
         submit: 'klasifiko rezultatet'
       form:
         search_field:
@@ -161,6 +167,9 @@ sq:
         one: '<strong>1 prej 1</strong>'
         other: '<strong>%{current}</strong> prej <strong>%{total}</strong>'
       documents:
+        aria:
+          search_results: 'Rezultatet e kërkimit'
+          limit_search: 'Kufizo këkimin'
         counter: '%{counter}. '
       facets:
         title: 'Kufizo këkimin'
@@ -206,5 +215,11 @@ sq:
 
     entry_name:
       default: 'entry'
+      grouped:
+        default: 'rezultat i grupuar'
 
     did_you_mean: 'A keni menduar: %{options}?'
+
+    main:
+      aria:
+        main_container: 'Përmbajtja kryesore'

data/config/locales/blacklight.zh.yml

@@ -13,7 +13,10 @@ zh:
 
   blacklight:
     application_name: 'Blacklight'
-
+    skip_links:
+      main_content: '转到主要内容'
+      search_field: '转到搜索'
+      first_result: '转到第一个搜索结果'
     header_links:
       login: '登陆'
       logout: '注销'
@@ -136,11 +139,13 @@ zh:
         invalid_solr_id: "抱歉，你要找的结果不存在。"
       per_page:
         label: '%{count}<span class="sr-only"> 每页</span>'
-        button_label: '%{count} 每页'
+        button_label: '%{count} 每页' # TODO: Remove during major release
+        button_label_html: '%{count}<span class="d-none d-sm-inline"> 每页</span>'
         title: '每页显示结果数'
         submit: '更新'
       sort:
-        label: '按 %{field} 排序'
+        label: '按 %{field} 排序' # TODO: Remove during major release
+        label_html: '<span class="d-none d-sm-inline">按 %{field} </span>排序'
         submit: '排序'
       form:
         search_field:
@@ -163,6 +168,9 @@ zh:
         one: '<strong>1 / 1</strong>'
         other: '<strong>%{current}</strong> / <strong>%{total}</strong>'
       documents:
+        aria:
+          search_results: '搜索结果'
+          limit_search: '限定搜索'
         counter: '%{counter}. '
       facets:
         title: '限定搜索'
@@ -208,5 +216,11 @@ zh:
 
     entry_name:
       default: '条目'
+      grouped:
+        default: '分组结果'
 
     did_you_mean: '你是要输入： %{options} 吗？'
+
+    main:
+      aria:
+        main_container: '主要内容'

data/lib/blacklight/configuration.rb

@@ -245,6 +245,12 @@ module Blacklight
         FacetField.new(field: field).normalize!
     end
 
+    # @param [String] group (nil) a group name of facet fields
+    # @return [Array<String>] a list of the facet field names from the configuration
+    def facet_field_names(group = nil)
+      facet_fields.select { |_facet, opts| group == opts[:group] }.values.map(&:field)
+    end
+
     # Add any configured facet fields to the default solr parameters hash
     # @overload add_facet_fields_to_solr_request!
     #    add all facet fields to the solr request

data/lib/blacklight/engine.rb

@@ -39,15 +39,16 @@ module Blacklight
       'Sprint' => 'messaging.sprintpcs.com',
       'T Mobile' => 'tmomail.net',
       'Alltel' => 'message.alltel.com',
-      'Cricket' => 'mms.mycricket.com'
+      'Cricket' => 'mms.mycricket.com',
+      'Google Fi' => 'msg.fi.google.com'
     }
 
     config.bookmarks_http_method = :post
 
     config.email_regexp = defined?(Devise) ? Devise.email_regexp : /\A[^@\s]+@[^@\s]+\z/
 
-    config.action_dispatch.rescue_responses.merge!(
-      "Blacklight::Exceptions::RecordNotFound" => :not_found
-    )
+    config.action_dispatch.rescue_responses["Blacklight::Exceptions::RecordNotFound"] = :not_found
+
+    config.enable_search_bar_autofocus = false
   end
 end

data/lib/blacklight/solr.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 module Blacklight
   module Solr
+    autoload :Document, 'blacklight/solr/document'
+    autoload :FacetPaginator, 'blacklight/solr/facet_paginator'
     autoload :Repository, 'blacklight/solr/repository'
     autoload :Request, 'blacklight/solr/request'
     autoload :Response, 'blacklight/solr/response'

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

@@ -39,6 +39,16 @@ class Blacklight::Solr::Response::GroupResponse
     total.zero?
   end
 
+  ##
+  # Overridden from Blacklight::Solr::Response::PaginationMethods to support
+  # grouped key specific i18n keys. `key` is the field being grouped
+  def entry_name(options)
+    I18n.t(
+      "blacklight.entry_name.grouped.#{key}",
+      default: :'blacklight.entry_name.grouped.default'
+    ).pluralize(options[:count])
+  end
+
   def method_missing meth, *args, &block
     if response.respond_to? meth
       response.send(meth, *args, &block)

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

@@ -14,4 +14,16 @@ module Blacklight::Solr::Response::PaginationMethods
   def total_count #:nodoc:
     total
   end
+
+  ##
+  # Should return response documents size, not hash size
+  def size
+    total_count
+  end
+
+  ##
+  # Meant to have the same signature as Kaminari::PaginatableArray#entry_name
+  def entry_name(options)
+    I18n.t('blacklight.entry_name.default').pluralize(options[:count])
+  end
 end

data/lib/generators/blacklight/assets_generator.rb

@@ -16,7 +16,6 @@ module Blacklight
       return if has_blacklight_assets?
 
       contents = "\n//\n// Required by Blacklight\n"
-      contents += "//= require jquery\n"
       contents += "//= require popper\n"
       contents += "// Twitter Typeahead for autocomplete\n"
       contents += "//= require twitter/typeahead\n"
@@ -32,6 +31,10 @@ module Blacklight
       insert_into_file "app/assets/javascripts/application.js", after: marker do
         contents
       end
+
+      insert_into_file "app/assets/javascripts/application.js", before: '//= require rails-ujs' do
+        "//= require jquery3\n"
+      end
     end
 
     # This is not a default in Rails 5.1+

data/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "blacklight-frontend",
-  "version": "7.1.0-alpha",
+  "version": "7.1.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

data/package.json

@@ -1,10 +1,10 @@
 {
   "name": "blacklight-frontend",
-  "version": "7.1.0-alpha",
+  "version": "7.2.0",
   "description": "[![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)",
   "main": "app/assets/javascripts/blacklight",
   "scripts": {
-    "js-compile-bundle": "shx cat app/javascript/blacklight/core.js app/javascript/blacklight/autocomplete.js app/javascript/blacklight/bookmark_toggle.js app/javascript/blacklight/checkbox_submit.js app/javascript/blacklight/collapsable.js app/javascript/blacklight/facet_load.js app/javascript/blacklight/modal.js app/javascript/blacklight/search_context.js | shx sed \"s/^(import|export).*//\" | babel --filename app/javascript/blacklight/blacklight.js > app/assets/javascripts/blacklight/blacklight.js"
+    "js-compile-bundle": "shx cat app/javascript/blacklight/core.js app/javascript/blacklight/autocomplete.js app/javascript/blacklight/bookmark_toggle.js app/javascript/blacklight/button_focus.js app/javascript/blacklight/checkbox_submit.js app/javascript/blacklight/facet_load.js app/javascript/blacklight/modal.js app/javascript/blacklight/search_context.js | shx sed \"s/^(import|export).*//\" | babel --filename app/javascript/blacklight/blacklight.js > app/assets/javascripts/blacklight/blacklight.js"
   },
   "repository": {
     "type": "git",

data/spec/features/facets_spec.rb

@@ -56,13 +56,34 @@ RSpec.describe "Facets" do
 
     expect(page).to have_css('#facet-format', visible: false)
 
-    page.find('h3.facet-field-heading a', text: 'Format').click
+    within('#facets .navbar') do
+      page.find('button.navbar-toggler').click
+    end
+
+    page.find('h3.facet-field-heading button', text: 'Format').click
 
     sleep(1) # let facet animation finish and wait for it to potentially re-collapse
 
     expect(page).to have_css('#facet-format', visible: true) # assert that it didn't re-collapse
   end
 
+  describe 'heading button focus with Firefox' do
+    before do
+      Capybara.current_driver = :selenium_headless
+    end
+
+    after do
+      Capybara.current_driver = :rack_test
+    end
+
+    it 'changes to the button on button click in Firefox' do
+      visit root_path
+      page.find('h3.facet-field-heading button', text: 'Format').click
+      focused_element_data_target = page.evaluate_script("document.activeElement")['data-target']
+      expect(focused_element_data_target).to eq '#facet-format'
+    end
+  end
+
   describe '"More" links' do
     it 'has default more link with sr-only text' do
       visit root_path

data/spec/features/search_filters_spec.rb

@@ -169,22 +169,37 @@ RSpec.describe "Facets" do
   it "is collapsed when not selected", js: true do
     skip("Test passes locally but not on Travis.") if ENV['TRAVIS']
     visit root_path
+
+    within('#facets .navbar') do
+      page.find('button.navbar-toggler').click
+    end
+
     within(".blacklight-subject_ssim") do
       expect(page).not_to have_selector(".card-body", visible: true)
     end
   end
-  it "expands when the heading is clicked", js: true do
+  it "expands when the heading button is clicked", js: true do
     skip("Test passes locally but not on Travis.") if ENV['TRAVIS']
     visit root_path
+
+    within('#facets .navbar') do
+      page.find('button.navbar-toggler').click
+    end
+
     within(".blacklight-subject_ssim") do
       expect(page).not_to have_selector(".card-body", visible: true)
-      find(".card-header").click
-      expect(page).to     have_selector(".card-body", visible: true)
+      find(".card-header button").click
+      expect(page).to have_selector(".card-body", visible: true)
     end
   end
-  it "expands when the anchor is clicked", js: true do
+  it "expands when the button is clicked", js: true do
     skip("Test passes locally but not on Travis.") if ENV['TRAVIS']
     visit root_path
+
+    within('#facets .navbar') do
+      page.find('button.navbar-toggler').click
+    end
+
     within(".blacklight-subject_ssim") do
       expect(page).not_to have_selector(".card-body", visible: true)
       find(".card-header").click
@@ -194,8 +209,13 @@ RSpec.describe "Facets" do
   it "keeps selected facets expanded on page load", js: true do
     skip("Test passes locally but not on Travis.") if ENV['TRAVIS']
     visit root_path
+
+    within('#facets .navbar') do
+      page.find('button.navbar-toggler').click
+    end
+
     within(".blacklight-subject_ssim") do
-      click_link "Topic"
+      page.find('h3.facet-field-heading', text: 'Topic').click
       expect(page).to have_selector(".panel-collapse", visible: true)
     end
     within(".blacklight-subject_ssim") do

data/spec/helpers/blacklight/layout_helper_behavior_spec.rb

@@ -4,28 +4,28 @@ RSpec.describe Blacklight::LayoutHelperBehavior do
   describe '#show_content_classes' do
     it 'returns a string of classes' do
       expect(helper.show_content_classes).to be_an String
-      expect(helper.show_content_classes).to eq 'col-md-9 show-document'
+      expect(helper.show_content_classes).to eq 'col-lg-9 show-document'
     end
   end
 
   describe '#show_sidebar_classes' do
     it 'returns a string of classes' do
       expect(helper.show_sidebar_classes).to be_an String
-      expect(helper.show_sidebar_classes).to eq 'page-sidebar col-md-3'
+      expect(helper.show_sidebar_classes).to eq 'page-sidebar col-lg-3'
     end
   end
 
   describe '#main_content_classes' do
     it 'returns a string of classes' do
       expect(helper.main_content_classes).to be_an String
-      expect(helper.main_content_classes).to eq 'col-md-9'
+      expect(helper.main_content_classes).to eq 'col-lg-9'
     end
   end
 
   describe '#sidebar_classes' do
     it 'returns a string of classes' do
       expect(helper.sidebar_classes).to be_an String
-      expect(helper.sidebar_classes).to eq 'page-sidebar col-md-3'
+      expect(helper.sidebar_classes).to eq 'page-sidebar col-lg-3'
     end
   end
 

data/spec/helpers/catalog_helper_spec.rb

@@ -62,15 +62,6 @@ RSpec.describe CatalogHelper do
         expect(html).to eq "<strong>1</strong> entry found"
         expect(html).to be_html_safe
       end
-
-      it "uses the model_name from the response" do
-        response = mock_response total: 1
-        allow(response).to receive(:model_name).and_return(double(human: 'thingy'))
-
-        html = page_entries_info(response)
-        expect(html).to eq "<strong>1</strong> thingy found"
-        expect(html).to be_html_safe
-      end
     end
 
     it "with a single page of results" do

data/spec/models/blacklight/icon_spec.rb

@@ -9,7 +9,31 @@ RSpec.describe Blacklight::Icon do
     end
     it 'returns raw svg' do
       expect(Capybara.string(subject.svg))
-        .to have_css 'svg title', text: 'Search'
+        .to have_css 'svg[width="24"]'
+    end
+    it 'adds role="image"' do
+      expect(Capybara.string(subject.svg))
+        .to have_css 'svg[role="image"]'
+    end
+    it 'adds title' do
+      expect(Capybara.string(subject.svg))
+        .to have_css 'title[id^="bl-icon-search-"]', text: 'search icon'
+    end
+    it 'adds aria-labelled-by' do
+      expect(Capybara.string(subject.svg))
+        .to have_css 'svg[aria-labelled-by^="bl-icon-search-"]'
+    end
+    context 'when label is false' do
+      subject { described_class.new(:search, classes: 'awesome', aria_hidden: true, label: false) }
+
+      it 'does not add title' do
+        expect(Capybara.string(subject.svg))
+          .not_to have_css 'title', text: 'search icon'
+      end
+      it 'does not add aria-labelled-by' do
+        expect(Capybara.string(subject.svg))
+          .not_to have_css 'svg[aria-labelled-by^="bl-icon-search-"]'
+      end
     end
   end