blacklight 7.41.0 → 8.0.0.beta1

data/app/javascript/blacklight/modal.js

@@ -23,12 +23,6 @@
   of the container will be placed inside the modal, the rest of the
   page will be ignored.
 
-  If you'd like to have a link or button that closes the modal,
-  you can just add a `data-dismiss="modal"` to the link,
-  standard Bootstrap convention. But you can also have
-  an href on this link for non-JS contexts, we'll make sure
-  inside the modal it closes the modal and the link is NOT followed.
-
   Link or forms inside the modal will ordinarily cause page loads
   when they are triggered. However, if you'd like their results
   to stay within the modal, just add `data-blacklight-modal="preserve"`
@@ -49,178 +43,119 @@
 
 
       <div class="modal-footer">
-        <%= link_to "Close the modal", request_done_path, class: "submit button dialog-close", data: { dismiss: "modal" } %>
+        <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
       </div>
     </div>
 
 
-  One additional feature. If the content returned from the AJAX modal load
-  has an element with `data-blacklight-modal=close`, that will trigger the modal
-  to be closed. And if this element includes a node with class "flash_messages",
-  the flash-messages node will be added to the main page inside #main-flahses.
+  One additional feature. If the content returned from the AJAX form submission
+  can be a turbo-stream that defines some HTML fragementsand where on the page to put them:
+  https://turbo.hotwired.dev/handbook/streams
+*/
+import Blacklight from './core'
+import ModalForm from './modalForm'
+
+const Modal = (() => {
+  // We keep all our data in Blacklight.modal object.
+  // Create lazily if someone else created first.
+  if (Blacklight.modal === undefined) {
+    Blacklight.modal = {};
+  }
 
-  == Events
+  const modal = Blacklight.modal
+
+  // a Bootstrap modal div that should be already on the page hidden
+  modal.modalSelector = '#blacklight-modal';
+
+  // Trigger selectors identify forms or hyperlinks that should open
+  // inside a modal dialog.
+  modal.triggerLinkSelector  = 'a[data-blacklight-modal~=trigger]';
+
+  // preserve selectors identify forms or hyperlinks that, if activated already
+  // inside a modal dialog, should have destinations remain inside the modal -- but
+  // won't trigger a modal if not already in one.
+  //
+  // No need to repeat selectors from trigger selectors, those will already
+  // be preserved. MUST be manually prefixed with the modal selector,
+  // so they only apply to things inside a modal.
+  modal.preserveLinkSelector = modal.modalSelector + ' a[data-blacklight-modal~=preserve]';
+
+  modal.containerSelector    = '[data-blacklight-modal~=container]';
+
+  // Called on fatal failure of ajax load, function returns content
+  // to show to user in modal.  Right now called only for extreme
+  // network errors.
+  modal.onFailure = function (jqXHR, textStatus, errorThrown) {
+      console.error('Server error:', this.url, jqXHR.status, errorThrown);
+
+      const contents = `<div class="modal-header">
+        <div class="modal-title">There was a problem with your request.</div>
+        <button type="button" class="blacklight-modal-close btn-close close" data-dismiss="modal" data-bs-dismiss="modal" aria-label="Close">
+          <span aria-hidden="true">&times;</span>
+        </button>
+        </div>
+        <div class="modal-body">
+          <p>Expected a successful response from the server, but got an error</p>
+          <pre>${this.type} ${this.url}\n${jqXHR.status}: ${errorThrown}</pre>
+        </div>`
+
+      document.querySelector(`${modal.modalSelector} .modal-content`).innerHTML = contents
+
+      modal.show();
+  }
 
-  We'll send out an event 'loaded.blacklight.blacklight-modal' with the #blacklight-modal
-  dialog as the target, right after content is loaded into the modal but before
-  it is shown (if not already a shown modal).  In an event handler, you can
-  inspect loaded content by looking inside $(this).  If you call event.preventDefault(),
-  we won't 'show' the dialog (although it may already have been shown, you may want to
-  $(this).modal("hide") if you want to ensure hidden/closed.
+  // Add the passed in contents to the modal and display it.
+modal.receiveAjax = function (contents) {
+      const domparser = new DOMParser();
+      const dom = domparser.parseFromString(contents, "text/html")
+      const elements = dom.querySelectorAll(`${modal.containerSelector} > *`)
+      document.querySelector(`${modal.modalSelector} .modal-content`).replaceChildren(...elements)
 
-  The data-blacklight-modal=close behavior is implemented with this event, see for example.
-*/
+      modal.show();
+  };
 
-// We keep all our data in Blacklight.modal object.
-// Create lazily if someone else created first.
-if (Blacklight.modal === undefined) {
-  Blacklight.modal = {};
-}
-
-// a Bootstrap modal div that should be already on the page hidden
-Blacklight.modal.modalSelector = '#blacklight-modal';
-
-// Trigger selectors identify forms or hyperlinks that should open
-// inside a modal dialog.
-Blacklight.modal.triggerLinkSelector  = 'a[data-blacklight-modal~=trigger]';
-Blacklight.modal.triggerFormSelector  = 'form[data-blacklight-modal~=trigger]';
-
-// preserve selectors identify forms or hyperlinks that, if activated already
-// inside a modal dialog, should have destinations remain inside the modal -- but
-// won't trigger a modal if not already in one.
-//
-// No need to repeat selectors from trigger selectors, those will already
-// be preserved. MUST be manually prefixed with the modal selector,
-// so they only apply to things inside a modal.
-Blacklight.modal.preserveLinkSelector = Blacklight.modal.modalSelector + ' a[data-blacklight-modal~=preserve]';
-
-Blacklight.modal.containerSelector    = '[data-blacklight-modal~=container]';
-
-Blacklight.modal.modalCloseSelector   = '[data-blacklight-modal~=close]';
-
-// Called on fatal failure of ajax load, function returns content
-// to show to user in modal.  Right now called only for extreme
-// network errors.
-Blacklight.modal.onFailure = function(jqXHR, textStatus, errorThrown) {
-  console.error('Server error:', this.url, jqXHR.status, errorThrown);
-
-  var contents = '<div class="modal-header">' +
-            '<div class="modal-title">There was a problem with your request.</div>' +
-            '<button type="button" class="blacklight-modal-close btn-close close" data-dismiss="modal" aria-label="Close">' +
-            '  <span aria-hidden="true">&times;</span>' +
-            '</button></div>' +
-            ' <div class="modal-body"><p>Expected a successful response from the server, but got an error</p>' +
-            '<pre>' +
-            this.type + ' ' + this.url + "\n" + jqXHR.status + ': ' + errorThrown +
-            '</pre></div>';
-  $(Blacklight.modal.modalSelector).find('.modal-content').html(contents);
-  Blacklight.modal.show();
-}
-
-Blacklight.modal.receiveAjax = function (contents) {
-    // does it have a data- selector for container?
-    // important we don't execute script tags, we shouldn't.
-    // code modelled off of JQuery ajax.load. https://github.com/jquery/jquery/blob/main/src/ajax/load.js?source=c#L62
-    var container =  $('<div>').
-      append( jQuery.parseHTML(contents) ).find( Blacklight.modal.containerSelector ).first();
-    if (container.length !== 0) {
-      contents = container.html();
-    }
-
-    $(Blacklight.modal.modalSelector).find('.modal-content').html(contents);
-
-    // send custom event with the modal dialog div as the target
-    var e    = $.Event('loaded.blacklight.blacklight-modal')
-    $(Blacklight.modal.modalSelector).trigger(e);
-    // if they did preventDefault, don't show the dialog
-    if (e.isDefaultPrevented()) return;
-
-    Blacklight.modal.show();
-};
-
-
-Blacklight.modal.modalAjaxLinkClick = function(e) {
-  e.preventDefault();
-
-  $.ajax({
-    url: $(this).attr('href')
-  })
-  .fail(Blacklight.modal.onFailure)
-  .done(Blacklight.modal.receiveAjax)
-};
-
-Blacklight.modal.modalAjaxFormSubmit = function(e) {
-    e.preventDefault();
 
-    $.ajax({
-      url: $(this).attr('action'),
-      data: $(this).serialize(),
-      type: $(this).attr('method') // POST
-    })
-    .fail(Blacklight.modal.onFailure)
-    .done(Blacklight.modal.receiveAjax)
-}
-
-
-
-Blacklight.modal.setupModal = function() {
-	// Event indicating blacklight is setting up a modal link,
-  // you can catch it and call e.preventDefault() to abort
-  // setup.
-	var e = $.Event('setup.blacklight.blacklight-modal');
-	$('body').trigger(e);
-	if (e.isDefaultPrevented()) return;
-
-  // Register both trigger and preserve selectors in ONE event handler, combining
-  // into one selector with a comma, so if something matches BOTH selectors, it
-  // still only gets the event handler called once.
-  $('body').on('click', Blacklight.modal.triggerLinkSelector + ', ' + Blacklight.modal.preserveLinkSelector,
-    Blacklight.modal.modalAjaxLinkClick);
-  $('body').on('submit', Blacklight.modal.triggerFormSelector + ', ' + Blacklight.modal.preserveFormSelector,
-    Blacklight.modal.modalAjaxFormSubmit);
-
-  // Catch our own custom loaded event to implement data-blacklight-modal=closed
-  $('body').on('loaded.blacklight.blacklight-modal', Blacklight.modal.checkCloseModal);
-
-  // we support doing data-dismiss=modal on a <a> with a href for non-ajax
-  // use, we need to suppress following the a's href that's there for
-  // non-JS contexts.
-  $('body').on('click', Blacklight.modal.modalSelector + ' a[data-dismiss~=modal]', function (e) {
+  modal.modalAjaxLinkClick = function(e) {
     e.preventDefault();
-  });
-};
-
-// A function used as an event handler on loaded.blacklight.blacklight-modal
-// to catch contained data-blacklight-modal=closed directions
-Blacklight.modal.checkCloseModal = function(event) {
-  if ($(event.target).find(Blacklight.modal.modalCloseSelector).length) {
-    var modalFlashes = $(this).find('.flash_messages');
+    const href = e.target.getAttribute('href')
+    fetch(href)
+      .then(response => {
+         if (!response.ok) {
+           throw new TypeError("Request failed");
+         }
+         return response.text();
+       })
+      .then(data => modal.receiveAjax(data))
+      .catch(error => modal.onFailure(error))
+  };
+
+  modal.setupModal = function() {
+    // Register both trigger and preserve selectors in ONE event handler, combining
+    // into one selector with a comma, so if something matches BOTH selectors, it
+    // still only gets the event handler called once.
+    document.addEventListener('click', (e) => {
+      if (e.target.matches(`${modal.triggerLinkSelector}, ${modal.preserveLinkSelector}`))
+        modal.modalAjaxLinkClick(e)
+      else if (e.target.matches('[data-bl-dismiss="modal"]'))
+        modal.hide()
+    })
+  };
 
-    Blacklight.modal.hide(event.target);
-    event.preventDefault();
+  modal.hide = function (el) {
+    const dom = document.querySelector(Blacklight.modal.modalSelector)
 
-    var mainFlashes = $('#main-flashes');
-    mainFlashes.append(modalFlashes);
-    modalFlashes.fadeIn(500);
+    if (!dom.open) return
+    dom.close()
   }
-}
 
-Blacklight.modal.hide = function(el) {
-  if (typeof bootstrap !== 'undefined' && typeof bootstrap.Modal !== 'undefined' && bootstrap.Modal.VERSION >= "5") {
-    bootstrap.Modal.getOrCreateInstance(el || document.querySelector(Blacklight.modal.modalSelector)).hide();
-  } else {
-    $(el || Blacklight.modal.modalSelector).modal('hide');
-  }
-}
+  modal.show = function(el) {
+    const dom = document.querySelector(Blacklight.modal.modalSelector)
 
-Blacklight.modal.show = function(el) {
-  if (typeof bootstrap !== 'undefined' && typeof bootstrap.Modal !== 'undefined' && bootstrap.Modal.VERSION >= "5") {
-    bootstrap.Modal.getOrCreateInstance(el || document.querySelector(Blacklight.modal.modalSelector)).show();
-  } else {
-    $(el || Blacklight.modal.modalSelector).modal('show');
+    if (dom.open) return
+    dom.showModal()
   }
-}
 
-Blacklight.onLoad(function() {
-  Blacklight.modal.setupModal();
-});
+  modal.setupModal()
+})()
+
+export default Modal

data/app/javascript/blacklight/modalForm.js

@@ -0,0 +1,60 @@
+// The email and sms forms are displayed inside a modal.  When the form is submitted,
+// this script closes the modal and puts the output on the main part of the page.
+// By default it is rendering catalog/sms_success and catalog/email_succcess.
+// These templates deliver a payload of the format used by turbo-streams.
+// See https://turbo.hotwired.dev/handbook/streams
+// That format allows a downstream application to override the template to define
+// multiple customizable areas of the page to get updated.
+export default class {
+    constructor(errorHandler, badRequestHandler, hideModal) {
+      this.errorHandler = errorHandler
+      this.badRequestHandler = badRequestHandler
+      this.hideModal = hideModal
+    }
+
+    get triggerFormSelector() {
+      return 'form[data-blacklight-modal~=trigger]'
+    }
+
+    bind() {
+      document.addEventListener('submit', (e) => {
+         if (e.target.matches(this.triggerFormSelector))
+          this.onSubmit(e)
+      })
+    }
+
+    // This is like a light-weight version of turbo that only supports append presently.
+    updateTurboStream(data) {
+        this.hideModal()
+        const domparser = new DOMParser();
+        const dom = domparser.parseFromString(data, "text/html")
+        dom.querySelectorAll("turbo-stream[action='append']").forEach((node) => {
+          const target = node.getAttribute('target')
+          const element = document.getElementById(target)
+          if (element)
+            element.append(node.querySelector('template').content.cloneNode(true))
+          else
+            console.error(`Unable to find an element on the page with and ID of "${target}""`)
+        })
+    }
+
+    onSubmit(e) {
+        e.preventDefault();
+        const form = e.target
+        fetch(form.action, {
+            body: new FormData(form),
+            headers: { "X-Requested-With": "XMLHttpRequest" }, // Ensures rails will return true when checking request.xhr?
+            method: form.method,
+          })
+          .then(response => {
+             if (response.status === 422) {
+               return response.text().then(content => this.badRequestHandler(content) )
+             }
+             if (!response.ok) {
+               throw new TypeError("Request failed");
+             }
+             response.text().then(content => this.updateTurboStream(content))
+           })
+          .catch(error => this.errorHandler(error))
+    }
+}

data/app/javascript/blacklight/search_context.js

@@ -1,67 +1,59 @@
-Blacklight.doSearchContextBehavior = function() {
-  if (typeof Blacklight.do_search_context_behavior == 'function') {
-    console.warn("do_search_context_behavior is deprecated. Use doSearchContextBehavior instead.");
-    return Blacklight.do_search_context_behavior();
-  }
-
-  const elements = document.querySelectorAll('a[data-context-href]')
-  // Equivalent to Array.from(), but supports ie11
-  const nodes = Array.prototype.slice.call(elements)
-
-  nodes.forEach(function(element) {
-    element.addEventListener('click', function(e) {
-      Blacklight.handleSearchContextMethod.call(e.currentTarget, e)
+import Blacklight from './core'
+
+const SearchContext = (() => {
+  Blacklight.doSearchContextBehavior = function() {
+    document.addEventListener('click', (e) => {
+      if (e.target.matches('[data-context-href]')) {
+        Blacklight.handleSearchContextMethod.call(e.target, e)
+      }
     })
-  })
-};
+  };
 
-// this is the Rails.handleMethod with a couple adjustments, described inline:
-// first, we're attaching this directly to the event handler, so we can check for meta-keys
-Blacklight.handleSearchContextMethod = function(event) {
-  if (typeof Blacklight.handle_search_context_method == 'function') {
-    console.warn("handle_search_context_method is deprecated. Use handleSearchContextMethod instead.");
-    return Blacklight.handle_search_context_method(event);
-  }
-  var link = this
+  Blacklight.csrfToken = () => document.querySelector('meta[name=csrf-token]')?.content
+  Blacklight.csrfParam = () => document.querySelector('meta[name=csrf-param]')?.content
 
-  // instead of using the normal href, we need to use the context href instead
-  let href = link.getAttribute('data-context-href')
-  let target = link.getAttribute('target')
-  let csrfToken = Blacklight.csrfToken()
-  let csrfParam = Blacklight.csrfParam()
-  let form = document.createElement('form')
-  form.method = 'post'
-  form.action = href
+  // this is the Rails.handleMethod with a couple adjustments, described inline:
+  // first, we're attaching this directly to the event handler, so we can check for meta-keys
+  Blacklight.handleSearchContextMethod = function(event) {
+    const link = this
 
+    // instead of using the normal href, we need to use the context href instead
+    let href = link.getAttribute('data-context-href')
+    let target = link.getAttribute('target')
+    let csrfToken = Blacklight.csrfToken()
+    let csrfParam = Blacklight.csrfParam()
+    let form = document.createElement('form')
+    form.method = 'post'
+    form.action = href
 
-  let formContent = `<input name="_method" value="post" type="hidden" />
-    <input name="redirect" value="${link.getAttribute('href')}" type="hidden" />`
 
-  // check for meta keys.. if set, we should open in a new tab
-  if(event.metaKey || event.ctrlKey) {
-    form.dataset.turbo = "false";
-    target = '_blank';
-  }
+    let formContent = `<input name="_method" value="post" type="hidden" />
+      <input name="redirect" value="${link.getAttribute('href')}" type="hidden" />`
 
-  if (csrfParam !== undefined && csrfToken !== undefined) {
-    formContent += `<input name="${csrfParam}" value="${csrfToken}" type="hidden" />`
-  }
+    // check for meta keys.. if set, we should open in a new tab
+    if(event.metaKey || event.ctrlKey) {
+      target = '_blank';
+    }
 
-  // Must trigger submit by click on a button, else "submit" event handler won't work!
-  // https://developer.mozilla.org/en-US/docs/Web/API/HTMLFormElement/submit
-  formContent += '<input type="submit" />'
+    if (csrfParam !== undefined && csrfToken !== undefined) {
+      formContent += `<input name="${csrfParam}" value="${csrfToken}" type="hidden" />`
+    }
 
-  if (target) { form.setAttribute('target', target); }
+    // Must trigger submit by click on a button, else "submit" event handler won't work!
+    // https://developer.mozilla.org/en-US/docs/Web/API/HTMLFormElement/submit
+    formContent += '<input type="submit" />'
 
-  form.style.display = 'none'
-  form.innerHTML = formContent
-  document.body.appendChild(form)
-  form.querySelector('[type="submit"]').click()
+    if (target) { form.setAttribute('target', target); }
 
-  event.preventDefault()
-  event.stopPropagation()
-};
+    form.style.display = 'none'
+    form.innerHTML = formContent
+    document.body.appendChild(form)
+    form.querySelector('[type="submit"]').click()
+
+    event.preventDefault()
+  };
 
-Blacklight.onLoad(function() {
   Blacklight.doSearchContextBehavior();
-});
+})()
+
+export default SearchContext

data/app/models/blacklight/facet_paginator.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Blacklight
   # Pagination for facet values -- works by setting the limit to max
   # displayable. You have to ask Solr for limit+1, to get enough
@@ -52,10 +53,10 @@ module Blacklight
 
     def current_page
       # A nil limit is unlimited, thus only one page.
-      if limit.nil? || limit.zero? #check for divide by zero
+      if limit.nil? || limit.zero? # check for divide by zero
         1
       else
-        @offset / limit + 1
+        (@offset / limit) + 1
       end
     end
 

data/app/models/blacklight/icon.rb

@@ -4,6 +4,8 @@ module Blacklight
   class Icon
     attr_reader :icon_name, :aria_hidden, :label, :role, :additional_options
 
+    delegate :present?, to: :file
+
     ##
     # @param [String, Symbol] icon_name
     # @param [String] classes additional classes separated by a string
@@ -32,7 +34,7 @@ module Blacklight
     end
 
     def icon_label
-      I18n.translate("blacklight.icon.#{icon_name_context}", default: icon_name.to_s.titleize)
+      I18n.t("blacklight.icon.#{icon_name_context}", default: icon_name.to_s.titleize)
     end
 
     ##
@@ -40,7 +42,7 @@ module Blacklight
     def options
       {
         class: classes,
-        "aria-hidden": (true if aria_hidden)
+        'aria-hidden': (true if aria_hidden)
       }
     end
 

data/app/models/bookmark.rb

@@ -4,8 +4,6 @@ class Bookmark < ApplicationRecord
   belongs_to :user, polymorphic: true
   belongs_to :document, polymorphic: true
 
-  validates :user_id, presence: true
-
   def document
     document_type.new document_type.unique_key => document_id
   end

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Blacklight::Configurable
   extend ActiveSupport::Concern
 
@@ -6,7 +7,7 @@ module Blacklight::Configurable
     helper_method :blacklight_config if respond_to? :helper_method
   end
 
-  #instance methods for blacklight_config, so get a deep copy of the class-level config
+  # instance methods for blacklight_config, so get a deep copy of the class-level config
   def blacklight_config
     @blacklight_config ||= self.class.blacklight_config.deep_copy
   end
@@ -31,9 +32,9 @@ module Blacklight::Configurable
     end
     attr_writer :blacklight_config
 
-    #simply a convenience method for blacklight_config.configure
-    def configure_blacklight(*args, &block)
-      blacklight_config.configure(*args, &block)
+    # simply a convenience method for blacklight_config.configure
+    def configure_blacklight(...)
+      blacklight_config.configure(...)
     end
 
     ##

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'active_model/conversion'
 
 module Blacklight::Document
@@ -28,16 +29,6 @@ module Blacklight::Document
       def find id
         repository.find(id).documents.first
       end
-
-      # In Rails 7.1+, needs this method
-      def composite_primary_key?
-        false
-      end
-
-      # In Rails 7.1+, needs this method
-      def has_query_constraints?
-        false
-      end
     end
 
     ##

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # This module provides the cache key which can be used by rails
 # caching to determine when to expire a particular object's cache
 # See http://apidock.com/rails/ActiveRecord/Integration/cache_key

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'builder'
 
 # This module provide Dublin Core export based on the document's semantic values
@@ -26,7 +27,7 @@ module Blacklight::Document::DublinCore
              'xmlns:dc' => "http://purl.org/dc/elements/1.1/",
              'xmlns:xsi' => "http://www.w3.org/2001/XMLSchema-instance",
              'xsi:schemaLocation' => %(http://www.openarchives.org/OAI/2.0/oai_dc/ http://www.openarchives.org/OAI/2.0/oai_dc.xsd)) do
-      to_semantic_values.select { |field, _values| dublin_core_field_name? field  }.each do |field, values|
+      to_semantic_values.select { |field, _values| dublin_core_field_name? field }.each do |field, values|
         Array.wrap(values).each do |v|
           xml.tag! "dc:#{field}", v
         end

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # This module provides the body of an email export based on the document's semantic values
 module Blacklight::Document::Email
   # Return a text string that will be the body of the email

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # == Transformation conventions
 # The main use case for extensions is for transforming a Document to another
 # format. Either to another type of Ruby object, or to an exportable string in
@@ -55,7 +56,7 @@ module Blacklight::Document::Export
   # register it using Mime::Type.register_alias if it's not previously
   # registered. This is a bit sketchy though.
   def will_export_as(short_name, content_type = nil)
-    #Lookup in Rails Mime::Type, register if needed, otherwise take
+    # Lookup in Rails Mime::Type, register if needed, otherwise take
     # content-type from registration if needed.
     if defined?(Mime) && Mime[short_name.to_sym]
       content_type ||= Mime[short_name.to_sym]

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # = Document Extensions
 # An Blacklight::Document extension is simply a ruby module which is mixed
 # in to individual Document instances.  The intended use case is for documents

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Blacklight::Document::SchemaOrg
   def itemtype
     "http://schema.org/Thing"

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Blacklight::Document
   module SemanticFields
     extend ActiveSupport::Concern
@@ -30,7 +31,7 @@ module Blacklight::Document
     # but extensions should call super and modify hash returned, to avoid
     # unintentionally erasing values provided by other extensions.
     def to_semantic_values
-      @semantic_value_hash ||= self.class.field_semantics.each_with_object(Hash.new { |hash, key| hash[key] = [] }) do |(key, field_names), hash|
+      @semantic_value_hash ||= self.class.field_semantics.each_with_object(Hash.new([])) do |(key, field_names), hash|
         ##
         # Handles single string field_name or an array of field_names
         value = Array.wrap(field_names).map { |field_name| self[field_name] }.flatten.compact

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # This module provides the body of an email export based on the document's semantic values
 module Blacklight::Document::Sms
   # Return a text string that will be the body of the email