blacklight 7.40.0 → 8.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e1a5889b0f9dee50b64165ffe292482619e54780bac24b14af00b3b1cba2fdd
-  data.tar.gz: 0ed718e93da4bca43bb242e5a97c6ced3546aa8ec9f17d18ce00a444dca95d93
+  metadata.gz: 765dc9ca02858805dc2cafc39f45090482e33301fec1c6ce6a7481a7bec5376d
+  data.tar.gz: de48bda0bbcfb1bb096d2f516480ef4bfb77fddbed03ab0ac4f1ab533f433400
 SHA512:
-  metadata.gz: ee5a1dc4ddb014510defa98a6c36a3d0e3ef9913c5cce5195878c688d062f7b95e3b30b376558adbc300ce4586f894e2e2af75dac933bc621c5401e2f7cf1eff
-  data.tar.gz: 0cd9ec1e44e68aeae47dbc86f95e18f1402831579b94d942c6ed4e9b264eab2b1f698bbe776616f962b4f6f28b4fe0fedb1e8e6d37aeb4b5be376425cd7d795d
+  metadata.gz: 29e910be60960a061594b0def8b675efe0c93de7f32ea7d92180eed6d7ec9abc5b003b265ed8ca46bd50950b2d584ee5e8bd49a9f09ca0fc82884e5c31744e78
+  data.tar.gz: 0a6805452778ce11213d7ac83238a19a596545a01d769b3f24ad59969f5f3e7fb6d0e9d8f8922792e34c062c3ccb73c04f149ff4e392f34d77ff2f6e6993e689

data/.env

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

data/.github/workflows/ruby.yml

@@ -18,142 +18,64 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 3.1
-        bundler: 'default'
+        ruby-version: 2.7
+        bundler: 'latest'
     - 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_vc2:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        ruby: ['3.2']
-    env:
-      RAILS_VERSION: 7.0.8
-      VIEW_COMPONENT_VERSION: "~> 2.74"
-    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
+    name: test (ruby ${{ matrix.ruby }} / rails ${{ matrix.rails_version }} ${{ matrix.additional_name }})
     strategy:
       matrix:
         ruby: [2.7, '3.0']
+        rails_version: ['6.1.7', '7.0.4']
+        bootstrap_version: [null]
+        api: [null]
+        additional_engine_cart_rails_options: ['']
+        additional_name: ['']
+        include:
+        - ruby: '3.2.0'
+          rails_version: '7.0.4'
+        - ruby: '3.1'
+          rails_version: '7.0.4'
+        - ruby: '3.1'
+          rails_version: '7.0.4'
+          additional_name: '/ Propshaft'
+          additional_engine_cart_rails_options: -a propshaft --css=bootstrap
+        - ruby: '3.0'
+          rails_version: '7.0.4'
+          bootstrap_version: '~> 4.0'
+          additional_name: '/ Bootstrap 4'
+        - ruby: '3.0'
+          rails_version: '7.0.4'
+          api: 'true'
+          additional_engine_cart_rails_options: --api --skip-yarn
+          additional_name: '/ API'
     env:
-      RAILS_VERSION: 7.0.8
+      RAILS_VERSION: ${{ matrix.rails_version }}
+      BOOTSTRAP_VERSION: ${{ matrix.bootstrap_version }}
+      BLACKLIGHT_API_TEST: ${{ matrix.api }}
+      ENGINE_CART_RAILS_OPTIONS: "--skip-git --skip-listen --skip-spring --skip-keeps --skip-action-cable --skip-coffee --skip-test ${{ matrix.additional_engine_cart_rails_options }}"
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        bundler: 'default'
+        bundler: 'latest'
         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
+    - uses: actions/checkout@v3
+    - name: Build docker image
+      run: docker-compose build app

data/.rubocop.yml

@@ -1,9 +1,6 @@
 require:
-  - rubocop-capybara
-  - rubocop-rails
   - rubocop-rspec
-  - rubocop-rspec_rails
-
+  - rubocop-rails
 
 inherit_from:
   - .rubocop_todo.yml
@@ -11,10 +8,17 @@ inherit_from:
 AllCops:
   DisplayCopNames: true
   TargetRubyVersion: 2.7
+  TargetRailsVersion: 6.1
   Exclude:
   - "lib/generators/blacklight/templates/**/*"
   - "blacklight.gemspec"
 
+
+Lint/UselessAssignment:
+  Exclude:
+    - app/presenters/blacklight/facet_item_pivot_presenter.rb # https://github.com/rubocop/rubocop/issues/11124
+
+
 # engine_cart block includes conditional, not duplication
 Bundler/DuplicatedGem:
   Exclude:
@@ -42,7 +46,6 @@ 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
@@ -53,6 +56,7 @@ Metrics/ModuleLength:
   Exclude:
     - 'app/controllers/concerns/blacklight/catalog.rb'
     - 'lib/blacklight/solr/search_builder_behavior.rb'
+    - 'lib/blacklight/solr/response/facets.rb'
 
 Metrics/AbcSize:
   Exclude:
@@ -79,15 +83,6 @@ Rails:
 Rails/ApplicationMailer:
   Enabled: false
 
-# Offense count: 1
-# Configuration parameters: IgnoredMetadata.
-RSpec/DescribeClass:
-  Exclude:
-    - 'spec/features/**/*'
-    - 'spec/lib/tasks/**/*'
-    - 'spec/routing/**/*'
-    - 'spec/views/**/*'
-
 # https://github.com/rubocop-hq/rubocop/issues/6439
 Style/AccessModifierDeclarations:
   Enabled: false
@@ -125,6 +120,8 @@ Style/ExponentialNotation:
 
 Style/HashEachMethods:
   Enabled: true
+  Exclude:
+    - 'spec/services/blacklight/search_service_spec.rb'
 
 Style/HashTransformKeys:
   Enabled: true
@@ -143,3 +140,235 @@ Style/SlicingWithRange:
 
 Rails/ContentTag:
   Enabled: false
+
+Gemspec/DeprecatedAttributeAssignment: # new in 1.10
+  Enabled: true
+Gemspec/RequireMFA: # new in 1.23
+  Enabled: true
+Layout/LineEndStringConcatenationIndentation: # new in 1.18
+  Enabled: true
+Layout/SpaceBeforeBrackets: # new in 1.7
+  Enabled: true
+Lint/AmbiguousAssignment: # new in 1.7
+  Enabled: true
+Lint/AmbiguousOperatorPrecedence: # new in 1.21
+  Enabled: true
+Lint/AmbiguousRange: # new in 1.19
+  Enabled: true
+Lint/DeprecatedConstants: # new in 1.8
+  Enabled: true
+Lint/DuplicateBranch: # new in 1.3
+  Enabled: true
+Lint/DuplicateRegexpCharacterClassElement: # new in 1.1
+  Enabled: true
+Lint/EmptyBlock: # new in 1.1
+  Enabled: true
+Lint/EmptyClass: # new in 1.3
+  Enabled: true
+Lint/EmptyInPattern: # new in 1.16
+  Enabled: true
+Lint/IncompatibleIoSelectWithFiberScheduler: # new in 1.21
+  Enabled: true
+Lint/LambdaWithoutLiteralBlock: # new in 1.8
+  Enabled: true
+Lint/NoReturnInBeginEndBlocks: # new in 1.2
+  Enabled: true
+Lint/NumberedParameterAssignment: # new in 1.9
+  Enabled: true
+Lint/OrAssignmentToConstant: # new in 1.9
+  Enabled: true
+Lint/RedundantDirGlobSort: # new in 1.8
+  Enabled: true
+Lint/RequireRelativeSelfPath: # new in 1.22
+  Enabled: true
+Lint/SymbolConversion: # new in 1.9
+  Enabled: true
+Lint/ToEnumArguments: # new in 1.1
+  Enabled: true
+Lint/TripleQuotes: # new in 1.9
+  Enabled: true
+Lint/UnexpectedBlockArity: # new in 1.5
+  Enabled: true
+Lint/UnmodifiedReduceAccumulator: # new in 1.1
+  Enabled: true
+Lint/UselessRuby2Keywords: # new in 1.23
+  Enabled: true
+Security/IoMethods: # new in 1.22
+  Enabled: true
+Style/ArgumentsForwarding: # new in 1.1
+  Enabled: true
+Style/CollectionCompact: # new in 1.2
+  Enabled: true
+Style/DocumentDynamicEvalDefinition: # new in 1.1
+  Enabled: true
+Style/EndlessMethod: # new in 1.8
+  Enabled: true
+Style/HashConversion: # new in 1.10
+  Enabled: true
+Style/HashExcept: # new in 1.7
+  Enabled: true
+Style/IfWithBooleanLiteralBranches: # new in 1.9
+  Enabled: true
+Style/InPatternThen: # new in 1.16
+  Enabled: true
+Style/MultilineInPatternThen: # new in 1.16
+  Enabled: true
+Style/NegatedIfElseCondition: # new in 1.2
+  Enabled: true
+Style/NilLambda: # new in 1.3
+  Enabled: true
+Style/NumberedParameters: # new in 1.22
+  Enabled: true
+Style/NumberedParametersLimit: # new in 1.22
+  Enabled: true
+Style/OpenStructUse: # new in 1.23
+  Enabled: true
+Style/QuotedSymbols: # new in 1.16
+  Enabled: true
+Style/RedundantArgument: # new in 1.4
+  Enabled: true
+Style/RedundantSelfAssignmentBranch: # new in 1.19
+  Enabled: true
+Style/SelectByRegexp: # new in 1.22
+  Enabled: true
+Style/StringChars: # new in 1.12
+  Enabled: true
+Style/SwapValues: # new in 1.1
+  Enabled: true
+RSpec/DescribeClass:
+  Exclude:
+    - 'spec/lib/tasks/blacklight_task_spec.rb'
+    - 'spec/features/**/*'
+    - 'spec/requests/**/*'
+    - 'spec/routing/**/*'
+    - 'spec/views/**/*'
+RSpec/ExcessiveDocstringSpacing: # new in 2.5
+  Enabled: true
+RSpec/IdenticalEqualityAssertion: # new in 2.4
+  Enabled: true
+RSpec/SubjectDeclaration: # new in 2.5
+  Enabled: true
+RSpec/Rails/AvoidSetupHook: # new in 2.4
+  Enabled: true
+Rails/ActiveRecordCallbacksOrder: # new in 2.7
+  Enabled: true
+Rails/AddColumnIndex: # new in 2.11
+  Enabled: true
+Rails/AfterCommitOverride: # new in 2.8
+  Enabled: true
+Rails/AttributeDefaultBlockValue: # new in 2.9
+  Enabled: true
+Rails/EagerEvaluationLogMessage: # new in 2.11
+  Enabled: true
+Rails/ExpandedDateRange: # new in 2.11
+  Enabled: true
+Rails/FindById: # new in 2.7
+  Enabled: true
+Rails/I18nLocaleAssignment: # new in 2.11
+  Enabled: true
+Rails/Inquiry: # new in 2.7
+  Enabled: true
+Rails/MailerName: # new in 2.7
+  Enabled: true
+Rails/MatchRoute: # new in 2.7
+  Enabled: true
+Rails/NegateInclude: # new in 2.7
+  Enabled: true
+Rails/Pluck: # new in 2.7
+  Enabled: true
+Rails/PluckInWhere: # new in 2.7
+  Enabled: true
+Rails/RedundantTravelBack: # new in 2.12
+  Enabled: true
+Rails/RenderInline: # new in 2.7
+  Enabled: true
+Rails/RenderPlainText: # new in 2.7
+  Enabled: true
+Rails/ShortI18n: # new in 2.7
+  Enabled: true
+Rails/SquishedSQLHeredocs: # new in 2.8
+  Enabled: true
+Rails/TimeZoneAssignment: # new in 2.10
+  Enabled: true
+Rails/UnusedIgnoredColumns: # new in 2.11
+  Enabled: true
+Rails/WhereEquals: # new in 2.9
+  Enabled: true
+Rails/WhereExists: # new in 2.7
+  Enabled: true
+Rails/WhereNot: # new in 2.8
+  Enabled: true
+Lint/RefinementImportMethods: # new in 1.27
+  Enabled: true
+Naming/BlockForwarding: # new in 1.24
+  Enabled: true
+Style/FileRead: # new in 1.24
+  Enabled: true
+Style/FileWrite: # new in 1.24
+  Enabled: true
+Style/MapToHash: # new in 1.24
+  Enabled: true
+Style/NestedFileDirname: # new in 1.26
+  Enabled: true
+Style/RedundantInitialize: # new in 1.27
+  Enabled: true
+RSpec/BeEq: # new in 2.9.0
+  Enabled: true
+RSpec/BeNil: # new in 2.9.0
+  Enabled: true
+RSpec/FactoryBot/SyntaxMethods: # new in 2.7
+  Enabled: true
+Rails/ActionControllerTestCase: # new in 2.14
+  Enabled: true
+Rails/CompactBlank: # new in 2.13
+  Enabled: true
+Rails/DeprecatedActiveModelErrorsMethods: # new in 2.14
+  Enabled: true
+Rails/DuplicateAssociation: # new in 2.14
+  Enabled: true
+Rails/DuplicateScope: # new in 2.14
+  Enabled: true
+Rails/DurationArithmetic: # new in 2.13
+  Enabled: true
+Rails/I18nLazyLookup: # new in 2.14
+  Enabled: true
+Rails/I18nLocaleTexts: # new in 2.14
+  Enabled: true
+Rails/MigrationClassName: # new in 2.14
+  Enabled: true
+Rails/RedundantPresenceValidationOnBelongsTo: # new in 2.13
+  Enabled: true
+Rails/RootJoinChain: # new in 2.13
+  Enabled: true
+Rails/TransactionExitStatement: # new in 2.14
+  Enabled: true
+Layout/LineContinuationLeadingSpace: # new in 1.31
+  Enabled: true
+Layout/LineContinuationSpacing: # new in 1.31
+  Enabled: true
+Lint/ConstantOverwrittenInRescue: # new in 1.31
+  Enabled: true
+Lint/NonAtomicFileOperation: # new in 1.31
+  Enabled: true
+Security/CompoundHash: # new in 1.28
+  Enabled: true
+Style/EnvHome: # new in 1.29
+  Enabled: true
+Style/FetchEnvVar: # new in 1.28
+  Enabled: true
+Style/MapCompactWithConditionalBlock: # new in 1.30
+  Enabled: true
+Style/ObjectThen: # new in 1.28
+  Enabled: true
+RSpec/ChangeByZero: # new in 2.11.0
+  Enabled: true
+RSpec/VerifiedDoubleReference: # new in 2.10.0
+  Enabled: true
+Rails/DotSeparatedKeys: # new in 2.15
+  Enabled: true
+Rails/RootPublicPath: # new in 2.15
+  Enabled: true
+Rails/StripHeredoc: # new in 2.15
+  Enabled: true
+Rails/ToFormattedS: # new in 2.15
+  Enabled: true