blacklight 8.13.0 → 9.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3806d03fd90598754cbf0f4d2cc5437788d456bbe8a81bc6367cd5e80e1391f1
-  data.tar.gz: 7fe3bb2c4f9c3a5ec1793f10e19c7ab23d91f611a8d811614b2c76b2e8f88835
+  metadata.gz: a4ffba1fbfab58e820f1953e4c0b1ff8d3bbcd57da645c10a44aa2f0a09f4a7a
+  data.tar.gz: 323b2afff4d4a8b308486ad81978b64f3a88aa8414e890ea5563bd3ae7820d0e
 SHA512:
-  metadata.gz: ded030f5290a59ee5a60f4d6517bb1a2364cc9a6410959b4f0ebe64c5d2ab381b3d19d612918425a7e68d3b3d68703e722f266b38d0197f863d7d2f2a484391a
-  data.tar.gz: 1c0de5ef22aff907b3ec2d5031418aa7d41111b81f3f3288522c82e7e03ece7d68c9d972873a487a4741e5c87355ad83ffbe4f7094cdacf3bd58c8e949714395
+  metadata.gz: 8d3bbad62d2d7ecfa2b19657d43dab0186e6a945dbd6093c120f2fa5ba833be91b78f75ccd73379008bfb20e199a44702ce49000ce5561203baae41029a5cd3f
+  data.tar.gz: 6a2837ca8deb3fd6650b947197d8dd5c5320631a339ac04a3e804aa1cc930050c50ed097f6fbff27ad3e50aab1c84b0bfe2817e91a466926dc0d0fd0202945b8

data/.env

@@ -1,6 +1,6 @@
-ALPINE_RUBY_VERSION=3.1.6
-RAILS_VERSION=6.1.4.6
-VIEW_COMPONENT_VERSION=3.12.1
+ALPINE_RUBY_VERSION=3.3
+RAILS_VERSION=7.2.1
+VIEW_COMPONENT_VERSION=3.14.0
 SOLR_PORT=8983
 SOLR_URL=http://solr:8983/solr/blacklight-core
 SOLR_VERSION=latest

data/.github/pull_request_template.md

@@ -0,0 +1,7 @@
+<!--
+Thanks for contributing to Blacklight!
+
+If you changed any SASS files in this pull-request, ensure you have built the CSS.
+You can do this by running `npm run build` and commit the resulting changes to `app/assets/builds/blacklight.css`
+
+-->

data/.github/workflows/ruby.yml

@@ -0,0 +1,98 @@
+# 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@v4
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.2
+          bundler: "latest"
+      - 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 linter
+        run: bundle exec rake rubocop
+  test:
+    runs-on: ubuntu-latest
+    name: test (ruby ${{ matrix.ruby }} / rails ${{ matrix.rails_version }} ${{ matrix.additional_name }})
+    strategy:
+      fail-fast: false
+      matrix:
+        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.3"
+            rails_version: "8.0.1"
+            additional_engine_cart_rails_options: --css=bootstrap
+          - ruby: "3.3"
+            rails_version: "8.0.1"
+            additional_engine_cart_rails_options: --css=bootstrap --js=esbuild
+            additional_name: "/ esbuild"
+          - ruby: "3.2"
+            rails_version: "7.1.5.1"
+            solr_version: "8.11.2"
+            additional_name: "Solr 8.11.2"
+          - ruby: "3.1"
+            rails_version: "7.1.5.1"
+          - ruby: "3.3"
+            rails_version: "7.1.5.1"
+            additional_name: "/ Propshaft"
+            additional_engine_cart_rails_options: -a propshaft --css=bootstrap
+          - ruby: "3.3"
+            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.2.2.1"
+            additional_engine_cart_rails_options: -a propshaft --css=bootstrap --js=esbuild
+            additional_name: "/ Propshaft, esbuild"
+    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
+      - 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
+  docker_build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Build docker image
+        run: docker compose build app

data/.rubocop.yml

@@ -1,4 +1,4 @@
-plugins:
+require:
   - rubocop-capybara
   - rubocop-rspec
   - rubocop-rspec_rails
@@ -10,8 +10,8 @@ inherit_from:
 
 AllCops:
   DisplayCopNames: true
-  TargetRubyVersion: 3.3
-  TargetRailsVersion: 7.2
+  TargetRubyVersion: 3.1
+  TargetRailsVersion: 7.0
   Exclude:
     - "lib/generators/blacklight/templates/**/*"
     - "blacklight.gemspec"
@@ -75,7 +75,7 @@ Naming/MethodParameterName:
     - of
     - by
 
-Naming/PredicatePrefix:
+Naming/PredicateName:
   ForbiddenPrefixes:
     - is_
 
@@ -89,9 +89,6 @@ Rails/ApplicationMailer:
 Style/AccessModifierDeclarations:
   Enabled: false
 
-Style/FormatStringToken:
-  EnforcedStyle: template
-
 Style/MissingRespondToMissing:
   Exclude:
     - "lib/blacklight/nested_open_struct_with_hash_access.rb"
@@ -460,11 +457,11 @@ Style/SuperWithArgsParentheses: # new in 1.58
   Enabled: true
 Style/YAMLFileRead: # new in 1.53
   Enabled: true
-Capybara/AssertStyle: # new in 2.17
+Capybara/ClickLinkOrButtonStyle: # new in 2.19
   Enabled: true
-Capybara/RSpec/MatchStyle:
+Capybara/MatchStyle: # new in 2.17
   Enabled: true
-Capybara/RSpec/NegationMatcher: # new in 2.14
+Capybara/NegationMatcher: # new in 2.14
   Enabled: true
   Exclude:
     - "spec/models/**/*"
@@ -474,7 +471,7 @@ Capybara/SpecificActions: # new in 2.14
   Enabled: true
 Capybara/SpecificFinders: # new in 2.13
   Enabled: true
-Capybara/RSpec/SpecificMatcher: # new in 2.12
+Capybara/SpecificMatcher: # new in 2.12
   Enabled: true
 Capybara/RSpec/HaveSelector: # new in 2.19
   Enabled: true
@@ -588,143 +585,3 @@ Rails/WhereRange: # new in 2.25
   Enabled: true
 Gemspec/AddRuntimeDependency: # new in 1.65
   Enabled: true
-Lint/ArrayLiteralInRegexp: # new in 1.71
-  Enabled: true
-Lint/ConstantReassignment: # new in 1.70
-  Enabled: true
-Lint/DuplicateSetElement: # new in 1.67
-  Enabled: true
-Lint/HashNewWithKeywordArgumentsAsDefault: # new in 1.69
-  Enabled: true
-Lint/NumericOperationWithConstantResult: # new in 1.69
-  Enabled: true
-Lint/SharedMutableDefault: # new in 1.70
-  Enabled: true
-Lint/UnescapedBracketInRegexp: # new in 1.68
-  Enabled: true
-Lint/UselessDefined: # new in 1.69
-  Enabled: true
-Lint/UselessNumericOperation: # new in 1.66
-  Enabled: true
-Style/AmbiguousEndlessMethodDefinition: # new in 1.68
-  Enabled: true
-Style/BitwisePredicate: # new in 1.68
-  Enabled: true
-Style/CombinableDefined: # new in 1.68
-  Enabled: true
-Style/DigChain: # new in 1.69
-  Enabled: true
-Style/FileNull: # new in 1.69
-  Enabled: true
-Style/FileTouch: # new in 1.69
-  Enabled: true
-Style/HashSlice: # new in 1.71
-  Enabled: true
-Style/ItAssignment: # new in 1.70
-  Enabled: true
-Style/KeywordArgumentsMerging: # new in 1.68
-  Enabled: true
-Style/RedundantInterpolationUnfreeze: # new in 1.66
-  Enabled: true
-Style/SafeNavigationChainLength: # new in 1.68
-  Enabled: true
-Rails/EnumSyntax: # new in 2.26
-  Enabled: true
-Rails/MultipleRoutePaths: # new in 2.29
-  Enabled: true
-Rails/StrongParametersExpect: # new in 2.29
-  Enabled: true
-Lint/CopDirectiveSyntax: # new in 1.72
-  Enabled: true
-Lint/RedundantTypeConversion: # new in 1.72
-  Enabled: true
-Lint/SuppressedExceptionInNumberConversion: # new in 1.72
-  Enabled: true
-Lint/UselessConstantScoping: # new in 1.72
-  Enabled: true
-Style/ComparableBetween: # new in 1.74
-  Enabled: true
-Style/HashFetchChain: # new in 1.75
-  Enabled: true
-Style/ItBlockParameter: # new in 1.75
-  Enabled: true
-Style/RedundantFormat: # new in 1.72
-  Enabled: true
-Capybara/FindAllFirst: # new in 2.22
-  Enabled: true
-Capybara/RSpec/NegationMatcherAfterVisit: # new in 2.22
-  Enabled: true
-RSpec/IncludeExamples: # new in 3.6
-  Enabled: true
-Lint/UselessDefaultValueArgument: # new in 1.76
-  Enabled: true
-Lint/UselessOr: # new in 1.76
-  Enabled: true
-Naming/PredicateMethod: # new in 1.76
-  Enabled: true
-Style/EmptyStringInsideInterpolation: # new in 1.76
-  Enabled: true
-Style/RedundantArrayFlatten: # new in 1.76
-  Enabled: true
-Gemspec/AttributeAssignment: # new in 1.77
-  Enabled: true
-Layout/EmptyLinesAfterModuleInclusion: # new in 1.79
-  Enabled: true
-Lint/DataDefineOverride: # new in 1.85
-  Enabled: true
-Lint/UnreachablePatternBranch: # new in 1.85
-  Enabled: true
-Style/ArrayIntersectWithSingleElement: # new in 1.81
-  Enabled: true
-Style/CollectionQuerying: # new in 1.77
-  Enabled: true
-Style/EmptyClassDefinition: # new in 1.84
-  Enabled: true
-Style/FileOpen: # new in 1.85
-  Enabled: true
-Style/MapJoin: # new in 1.85
-  Enabled: true
-Style/ModuleMemberExistenceCheck: # new in 1.82
-  Enabled: true
-Style/NegativeArrayIndex: # new in 1.84
-  Enabled: true
-Style/OneClassPerFile: # new in 1.85
-  Enabled: true
-Style/PartitionInsteadOfDoubleSelect: # new in 1.85
-  Enabled: true
-Style/PredicateWithKind: # new in 1.85
-  Enabled: true
-Style/ReduceToHash: # new in 1.85
-  Enabled: true
-Style/RedundantMinMaxBy: # new in 1.85
-  Enabled: true
-Style/ReverseFind: # new in 1.84
-  Enabled: true
-Style/SelectByKind: # new in 1.85
-  Enabled: true
-Style/SelectByRange: # new in 1.85
-  Enabled: true
-Style/TallyMethod: # new in 1.85
-  Enabled: true
-Capybara/RSpec/CurrentPathExpectation: # new in 1.18
-  Enabled: true
-Capybara/RSpec/HaveContent: # new in 2.23
-  Enabled: true
-Capybara/RSpec/VisibilityMatcher: # new in 1.39
-  Enabled: true
-RSpec/LeakyLocalVariable: # new in 3.8
-  Enabled: true
-RSpec/Output: # new in 3.9
-  Enabled: true
-RSpecRails/HttpStatusNameConsistency: # new in 2.32
-  Enabled: true
-Rails/FindByOrAssignmentMemoization: # new in 2.33
-  Enabled: true
-Rails/OrderArguments: # new in 2.33
-  Enabled: true
-Rails/RedirectBackOrTo: # new in 2.34
-  Enabled: true
-RSpec/DiscardedMatcher: # new in 3.10
-  Enabled: true
-RSpec/MatchWithSimpleRegex: # new in 3.10
-  Enabled: true

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2026-07-22 03:10:29 UTC using RuboCop version 1.88.2.
+# on 2024-09-03 14:22:19 UTC using RuboCop version 1.66.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -8,35 +8,17 @@
 
 # Offense count: 4
 # This cop supports safe autocorrection (--autocorrect).
-Capybara/RSpec/CurrentPathExpectation:
+Capybara/CurrentPathExpectation:
   Exclude:
     - 'spec/features/alternate_controller_spec.rb'
 
-# Offense count: 6
-Capybara/RSpec/NegationMatcherAfterVisit:
-  Exclude:
-    - 'spec/features/facets_spec.rb'
-    - 'spec/features/modal_spec.rb'
-    - 'spec/features/record_view_spec.rb'
-    - 'spec/features/search_context_spec.rb'
-    - 'spec/features/sitelinks_search_box_spec.rb'
-
 # Offense count: 13
-Capybara/RSpec/VisibilityMatcher:
+Capybara/VisibilityMatcher:
   Exclude:
     - 'spec/features/facets_spec.rb'
     - 'spec/features/search_filters_spec.rb'
     - 'spec/helpers/blacklight_helper_spec.rb'
 
-# Offense count: 5
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: leading, trailing
-Layout/LineContinuationLeadingSpace:
-  Exclude:
-    - 'lib/generators/blacklight/controller_generator.rb'
-    - 'lib/generators/blacklight/user_generator.rb'
-
 # Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowedMethods, AllowedPatterns.
@@ -53,12 +35,20 @@ Lint/AmbiguousOperator:
     - 'spec/models/blacklight/facet_paginator_spec.rb'
     - 'spec/services/blacklight/search_service_spec.rb'
 
-# Offense count: 7
+# Offense count: 45
 # This cop supports safe autocorrection (--autocorrect).
 Lint/AmbiguousRegexpLiteral:
   Exclude:
+    - 'spec/controllers/catalog_controller_spec.rb'
     - 'spec/features/alternate_controller_spec.rb'
+    - 'spec/helpers/blacklight/url_helper_behavior_spec.rb'
+    - 'spec/helpers/catalog_helper_spec.rb'
     - 'spec/models/record_mailer_spec.rb'
+    - 'spec/views/catalog/_document.html.erb_spec.rb'
+    - 'spec/views/catalog/_search_header.erb_spec.rb'
+    - 'spec/views/catalog/_sort_and_per_page.html.erb_spec.rb'
+    - 'spec/views/catalog/index.html.erb_spec.rb'
+    - 'spec/views/catalog/show.html.erb_spec.rb'
 
 # Offense count: 1
 Lint/BinaryOperatorWithIdenticalOperands:
@@ -91,7 +81,7 @@ Lint/EmptyFile:
   Exclude:
     - 'spec/components/blacklight/document_metadata_component_spec.rb'
 
-# Offense count: 51
+# Offense count: 48
 # Configuration parameters: AllowedParentClasses.
 Lint/MissingSuper:
   Enabled: false
@@ -106,12 +96,12 @@ Lint/ParenthesesAsGroupedExpression:
     - 'spec/features/search_spec.rb'
     - 'spec/models/blacklight/solr/repository_spec.rb'
 
-# Offense count: 1
-Lint/UselessDefined:
+# Offense count: 2
+Lint/ShadowingOuterLocalVariable:
   Exclude:
-    - 'spec/models/blacklight/solr/document_spec.rb'
+    - 'spec/models/blacklight/configuration_spec.rb'
 
-# Offense count: 82
+# Offense count: 83
 # Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
 Metrics/AbcSize:
   Max: 46
@@ -122,12 +112,12 @@ Metrics/AbcSize:
 Metrics/BlockLength:
   Max: 26
 
-# Offense count: 40
+# Offense count: 42
 # Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/CyclomaticComplexity:
-  Max: 13
+  Max: 14
 
-# Offense count: 79
+# Offense count: 78
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 Metrics/MethodLength:
   Max: 27
@@ -142,7 +132,7 @@ Metrics/ModuleLength:
 Metrics/ParameterLists:
   Max: 6
 
-# Offense count: 34
+# Offense count: 36
 # Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/PerceivedComplexity:
   Max: 14
@@ -168,19 +158,10 @@ Naming/MethodParameterName:
     - 'lib/blacklight/solr/document.rb'
     - 'lib/blacklight/solr/search_builder_behavior.rb'
 
-# Offense count: 3
-# Configuration parameters: Mode, AllowedMethods, AllowedPatterns, AllowBangMethods, WaywardPredicates.
-# AllowedMethods: call
-# WaywardPredicates: infinite?, nonzero?
-Naming/PredicateMethod:
-  Exclude:
-    - 'app/controllers/concerns/blacklight/catalog.rb'
-    - 'lib/blacklight/solr/repository.rb'
-
 # Offense count: 9
 # Configuration parameters: EnforcedStyle, CheckMethodNames, CheckSymbols, AllowedIdentifiers, AllowedPatterns.
 # SupportedStyles: snake_case, normalcase, non_integer
-# AllowedIdentifiers: TLS1_1, TLS1_2, capture3, iso8601, rfc1123_date, rfc822, rfc2822, rfc3339, x86_64
+# AllowedIdentifiers: capture3, iso8601, rfc1123_date, rfc822, rfc2822, rfc3339, x86_64
 Naming/VariableNumber:
   Exclude:
     - 'spec/lib/blacklight/search_state_spec.rb'
@@ -194,13 +175,13 @@ RSpec/BeforeAfterAll:
     - 'spec/models/blacklight/document/dublin_core_spec.rb'
     - 'spec/models/blacklight/solr/document_spec.rb'
 
-# Offense count: 110
+# Offense count: 109
 # Configuration parameters: Prefixes, AllowedPatterns.
 # Prefixes: when, with, without
 RSpec/ContextWording:
   Enabled: false
 
-# Offense count: 149
+# Offense count: 138
 # Configuration parameters: CountAsOne.
 RSpec/ExampleLength:
   Max: 33
@@ -227,7 +208,6 @@ RSpec/InstanceVariable:
     - 'spec/views/catalog/index.atom.builder_spec.rb'
 
 # Offense count: 4
-# This cop supports safe autocorrection (--autocorrect).
 RSpec/IteratedExpectation:
   Exclude:
     - 'spec/models/blacklight/solr/response/group_response_spec.rb'
@@ -266,22 +246,22 @@ RSpec/MessageSpies:
     - 'spec/models/blacklight/suggest_search_spec.rb'
     - 'spec/presenters/blacklight/field_presenter_spec.rb'
 
-# Offense count: 403
+# Offense count: 390
 RSpec/MultipleExpectations:
   Max: 16
 
-# Offense count: 296
+# Offense count: 292
 # Configuration parameters: AllowSubject.
 RSpec/MultipleMemoizedHelpers:
   Max: 14
 
-# Offense count: 424
+# Offense count: 399
 # Configuration parameters: EnforcedStyle, IgnoreSharedExamples.
 # SupportedStyles: always, named_only
 RSpec/NamedSubject:
   Enabled: false
 
-# Offense count: 61
+# Offense count: 60
 # Configuration parameters: AllowedGroups.
 RSpec/NestedGroups:
   Max: 5
@@ -304,6 +284,7 @@ RSpec/RepeatedExampleGroupDescription:
 
 # Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AutoCorrect.
 RSpec/ScatteredLet:
   Exclude:
     - 'spec/views/catalog/index.atom.builder_spec.rb'
@@ -320,7 +301,6 @@ RSpec/StubbedMock:
     - 'spec/presenters/blacklight/field_presenter_spec.rb'
 
 # Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
 RSpec/SubjectDeclaration:
   Exclude:
     - 'spec/models/blacklight/document/cache_key_spec.rb'
@@ -335,21 +315,10 @@ RSpec/SubjectStub:
     - 'spec/presenters/blacklight/document_presenter_spec.rb'
     - 'spec/services/blacklight/search_service_spec.rb'
 
-# Offense count: 18
+# Offense count: 80
 # Configuration parameters: IgnoreNameless, IgnoreSymbolicNames.
 RSpec/VerifiedDoubles:
-  Exclude:
-    - 'spec/components/blacklight/search/facet_suggest_input_spec.rb'
-    - 'spec/components/blacklight/system/dropdown_component_spec.rb'
-    - 'spec/controllers/catalog_controller_spec.rb'
-    - 'spec/helpers/blacklight/configuration_helper_behavior_spec.rb'
-    - 'spec/helpers/blacklight/url_helper_behavior_spec.rb'
-    - 'spec/helpers/catalog_helper_spec.rb'
-    - 'spec/presenters/blacklight/document_presenter_spec.rb'
-    - 'spec/presenters/blacklight/field_presenter_spec.rb'
-    - 'spec/presenters/blacklight/thumbnail_presenter_spec.rb'
-    - 'spec/services/blacklight/search_service_spec.rb'
-    - 'spec/views/catalog/_document_list.html.erb_spec.rb'
+  Enabled: false
 
 # Offense count: 4
 # This cop supports unsafe autocorrection (--autocorrect-all).
@@ -359,7 +328,9 @@ Rails/Date:
   Exclude:
     - 'spec/models/search_spec.rb'
 
-# Offense count: 22
+# Offense count: 20
+# Configuration parameters: Include.
+# Include: app/helpers/**/*.rb
 Rails/HelperInstanceVariable:
   Exclude:
     - 'app/helpers/blacklight/catalog_helper_behavior.rb'
@@ -369,6 +340,8 @@ Rails/HelperInstanceVariable:
     - 'app/helpers/blacklight/render_partials_helper_behavior.rb'
 
 # Offense count: 2
+# Configuration parameters: Include.
+# Include: spec/**/*.rb, test/**/*.rb
 Rails/I18nLocaleAssignment:
   Exclude:
     - 'spec/helpers/blacklight_helper_spec.rb'
@@ -378,7 +351,7 @@ Rails/OutputSafety:
   Exclude:
     - 'app/presenters/blacklight/rendering/join.rb'
 
-# Offense count: 15
+# Offense count: 14
 Security/Eval:
   Exclude:
     - 'spec/models/blacklight/solr/response_spec.rb'
@@ -396,7 +369,7 @@ Style/Alias:
     - 'lib/blacklight/solr/response.rb'
     - 'lib/blacklight/solr/response/group_response.rb'
 
-# Offense count: 2
+# Offense count: 3
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle, ProceduralMethods, FunctionalMethods, AllowedMethods, AllowedPatterns, AllowBracesOnProceduralOneLiners, BracesRequiredMethods.
 # SupportedStyles: line_count_based, semantic, braces_for_chaining, always_braces
@@ -408,12 +381,10 @@ Style/BlockDelimiters:
     - 'app/views/catalog/index.rss.builder'
     - 'app/views/catalog/opensearch.xml.builder'
 
-# Offense count: 42
+# Offense count: 52
 # This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: EnforcedStyle, EnforcedStyleForClasses, EnforcedStyleForModules.
+# Configuration parameters: EnforcedStyle.
 # SupportedStyles: nested, compact
-# SupportedStylesForClasses: ~, nested, compact
-# SupportedStylesForModules: ~, nested, compact
 Style/ClassAndModuleChildren:
   Enabled: false
 
@@ -438,7 +409,7 @@ Style/DocumentDynamicEvalDefinition:
     - 'app/builders/blacklight/action_builder.rb'
     - 'lib/blacklight/configuration/fields.rb'
 
-# Offense count: 134
+# Offense count: 133
 # Configuration parameters: AllowedConstants.
 Style/Documentation:
   Enabled: false
@@ -457,6 +428,14 @@ Style/ExpandPathArguments:
     - 'lib/generators/blacklight/test_support_generator.rb'
     - 'lib/generators/blacklight/user_generator.rb'
 
+# Offense count: 16
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: MaxUnannotatedPlaceholdersAllowed, AllowedMethods, AllowedPatterns.
+# SupportedStyles: annotated, template, unannotated
+# AllowedMethods: redirect
+Style/FormatStringToken:
+  EnforcedStyle: template
+
 # Offense count: 6
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: MinBodyLength, AllowConsecutiveConditionals.
@@ -468,7 +447,7 @@ Style/GuardClause:
     - 'app/helpers/blacklight/catalog_helper_behavior.rb'
     - 'lib/blacklight/solr/search_builder_behavior.rb'
 
-# Offense count: 30
+# Offense count: 29
 # This cop supports safe autocorrection (--autocorrect).
 Style/IfUnlessModifier:
   Enabled: false
@@ -490,7 +469,7 @@ Style/MultipleComparison:
 
 # Offense count: 2
 # This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: EnforcedStyle, Recursive.
+# Configuration parameters: EnforcedStyle.
 # SupportedStyles: literals, strict
 Style/MutableConstant:
   Exclude:
@@ -553,7 +532,7 @@ Style/RescueStandardError:
     - 'lib/blacklight/configuration/fields.rb'
     - 'lib/railties/blacklight.rake'
 
-# Offense count: 12
+# Offense count: 11
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: ConvertCodeThatCanStartToReturnNil, AllowedMethods, MaxChainLength.
 # AllowedMethods: present?, blank?, presence, try, try!
@@ -582,7 +561,7 @@ Style/SoleNestedConditional:
   Exclude:
     - 'app/controllers/concerns/blacklight/controller.rb'
 
-# Offense count: 31
+# Offense count: 32
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: MinSize.
 # SupportedStyles: percent, brackets

data/.solr_wrapper.yml

@@ -1,7 +1,5 @@
 # Place any default configuration for solr_wrapper here
 # port: 8983
-env:
-  SOLR_MODULES: analysis-extras
 collection:
   dir: lib/generators/blacklight/templates/solr/conf
   name: blacklight-core