blacklight 7.5.0 → 7.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9494eb9f9c98dc35a06a369d93d30095cb05718427599f49c2179c3ab0d44456
-  data.tar.gz: fafdd89b5d4bf169f303e2673a7369b32b14894dfb983405cb37f556dcab1a3b
+  metadata.gz: b85d437eb826605fb701c8c18e4263528b67f4c881a43288e46b8f46ad48881b
+  data.tar.gz: daa54afe4a032f8ab13348850decaa8340dca486f993b3b508943e00103225c4
 SHA512:
-  metadata.gz: 5011b8be264ee25f7b701e77e0e099add0f382d7f95e85123e53a6f2b215fe867b4bc5fdbb0ff02845c125fe0d89674f83750bb044650acdad103d6eb4fcb1ac
-  data.tar.gz: c772cdf8efef43a8c86c81b7ff445f5a7a6a7ab6ebdb8d6d2bac4654a558528522e6e76eec8e330996288f2e0d991fb531fb7852ded86c4bd8f0f69f0db53563
+  metadata.gz: caab714113f5900e604ee045cbea1c28410d4c099ef340a4bc2c97f1f36806861eea82ab5d5b85cbe4f686dc796282fe678d1886f2d090d44825797a1da759be
+  data.tar.gz: 7446370ad47268865a69220be2b5c43120781666500c9bd97dff7e368718faad227a02ac542a6441a53c99f6f9f72242cc142918431af9e1b6e480eaa5f6e943

data/.rubocop_todo.yml

@@ -217,7 +217,7 @@ Metrics/MethodLength:
 # Offense count: 8
 # Configuration parameters: CountComments.
 Metrics/ModuleLength:
-  Max: 210
+  Max: 212
 
 # Offense count: 1
 # Configuration parameters: CountKeywordArgs.

data/.travis.yml

@@ -8,18 +8,18 @@ notifications:
 
 matrix:
   include:
+    - rvm: 2.7.0
+      env: "RAILS_VERSION=6.0.2.1"
     - rvm: 2.6.5
       env: "RAILS_VERSION=6.0.0 ENGINE_CART_RAILS_OPTIONS=\"--skip-webpack-install\""
     - rvm: 2.6.5
       env: "RAILS_VERSION=5.2.3"
-    - rvm: 2.5.7
-      env: "RAILS_VERSION=5.1.7"
     - rvm: 2.5.7
       env: "RAILS_VERSION=5.2.3 BLACKLIGHT_API_TEST=true ENGINE_CART_RAILS_OPTIONS=\"--api --skip-git --skip-bundle --skip-listen --skip-spring --skip-yarn --skip-keeps --skip-action-cable --skip-coffee --skip-test\""
     - rvm: 2.4.9
-      env: "RAILS_VERSION=5.1.7"
+      env: "RAILS_VERSION=5.2.4.1"
     - rvm: jruby-9.2.8.0
-      env: "RAILS_VERSION=5.1.7 JRUBY_OPTS=\"-J-Xms512m -J-Xmx1024m\""
+      env: "RAILS_VERSION=5.2.4.1 JRUBY_OPTS=\"-J-Xms512m -J-Xmx1024m\""
   allow_failures:
     - rvm: jruby-9.2.8.0
   fast_finish: true

data/VERSION

@@ -1 +1 @@
-7.5.0
+7.5.1

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

@@ -114,7 +114,10 @@ module Blacklight::Catalog
   # @return [Array] first value is a Blacklight::Solr::Response and the second
   #                 is a list of documents
   def action_documents
-    search_service.fetch(Array(params[:id]))
+    deprecated_response, @documents = search_service.fetch(Array(params[:id]))
+    raise Blacklight::Exceptions::RecordNotFound if @documents.blank?
+
+    [deprecated_response, @documents]
   end
 
   def action_success_redirect_path

data/app/models/blacklight/icon.rb

@@ -10,7 +10,7 @@ module Blacklight
     # @param [Boolean] aria_hidden include aria_hidden attribute
     # @param [Boolean] label include <title> and aria-label as part of svg
     # @param [String] role role attribute to be included in svg
-    def initialize(icon_name, classes: '', aria_hidden: false, label: true, role: 'image')
+    def initialize(icon_name, classes: '', aria_hidden: false, label: true, role: 'img')
       @icon_name = icon_name
       @classes = classes
       @aria_hidden = aria_hidden
@@ -24,7 +24,7 @@ module Blacklight
     def svg
       svg = ng_xml.at_xpath('svg')
       svg['role'] = role
-      svg['aria-labelled-by'] = unique_id if label
+      svg['aria-labelledby'] = unique_id if label
       svg.add_child("<title id='#{unique_id}'>#{icon_label}</title>") if label
       ng_xml.to_xml
     end

data/lib/blacklight/nested_open_struct_with_hash_access.rb

@@ -89,7 +89,7 @@ module Blacklight
       len = args.length
 
       if len.zero?
-        new_ostruct_member(mid)
+        new_ostruct_member!(mid)
         @table[mid]
       else
         super

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "blacklight-frontend",
-  "version": "7.5.0",
+  "version": "7.5.1",
   "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": {

data/spec/controllers/catalog_controller_spec.rb

@@ -468,8 +468,13 @@ RSpec.describe CatalogController, api: true do
     let(:mock_response) { instance_double(Blacklight::Solr::Response, documents: [SolrDocument.new(id: 'my_fake_doc'), SolrDocument.new(id: 'my_other_doc')]) }
 
     before do
+      mock_document.extend(Blacklight::Document::Sms)
+      mock_document.extend(Blacklight::Document::Email)
+      allow(mock_document).to receive(:to_semantic_values).and_return({})
+      allow(mock_document).to receive(:to_model).and_return(SolrDocument.new(id: 'my_fake_doc'))
+
       allow(controller).to receive(:search_service).and_return(search_service)
-      expect(search_service).to receive(:fetch).and_return([mock_response, []])
+      expect(search_service).to receive(:fetch).and_return([mock_response, [mock_document]])
       request.env["HTTP_REFERER"] = "/catalog/#{doc_id}"
       SolrDocument.use_extension(Blacklight::Document::Email)
       SolrDocument.use_extension(Blacklight::Document::Sms)
@@ -553,6 +558,13 @@ RSpec.describe CatalogController, api: true do
       end.to raise_error Blacklight::Exceptions::RecordNotFound
     end
 
+    it "returns status 404 for exportable actions on records that do not exist" do
+      allow(controller).to receive_messages(find: double(documents: []))
+      expect do
+        get :citation, params: { id: "bad-record-identifer" }
+      end.to raise_error Blacklight::Exceptions::RecordNotFound
+    end
+
     context "when there is an invalid search", api: false do
       let(:service) { instance_double(Blacklight::SearchService) }
       let(:fake_error) { Blacklight::Exceptions::InvalidRequest.new }

data/spec/models/blacklight/icon_spec.rb

@@ -11,17 +11,17 @@ RSpec.describe Blacklight::Icon do
       expect(Capybara.string(subject.svg))
         .to have_css 'svg[width="24"]'
     end
-    it 'adds role="image"' do
+    it 'adds role="img"' do
       expect(Capybara.string(subject.svg))
-        .to have_css 'svg[role="image"]'
+        .to have_css 'svg[role="img"]'
     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
+    it 'adds aria-labelledby' do
       expect(Capybara.string(subject.svg))
-        .to have_css 'svg[aria-labelled-by^="bl-icon-search-"]'
+        .to have_css 'svg[aria-labelledby^="bl-icon-search-"]'
     end
     context 'when label is false' do
       subject { described_class.new(:search, classes: 'awesome', aria_hidden: true, label: false) }
@@ -30,9 +30,9 @@ RSpec.describe Blacklight::Icon do
         expect(Capybara.string(subject.svg))
           .not_to have_css 'title', text: 'search icon'
       end
-      it 'does not add aria-labelled-by' do
+      it 'does not add aria-labelledby' do
         expect(Capybara.string(subject.svg))
-          .not_to have_css 'svg[aria-labelled-by^="bl-icon-search-"]'
+          .not_to have_css 'svg[aria-labelledby^="bl-icon-search-"]'
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 7.5.0
+  version: 7.5.1
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-18 00:00:00.000000000 Z
+date: 2020-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails