blacklight 7.36.1 → 7.37.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f765559b5df84d243537823f81c5b6d9fccca157bf7cc17a1c857067f76c4a79
-  data.tar.gz: d0de6aa0209d19691e48569b9aa33011f13259755502997082add198ad6e21de
+  metadata.gz: a363d5e420f14ec8b9bc11825cfa98fd31e0be3b7e45da9fb1a60895d8d7e491
+  data.tar.gz: 928f51bf66d44b4dbb2243e845f978176a78720e50f386340c1f247c542fc7f2
 SHA512:
-  metadata.gz: d241feeec8c93d23cfbe7a8b9b8600e2cd10ccfe52ddd26e8706b721173311033b31d9378226929008fa8d9326828c9e9363646d67a48f74359fda7479b1a468
-  data.tar.gz: bc1df26425a9e43efb3b01bbdcdf31e4b9fd3ad2ee9e6215780e485bf1c7f62d6b625a5c554549f183c1ce104503bba175e0830349cdadc981c7d895d0c440c8
+  metadata.gz: ec45d9d2d4e513eecc80ed7de3c47d083bb0b0a43f52863f1cdf28504be9688d0568a61ba1ab739da100a85b503b9f185346ea7fdd8519d35d9a736023e5a879
+  data.tar.gz: d73ec607a44211851883e93a49d40a2eebb31f55e4967a9347866b891499f8ea49444cd2faa1352124e8482a38abc84ad0891485e2c4dfd6cb4a685ea726b30a

data/.github/workflows/ruby.yml

@@ -47,7 +47,7 @@ jobs:
     - name: Run tests
       run: bundle exec rake ci
       env:
-        ENGINE_CART_RAILS_OPTIONS: '--skip-git --skip-listen --skip-spring --skip-keeps --skip-action-cable --skip-coffee --skip-test'
+        ENGINE_CART_RAILS_OPTIONS: '--skip-git --skip-listen --skip-spring --skip-keeps --skip-coffee --skip-test'
   test_bootstrap5:
     runs-on: ubuntu-latest
     strategy:
@@ -68,7 +68,7 @@ jobs:
       run: bundle exec rake ci
       env:
         BOOTSTRAP_VERSION: '~> 5.0'
-        ENGINE_CART_RAILS_OPTIONS: '--skip-git --skip-listen --skip-spring --skip-keeps --skip-action-cable --skip-coffee --skip-test'
+        ENGINE_CART_RAILS_OPTIONS: '--skip-git --skip-listen --skip-spring --skip-keeps --skip-coffee --skip-test'
   test_rails6_0:
     runs-on: ubuntu-latest
     strategy:
@@ -151,7 +151,7 @@ jobs:
     - name: Run tests
       run: bundle exec rake ci
       env:
-        ENGINE_CART_RAILS_OPTIONS: '--skip-git --skip-listen --skip-spring --skip-keeps --skip-action-cable --skip-coffee --skip-test'
+        ENGINE_CART_RAILS_OPTIONS: '--skip-git --skip-listen --skip-spring --skip-keeps --skip-coffee --skip-test'
   api_test:
     runs-on: ubuntu-latest
     strategy:

data/Gemfile

@@ -48,29 +48,3 @@ end
 # END ENGINE_CART BLOCK
 
 eval_gemfile File.expand_path("spec/test_app_templates/Gemfile.extra", File.dirname(__FILE__))
-
-gem "rubocop", "~> 1.60"
-
-gem "rubocop-capybara", "~> 2.20"
-
-gem "rubocop-rspec", "~> 2.26"
-
-gem "rubocop-rails", "~> 2.23"
-
-gem "rspec", "~> 3.12"
-
-gem "simplecov", "~> 0.22.0"
-
-gem "engine_cart", "~> 2.6"
-
-gem "rspec-rails", "~> 6.1"
-
-gem "rspec-collection_matchers", "~> 1.2"
-
-gem "capybara", "~> 3.39"
-
-gem "selenium-webdriver", "~> 4.16"
-
-gem "equivalent-xml", "~> 0.6.0"
-
-gem "axe-core-rspec", "~> 4.8"

data/VERSION

@@ -1 +1 @@
-7.36.1
+7.37.0

data/app/assets/javascripts/blacklight/blacklight.js

@@ -1,17 +1,17 @@
 "use strict";
 
-var Blacklight = function () {
+const Blacklight = function () {
   var buffer = new Array();
   return {
-    onLoad: function onLoad(func) {
+    onLoad: function (func) {
       buffer.push(func);
     },
-    activate: function activate() {
+    activate: function () {
       for (var i = 0; i < buffer.length; i++) {
         buffer[i].call();
       }
     },
-    listeners: function listeners() {
+    listeners: function () {
       var listeners = [];
       if (typeof Turbo !== 'undefined') {
         listeners.push('turbo:load');
@@ -39,7 +39,7 @@ Blacklight.listeners().forEach(function (listener) {
   });
 });
 Blacklight.onLoad(function () {
-  var elem = document.querySelector('.no-js');
+  const elem = document.querySelector('.no-js');
 
   // The "no-js" class may already have been removed because this function is
   // run on every turbo:load event, in that case, it won't find an element.
@@ -47,6 +47,14 @@ Blacklight.onLoad(function () {
   elem.classList.remove('no-js');
   elem.classList.add('js');
 });
+Blacklight.csrfToken = () => {
+  var _document$querySelect;
+  return (_document$querySelect = document.querySelector('meta[name=csrf-token]')) === null || _document$querySelect === void 0 ? void 0 : _document$querySelect.content;
+};
+Blacklight.csrfParam = () => {
+  var _document$querySelect2;
+  return (_document$querySelect2 = document.querySelector('meta[name=csrf-param]')) === null || _document$querySelect2 === void 0 ? void 0 : _document$querySelect2.content;
+};
 window.Blacklight = Blacklight;
 /*global Bloodhound */
 
@@ -89,7 +97,7 @@ Blacklight.onLoad(function () {
     $(Blacklight.doBookmarkToggleBehavior.selector).blCheckboxSubmit({
       // cssClass is added to elements added, plus used for id base
       cssClass: 'toggle-bookmark',
-      success: function success(checked, response) {
+      success: function (checked, response) {
         if (response.bookmarks) {
           $('[data-role=bookmark-counter]').text(response.bookmarks.count);
         }
@@ -105,8 +113,8 @@ Blacklight.onLoad(function () {
   // Button clicks should change focus. As of 10/3/19, Firefox for Mac and
   // Safari both do not set focus to a button on button click.
   // See https://zellwk.com/blog/inconsistent-button-behavior/ for background information
-  document.querySelectorAll('button.collapse-toggle').forEach(function (button) {
-    button.addEventListener('click', function () {
+  document.querySelectorAll('button.collapse-toggle').forEach(button => {
+    button.addEventListener('click', () => {
       event.target.focus();
     });
   });
@@ -187,15 +195,18 @@ Blacklight.onLoad(function () {
         checkbox.attr('disabled', 'disabled');
         $.ajax({
           url: form.attr('action'),
+          beforeSend: function (xhr) {
+            xhr.setRequestHeader('X-CSRF-Token', Blacklight.csrfToken());
+          },
           dataType: 'json',
           type: form.attr('method').toUpperCase(),
           data: form.serialize(),
-          error: function error() {
+          error: function () {
             label.removeAttr('disabled');
             checkbox.removeAttr('disabled');
             options.error.call();
           },
-          success: function success(data, status, xhr) {
+          success: function (data, status, xhr) {
             //if app isn't running at all, xhr annoyingly
             //reports success with status 0.
             if (xhr.status != 0) {
@@ -219,10 +230,10 @@ Blacklight.onLoad(function () {
   $.fn.blCheckboxSubmit.defaults = {
     //cssClass is added to elements added, plus used for id base
     cssClass: 'blCheckboxSubmit',
-    error: function error() {
+    error: function () {
       alert("Error");
     },
-    success: function success() {} //callback
+    success: function () {} //callback
   };
 })(jQuery);
 /*global Blacklight */
@@ -234,11 +245,11 @@ Blacklight.doResizeFacetLabelsAndCounts = function () {
     return b.textContent.length - a.textContent.length;
   }
   document.querySelectorAll('.facet-values, .pivot-facet').forEach(function (elem) {
-    var nodes = elem.querySelectorAll('.facet-count');
+    const nodes = elem.querySelectorAll('.facet-count');
     // TODO: when we drop ie11 support, this can become the spread operator:
-    var longest = Array.from(nodes).sort(longer)[0];
+    const longest = Array.from(nodes).sort(longer)[0];
     if (longest && longest.textContent) {
-      var width = longest.textContent.length + 1 + 'ch';
+      const width = longest.textContent.length + 1 + 'ch';
       elem.querySelector('.facet-count').style.width = width;
     }
   });
@@ -443,23 +454,15 @@ Blacklight.doSearchContextBehavior = function () {
     console.warn("do_search_context_behavior is deprecated. Use doSearchContextBehavior instead.");
     return Blacklight.do_search_context_behavior();
   }
-  var elements = document.querySelectorAll('a[data-context-href]');
+  const elements = document.querySelectorAll('a[data-context-href]');
   // Equivalent to Array.from(), but supports ie11
-  var nodes = Array.prototype.slice.call(elements);
+  const nodes = Array.prototype.slice.call(elements);
   nodes.forEach(function (element) {
     element.addEventListener('click', function (e) {
       Blacklight.handleSearchContextMethod.call(e.currentTarget, e);
     });
   });
 };
-Blacklight.csrfToken = function () {
-  var _document$querySelect;
-  return (_document$querySelect = document.querySelector('meta[name=csrf-token]')) === null || _document$querySelect === void 0 ? void 0 : _document$querySelect.content;
-};
-Blacklight.csrfParam = function () {
-  var _document$querySelect2;
-  return (_document$querySelect2 = document.querySelector('meta[name=csrf-param]')) === null || _document$querySelect2 === void 0 ? void 0 : _document$querySelect2.content;
-};
 
 // 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
@@ -471,17 +474,18 @@ Blacklight.handleSearchContextMethod = function (event) {
   var link = this;
 
   // instead of using the normal href, we need to use the context href instead
-  var href = link.getAttribute('data-context-href');
-  var target = link.getAttribute('target');
-  var csrfToken = Blacklight.csrfToken();
-  var csrfParam = Blacklight.csrfParam();
-  var form = document.createElement('form');
+  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;
-  var formContent = "<input name=\"_method\" value=\"post\" type=\"hidden\" />\n    <input name=\"redirect\" value=\"".concat(link.getAttribute('href'), "\" type=\"hidden\" />");
+  let formContent = "<input name=\"_method\" value=\"post\" type=\"hidden\" />\n    <input name=\"redirect\" value=\"".concat(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';
   }
   if (csrfParam !== undefined && csrfToken !== undefined) {

data/app/components/blacklight/facet_field_component.html.erb

@@ -8,11 +8,12 @@
       data-target="#<%= @facet_field.html_id %>"
       data-bs-target="#<%= @facet_field.html_id %>"
       aria-expanded="<%= @facet_field.collapsed? ? 'false' : 'true' %>"
+      arial-controls="<%= @facet_field.html_id %>"
     >
       <%= label %>
     </button>
   </h3>
-  <div id="<%= @facet_field.html_id %>" aria-labelledby="<%= @facet_field.html_id %>-header" class="panel-collapse facet-content collapse <%= "show" unless @facet_field.collapsed? %>">
+  <div id="<%= @facet_field.html_id %>" role="region" aria-labelledby="<%= @facet_field.html_id %>-header" class="panel-collapse facet-content collapse <%= "show" unless @facet_field.collapsed? %>">
     <div class="card-body">
       <%= body %>
 

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

@@ -48,18 +48,7 @@ module Blacklight::TokenBasedUser
   end
 
   def secret_key_generator
-    @secret_key_generator ||= begin
-      app = Rails.application
-
-      secret_key_base = if app.respond_to?(:credentials)
-                          # Rails 5.2+
-                          app.credentials.secret_key_base
-                        else
-                          # Rails <= 5.1
-                          app.secrets.secret_key_base
-                        end
-      ActiveSupport::KeyGenerator.new(secret_key_base)
-    end
+    @secret_key_generator ||= ActiveSupport::KeyGenerator.new(Rails.application.secret_key_base)
   end
 
   def message_encryptor

data/app/javascript/blacklight/checkbox_submit.js

@@ -90,6 +90,7 @@
 
             $.ajax({
                 url: form.attr('action'),
+                beforeSend: function(xhr) { xhr.setRequestHeader('X-CSRF-Token', Blacklight.csrfToken()) },
                 dataType: 'json',
                 type: form.attr('method').toUpperCase(),
                 data: form.serialize(),

data/app/javascript/blacklight/core.js

@@ -51,4 +51,7 @@ Blacklight.onLoad(function () {
   elem.classList.add('js')
 })
 
+Blacklight.csrfToken = () => document.querySelector('meta[name=csrf-token]')?.content
+Blacklight.csrfParam = () => document.querySelector('meta[name=csrf-param]')?.content
+
 window.Blacklight = Blacklight

data/app/javascript/blacklight/search_context.js

@@ -15,9 +15,6 @@ Blacklight.doSearchContextBehavior = function() {
   })
 };
 
-Blacklight.csrfToken = () => document.querySelector('meta[name=csrf-token]')?.content
-Blacklight.csrfParam = () => document.querySelector('meta[name=csrf-param]')?.content
-
 // 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) {
@@ -42,6 +39,7 @@ Blacklight.handleSearchContextMethod = function(event) {
 
   // check for meta keys.. if set, we should open in a new tab
   if(event.metaKey || event.ctrlKey) {
+    form.dataset.turbo = "false";
     target = '_blank';
   }
 

data/app/values/blacklight/types.rb

@@ -69,6 +69,19 @@ module Blacklight
       end
     end
 
+    class Time < Value
+      def cast(input)
+        value = super
+        return if value.blank?
+
+        begin
+          ::Time.parse(value.to_s) # rubocop:disable Rails/TimeZone
+        rescue ArgumentError
+          Rails.logger&.info "Unable to parse time: #{value.inspect}"
+        end
+      end
+    end
+
     class Boolean < Value
       def cast(input)
         ActiveModel::Type::Boolean.new.cast(super)
@@ -110,6 +123,7 @@ module Blacklight
     register :boolean, Boolean
     register :string, String
     register :date, Date
+    register :time, Time
     register :array, Array
     register :json, JsonValue
     register :html, Html

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "blacklight-frontend",
-  "version": "7.33.1",
+  "version": "7.37.0",
   "description": "The frontend code and styles for Blacklight",
   "main": "app/assets/javascripts/blacklight",
   "scripts": {

data/spec/models/solr_document_spec.rb

@@ -49,6 +49,7 @@ RSpec.describe SolrDocument, api: true do
         attribute :author, :array, 'author_tesim', of: :string
         attribute :first_author, :select, 'author_tesim', by: :min
         attribute :date, :date, field: 'date_dtsi'
+        attribute :time, :time, field: 'date_dtsi'
         attribute :whatever, :string, default: ->(*) { 'default_value' }
       end
     end
@@ -56,14 +57,17 @@ RSpec.describe SolrDocument, api: true do
       doc_class.new(id: '123',
                     title_tesim: ['Good Omens'],
                     author_tesim: ['Neil Gaiman', 'Terry Pratchett'],
-                    date_dtsi: '1990-01-01T00:00:00Z')
+                    date_dtsi: '1990-01-01T17:23:13Z')
     end
 
     it "casts the attributes" do
       expect(document.title).to eq 'Good Omens'
       expect(document.author).to eq ['Neil Gaiman', 'Terry Pratchett']
       expect(document.first_author).to eq 'Neil Gaiman'
-      expect(document.date).to eq Date.new(1990)
+      expect(document.date).to be_a Date
+      expect(document.date.to_s).to eq '1990-01-01'
+      expect(document.time).to be_a Time
+      expect(document.time.to_s).to eq '1990-01-01 17:23:13 UTC'
       expect(document.whatever).to eq 'default_value'
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 7.36.1
+  version: 7.37.0
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -17,7 +17,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-01-18 00:00:00.000000000 Z
+date: 2024-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -957,7 +957,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
+rubygems_version: 3.5.4
 signing_key:
 specification_version: 4
 summary: Blacklight provides a discovery interface for any Solr (http://lucene.apache.org/solr)