blacklight 9.0.0.beta1 → 9.0.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4ffba1fbfab58e820f1953e4c0b1ff8d3bbcd57da645c10a44aa2f0a09f4a7a
-  data.tar.gz: 323b2afff4d4a8b308486ad81978b64f3a88aa8414e890ea5563bd3ae7820d0e
+  metadata.gz: 35ec893efb2a95e7a708691df6c41db2053379f1f5fa770a658f8ad39ecb9ce5
+  data.tar.gz: 8f9995385332ea84fcf62a67c7b0e41cc43273e23f81f3cc586e6a7203aa46e9
 SHA512:
-  metadata.gz: 8d3bbad62d2d7ecfa2b19657d43dab0186e6a945dbd6093c120f2fa5ba833be91b78f75ccd73379008bfb20e199a44702ce49000ce5561203baae41029a5cd3f
-  data.tar.gz: 6a2837ca8deb3fd6650b947197d8dd5c5320631a339ac04a3e804aa1cc930050c50ed097f6fbff27ad3e50aab1c84b0bfe2817e91a466926dc0d0fd0202945b8
+  metadata.gz: 7b884477b1f809caf3046b28bf7ac118a50affd078566a068f716472f0fbdb95ac7f3c7f48a7afa5239daaded752d014ea5d1fb34e34fda5653610cea71385b1
+  data.tar.gz: e0ff913bafcfbd0c47db8f6f184a511525343178b857cd02a3f5b9661dc7533542841eb9f1510900eb5f6ed27715e48f47789e33e950780c37ea7a7cc01fb089

data/.github/matrix.json

@@ -0,0 +1,47 @@
+{
+  "ruby": ["3.4"],
+  "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.2",
+      "additional_engine_cart_rails_options": "--css=bootstrap"
+    },
+    {
+      "ruby": "3.3",
+      "rails_version": "8.0.2",
+      "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.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"
+    }
+  ]
+}

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,25 @@
+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: "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

data/.github/workflows/main.yml

@@ -0,0 +1,22 @@
+# 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/release_7_x_scheduled.yml

@@ -0,0 +1,39 @@
+# If there are failures running this workflow, please resolve them on the release-7.x branch
+# and then port any necessary changes to this branch.
+
+name: release-7.x scheduled
+
+on:
+  workflow_dispatch:
+  schedule:
+    # Weekly at 9:35 on Friday
+    # Somewhat weird timing so that it isn't delayed too much
+    - cron: '35 9 * * 5'
+jobs:
+  lint:
+    uses: projectblacklight/blacklight/.github/workflows/lint.yml@release-7.x
+    with:
+      ref: release-7.x
+  test:
+    uses: projectblacklight/blacklight/.github/workflows/test.yml@release-7.x
+    with:
+      ref: release-7.x
+  docker_build:
+    uses: projectblacklight/blacklight/.github/workflows/build.yml@release-7.x
+    with:
+      ref: release-7.x
+  report:
+    runs-on: ubuntu-latest
+    if: ${{ always() && contains(join(needs.*.result, ','), 'failure') }}
+    needs: [lint, test, docker_build]
+    steps:
+      - name: Report on failure of any dependent job
+        env:
+          NEEDS: ${{ toJSON(needs) }}
+        uses: slackapi/slack-github-action@v2.0.0
+        with:
+          method: chat.postMessage
+          token: ${{ secrets.SLACK_BOT_TOKEN }}
+          payload: |
+            channel: ${{ secrets.SLACK_CHANNEL_ID }}
+            text: "The weekly CI run of the release-7.x branch has failed"

data/.github/workflows/release_8_x_scheduled.yml

@@ -0,0 +1,39 @@
+# If there are failures running this workflow, please resolve them on the release-8.x branch
+# and then port any necessary changes to this branch.
+
+name: release-8.x scheduled
+
+on:
+  workflow_dispatch:
+  schedule:
+    # Weekly at 9:35 on Friday
+    # Somewhat weird timing so that it isn't delayed too much
+    - cron: '35 9 * * 5'
+jobs:
+  lint:
+    uses: projectblacklight/blacklight/.github/workflows/lint.yml@release-8.x
+    with:
+      ref: release-8.x
+  test:
+    uses: projectblacklight/blacklight/.github/workflows/test.yml@release-8.x
+    with:
+      ref: release-8.x
+  docker_build:
+    uses: projectblacklight/blacklight/.github/workflows/build.yml@release-8.x
+    with:
+      ref: release-8.x
+  report:
+    runs-on: ubuntu-latest
+    if: ${{ always() && contains(join(needs.*.result, ','), 'failure') }}
+    needs: [lint, test, docker_build]
+    steps:
+      - name: Report on failure of any dependent job
+        env:
+          NEEDS: ${{ toJSON(needs) }}
+        uses: slackapi/slack-github-action@v2.0.0
+        with:
+          method: chat.postMessage
+          token: ${{ secrets.SLACK_BOT_TOKEN }}
+          payload: |
+            channel: ${{ secrets.SLACK_CHANNEL_ID }}
+            text: "The weekly CI run of the release-8.x branch has failed"

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

@@ -1,4 +1,4 @@
-require:
+plugins:
   - rubocop-capybara
   - rubocop-rspec
   - rubocop-rspec_rails
@@ -10,7 +10,7 @@ inherit_from:
 
 AllCops:
   DisplayCopNames: true
-  TargetRubyVersion: 3.1
+  TargetRubyVersion: 3.2
   TargetRailsVersion: 7.0
   Exclude:
     - "lib/generators/blacklight/templates/**/*"
@@ -585,3 +585,71 @@ 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/NegationMatcherAfterVisit: # new in 2.22
+  Enabled: true
+RSpec/IncludeExamples: # new in 3.6
+  Enabled: true

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2024-09-03 14:22:19 UTC using RuboCop version 1.66.0.
+# on 2025-05-09 14:34:28 UTC using RuboCop version 1.75.5.
 # 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
@@ -12,6 +12,16 @@ Capybara/CurrentPathExpectation:
   Exclude:
     - 'spec/features/alternate_controller_spec.rb'
 
+# Offense count: 7
+Capybara/NegationMatcherAfterVisit:
+  Exclude:
+    - 'spec/features/bookmarks_spec.rb'
+    - '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/VisibilityMatcher:
   Exclude:
@@ -35,7 +45,7 @@ Lint/AmbiguousOperator:
     - 'spec/models/blacklight/facet_paginator_spec.rb'
     - 'spec/services/blacklight/search_service_spec.rb'
 
-# Offense count: 45
+# Offense count: 43
 # This cop supports safe autocorrection (--autocorrect).
 Lint/AmbiguousRegexpLiteral:
   Exclude:
@@ -45,7 +55,6 @@ Lint/AmbiguousRegexpLiteral:
     - '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'
@@ -75,13 +84,7 @@ Lint/EmptyBlock:
     - 'app/controllers/concerns/blacklight/bookmarks.rb'
     - 'lib/blacklight/solr/search_builder_behavior.rb'
 
-# Offense count: 1
-# Configuration parameters: AllowComments.
-Lint/EmptyFile:
-  Exclude:
-    - 'spec/components/blacklight/document_metadata_component_spec.rb'
-
-# Offense count: 48
+# Offense count: 50
 # Configuration parameters: AllowedParentClasses.
 Lint/MissingSuper:
   Enabled: false
@@ -96,12 +99,7 @@ Lint/ParenthesesAsGroupedExpression:
     - 'spec/features/search_spec.rb'
     - 'spec/models/blacklight/solr/repository_spec.rb'
 
-# Offense count: 2
-Lint/ShadowingOuterLocalVariable:
-  Exclude:
-    - 'spec/models/blacklight/configuration_spec.rb'
-
-# Offense count: 83
+# Offense count: 81
 # Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
 Metrics/AbcSize:
   Max: 46
@@ -112,27 +110,27 @@ Metrics/AbcSize:
 Metrics/BlockLength:
   Max: 26
 
-# Offense count: 42
+# Offense count: 40
 # Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/CyclomaticComplexity:
-  Max: 14
+  Max: 13
 
-# Offense count: 78
+# Offense count: 77
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 Metrics/MethodLength:
   Max: 27
 
-# Offense count: 4
+# Offense count: 3
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ModuleLength:
-  Max: 124
+  Max: 114
 
-# Offense count: 8
+# Offense count: 7
 # Configuration parameters: CountKeywordArgs, MaxOptionalParameters.
 Metrics/ParameterLists:
   Max: 6
 
-# Offense count: 36
+# Offense count: 33
 # Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/PerceivedComplexity:
   Max: 14
@@ -161,7 +159,7 @@ Naming/MethodParameterName:
 # Offense count: 9
 # Configuration parameters: EnforcedStyle, CheckMethodNames, CheckSymbols, AllowedIdentifiers, AllowedPatterns.
 # SupportedStyles: snake_case, normalcase, non_integer
-# AllowedIdentifiers: capture3, iso8601, rfc1123_date, rfc822, rfc2822, rfc3339, x86_64
+# AllowedIdentifiers: TLS1_1, TLS1_2, capture3, iso8601, rfc1123_date, rfc822, rfc2822, rfc3339, x86_64
 Naming/VariableNumber:
   Exclude:
     - 'spec/lib/blacklight/search_state_spec.rb'
@@ -181,7 +179,7 @@ RSpec/BeforeAfterAll:
 RSpec/ContextWording:
   Enabled: false
 
-# Offense count: 138
+# Offense count: 146
 # Configuration parameters: CountAsOne.
 RSpec/ExampleLength:
   Max: 33
@@ -232,7 +230,7 @@ RSpec/MessageChain:
     - 'spec/presenters/blacklight/field_presenter_spec.rb'
     - 'spec/views/shared/_user_util_links.html.erb_spec.rb'
 
-# Offense count: 28
+# Offense count: 27
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: have_received, receive
 RSpec/MessageSpies:
@@ -246,22 +244,22 @@ RSpec/MessageSpies:
     - 'spec/models/blacklight/suggest_search_spec.rb'
     - 'spec/presenters/blacklight/field_presenter_spec.rb'
 
-# Offense count: 390
+# Offense count: 401
 RSpec/MultipleExpectations:
   Max: 16
 
-# Offense count: 292
+# Offense count: 294
 # Configuration parameters: AllowSubject.
 RSpec/MultipleMemoizedHelpers:
   Max: 14
 
-# Offense count: 399
+# Offense count: 431
 # Configuration parameters: EnforcedStyle, IgnoreSharedExamples.
 # SupportedStyles: always, named_only
 RSpec/NamedSubject:
   Enabled: false
 
-# Offense count: 60
+# Offense count: 62
 # Configuration parameters: AllowedGroups.
 RSpec/NestedGroups:
   Max: 5
@@ -289,7 +287,7 @@ RSpec/ScatteredLet:
   Exclude:
     - 'spec/views/catalog/index.atom.builder_spec.rb'
 
-# Offense count: 20
+# Offense count: 19
 RSpec/StubbedMock:
   Exclude:
     - 'spec/controllers/catalog_controller_spec.rb'
@@ -315,7 +313,7 @@ RSpec/SubjectStub:
     - 'spec/presenters/blacklight/document_presenter_spec.rb'
     - 'spec/services/blacklight/search_service_spec.rb'
 
-# Offense count: 80
+# Offense count: 79
 # Configuration parameters: IgnoreNameless, IgnoreSymbolicNames.
 RSpec/VerifiedDoubles:
   Enabled: false
@@ -328,7 +326,7 @@ Rails/Date:
   Exclude:
     - 'spec/models/search_spec.rb'
 
-# Offense count: 20
+# Offense count: 17
 # Configuration parameters: Include.
 # Include: app/helpers/**/*.rb
 Rails/HelperInstanceVariable:
@@ -351,7 +349,7 @@ Rails/OutputSafety:
   Exclude:
     - 'app/presenters/blacklight/rendering/join.rb'
 
-# Offense count: 14
+# Offense count: 15
 Security/Eval:
   Exclude:
     - 'spec/models/blacklight/solr/response_spec.rb'
@@ -383,8 +381,10 @@ Style/BlockDelimiters:
 
 # Offense count: 52
 # This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: EnforcedStyle.
+# Configuration parameters: EnforcedStyle, EnforcedStyleForClasses, EnforcedStyleForModules.
 # SupportedStyles: nested, compact
+# SupportedStylesForClasses: , nested, compact
+# SupportedStylesForModules: , nested, compact
 Style/ClassAndModuleChildren:
   Enabled: false
 
@@ -409,7 +409,7 @@ Style/DocumentDynamicEvalDefinition:
     - 'app/builders/blacklight/action_builder.rb'
     - 'lib/blacklight/configuration/fields.rb'
 
-# Offense count: 133
+# Offense count: 131
 # Configuration parameters: AllowedConstants.
 Style/Documentation:
   Enabled: false
@@ -428,9 +428,9 @@ Style/ExpandPathArguments:
     - 'lib/generators/blacklight/test_support_generator.rb'
     - 'lib/generators/blacklight/user_generator.rb'
 
-# Offense count: 16
+# Offense count: 17
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: MaxUnannotatedPlaceholdersAllowed, AllowedMethods, AllowedPatterns.
+# Configuration parameters: MaxUnannotatedPlaceholdersAllowed, Mode, AllowedMethods, AllowedPatterns.
 # SupportedStyles: annotated, template, unannotated
 # AllowedMethods: redirect
 Style/FormatStringToken:
@@ -447,18 +447,17 @@ Style/GuardClause:
     - 'app/helpers/blacklight/catalog_helper_behavior.rb'
     - 'lib/blacklight/solr/search_builder_behavior.rb'
 
-# Offense count: 29
+# Offense count: 30
 # This cop supports safe autocorrection (--autocorrect).
 Style/IfUnlessModifier:
   Enabled: false
 
-# Offense count: 6
+# Offense count: 4
 # This cop supports safe autocorrection (--autocorrect).
 Style/MultilineIfModifier:
   Exclude:
     - 'app/views/catalog/index.atom.builder'
     - 'lib/blacklight/solr/response/facets.rb'
-    - 'lib/blacklight/solr/search_builder_behavior.rb'
 
 # Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
@@ -467,15 +466,7 @@ Style/MultipleComparison:
   Exclude:
     - 'lib/blacklight/configuration/context.rb'
 
-# Offense count: 2
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: literals, strict
-Style/MutableConstant:
-  Exclude:
-    - 'lib/blacklight/solr/request.rb'
-
-# Offense count: 9
+# Offense count: 8
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyle, AllowedMethods, AllowedPatterns.
 # SupportedStyles: predicate, comparison
@@ -507,13 +498,12 @@ Style/ParenthesesAroundCondition:
   Exclude:
     - 'app/views/catalog/_document.atom.builder'
 
-# Offense count: 3
+# Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: PreferredDelimiters.
 Style/PercentLiteralDelimiters:
   Exclude:
     - 'lib/blacklight/engine.rb'
-    - 'lib/blacklight/solr/request.rb'
 
 # Offense count: 2
 # This cop supports safe autocorrection (--autocorrect).
@@ -532,20 +522,6 @@ Style/RescueStandardError:
     - 'lib/blacklight/configuration/fields.rb'
     - 'lib/railties/blacklight.rake'
 
-# Offense count: 11
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: ConvertCodeThatCanStartToReturnNil, AllowedMethods, MaxChainLength.
-# AllowedMethods: present?, blank?, presence, try, try!
-Style/SafeNavigation:
-  Exclude:
-    - 'app/controllers/concerns/blacklight/bookmarks.rb'
-    - 'app/controllers/concerns/blacklight/controller.rb'
-    - 'app/services/blacklight/field_retriever.rb'
-    - 'lib/blacklight.rb'
-    - 'lib/blacklight/configuration/facet_field.rb'
-    - 'lib/blacklight/configuration/search_field.rb'
-    - 'lib/blacklight/solr/search_builder_behavior.rb'
-
 # Offense count: 6
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowAsExpressionSeparator.
@@ -561,7 +537,7 @@ Style/SoleNestedConditional:
   Exclude:
     - 'app/controllers/concerns/blacklight/controller.rb'
 
-# Offense count: 32
+# Offense count: 31
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: MinSize.
 # SupportedStyles: percent, brackets

data/.solr_wrapper.yml

@@ -1,5 +1,7 @@
 # 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

data/VERSION

@@ -1 +1 @@
-9.0.0.beta1
+9.0.0.beta2