blacklight 7.6.0 → 7.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '087bb21bf2c345072d1fade572f09741ab819c5f44e8b563c6818530c1da6da8'
-  data.tar.gz: eebaefbf5c6ec5b3f245ef17ce59c006ac09ffefb047f336aa185cace7bd293e
+  metadata.gz: 25f35365c3e8f37c1a405aa2c3ed398c82643f275ba6326dd678ad39edb3c101
+  data.tar.gz: a55e315a722c78ceed677a739d2dd3debd6f332849e50c7ecb9e269bbf83449e
 SHA512:
-  metadata.gz: edce2eb3d01ea8ea635515c70db1b9e584ea96d4a360378897bc8340a94919f9ffa6f7be6824aa644c07929b3623f0f90f14280eef71b180f0d2022da8f0f677
-  data.tar.gz: ac8cc8d0432746cc80b01d330cc6bad45fc54ac4a2386a11c7c54285a1202ced0cd5b0f51f603e0281c4e33520565514ffadc8f549fa66ca0fb45533afe8c774
+  metadata.gz: a7df6ed0d222bbeff7e710066370d8e298bdec544663fb486c72a20b5a7ec85868d29e984982f1bb2a61e2e0ed2bd17ce9880debf1df9e155d075e49fb284ad5
+  data.tar.gz: b04f3d9435d93a6bf144eba9b942b747d4632dd577916f62273813611688c6f02d5faf9263cd84219389609fe2dd687aef91c1b0d4ba5e46b8122a595f3e3f25

data/.gitignore

@@ -14,6 +14,5 @@ log/*
 tmp/*
 pkg/*
 .internal_test_app
-.vagrant
 /spec/examples.txt
 node_modules/*

data/VERSION

@@ -1 +1 @@
-7.6.0
+7.7.0

data/app/helpers/blacklight/configuration_helper_behavior.rb

@@ -91,10 +91,11 @@ module Blacklight::ConfigurationHelperBehavior
   end
 
   # Shortcut for commonly needed operation, look up display
-  # label for the key specified. Returns "Keyword" if a label
-  # can't be found.
+  # label for the key specified.
   def label_for_search_field(key)
     field_config = blacklight_config.search_fields[key]
+    return if key.nil? && field_config.nil?
+
     field_config ||= Blacklight::Configuration::NullField.new(key: key)
 
     field_config.display_label('search')

data/app/models/blacklight/icon.rb

@@ -2,7 +2,7 @@
 
 module Blacklight
   class Icon
-    attr_reader :icon_name, :aria_hidden, :label, :role
+    attr_reader :icon_name, :aria_hidden, :label, :role, :additional_options
     ##
     # @param [String, Symbol] icon_name
     # @param [Hash] options
@@ -10,12 +10,14 @@ 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: 'img')
+    # @param [Hash] additional_options the way forward instead of named arguments
+    def initialize(icon_name, classes: '', aria_hidden: false, label: true, role: 'img', additional_options: {})
       @icon_name = icon_name
       @classes = classes
       @aria_hidden = aria_hidden
       @label = label
       @role = role
+      @additional_options = additional_options
     end
 
     ##
@@ -30,11 +32,11 @@ module Blacklight
     end
 
     def icon_label
-      I18n.translate("blacklight.icon.#{icon_name}", default: "#{icon_name} icon")
+      I18n.translate("blacklight.icon.#{icon_name_context}", default: "#{icon_name} icon")
     end
 
     def unique_id
-      @unique_id ||= "bl-icon-#{icon_name}-#{SecureRandom.hex(8)}"
+      @unique_id ||= "bl-icon-#{icon_name_context}-#{SecureRandom.hex(8)}"
     end
 
     ##
@@ -66,6 +68,10 @@ module Blacklight
 
     private
 
+    def icon_name_context
+      [icon_name, additional_options[:label_context]].compact.join('_')
+    end
+
     def file
       # Rails.application.assets is `nil` in production mode (where compile assets is enabled).
       # This workaround is based off of this comment: https://github.com/fphilipe/premailer-rails/issues/145#issuecomment-225992564

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

@@ -1,6 +1,6 @@
-<% # Using the Bootstrap Pagination class  -%>
-<div class='pagination-search-widgets'>
-  <% if @search_context[:prev] || @search_context[:next] %>
+<% if @search_context[:prev] || @search_context[:next] %>
+  <div class='pagination-search-widgets'>
+  
     <div class="page-links">
       <%= link_to_previous_document @search_context[:prev] %> |
 
@@ -8,5 +8,5 @@
 
       <%= link_to_next_document @search_context[:next] %>
     </div>
-  <% end %>
-</div>
+  </div>
+<% end %>

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

@@ -17,7 +17,7 @@
     <%= content_for(:head) %>
   </head>
   <body class="<%= render_body_class %>">
-    <nav id="skip-link" role="navigation" aria-label="<%= t('blacklight.skip_links') %>">
+    <nav id="skip-link" role="navigation" aria-label="<%= t('blacklight.skip_links.label') %>">
       <%= link_to t('blacklight.skip_links.search_field'), '#search_field', class: 'element-invisible element-focusable rounded-bottom py-2 px-3', data: { turbolinks: 'false' } %>
       <%= link_to t('blacklight.skip_links.main_content'), '#main-container', class: 'element-invisible element-focusable rounded-bottom py-2 px-3', data: { turbolinks: 'false' } %>
       <%= content_for(:skip_links) %>

data/package.json

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

data/spec/helpers/blacklight/configuration_helper_behavior_spec.rb

@@ -274,6 +274,9 @@ RSpec.describe Blacklight::ConfigurationHelperBehavior do
       it 'handles a missing key' do
         expect(helper.label_for_search_field('not-found')).to eq 'Not Found'
       end
+      it 'handles a missing field' do
+        expect(helper.label_for_search_field(nil)).to eq nil
+      end
     end
 
     describe '#sort_field_label' do

data/spec/models/blacklight/icon_spec.rb

@@ -35,6 +35,15 @@ RSpec.describe Blacklight::Icon do
           .not_to have_css 'svg[aria-labelledby^="bl-icon-search-"]'
       end
     end
+
+    context ' with a label context' do
+      subject { described_class.new(:search, classes: 'awesome', aria_hidden: true, additional_options: { label_context: 'foo' }) }
+
+      it 'adds title' do
+        expect(Capybara.string(subject.svg))
+          .to have_css 'title[id^="bl-icon-search_foo-"]', text: 'search icon'
+      end
+    end
   end
 
   describe '#options' do

data/spec/views/catalog/_previous_next_doc.html.erb_spec.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+RSpec.describe "catalog/_previous_next_doc.html.erb" do
+  it "without next or previous does not render content" do
+    assign(:search_context, {})
+    render
+    expect(rendered).not_to have_selector ".pagination-search-widgets"
+  end
+
+  it "with next or previous does render content" do
+    assign(:search_context, next: 'foo', prev: 'bar')
+    allow(view).to receive(:link_to_previous_document).and_return('')
+    allow(view).to receive(:item_page_entry_info).and_return('')
+    allow(view).to receive(:link_to_next_document).and_return('')
+    render
+    expect(rendered).to have_selector ".pagination-search-widgets"
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 7.6.0
+  version: 7.7.0
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-14 00:00:00.000000000 Z
+date: 2020-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -309,7 +309,6 @@ files:
 - README.md
 - Rakefile
 - VERSION
-- Vagrantfile
 - app/assets/images/blacklight/list.svg
 - app/assets/images/blacklight/logo.png
 - app/assets/images/blacklight/search.svg
@@ -594,7 +593,6 @@ files:
 - lib/railties/blacklight.rake
 - package-lock.json
 - package.json
-- provision.sh
 - spec/controllers/alternate_controller_spec.rb
 - spec/controllers/application_controller_spec.rb
 - spec/controllers/blacklight/base_spec.rb
@@ -699,6 +697,7 @@ files:
 - spec/views/catalog/_index.html.erb_spec.rb
 - spec/views/catalog/_index_header.html.erb_spec.rb
 - spec/views/catalog/_paginate_compact.html.erb_spec.rb
+- spec/views/catalog/_previous_next_doc.html.erb_spec.rb
 - spec/views/catalog/_search_header.erb_spec.rb
 - spec/views/catalog/_show.html.erb_spec.rb
 - spec/views/catalog/_show_sidebar.erb_spec.rb
@@ -739,7 +738,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.1
 signing_key: 
 specification_version: 4
 summary: Blacklight provides a discovery interface for any Solr (http://lucene.apache.org/solr)
@@ -849,6 +848,7 @@ test_files:
 - spec/views/catalog/_index.html.erb_spec.rb
 - spec/views/catalog/_index_header.html.erb_spec.rb
 - spec/views/catalog/_paginate_compact.html.erb_spec.rb
+- spec/views/catalog/_previous_next_doc.html.erb_spec.rb
 - spec/views/catalog/_search_header.erb_spec.rb
 - spec/views/catalog/_show.html.erb_spec.rb
 - spec/views/catalog/_show_sidebar.erb_spec.rb

data/Vagrantfile

@@ -1,79 +0,0 @@
-# frozen_string_literal: true
-
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-# All Vagrant configuration is done below. The "2" in Vagrant.configure
-# configures the configuration version (we support older styles for
-# backwards compatibility). Please don't change it unless you know what
-# you're doing.
-Vagrant.configure(2) do |config|
-  # The most common configuration options are documented and commented below.
-  # For a complete reference, please see the online documentation at
-  # https://docs.vagrantup.com.
-
-  # Every Vagrant development environment requires a box. You can search for
-  # boxes at https://atlas.hashicorp.com/search.
-  config.vm.box = "bento/centos-7.1"
-  config.vm.hostname = "blacklight"
-  config.vm.synced_folder ".", "/home/vagrant/sync", type: 'virtualbox'
-
-  # Disable automatic box update checking. If you disable this, then
-  # boxes will only be checked for updates when the user runs
-  # `vagrant box outdated`. This is not recommended.
-  # config.vm.box_check_update = false
-
-  # Create a forwarded port mapping which allows access to a specific port
-  # within the machine from a port on the host machine. In the example below,
-  # accessing "localhost:8080" will access port 80 on the guest machine.
-  # config.vm.network "forwarded_port", guest: 80, host: 8080
-  config.vm.network "forwarded_port", guest: 8983, host: 8983, auto_correct: true
-  config.vm.network "forwarded_port", guest: 3000, host: 3000, auto_correct: true
-
-  # Create a private network, which allows host-only access to the machine
-  # using a specific IP.
-  # config.vm.network "private_network", ip: "192.168.33.10"
-
-  # Create a public network, which generally matched to bridged network.
-  # Bridged networks make the machine appear as another physical device on
-  # your network.
-  # config.vm.network "public_network"
-
-  # Share an additional folder to the guest VM. The first argument is
-  # the path on the host to the actual folder. The second argument is
-  # the path on the guest to mount the folder. And the optional third
-  # argument is a set of non-required options.
-  # config.vm.synced_folder "../data", "/vagrant_data"
-
-  # Provider-specific configuration so you can fine-tune various
-  # backing providers for Vagrant. These expose provider-specific options.
-  # Example for VirtualBox:
-  #
-  # config.vm.provider "virtualbox" do |vb|
-  #   # Display the VirtualBox GUI when booting the machine
-  #   vb.gui = true
-  #
-  #   # Customize the amount of memory on the VM:
-  #   vb.memory = "1024"
-  # end
-  #
-  # View the documentation for the provider you are using for more
-  # information on available options.
-
-  # Define a Vagrant Push strategy for pushing to Atlas. Other push strategies
-  # such as FTP and Heroku are also available. See the documentation at
-  # https://docs.vagrantup.com/v2/push/atlas.html for more information.
-  # config.push.define "atlas" do |push|
-  #   push.app = "YOUR_ATLAS_USERNAME/YOUR_APPLICATION_NAME"
-  # end
-
-  # Enable provisioning with a shell script. Additional provisioners such as
-  # Puppet, Chef, Ansible, Salt, and Docker are also available. Please see the
-  # documentation for more information about their specific syntax and use.
-  # config.vm.provision "shell", inline: <<-SHELL
-  #   sudo apt-get update
-  #   sudo apt-get install -y apache2
-  # SHELL
-
-  config.vm.provision "shell", path: "provision.sh"
-end

data/provision.sh

@@ -1,30 +0,0 @@
-#!/usr/bin/env bash
-
-# This script is used by the Vagrant file to provision the box
-
-# Install server dependencies
-sudo yum install -y epel-release
-sudo yum install -y curl git java-1.8.0-openjdk-devel nodejs yum-utils gcc bzip2 kernel-devel dkms
-
-# Install RVM and Ruby
-su - vagrant -c 'gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3'
-su - vagrant -c 'curl -sSL https://get.rvm.io | bash -s stable'
-su - vagrant -c 'rvm 2.2.3 --install --default'
-
-# Install bundler gem and bundle install
-su - vagrant -c 'gem install bundler'
-su - vagrant -c 'cd /home/vagrant/sync && bundle install'
-
-# Create the test application
-su - vagrant -c 'cd /home/vagrant/sync && rake engine_cart:generate'
-
-# Output some instructions on what to do next
-echo "
-Now to start Solr and Blacklight run the following from within the Blacklight directory:
-
-vagrant ssh
-cd /home/vagrant/sync
-rake blacklight:server[\"-b 0.0.0.0\"]
-
-Now you can make changes to Blacklight and see the results.
-"