arclight 1.6.2 → 1.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f420e8cfdd2330f786efc0792a102163f114625752b77c32695c172217d66ce
-  data.tar.gz: b373b12a559f9fafadb8d0a0fb0e66e1691b81a91e989ecf23db5cf090f7ee27
+  metadata.gz: c8c7831f602d55e56beadc3d646db07f706e30410cc3bf018a9c70395cbd4f00
+  data.tar.gz: 61351fce767938738f5a2ed42a9b4f293b3172239d690e8b3ba9d8f9b8241d94
 SHA512:
-  metadata.gz: 15656150e9dcc4c27a871376c9a7f297fa44bc8f45b20354ec11f8320742c51531c968e662bf926b5fb7c3c5f514060fc6e1ed9ba142a51b31b9febef501e573
-  data.tar.gz: 0fb9df78502d8e33a5dd4ca59117ca82ccfe770e0c6c9caac785c9d311ee3d12db88201e061a9ed9a33678276ec2cb1e75c011c29640e0219f87d99359874ce0
+  metadata.gz: ce327b7458248a8542b5c202facdb3dc2f09e630305189195ea9c842470e17bc26e3eb752d8b6e09e47e8a15fce5d25d92e54a2ffd11efdec40301ca44f7d9aa
+  data.tar.gz: 6a69a0641e76a4517cff2805b86cbd85927fb6540d5a9393cf183d662d6896e46cc3f44b172939d554b3cf3de7f1517ab4dfb8f467d95a6e87088b334d9305b1

data/.github/workflows/ruby.yml

@@ -11,23 +11,20 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        rails_version: [7.1.5.1, 7.2.2.1]
-        ruby: ["3.2", "3.3"]
+        rails_version: ["8.0.5.1", "8.1.3.1"]
+        ruby: ["3.3", "3.4"]
+        bundler_version: ["2.7.2"]
         additional_engine_cart_rails_options: [""]
-        include:
-          - ruby: "3.1"
-            rails_version: "7.1.5"
-          - ruby: "3.3"
-            rails_version: "8.0.1"
     env:
       RAILS_VERSION: ${{ matrix.rails_version }}
       ENGINE_CART_RAILS_OPTIONS: "--skip-git --skip-listen --skip-spring --skip-keeps --skip-kamal --skip-solid --skip-coffee --skip-test --css bootstrap -a propshaft -j importmap ${{ matrix.additional_engine_cart_rails_options }}"
+      BUNDLER_VERSION: ${{ matrix.bundler_version || '2.7.2' }}
     steps:
       - uses: actions/checkout@v4
       - name: Set up Ruby ${{ matrix.ruby }}
         uses: ruby/setup-ruby@v1
         with:
-          bundler: latest
+          bundler: ${{ matrix.bundler_version || '2.7.2' }}
           ruby-version: ${{ matrix.ruby }}
       - name: Install dependencies with Rails ${{ matrix.rails_version }}
         run: bundle install
@@ -41,8 +38,8 @@ jobs:
       - name: Install Ruby and gems
         uses: ruby/setup-ruby@v1
         with:
-          bundler: latest
-          ruby-version: 3.2
+          ruby-version: 3.3
+          bundler: ${{ matrix.bundler_version || '2.7.2' }}
       - name: Install dependencies with Bundler
         run: bundle install
       - name: Install dependencies with yarn

data/.rubocop.yml

@@ -1,12 +1,10 @@
 plugins:
-  - rubocop-factory_bot
-
-require:
   - rubocop-rspec
   - rubocop-rails
   - rubocop-rake
   - rubocop-rspec_rails
   - rubocop-capybara
+  - rubocop-factory_bot
 
 inherit_from:
   - .rubocop_todo.yml
@@ -38,7 +36,7 @@ Metrics/BlockLength:
     - "spec/**/*"
     - "tasks/**/*"
 
-Naming/PredicateName:
+Naming/PredicatePrefix:
   ForbiddenPrefixes:
     - is_
 
@@ -207,7 +205,7 @@ RSpec/VerifiedDoubleReference: # new in 2.10.0
   Enabled: true
 Capybara/SpecificFinders: # new in 2.13
   Enabled: true
-Capybara/SpecificMatcher: # new in 2.12
+Capybara/RSpec/SpecificMatcher: # new in 2.12
   Enabled: true
 FactoryBot/SyntaxMethods: # new in 2.7
   Enabled: true
@@ -319,7 +317,7 @@ Style/RedundantStringEscape: # new in 1.37
   Enabled: true
 RSpec/SortMetadata: # new in 2.14
   Enabled: true
-Capybara/NegationMatcher: # new in 2.14
+Capybara/RSpec/NegationMatcher: # new in 2.14
   Enabled: true
 Capybara/SpecificActions: # new in 2.14
   Enabled: true
@@ -353,7 +351,7 @@ Style/RedundantDoubleSplatHashBraces: # new in 1.41
   Enabled: true
 Style/RedundantHeredocDelimiterQuotes: # new in 1.45
   Enabled: true
-Capybara/MatchStyle: # new in 2.17
+Capybara/RSpec/MatchStyle: # new in 2.17
   Enabled: true
 RSpec/DuplicatedMetadata: # new in 2.16
   Enabled: true
@@ -443,8 +441,6 @@ Style/SuperWithArgsParentheses: # new in 1.58
   Enabled: true
 Style/YAMLFileRead: # new in 1.53
   Enabled: true
-Capybara/ClickLinkOrButtonStyle: # new in 2.19
-  Enabled: true
 Capybara/RedundantWithinFind: # new in 2.20
   Enabled: true
 Capybara/RSpec/HaveSelector: # new in 2.19

data/Gemfile

@@ -3,7 +3,7 @@
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in arclight.gemspec
-gemspec
+gemspec path: File.expand_path(__dir__)
 
 # BEGIN ENGINE_CART BLOCK
 # engine_cart: 2.5.0

data/app/models/concerns/arclight/search_behavior.rb

@@ -24,6 +24,11 @@ module Arclight
       solr_parameters[:start] = blacklight_params[:offset] if blacklight_params[:offset]
       solr_parameters[:sort] = 'sort_isi asc'
       solr_parameters[:facet] = false
+      # The default fl includes `collection:[subquery]`, which runs a separate
+      # Solr subquery to look up the parent collection for every returned
+      # component (this can be slow). The hierarchy view does not use the collection
+      # subquery, so drop it here and return stored fields.
+      solr_parameters[:fl] = '*'
     end
     # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity
 

data/arclight.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
+  spec.add_dependency 'benchmark'
   spec.add_dependency 'blacklight', '>= 8.0.0', '< 9'
   spec.add_dependency 'gretel'
   spec.add_dependency 'rails', '>= 7.1', '< 9'
@@ -37,9 +38,12 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '>= 12.0'
   spec.add_development_dependency 'rspec-rails'
   spec.add_development_dependency 'rubocop', '~> 1.8'
-  spec.add_development_dependency 'rubocop-rails', '~> 2.8'
+  spec.add_development_dependency 'rubocop-capybara'
+  spec.add_development_dependency 'rubocop-factory_bot'
+  spec.add_development_dependency 'rubocop-rails'
   spec.add_development_dependency 'rubocop-rake'
-  spec.add_development_dependency 'rubocop-rspec', '~> 2.3'
+  spec.add_development_dependency 'rubocop-rspec'
+  spec.add_development_dependency 'rubocop-rspec_rails'
   spec.add_development_dependency 'selenium-webdriver'
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'solr_wrapper'

data/lib/arclight/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Arclight
-  VERSION = '1.6.2'
+  VERSION = '1.6.3'
 end

metadata

@@ -1,18 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: arclight
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.6.3
 platform: ruby
 authors:
 - Darren Hardy
 - Jessie Keck
 - Gordon Leacock
 - Jack Reed
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-08-11 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: benchmark
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: blacklight
   requirement: !ruby/object:Gem::Requirement
@@ -193,20 +206,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
+- !ruby/object:Gem::Dependency
+  name: rubocop-capybara
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-factory_bot
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
@@ -225,16 +266,30 @@ dependencies:
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec_rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
@@ -495,7 +550,6 @@ licenses:
 - Apache-2.0
 metadata:
   source_code_uri: https://github.com/projectblacklight/arclight
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -510,8 +564,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
-signing_key:
+rubygems_version: 4.0.10
 specification_version: 4
 summary: A Blacklight-based environment to support discovery and delivery for archives
   and special collections