blacklight 9.0.0.beta8 → 9.1.0

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

@@ -17,9 +17,9 @@ RSpec.describe "catalog/_document" do
     stub_template "catalog/_b_default.html.erb" => "b_partial"
     stub_template "catalog/_c_default.html.erb" => "c_partial"
     render partial: "catalog/document", locals: { document: document, document_counter: 1, view_config: blacklight_config.index }
-    expect(rendered).to match /a_partial/
-    expect(rendered).to match /b_partial/
-    expect(rendered).to match /c_partial/
+    expect(rendered).to include('a_partial')
+    expect(rendered).to include('b_partial')
+    expect(rendered).to include('c_partial')
   end
 
   context 'with a configured document component' do
@@ -39,7 +39,7 @@ RSpec.describe "catalog/_document" do
 
     it 'renders the document component' do
       render partial: "catalog/document", locals: { document: document, document_counter: 1, view_config: blacklight_config.index }
-      expect(rendered).to match /blah/
+      expect(rendered).to include('blah')
     end
   end
 end

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 RSpec.describe "catalog/_paginate_compact.html.erb" do
-  let(:user) { User.new { |u| u.save(validate: false) } }
+  let(:user) { create_user }
   let(:blacklight_config) { Blacklight::Configuration.new }
 
   before do
@@ -16,7 +16,7 @@ RSpec.describe "catalog/_paginate_compact.html.erb" do
   end
 
   it "renders ActiveRecord collections" do
-    50.times { b = Bookmark.new; b.user = user; b.save! }
+    50.times { Bookmark.create!(user: user) }
     render partial: 'catalog/paginate_compact', object: Bookmark.page(1).per(25)
     expect(rendered).to have_css ".page-entries"
     expect(rendered).to have_css "a[@rel=next]"

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

@@ -17,10 +17,10 @@ RSpec.describe "catalog/_sort_and_per_page" do
     stub_template "catalog/_per_page_widget.html.erb" => "per_page_widget"
     stub_template "catalog/_view_type_group.html.erb" => "view_type_group"
     render
-    expect(rendered).to match /paginate_compact/
-    expect(rendered).to match /sort_widget/
-    expect(rendered).to match /per_page_widget/
-    expect(rendered).to match /view_type_group/
+    expect(rendered).to include('paginate_compact')
+    expect(rendered).to include('sort_widget')
+    expect(rendered).to include('per_page_widget')
+    expect(rendered).to include('view_type_group')
   end
 
   it "does not render the pagination controls with bad limit values" do
@@ -30,6 +30,6 @@ RSpec.describe "catalog/_sort_and_per_page" do
     stub_template "catalog/_per_page_widget.html.erb" => "per_page_widget"
     stub_template "catalog/_view_type_group.html.erb" => "view_type_group"
     render
-    expect(rendered).not_to match /paginate_compact/
+    expect(rendered).not_to include('paginate_compact')
   end
 end

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

@@ -12,7 +12,7 @@ RSpec.describe "catalog/index.html.erb" do
     it "renders the Search::SidebarComponent component" do
       render
 
-      expect(sidebar).to match /Limit your search/
+      expect(sidebar).to include('Limit your search')
     end
   end
 
@@ -31,7 +31,7 @@ RSpec.describe "catalog/index.html.erb" do
 
     it "renders the search_header partial" do
       render
-      expect(rendered).to match /sortAndPerPage/
+      expect(rendered).to include('sortAndPerPage')
     end
   end
 end

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

@@ -9,7 +9,6 @@ RSpec.describe "catalog/show.html.erb" do
     allow(presenter).to receive(:html_title).and_return('Heading')
     allow(document).to receive(:more_like_this).and_return([])
     allow(view).to receive_messages(has_user_authentication_provider?: false)
-    allow(view).to receive_messages(render_document_sidebar_partial: "Sidebar")
     allow(view).to receive_messages(current_search_session: nil, search_session: {})
     assign :document, document
     allow(view).to receive_messages(document_presenter: presenter, action_name: 'show', blacklight_config: blacklight_config)
@@ -36,8 +35,8 @@ RSpec.describe "catalog/show.html.erb" do
     stub_template "catalog/_b_default.html.erb" => "b_partial"
     stub_template "catalog/_c_default.html.erb" => "c_partial"
     render
-    expect(rendered).to match /a_partial/
-    expect(rendered).to match /b_partial/
-    expect(rendered).to match /c_partial/
+    expect(rendered).to include('a_partial')
+    expect(rendered).to include('b_partial')
+    expect(rendered).to include('c_partial')
   end
 end

data/spec/views/shared/_user_util_links.html.erb_spec.rb

@@ -7,6 +7,10 @@ RSpec.describe "shared/_user_util_links" do
     end
   end
 
+  before do
+    allow(controller).to receive(:render_bookmarks_control?).and_return false
+  end
+
   it "renders the correct bookmark count" do
     count = rand(99)
     allow(controller).to receive(:render_bookmarks_control?).and_return true
@@ -15,4 +19,56 @@ RSpec.describe "shared/_user_util_links" do
     render "shared/user_util_links"
     expect(rendered).to have_css('#bookmarks_nav span.badge[data-role=bookmark-counter]', text: count.to_s)
   end
+
+  it "renders Rails authentication session links" do
+    user = instance_double(User, to_s: "xyz@example.com")
+
+    allow(view).to receive_messages(
+      blacklight_account_path: nil,
+      blacklight_config: blacklight_config,
+      blacklight_login_path: "/session/new",
+      blacklight_logout_link_options: { data: { turbo_method: :delete } },
+      blacklight_logout_path: "/session",
+      current_user: user,
+      has_user_authentication_provider?: true
+    )
+
+    render "shared/user_util_links"
+
+    expect(rendered).to have_link("Log Out", href: "/session")
+    expect(rendered).to have_css('a[data-turbo-method="delete"]', text: "Log Out")
+    expect(rendered).to have_no_link("xyz@example.com")
+  end
+
+  it "renders Devise-compatible session and registration links" do
+    user = instance_double(User, to_s: "xyz@example.com")
+
+    allow(view).to receive_messages(
+      blacklight_account_path: "/users/edit",
+      blacklight_config: blacklight_config,
+      blacklight_login_path: "/users/sign_in",
+      blacklight_logout_link_options: {},
+      blacklight_logout_path: "/users/sign_out",
+      current_user: user,
+      has_user_authentication_provider?: true
+    )
+
+    render "shared/user_util_links"
+
+    expect(rendered).to have_link("Log Out", href: "/users/sign_out")
+    expect(rendered).to have_link("xyz@example.com", href: "/users/edit")
+  end
+
+  it "renders a provider-neutral login link" do
+    allow(view).to receive_messages(
+      blacklight_config: blacklight_config,
+      blacklight_login_path: "/session/new",
+      current_user: nil,
+      has_user_authentication_provider?: true
+    )
+
+    render "shared/user_util_links"
+
+    expect(rendered).to have_link("Login", href: "/session/new")
+  end
 end

data/template.demo.rb

@@ -4,7 +4,8 @@ gem 'blacklight', '>= 7.0'
 
 after_bundle do
   # run the blacklight install generator
-  options = ENV.fetch("BLACKLIGHT_INSTALL_OPTIONS", '--devise --marc')
+  default_authentication_option = Rails.gem_version >= Gem::Version.new('8.0.0') ? '--authentication' : '--devise'
+  options = ENV.fetch("BLACKLIGHT_INSTALL_OPTIONS", "#{default_authentication_option} --marc")
 
   generate 'blacklight:install', options
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 9.0.0.beta8
+  version: 9.1.0
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -16,7 +16,7 @@ authors:
 - Justin Coyne
 bindir: exe
 cert_chain: []
-date: 1980-01-02 00:00:00.000000000 Z
+date: 2026-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -24,7 +24,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '7.2'
     - - "<"
       - !ruby/object:Gem::Version
         version: '9'
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '7.2'
     - - "<"
       - !ruby/object:Gem::Version
         version: '9'
@@ -112,22 +112,16 @@ dependencies:
   name: view_component
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.0'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.0'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
@@ -424,8 +418,6 @@ files:
 - ".github/workflows/release_8_x_scheduled.yml"
 - ".github/workflows/test.yml"
 - ".gitignore"
-- ".hound.yml"
-- ".jshintrc"
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
@@ -439,7 +431,8 @@ files:
 - VERSION
 - app/assets/builds/blacklight.css
 - app/assets/config/blacklight/manifest.js
-- app/assets/images/blacklight/logo.png
+- app/assets/images/blacklight/logo-dark.svg
+- app/assets/images/blacklight/logo.svg
 - app/assets/images/favicon.ico
 - app/assets/javascripts/blacklight/blacklight.esm.js
 - app/assets/javascripts/blacklight/blacklight.esm.js.map
@@ -532,10 +525,14 @@ files:
 - app/components/blacklight/header_component.rb
 - app/components/blacklight/hidden_search_state_component.rb
 - app/components/blacklight/icons/bookmark_icon_component.rb
+- app/components/blacklight/icons/checkmark_component.rb
+- app/components/blacklight/icons/circle_half_component.rb
 - app/components/blacklight/icons/icon_component.rb
 - app/components/blacklight/icons/list_component.rb
+- app/components/blacklight/icons/moon_stars_component.rb
 - app/components/blacklight/icons/remove_component.rb
 - app/components/blacklight/icons/search_component.rb
+- app/components/blacklight/icons/sun_component.rb
 - app/components/blacklight/metadata_field_component.html.erb
 - app/components/blacklight/metadata_field_component.rb
 - app/components/blacklight/metadata_field_layout_component.html.erb
@@ -582,6 +579,8 @@ files:
 - app/components/blacklight/system/flash_message_component.rb
 - app/components/blacklight/system/modal_component.html.erb
 - app/components/blacklight/system/modal_component.rb
+- app/components/blacklight/theme_switcher_component.html.erb
+- app/components/blacklight/theme_switcher_component.rb
 - app/components/blacklight/top_navbar_component.html.erb
 - app/components/blacklight/top_navbar_component.rb
 - app/controllers/bookmarks_controller.rb
@@ -589,7 +588,7 @@ files:
 - app/controllers/concerns/blacklight/bookmarks.rb
 - app/controllers/concerns/blacklight/catalog.rb
 - app/controllers/concerns/blacklight/controller.rb
-- app/controllers/concerns/blacklight/facetable.rb
+- app/controllers/concerns/blacklight/guest_user.rb
 - app/controllers/concerns/blacklight/search_context.rb
 - app/controllers/concerns/blacklight/search_history.rb
 - app/controllers/concerns/blacklight/searchable.rb
@@ -610,6 +609,7 @@ files:
 - app/javascript/blacklight-frontend/bookmark_toggle.js
 - app/javascript/blacklight-frontend/button_focus.js
 - app/javascript/blacklight-frontend/checkbox_submit.js
+- app/javascript/blacklight-frontend/color_theme_switcher.js
 - app/javascript/blacklight-frontend/core.js
 - app/javascript/blacklight-frontend/debounce.js
 - app/javascript/blacklight-frontend/facet_suggest.js
@@ -632,7 +632,6 @@ files:
 - app/models/concerns/blacklight/document/semantic_fields.rb
 - app/models/concerns/blacklight/suggest/response.rb
 - app/models/concerns/blacklight/user.rb
-- app/models/facet_search_builder.rb
 - app/models/record_mailer.rb
 - app/models/search.rb
 - app/models/search_builder.rb
@@ -661,7 +660,6 @@ files:
 - app/presenters/blacklight/thumbnail_presenter.rb
 - app/services/blacklight/bookmarks_search_builder.rb
 - app/services/blacklight/document_factory.rb
-- app/services/blacklight/facet_search_service.rb
 - app/services/blacklight/field_retriever.rb
 - app/services/blacklight/search_params_yaml_coder.rb
 - app/services/blacklight/search_service.rb
@@ -711,6 +709,7 @@ files:
 - app/views/catalog/index.html.erb
 - app/views/catalog/index.json.jbuilder
 - app/views/catalog/index.rss.builder
+- app/views/catalog/opensearch.json.jbuilder
 - app/views/catalog/opensearch.xml.builder
 - app/views/catalog/send_email_record.erb
 - app/views/catalog/show.html.erb
@@ -761,9 +760,9 @@ files:
 - db/migrate/20140320000000_add_polymorphic_type_to_bookmarks.rb
 - lib/blacklight.rb
 - lib/blacklight/abstract_repository.rb
-- lib/blacklight/abstract_search_builder.rb
 - lib/blacklight/component.rb
 - lib/blacklight/configuration.rb
+- lib/blacklight/configuration/action_config_map_entry.rb
 - lib/blacklight/configuration/context.rb
 - lib/blacklight/configuration/display_field.rb
 - lib/blacklight/configuration/facet_field.rb
@@ -780,7 +779,6 @@ files:
 - lib/blacklight/configuration/view_config.rb
 - lib/blacklight/engine.rb
 - lib/blacklight/exceptions.rb
-- lib/blacklight/facet_search_builder.rb
 - lib/blacklight/nested_open_struct_with_hash_access.rb
 - lib/blacklight/open_struct_with_hash_access.rb
 - lib/blacklight/parameters.rb
@@ -797,7 +795,6 @@ files:
 - lib/blacklight/solr/default_filter_query_builder.rb
 - lib/blacklight/solr/document.rb
 - lib/blacklight/solr/facet_paginator.rb
-- lib/blacklight/solr/facet_search_builder_behavior.rb
 - lib/blacklight/solr/field_reflection_search_builder.rb
 - lib/blacklight/solr/repository.rb
 - lib/blacklight/solr/request.rb
@@ -898,6 +895,7 @@ files:
 - spec/features/bookmarks_spec.rb
 - spec/features/citation_spec.rb
 - spec/features/component_template_override_spec.rb
+- spec/features/dark_mode_spec.rb
 - spec/features/did_you_mean_spec.rb
 - spec/features/facet_missing_spec.rb
 - spec/features/facets_spec.rb
@@ -924,6 +922,7 @@ files:
 - spec/helpers/catalog_helper_spec.rb
 - spec/i18n_spec.rb
 - spec/integration/generators/blacklight/solr_generator_spec.rb
+- spec/integration/generators/blacklight/user_generator_spec.rb
 - spec/lib/blacklight/component_spec.rb
 - spec/lib/blacklight/configuration/facet_field_spec.rb
 - spec/lib/blacklight/configuration/field_spec.rb
@@ -945,13 +944,11 @@ files:
 - spec/models/blacklight/document/dublin_core_spec.rb
 - spec/models/blacklight/document_spec.rb
 - spec/models/blacklight/facet_paginator_spec.rb
-- spec/models/blacklight/facet_search_builder_spec.rb
 - spec/models/blacklight/icon_spec.rb
 - spec/models/blacklight/search_builder_spec.rb
 - spec/models/blacklight/solr/default_filter_query_builder_spec.rb
 - spec/models/blacklight/solr/document_spec.rb
 - spec/models/blacklight/solr/facet_paginator_spec.rb
-- spec/models/blacklight/solr/facet_search_builder_behavior_spec.rb
 - spec/models/blacklight/solr/repository_spec.rb
 - spec/models/blacklight/solr/request_spec.rb
 - spec/models/blacklight/solr/response/facets_spec.rb
@@ -990,7 +987,9 @@ files:
 - spec/support/features.rb
 - spec/support/features/search_helpers.rb
 - spec/support/features/session_helpers.rb
+- spec/support/features/turbo_helpers.rb
 - spec/support/presenter_test_helpers.rb
+- spec/support/user_helpers.rb
 - spec/support/view_component_test_helpers.rb
 - spec/test_app_templates/Gemfile.extra
 - spec/test_app_templates/lib/generators/test_app_generator.rb
@@ -1024,14 +1023,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.1'
+      version: '3.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.1
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Blacklight provides a discovery interface for any Solr (http://lucene.apache.org/solr)
   index.
@@ -1082,6 +1081,7 @@ test_files:
 - spec/features/bookmarks_spec.rb
 - spec/features/citation_spec.rb
 - spec/features/component_template_override_spec.rb
+- spec/features/dark_mode_spec.rb
 - spec/features/did_you_mean_spec.rb
 - spec/features/facet_missing_spec.rb
 - spec/features/facets_spec.rb
@@ -1108,6 +1108,7 @@ test_files:
 - spec/helpers/catalog_helper_spec.rb
 - spec/i18n_spec.rb
 - spec/integration/generators/blacklight/solr_generator_spec.rb
+- spec/integration/generators/blacklight/user_generator_spec.rb
 - spec/lib/blacklight/component_spec.rb
 - spec/lib/blacklight/configuration/facet_field_spec.rb
 - spec/lib/blacklight/configuration/field_spec.rb
@@ -1129,13 +1130,11 @@ test_files:
 - spec/models/blacklight/document/dublin_core_spec.rb
 - spec/models/blacklight/document_spec.rb
 - spec/models/blacklight/facet_paginator_spec.rb
-- spec/models/blacklight/facet_search_builder_spec.rb
 - spec/models/blacklight/icon_spec.rb
 - spec/models/blacklight/search_builder_spec.rb
 - spec/models/blacklight/solr/default_filter_query_builder_spec.rb
 - spec/models/blacklight/solr/document_spec.rb
 - spec/models/blacklight/solr/facet_paginator_spec.rb
-- spec/models/blacklight/solr/facet_search_builder_behavior_spec.rb
 - spec/models/blacklight/solr/repository_spec.rb
 - spec/models/blacklight/solr/request_spec.rb
 - spec/models/blacklight/solr/response/facets_spec.rb
@@ -1174,7 +1173,9 @@ test_files:
 - spec/support/features.rb
 - spec/support/features/search_helpers.rb
 - spec/support/features/session_helpers.rb
+- spec/support/features/turbo_helpers.rb
 - spec/support/presenter_test_helpers.rb
+- spec/support/user_helpers.rb
 - spec/support/view_component_test_helpers.rb
 - spec/test_app_templates/Gemfile.extra
 - spec/test_app_templates/lib/generators/test_app_generator.rb

data/.hound.yml

@@ -1,4 +0,0 @@
-ruby:
-  config_file: .rubocop.yml
-javascript:
-  config_file: .jshintrc

data/.jshintrc

@@ -1,22 +0,0 @@
-{
-  "asi": true,
-  "browser": true,
-  "jquery": true,
-  "node": true,
-  "esnext": true,
-  "camelcase": true,
-  "eqeqeq": true,
-  "indent": 2,
-  "latedef": true,
-  "maxlen": 80,
-  "newcap": true,
-  "quotmark": "single",
-  "strict": true,
-  "undef": true,
-  "unused": true,
-  "eqnull": true,
-  "predef": [
-    "Blacklight",
-    "Rails"
-  ]
-}

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

@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-
-# The Facetable module can be included onto classes that need to initialize a FacetSearchService.
-# There are two dependencies you must provide on the including class. Typically these
-# would be provided by Blacklight::Controller
-#  1. search_state
-#  2. blacklight_config
-#
-# Additionally, the including class may override the facet_search_service_context method to provide
-# further context to the SearchService. For example you could override this to provide the
-# currently signed in user.
-module Blacklight::Facetable
-  extend ActiveSupport::Concern
-
-  included do
-    # Which class to use for the search service. You can subclass SearchService if you
-    # want to override any of the methods (e.g. SearchService#fetch)
-    class_attribute :facet_search_service_class
-    self.facet_search_service_class = Blacklight::FacetSearchService
-  end
-
-  # @return [Blacklight::FacetSearchService]
-  def facet_search_service
-    facet_search_service_class.new(config: blacklight_config, search_state: search_state, user_params: search_state.to_h, **facet_search_service_context)
-  end
-
-  # Override this method on the class that includes Blacklight::Facetable to provide more context to the search service if necessary.
-  # For example, if your search builder needs to be aware of the current user, override this method to return a hash including the current user.
-  # Then the search builder could use some property about the current user to construct a constraint on the search.
-  # @return [Hash] a hash of context information to pass through to the search service
-  def facet_search_service_context
-    search_service_context
-  end
-end

data/app/models/facet_search_builder.rb

@@ -1,5 +0,0 @@
-# frozen_string_literal: true
-
-class FacetSearchBuilder < Blacklight::FacetSearchBuilder
-  include Blacklight::Solr::FacetSearchBuilderBehavior
-end

data/app/services/blacklight/facet_search_service.rb

@@ -1,44 +0,0 @@
-# frozen_string_literal: true
-
-# FacetSearchService returns a facet list from the repository. This is for drawing the "more facets" modal
-module Blacklight
-  class FacetSearchService
-    def initialize(config:, search_state:, search_builder_class: config.facet_search_builder_class, **context)
-      @blacklight_config = config
-      @search_state = search_state
-      @user_params = @search_state.params
-      @search_builder_class = search_builder_class
-      @context = context
-    end
-
-    # The blacklight_config + controller are accessed by the search_builder
-    attr_reader :blacklight_config, :context
-
-    def search_builder
-      search_builder_class.new(self)
-    end
-
-    def search_state_class
-      @search_state.class
-    end
-
-    ##
-    # Get the solr response when retrieving only a single facet field
-    # @return [Blacklight::Solr::Response] the solr response
-    def facet_field_response(facet_field, extra_controller_params = {})
-      query = search_builder.with(search_state).facet(facet_field)
-      repository.search(params: query.merge(extra_controller_params))
-    end
-
-    def facet_suggest_response(facet_field, facet_suggestion_query, extra_controller_params = {})
-      query = search_builder.with(search_state).facet(facet_field).facet_suggestion_query(facet_suggestion_query)
-      repository.search(params: query.merge(extra_controller_params))
-    end
-
-    private
-
-    attr_reader :search_builder_class, :search_state
-
-    delegate :repository, to: :blacklight_config
-  end
-end