blacklight 7.39.0 → 7.41.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f22fe88564a62b7817f8f70d715f3bb41c52e742e397a5276e7b6adb5fd82c4
-  data.tar.gz: 556f88d174f56f549955b8d505446f2ee06f75738bac240ba69658bea52f40d0
+  metadata.gz: 999d98759b905568ee633ca05e1d7b054564d9bd7467d55e7bf816da365a1941
+  data.tar.gz: 452085f8079287d578b2141429077134ea68dd9a7da08372971f868acfe28f14
 SHA512:
-  metadata.gz: ad3e2e137494e604fe6253a78bf960c6a933c3c6d863bb3c873eec700a91a25743a9e348b61f8bfdc4f446864318e11fd7a79bcd158b89f56ce285276f97cf11
-  data.tar.gz: 0bba87c8470d46409e7483d52bd33ca013b17ee8090ee0c68e38827afbcd3664acd1ca14f98b547c213ffadf1d8ead1514b0ac2316bddf007c50afd603777ad5
+  metadata.gz: c5f9ed2a7d1f1b03b8a1f704a5233eec2aa6885ca2637ef60e315a286e834740388f3c8c203f0cc78b98bc6c9463cf562fcd54bdc5f2e6423c4c2925a26bdc32
+  data.tar.gz: 78c0f61b1c4d821f084eea9a994947042c7f3afb3c8383ece3f95a44498d227f558256460ef215197e6b776aac52f53158b1e53aaca0267fc774de0c52d5938e

data/.env

@@ -1,6 +1,6 @@
 ALPINE_RUBY_VERSION=3.2.2
 RAILS_VERSION=7.0.8
-VIEW_COMPONENT_VERSION=2.66.0
+VIEW_COMPONENT_VERSION=2.74.0
 SOLR_PORT=8983
 SOLR_URL=http://solr:8983/solr/blacklight-core
 SOLR_VERSION=latest

data/.github/matrix.json

@@ -0,0 +1,62 @@
+{
+  "ruby": ["3.3"],
+  "rails_version": [
+    "7.1.5.1",
+    "7.2.2.1"
+  ],
+  "bootstrap_version": [
+    null
+  ],
+  "view_component_version": [
+    "~> 3.12"
+  ],
+  "api": [
+    null
+  ],
+  "additional_engine_cart_rails_options": [
+    ""
+  ],
+  "additional_name": [
+    ""
+  ],
+  "include": [
+    {
+      "ruby": "3.2",
+      "rails_version": "7.1.5.1"
+    },
+    {
+      "ruby": "3.3",
+      "rails_version": "7.1.5.1",
+      "bootstrap_version": "~> 5.0",
+      "additional_name": "| bootstrap 5"
+    },
+    {
+      "ruby": "3.4",
+      "rails_version": "7.2.2.1"
+    },
+    {
+      "ruby": "3.4",
+      "rails_version": "8.0.2"
+    },
+    {
+      "ruby": "3.3",
+      "rails_version": "7.1.5.1",
+      "view_component_version": "~> 2.74",
+      "additional_name": "| View Component 2"
+    },
+    {
+      "ruby": "3.2",
+      "rails_version": "7.1.5.1",
+      "api": "true",
+      "additional_engine_cart_rails_options": "--api --skip-yarn",
+      "additional_name": "| API"
+    },
+    {
+      "ruby": "3.3",
+      "rails_version": "7.1.5.1",
+      "api:": "true",
+      "additional_engine_cart_rails_options": "--api --skip-yarn",
+      "additional_name": "| API"
+    }
+  ]
+}

data/.github/workflows/build.yml

@@ -0,0 +1,16 @@
+on:
+  workflow_call:
+    inputs:
+      ref:
+        required: false
+        type: string
+        default: ''
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ inputs.ref }}
+      - name: Build docker image
+        run: docker compose build app

data/.github/workflows/lint.yml

@@ -0,0 +1,23 @@
+on:
+  workflow_call:
+    inputs:
+      ref:
+        required: false
+        type: string
+        default: ''
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ inputs.ref }}
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.2
+          bundler: "default"
+      - name: Install dependencies
+        run: bundle install
+      - name: Run linter
+        run: bundle exec rake rubocop

data/.github/workflows/main.yml

@@ -0,0 +1,23 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: CI
+
+on:
+  push:
+    branches:
+      - main
+      - 'release-*'
+  pull_request:
+
+jobs:
+  lint:
+    uses: ./.github/workflows/lint.yml
+  test:
+    uses: ./.github/workflows/test.yml
+  docker_build:
+    uses: ./.github/workflows/build.yml

data/.github/workflows/test.yml

@@ -0,0 +1,53 @@
+on:
+  workflow_call:
+    inputs:
+      ref:
+        required: false
+        type: string
+        default: ''
+        description: The branch or reference to run the workflow against
+jobs:
+  set_matrix:
+    runs-on: ubuntu-latest
+    outputs:
+      matrix: ${{ steps.matrix.outputs.matrix }}
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+        with:
+          ref: ${{ inputs.ref }}
+      - name: Echo ./.github/matrix.json
+        id: matrix
+        run: |
+          echo "matrix<<EOF" >> $GITHUB_OUTPUT
+          cat ./.github/matrix.json >> $GITHUB_OUTPUT
+          echo "EOF" >> $GITHUB_OUTPUT
+  test:
+    needs: set_matrix
+    runs-on: ubuntu-latest
+    name: ruby ${{ matrix.ruby }} | rails ${{ matrix.rails_version }} ${{ matrix.additional_name }}
+    strategy:
+      fail-fast: false
+      matrix: ${{fromJson(needs.set_matrix.outputs.matrix)}}
+    env:
+      RAILS_VERSION: ${{ matrix.rails_version }}
+      SOLR_VERSION: ${{ matrix.solr_version || 'latest' }}
+      VIEW_COMPONENT_VERSION: ${{ matrix.view_component_version }}
+      BOOTSTRAP_VERSION: ${{ matrix.bootstrap_version }}
+      BLACKLIGHT_API_TEST: ${{ matrix.api }}
+      ENGINE_CART_RAILS_OPTIONS: "--skip-git --skip-listen --skip-spring --skip-keeps --skip-kamal --skip-solid --skip-coffee --skip-test ${{ matrix.additional_engine_cart_rails_options }}"
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ inputs.ref }}
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          bundler: "latest"
+          ruby-version: ${{ matrix.ruby }}
+      - name: Change permissions
+        run: "chmod -f -R o-w /opt/hostedtoolcache/Ruby/3.2.5/x64/lib/ruby/gems/3.2.0/gems | :"
+      - name: Install dependencies
+        run: bundle install
+      - name: Run tests
+        run: bundle exec rake ci

data/.rubocop.yml

@@ -42,6 +42,7 @@ Metrics/ClassLength:
     - "lib/blacklight/search_builder.rb"
     - "lib/blacklight/search_state.rb"
     - "lib/blacklight/search_state/filter_field.rb"
+    - "app/presenters/blacklight/document_presenter.rb"
 
 Layout/LineLength:
   Max: 200

data/VERSION

@@ -1 +1 @@
-7.39.0
+7.41.0

data/app/components/blacklight/document/action_component.rb

@@ -60,9 +60,7 @@ module Blacklight
         end
       end
 
-      def key
-        @action.key
-      end
+      delegate :key, to: :@action
     end
   end
 end

data/app/components/blacklight/search_context/server_item_pagination_component.html.erb

@@ -0,0 +1,10 @@
+<div class='pagination-search-widgets'>
+
+  <div class="page-links">
+    <%= link_to_previous_document %> |
+
+    <%= item_page_entry_info %> |
+
+    <%= link_to_next_document %>
+  </div>
+</div>

data/app/components/blacklight/search_context/server_item_pagination_component.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Blacklight
+  module SearchContext
+    class ServerItemPaginationComponent < Blacklight::SearchContextComponent
+      with_collection_parameter :search_context
+
+      def initialize(search_context:, search_session:, current_document:)
+        @search_context = search_context
+        @search_session = search_session
+        @current_document_id = current_document.id
+      end
+    end
+  end
+end

data/app/components/blacklight/search_context_component.rb

@@ -5,6 +5,7 @@ module Blacklight
     with_collection_parameter :search_context
 
     def initialize(search_context:, search_session:)
+      Deprecation.warn("Blacklight::SearchContextComponent is deprecated and will be moved to Blacklight::SearchContext::ServerItemPaginationComponent in Blacklight 8.0.0")
       @search_context = search_context
       @search_session = search_session
     end

data/app/helpers/blacklight/catalog_helper_behavior.rb

@@ -106,7 +106,7 @@ module Blacklight::CatalogHelperBehavior
                                                        total: number_with_delimiter(search_session['total']),
                                                        count: search_session['total'].to_i).html_safe
   end
-  deprecation_deprecate item_page_entry_info: 'Use Blacklight::SearchContextComponent methods instead'
+  deprecation_deprecate item_page_entry_info: 'Use Blacklight::SearchContext::ServerItemPaginationComponent methods instead'
 
   ##
   # Look up search field user-displayable label

data/app/helpers/blacklight/url_helper_behavior.rb

@@ -58,7 +58,7 @@ module Blacklight::UrlHelperBehavior
       tag.span raw(t('views.pagination.previous')), class: 'previous'
     end
   end
-  deprecation_deprecate link_to_previous_document: 'Moving to Blacklight::SearchContextComponent'
+  deprecation_deprecate link_to_previous_document: 'Moving to Blacklight::SearchContext::ServerItemPaginationComponent'
 
   ##
   # Link to the next document in the current search context
@@ -69,7 +69,7 @@ module Blacklight::UrlHelperBehavior
       tag.span raw(t('views.pagination.next')), class: 'next'
     end
   end
-  deprecation_deprecate link_to_previous_document: 'Moving to Blacklight::SearchContextComponent'
+  deprecation_deprecate link_to_previous_document: 'Moving to Blacklight::SearchContext::ServerItemPaginationComponent'
 
   ##
   # Attributes for a link that gives a URL we can use to track clicks for the current search session

data/app/presenters/blacklight/document_presenter.rb

@@ -11,18 +11,26 @@ module Blacklight
     # @param [SolrDocument] document
     # @param [ActionView::Base] view_context scope for linking and generating urls
     # @param [Blacklight::Configuration] configuration
-    def initialize(document, view_context, configuration = view_context.blacklight_config)
+    def initialize(document, view_context, configuration = view_context.blacklight_config, view_config: nil, field_presenter_options: {})
       @document = document
       @view_context = view_context
       @configuration = configuration
+      @view_config = view_config
+      @field_presenter_options = field_presenter_options
     end
 
     # @return [Hash<String,Configuration::Field>]  all the fields for this index view that should be rendered
-    def fields_to_render
-      return to_enum(:fields_to_render) unless block_given?
+    def fields_to_render(document_fields = fields, **kwargs)
+      unless block_given?
+        return to_enum(:fields_to_render, document_fields, **kwargs) unless method(:fields_to_render).arity.zero?
 
-      fields.each do |name, field_config|
-        field_presenter = field_presenter(field_config)
+        Deprecation.warn(self.class, 'In Blacklight 8, Blacklight::DocumentPresenter#fields_to_render accepts additional arguments')
+
+        return to_enum(:fields_to_render)
+      end
+
+      document_fields.each do |name, field_config|
+        field_presenter = field_presenter(field_config, kwargs)
 
         next unless field_presenter.render_field? && field_presenter.any?
 
@@ -30,10 +38,21 @@ module Blacklight
       end
     end
 
-    def field_presenters
-      return to_enum(:field_presenters) unless block_given?
+    def field_presenters(document_fields = fields, **kwargs)
+      unless block_given?
+        return to_enum(:field_presenters, document_fields, **kwargs) unless method(:field_presenters).arity.zero?
+
+        Deprecation.warn(self.class, 'In Blacklight 8, Blacklight::DocumentPresenter#field_presenters accepts additional arguments')
 
-      fields_to_render.each { |_, _, config| yield config }
+        return to_enum(:field_presenters)
+      end
+
+      if method(:fields_to_render).arity.zero?
+        Deprecation.warn(self.class, 'In Blacklight 8, Blacklight::DocumentPresenter#fields_to_render accept additional arguments')
+        fields_to_render.each { |_, _, config| yield config }
+      else
+        fields_to_render(document_fields, **kwargs).each { |_, _, config| yield config }
+      end
     end
 
     ##
@@ -122,7 +141,7 @@ module Blacklight
     end
 
     def show_view_config
-      configuration.view_config(:show)
+      configuration.view_config(:show, action_name: view_context.action_name)
     end
 
     def inspect
@@ -158,7 +177,7 @@ module Blacklight
     end
 
     def field_presenter_options
-      {}
+      @field_presenter_options ||= {}
     end
   end
 end

data/app/presenters/blacklight/index_presenter.rb

@@ -30,7 +30,7 @@ module Blacklight
     deprecation_deprecate label: 'Use #heading'
 
     def view_config
-      @view_config ||= configuration.view_config(view_context.document_index_view_type)
+      @view_config ||= configuration.view_config(view_context.document_index_view_type, action_name: view_context.action_name)
     end
 
     private

data/app/presenters/blacklight/json_presenter.rb

@@ -12,9 +12,7 @@ module Blacklight
 
     attr_reader :blacklight_config
 
-    def documents
-      @response.documents
-    end
+    delegate :documents, to: :@response
 
     # @return [Array<Blacklight::Solr::Response::Facets::FacetField>]
     def search_facets

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

@@ -1,2 +1,2 @@
-<% Deprecation.warn(self, 'The partial _previous_next_doc.html.erb will be removed in 8.0. Render Blacklight::SearchContextComponent instead.') %>
+<% Deprecation.warn(self, 'The partial _previous_next_doc.html.erb will be removed in 8.0. Render Blacklight::SearchContext::ServerItemPaginationComponent instead.') %>
 <%= render(Blacklight::SearchContextComponent.new(search_context: @search_context, search_session: search_session)) %>

data/blacklight.gemspec

@@ -25,14 +25,14 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 2.7'
 
-  s.add_dependency "rails", '>= 6.1', '< 7.3'
+  s.add_dependency "rails", '>= 6.1', '< 8.1'
   s.add_dependency "globalid"
   s.add_dependency "jbuilder", '~> 2.7'
   s.add_dependency "kaminari", ">= 0.15" # the pagination (page 1,2,3, etc..) of our search results
   s.add_dependency "deprecation"
   s.add_dependency "i18n", '>= 1.7.0' # added named parameters
   s.add_dependency "ostruct", '>= 0.3.2'
-  s.add_dependency "view_component", '>= 2.66', '< 4'
+  s.add_dependency "view_component", '>= 2.74', '< 4'
   s.add_dependency 'hashdiff'
   s.add_dependency "zeitwerk"
 

data/docker-compose.yml

@@ -23,6 +23,7 @@ services:
     environment:
       - SOLR_PORT # Set via environment variable or use default defined in .env file
       - SOLR_VERSION # Set via environment variable or use default defined in .env file
+      - SOLR_MODULES=analysis-extras
     image: "solr:${SOLR_VERSION}"
     volumes:
       - $PWD/lib/generators/blacklight/templates/solr/conf:/opt/solr/conf

data/lib/blacklight/component.rb

@@ -3,57 +3,20 @@
 module Blacklight
   class Component < ViewComponent::Base
     class << self
-      # Workaround for https://github.com/ViewComponent/view_component/issues/1565
-      def config
-        @config ||= ViewComponent::Config.defaults.merge(ViewComponent::Base.config)
-      end
+      alias upstream_sidecar_files sidecar_files
 
-      # rubocop:disable Naming/MemoizedInstanceVariableName
-      def compiler
-        @__vc_compiler ||= EngineCompiler.new(self)
+      def reset_compiler!
+        @__vc_compiler = nil
       end
-      # rubocop:enable Naming/MemoizedInstanceVariableName
-
-      alias sidecar_files _sidecar_files unless ViewComponent::Base.respond_to? :sidecar_files
-    end
-
-    EXCLUDE_VARIABLES = [
-      :@lookup_context, :@view_renderer, :@view_flow, :@view_context,
-      :@tag_builder, :@current_template,
-      :@__vc_set_slots, :@__vc_original_view_context,
-      :@__vc_variant, :@__vc_content_evaluated,
-      :@__vc_render_in_block, :@__vc_content, :@__vc_helpers
-    ].freeze
-
-    def inspect
-      # Exclude variables added by render_in
-      render_variables = instance_variables - EXCLUDE_VARIABLES
-      fields = render_variables.map { |ivar| "#{ivar}:#{instance_variable_get(ivar).inspect}" }.join(', ')
-      "#<#{self.class.name}:#{object_id} #{fields}>"
-    end
-
-    class EngineCompiler < ::ViewComponent::Compiler
-      # ViewComponent::Compiler locates and caches templates from sidecar files to the component source file.
-      # While this is sensible in a Rails application, it prevents component templates defined in an Engine
-      # from being overridden by an installing application without subclassing the component, which may also
-      # require modifying any partials rendering the component. This subclass of compiler overrides the template
-      # location algorithm to take the sidecar file names from the Engine, but look to see if a file of the
-      # same name existing in the installing application (ie, under Rails.root). If the latter exists, this
-      # compiler will cache that template instead of the engine-defined file; if not, the compiler will fall
-      # back to the engine-defined file.
-      def templates
-        @templates ||= begin
-          extensions = ActionView::Template.template_handler_extensions
 
-          component_class.sidecar_files(extensions).each_with_object([]) do |path, memo|
-            pieces = File.basename(path).split(".")
-            app_path = "#{Rails.root}/#{path.slice(path.index(component_class.view_component_path)..-1)}"
+      def sidecar_files(*args, **kwargs)
+        upstream_sidecar_files(*args, **kwargs).map do |path|
+          app_path = Rails.root.join(path.slice(path.index(view_component_path)..-1).to_s).to_s
 
-            memo << {
-              path: File.exist?(app_path) ? app_path : path,
-              variant: pieces.second.split("+").second&.to_sym,
-              handler: pieces.last
-            }
+          if File.exist?(app_path)
+            app_path
+          else
+            path
           end
         end
       end

data/lib/blacklight/nested_open_struct_with_hash_access.rb

@@ -120,7 +120,7 @@ module Blacklight
 
     def set_default_proc!
       self.default_proc = lambda do |hash, key|
-        hash[key] = nested_class.new(key: key)
+        hash[key] = nested_class.new({ key: key })
       end
     end
   end

data/lib/generators/blacklight/controller_generator.rb

@@ -30,7 +30,7 @@ module Blacklight
       route <<-EOF
   concern :searchable, Blacklight::Routes::Searchable.new
 
-  resource :catalog, only: [:index], as: 'catalog', path: '/catalog', controller: 'catalog' do
+  resource :catalog, only: [], as: 'catalog', path: '/catalog', controller: 'catalog' do
     concerns :searchable
   end
       EOF

data/lib/generators/blacklight/templates/solr/conf/solrconfig.xml

@@ -16,7 +16,7 @@
     </updateLog>
   </updateHandler>
 
-  <!-- solr lib dirs -->
+  <!-- solr lib dirs, which are needed for Solr 8 compatibility but ignored in solr 9.8 and above -->
   <lib dir="${solr.install.dir:../../../..}/modules/analysis-extras/lib" />
   <lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lib" />
   <lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lucene-libs" />

data/lib/generators/blacklight/test_support_generator.rb

@@ -17,7 +17,7 @@ module Blacklight
       copy_file "alternate_controller.rb", "app/controllers/alternate_controller.rb"
 
       routing_code = <<-EOF
-    resource :alternate, controller: 'alternate', only: [:index] do
+    resource :alternate, controller: 'alternate', only: [] do
       concerns :searchable
     end
       EOF

data/package.json

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

data/spec/components/blacklight/search_context/server_item_pagination_component_spec.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Blacklight::SearchContext::ServerItemPaginationComponent, type: :component do
+  subject(:render) { render_inline(instance) }
+
+  let(:current_document_id) { 9 }
+  let(:current_document) { SolrDocument.new(id: current_document_id) }
+  let(:search_session) { { 'document_id' => current_document_id, 'counter' => 1, 'total' => '3' } }
+  let(:instance) { described_class.new(search_context: search_context, search_session: search_session, current_document: current_document) }
+
+  before do
+    allow(controller).to receive(:search_session).and_return(search_session)
+    allow(controller).to receive(:current_search_session).and_return(double(id: current_document_id))
+    controller.class.helper_method :search_session
+    controller.class.helper_method :current_search_session
+  end
+
+  context 'when there is next and previous' do
+    let(:search_context) { { next: next_doc, prev: prev_doc } }
+    let(:prev_doc) { SolrDocument.new(id: '777') }
+    let(:next_doc) { SolrDocument.new(id: '888') }
+
+    before do
+      # allow(controller).to receive(:controller_tracking_method).and_return('track_catalog_path')
+
+      allow(controller).to receive_messages(controller_name: 'catalog', link_to_previous_document: '', link_to_next_document: '')
+    end
+
+    it "renders content" do
+      expect(render.css('.page-links').to_html).not_to be_blank
+    end
+  end
+end

data/spec/components/blacklight/search_context_component_spec.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+RSpec.describe Blacklight::SearchContextComponent, type: :component do
+  subject(:render) { render_inline(instance) }
+
+  let(:current_document_id) { 9 }
+  let(:search_session) { { 'document_id' => current_document_id, 'counter' => 1, 'total' => '3' } }
+  let(:instance) { described_class.new(search_context: search_context, search_session: search_session) }
+
+  before do
+    allow(controller).to receive(:search_session).and_return(search_session)
+    allow(controller).to receive(:current_search_session).and_return(double(id: current_document_id))
+    controller.class.helper_method :search_session
+    controller.class.helper_method :current_search_session
+  end
+
+  context 'when there is next and previous' do
+    let(:search_context) { { next: next_doc, prev: prev_doc } }
+    let(:prev_doc) { SolrDocument.new(id: '777') }
+    let(:next_doc) { SolrDocument.new(id: '888') }
+
+    before do
+      allow(controller).to receive_messages(controller_name: 'catalog', link_to_previous_document: '', link_to_next_document: '')
+    end
+
+    it "renders content" do
+      expect(render.css('.page-links').to_html).not_to be_blank
+    end
+  end
+end

data/spec/features/facets_spec.rb

@@ -79,13 +79,11 @@ RSpec.describe "Facets" do
     expect(page).to have_css('.constraint-value', text: 'Language Tibetan')
   end
 
-  describe 'heading button focus with Firefox' do
-    it 'changes to the button on button click in Firefox' do
-      pending 'Capybara::NotSupportedByDriverError: Capybara::Driver::Base#evaluate_script'
+  describe 'heading button focus' do
+    it 'changes to the button on button click', js: true do
       visit root_path
       page.find('h3.facet-field-heading button', text: 'Format').click
-      focused_element_data_target = page.evaluate_script("document.activeElement")['data-bs-target']
-      expect(focused_element_data_target).to eq '#facet-format'
+      expect(page.active_element.text).to eq 'Format'
     end
   end
 

data/spec/features/search_context_spec.rb

@@ -35,7 +35,7 @@ RSpec.describe "Search Results context", js: true do
   it "does not display stale previous and next links for direct item views" do
     search_for ''
     click_on 'Pluvial nectar of blessings'
-
+    expect(page).to have_link('Cite')
     # Go to the number 9 result separately
     visit '/catalog/2003546302'
     expect(page).not_to have_selector '.page-links'

data/spec/lib/blacklight/component_spec.rb

@@ -1,43 +1,48 @@
 # frozen_string_literal: true
 
-RSpec.describe Blacklight::Component do
-  let(:component_class) { Blacklight::DocumentTitleComponent }
+RSpec.describe Blacklight::Component, type: :component do
+  let(:component_class) { Blacklight::System::ModalComponent }
 
-  context "subclassed" do
-    it "returns our Compiler implementation" do
-      expect(component_class.ancestors).to include described_class
-      expect(component_class.compiler).to be_a Blacklight::Component::EngineCompiler
+  before do
+    component_class.reset_compiler!
+    ViewComponent::CompileCache.invalidate!
+
+    component_class.class_eval do
+      undef :call if method_defined?(:call)
     end
   end
 
-  describe Blacklight::Component::EngineCompiler do
-    subject(:compiler) { described_class.new(component_class) }
+  after do
+    component_class.reset_compiler!
+    ViewComponent::CompileCache.invalidate!
 
-    let(:original_compiler) { ViewComponent::Compiler.new(component_class) }
-    let(:original_path) { original_compiler.send(:templates).first[:path] }
-    let(:resolved_path) { compiler.templates.first[:path] }
+    component_class.class_eval do
+      undef :call if method_defined?(:call)
+    end
+  end
 
-    context "without overrides" do
-      it "links to engine template" do
-        expect(resolved_path).not_to include(".internal_test_app")
-        expect(resolved_path).to eql(original_path)
-      end
+  context "without overrides" do
+    it "renders the engine template" do
+      render_inline(component_class.new)
+      expect(page).to have_css('.modal-header')
     end
+  end
 
-    context "with overrides" do
-      let(:path_match) do
-        Regexp.new(Regexp.escape(File.join(".internal_test_app", component_class.view_component_path)))
+  context "with overrides" do
+    around do |ex|
+      FileUtils.mkdir_p(Rails.root.join('app/components/blacklight/system'))
+      Rails.root.join("app/components/blacklight/system/modal_component.html.erb").open("w") do |f|
+        f.puts '<div class="custom-modal">Overridden</div>'
       end
 
-      before do
-        allow(File).to receive(:exist?).and_call_original
-        allow(File).to receive(:exist?).with(path_match).and_return(true)
-      end
+      ex.run
+    ensure
+      Rails.root.join('app/components/blacklight/system/modal_component.html.erb').unlink
+    end
 
-      it "links to application template" do
-        expect(resolved_path).to include(".internal_test_app")
-        expect(resolved_path).not_to eql(original_path)
-      end
+    it "renders to application template" do
+      render_inline(component_class.new)
+      expect(page).to have_css('.custom-modal')
     end
   end
 end

data/spec/models/solr_document_spec.rb

@@ -37,7 +37,9 @@ RSpec.describe SolrDocument, api: true do
                           title_tesim: ['Good Omens'])
     end
 
-    it { is_expected.to end_with "_source: {\"id\"=>\"123\", \"title_tesim\"=>[\"Good Omens\"]}>" }
+    it 'ends with the expected information' do
+      expect(inspect).to match(/_source: {"id" ?=> ?"123", "title_tesim" ?=> ?\["Good Omens"\]\}>$/)
+    end
   end
 
   describe '.attribute' do

data/spec/presenters/blacklight/document_presenter_spec.rb

@@ -12,6 +12,7 @@ RSpec.describe Blacklight::DocumentPresenter do
 
   before do
     allow(request_context).to receive(:search_state).and_return(search_state)
+    allow(request_context).to receive(:action_name).and_return(:show)
   end
 
   describe '#fields_to_render' do

data/spec/presenters/blacklight/index_presenter_spec.rb

@@ -22,6 +22,7 @@ RSpec.describe Blacklight::IndexPresenter, api: true do
 
   before do
     allow(request_context).to receive(:search_state).and_return(search_state)
+    allow(request_context).to receive(:action_name).and_return(:index)
   end
 
   describe '#fields' do

data/spec/presenters/blacklight/show_presenter_spec.rb

@@ -22,6 +22,7 @@ RSpec.describe Blacklight::ShowPresenter, api: true do
 
   before do
     allow(request_context).to receive(:search_state).and_return(search_state)
+    allow(request_context).to receive(:action_name).and_return(:show)
   end
 
   describe "link_rel_alternates" do

data/spec/spec_helper.rb

@@ -48,8 +48,11 @@ RSpec.configure do |config|
   # When we're testing the API, only run the api tests
   config.filter_run api: true if ENV['BLACKLIGHT_API_TEST']
 
-  # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
-  config.fixture_path = Rails.root.join("spec/fixtures")
+  if Rails.version.to_f >= 7.1
+    config.fixture_paths = [Rails.root.join("spec/fixtures")]
+  else
+    config.fixture_path = Rails.root.join("spec/fixtures")
+  end
 
   # If you're not using ActiveRecord, or you'd prefer not to run each of your
   # examples within a transaction, remove the following line or assign false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 7.39.0
+  version: 7.41.0
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -17,7 +17,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-09-26 00:00:00.000000000 Z
+date: 2025-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -28,7 +28,7 @@ dependencies:
         version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.3'
+        version: '8.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -38,7 +38,7 @@ dependencies:
         version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.3'
+        version: '8.1'
 - !ruby/object:Gem::Dependency
   name: globalid
   requirement: !ruby/object:Gem::Requirement
@@ -129,7 +129,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.66'
+        version: '2.74'
     - - "<"
       - !ruby/object:Gem::Version
         version: '4'
@@ -139,7 +139,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.66'
+        version: '2.74'
     - - "<"
       - !ruby/object:Gem::Version
         version: '4'
@@ -417,7 +417,11 @@ files:
 - ".docker/app/entrypoint.sh"
 - ".dockerignore"
 - ".env"
-- ".github/workflows/ruby.yml"
+- ".github/matrix.json"
+- ".github/workflows/build.yml"
+- ".github/workflows/lint.yml"
+- ".github/workflows/main.yml"
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".hound.yml"
 - ".jshintrc"
@@ -528,6 +532,8 @@ files:
 - app/components/blacklight/search_bar_component.html.erb
 - app/components/blacklight/search_bar_component.rb
 - app/components/blacklight/search_button_component.rb
+- app/components/blacklight/search_context/server_item_pagination_component.html.erb
+- app/components/blacklight/search_context/server_item_pagination_component.rb
 - app/components/blacklight/search_context_component.html.erb
 - app/components/blacklight/search_context_component.rb
 - app/components/blacklight/search_history_constraint_layout_component.rb
@@ -841,6 +847,8 @@ files:
 - spec/components/blacklight/response/pagination_component_spec.rb
 - spec/components/blacklight/response/spellcheck_component_spec.rb
 - spec/components/blacklight/search_bar_component_spec.rb
+- spec/components/blacklight/search_context/server_item_pagination_component_spec.rb
+- spec/components/blacklight/search_context_component_spec.rb
 - spec/components/blacklight/start_over_button_component_spec.rb
 - spec/components/blacklight/system/flash_message_component_spec.rb
 - spec/controllers/alternate_controller_spec.rb
@@ -1029,6 +1037,8 @@ test_files:
 - spec/components/blacklight/response/pagination_component_spec.rb
 - spec/components/blacklight/response/spellcheck_component_spec.rb
 - spec/components/blacklight/search_bar_component_spec.rb
+- spec/components/blacklight/search_context/server_item_pagination_component_spec.rb
+- spec/components/blacklight/search_context_component_spec.rb
 - spec/components/blacklight/start_over_button_component_spec.rb
 - spec/components/blacklight/system/flash_message_component_spec.rb
 - spec/controllers/alternate_controller_spec.rb

data/.github/workflows/ruby.yml

@@ -1,159 +0,0 @@
-# This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
-# documentation.
-# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
-# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
-
-name: CI
-
-on:
-  push:
-    branches:
-      - main
-      - 'release-*'
-  pull_request:
-
-jobs:
-  lint:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: 3.1
-        bundler: 'default'
-    - name: Install dependencies
-      run: bundle install
-    - name: Run linter
-      run: bundle exec rake rubocop
-  test:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        ruby: [3.1, 3.2]
-    env:
-      RAILS_VERSION: 7.0.8
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby }}
-        bundler: 'default'
-    - name: Install dependencies
-      run: bundle install
-    - name: Run tests
-      run: bundle exec rake ci
-      env:
-        ENGINE_CART_RAILS_OPTIONS: '--skip-git --skip-listen --skip-spring --skip-keeps --skip-coffee --skip-test'
-  test_bootstrap5:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        ruby: ['3.0']
-    env:
-      RAILS_VERSION: 7.0.8
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby }}
-        bundler: 'default'
-    - name: Install dependencies
-      run: bundle install
-    - name: Run tests
-      run: bundle exec rake ci
-      env:
-        BOOTSTRAP_VERSION: '~> 5.0'
-        ENGINE_CART_RAILS_OPTIONS: '--skip-git --skip-listen --skip-spring --skip-keeps --skip-coffee --skip-test'
-  test_rails6_1:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        ruby: ['3.0']
-    env:
-      RAILS_VERSION: 6.1.6.1
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby }}
-        bundler: 'default'
-    - name: Install dependencies
-      run: bundle install
-    - name: Run tests
-      run: bundle exec rake ci
-      env:
-        ENGINE_CART_RAILS_OPTIONS: '--skip-git --skip-keeps --skip-action-cable --skip-test'
-  test_rails7_2:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        ruby: [3.1, 3.2]
-    env:
-      RAILS_VERSION: 7.2.0
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby }}
-        bundler: 'default'
-    - name: Install dependencies
-      run: bundle install
-    - name: Run tests
-      run: bundle exec rake ci
-      env:
-        ENGINE_CART_RAILS_OPTIONS: '--skip-keeps --skip-test'
-  test_vc3:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        ruby: ['3.2']
-    env:
-      RAILS_VERSION: 7.0.8
-      VIEW_COMPONENT_VERSION: ${{ matrix.view_component_version }}
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby }}
-        bundler: 'default'
-    - name: Install dependencies
-      run: bundle install
-    - name: Run tests
-      run: bundle exec rake ci
-      env:
-        ENGINE_CART_RAILS_OPTIONS: '--skip-git --skip-listen --skip-spring --skip-keeps --skip-coffee --skip-test'
-  api_test:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        ruby: [2.7, '3.0']
-    env:
-      RAILS_VERSION: 7.0.8
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        bundler: 'default'
-        ruby-version: ${{ matrix.ruby }}
-    - name: Install dependencies
-      run: bundle install
-    - name: Run tests
-      run: bundle exec rake ci
-      env:
-        BLACKLIGHT_API_TEST: true
-        ENGINE_CART_RAILS_OPTIONS: '-a propshaft --api --skip-git --skip-bundle --skip-listen --skip-spring --skip-yarn --skip-keeps --skip-action-cable --skip-coffee --skip-test'
-  docker_build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - name: Build docker image
-        run: docker compose build app