blacklight 7.10.0 → 7.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b7f2fb6980380cf12a51209225c105a4553f662015935c12335f7f0092086d6
-  data.tar.gz: fa8de265b2adfc5ca3e1bc6c8f94e6ed7cdbbd3d465b70516924c30aaf6d3a4b
+  metadata.gz: c8fb80459866144384607d4a10514e767df6a91c2b4479056ff249e036872b92
+  data.tar.gz: f21dceeab6bc00811799379c7082af587a019101d570071baa98fa9f1aeb9886
 SHA512:
-  metadata.gz: 3b2a6adc3e2affcfb8e0a193493b37e5b1fac9ccf98c5145a985b4bd8166b1cf2e525d7f603eb1fbca7170ea6f1c32823e9acd6b0f55fa103fe637cba5628ccb
-  data.tar.gz: 126dff3afa6c1db27e4b707952b9ce82926ca66c5882164739e0a5ba63a95c1f8af9c069a151fd0f031705d8757dac57c9013b9c7c64dbd6d6a4ec05fbbff4ab
+  metadata.gz: 9613e0b9fbfbf15765fd21175c942f3f65c208cfdcaf8ded9158520a44ea507896e7419a53085071badf1e0452071b81d99cd2013cbdb727c85f944e87524fc1
+  data.tar.gz: 684cbee2ba2125ac367445bad68ac18d1d2d437c724ad0f0c6a3ac2648705a933e1edb6631193499b4836035e3c6da5b3528a988e555a34b3f1b529b90429e86

data/.github/workflows/ruby.yml

@@ -0,0 +1,89 @@
+# 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: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: 2.7
+    - name: Install dependencies
+      run: bundle install
+    - name: Run linter
+      run: bundle exec rake rubocop
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: [2.6, 2.7]
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+    - 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-action-cable --skip-coffee --skip-test'
+  test_rails5:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: [2.5, 2.6]
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+    - name: Install dependencies
+      run: bundle install
+      env:
+        RAILS_VERSION: 5.2.4.2
+    - name: Run tests
+      run: bundle exec rake ci
+      env:
+        RAILS_VERSION: 5.2.4.2
+        ENGINE_CART_RAILS_OPTIONS: '--skip-git --skip-listen --skip-spring --skip-keeps --skip-action-cable --skip-coffee --skip-test'
+  api_test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: [2.7]
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        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: '--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@v2
+    - name: Build docker image
+      run: docker-compose build app

data/.rubocop.yml

@@ -1,11 +1,14 @@
-require: rubocop-rspec
+require:
+  - rubocop-rspec
+  - rubocop-rails
+
 
 inherit_from:
   - .rubocop_todo.yml
 
 AllCops:
   DisplayCopNames: true
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.5
   Exclude:
   - "lib/generators/blacklight/templates/**/*"
   - "blacklight.gemspec"
@@ -26,6 +29,7 @@ Layout/IndentationConsistency:
 Metrics/BlockLength:
   Exclude:
     - "app/views/catalog/index.json.jbuilder"
+    - "app/views/catalog/_document.atom.builder"
     - "lib/railties/blacklight.rake"
     - "tasks/blacklight.rake"
     - "spec/**/*"
@@ -33,23 +37,35 @@ Metrics/BlockLength:
 Metrics/ClassLength:
   Exclude:
     - "lib/blacklight/configuration.rb"
+    - "lib/blacklight/search_builder.rb"
+    - "lib/blacklight/search_state.rb"
 
-Metrics/LineLength:
+Layout/LineLength:
   Max: 200
   Exclude:
     - 'spec/**/*'
 
+Metrics/ModuleLength:
+  Exclude:
+    - 'app/controllers/concerns/blacklight/catalog.rb'
+    - 'lib/blacklight/solr/search_builder_behavior.rb'
+
 Naming/HeredocDelimiterNaming:
   Enabled: false
 
+Naming/MethodParameterName:
+  AllowedNames:
+    - id
+    - q
+
 Naming/PredicateName:
-  NamePrefixBlacklist:
+  ForbiddenPrefixes:
     - is_
 
 Rails:
   Enabled: true
 
-Rails/OutputSafety:
+Rails/ApplicationMailer:
   Enabled: false
 
 # https://github.com/rubocop-hq/rubocop/issues/6439
@@ -62,3 +78,47 @@ Style/MissingRespondToMissing:
 
 Style/StringLiterals:
   Enabled: false
+
+Style/MethodDefParentheses:
+  Enabled: false
+
+Layout/EmptyLinesAroundAttributeAccessor:
+  Enabled: true
+
+Layout/SpaceAroundMethodCallOperator:
+  Enabled: true
+
+Lint/DeprecatedOpenSSLConstant:
+  Enabled: true
+
+Lint/MixedRegexpCaptureTypes:
+  Enabled: true
+
+Lint/RaiseException:
+  Enabled: true
+
+Lint/StructNewOverride:
+  Enabled: true
+
+Style/ExponentialNotation:
+  Enabled: true
+
+Style/HashEachMethods:
+  Enabled: true
+  Exclude:
+    - 'spec/services/blacklight/search_service_spec.rb'
+
+Style/HashTransformKeys:
+  Enabled: true
+
+Style/HashTransformValues:
+  Enabled: true
+
+Style/RedundantRegexpCharacterClass:
+  Enabled: true
+
+Style/RedundantRegexpEscape:
+  Enabled: true
+
+Style/SlicingWithRange:
+  Enabled: true

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2020-03-30 10:03:33 -0700 using RuboCop version 0.63.1.
+# on 2020-09-24 02:12:21 UTC using RuboCop version 0.91.1.
 # 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,13 +12,13 @@ Capybara/CurrentPathExpectation:
   Exclude:
     - 'spec/features/alternate_controller_spec.rb'
 
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, IndentationWidth.
-# SupportedStyles: with_first_parameter, with_fixed_indentation
-Layout/AlignParameters:
+# Offense count: 20
+Capybara/VisibilityMatcher:
   Exclude:
-    - 'app/views/catalog/_document.atom.builder'
+    - 'spec/features/facets_spec.rb'
+    - 'spec/features/search_filters_spec.rb'
+    - 'spec/helpers/blacklight/hash_as_hidden_fields_behavior_spec.rb'
+    - 'spec/helpers/blacklight_helper_spec.rb'
 
 # Offense count: 8
 # Cop supports --auto-correct.
@@ -36,14 +36,22 @@ Layout/ClosingParenthesisIndentation:
   Exclude:
     - 'app/views/catalog/index.atom.builder'
 
-# Offense count: 109
+# Offense count: 111
 # Cop supports --auto-correct.
 Layout/EmptyLineAfterMagicComment:
   Enabled: false
 
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: AllowAliasSyntax, AllowedMethods.
+# AllowedMethods: alias_method, public, protected, private
+Layout/EmptyLinesAroundAttributeAccessor:
+  Exclude:
+    - 'app/presenters/blacklight/field_presenter.rb'
+
 # Offense count: 7
 # Cop supports --auto-correct.
-# Configuration parameters: AllowForAlignment, ForceEqualSignAlignment.
+# Configuration parameters: AllowForAlignment, AllowBeforeTrailingComments, ForceEqualSignAlignment.
 Layout/ExtraSpacing:
   Exclude:
     - 'app/models/concerns/blacklight/document/dublin_core.rb'
@@ -55,12 +63,13 @@ Layout/ExtraSpacing:
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, IndentationWidth.
 # SupportedStyles: special_inside_parentheses, consistent, align_braces
-Layout/IndentHash:
+Layout/FirstHashElementIndentation:
   Exclude:
     - 'lib/blacklight/configuration.rb'
 
 # Offense count: 6
 # Cop supports --auto-correct.
+# Configuration parameters: AllowDoxygenCommentStyle, AllowGemfileRubyComment.
 Layout/LeadingCommentSpace:
   Exclude:
     - 'app/models/blacklight/facet_paginator.rb'
@@ -90,13 +99,12 @@ Layout/MultilineMethodCallIndentation:
   Exclude:
     - 'lib/blacklight/search_builder.rb'
 
-# Offense count: 11
+# Offense count: 9
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, IndentationWidth.
 # SupportedStyles: aligned, indented
 Layout/MultilineOperationIndentation:
   Exclude:
-    - 'app/helpers/blacklight/facets_helper_behavior.rb'
     - 'app/helpers/blacklight/search_history_constraints_helper_behavior.rb'
     - 'lib/blacklight/configuration/context.rb'
     - 'lib/blacklight/search_state.rb'
@@ -125,12 +133,20 @@ Layout/SpaceInsideParens:
     - 'app/views/catalog/_document.rss.builder'
     - 'app/views/catalog/index.atom.builder'
 
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: AllowInHeredoc.
+Layout/TrailingWhitespace:
+  Exclude:
+    - 'lib/blacklight/configuration.rb'
+
 # Offense count: 1
 Lint/AmbiguousBlockAssociation:
   Exclude:
     - 'lib/blacklight/solr/search_builder_behavior.rb'
 
 # Offense count: 8
+# Cop supports --auto-correct.
 Lint/AmbiguousOperator:
   Exclude:
     - 'spec/helpers/blacklight/facets_helper_behavior_spec.rb'
@@ -142,6 +158,7 @@ Lint/AmbiguousOperator:
     - 'spec/services/blacklight/search_service_spec.rb'
 
 # Offense count: 55
+# Cop supports --auto-correct.
 Lint/AmbiguousRegexpLiteral:
   Exclude:
     - 'spec/controllers/catalog_controller_spec.rb'
@@ -156,10 +173,10 @@ Lint/AmbiguousRegexpLiteral:
     - 'spec/views/catalog/index.html.erb_spec.rb'
     - 'spec/views/catalog/show.html.erb_spec.rb'
 
-# Offense count: 30
+# Offense count: 29
+# Cop supports --auto-correct.
 Lint/ParenthesesAsGroupedExpression:
   Exclude:
-    - 'spec/controllers/catalog_controller_spec.rb'
     - 'spec/features/did_you_mean_spec.rb'
     - 'spec/features/search_filters_spec.rb'
     - 'spec/features/search_pagination_spec.rb'
@@ -172,17 +189,13 @@ Lint/ShadowingOuterLocalVariable:
   Exclude:
     - 'spec/models/blacklight/configuration_spec.rb'
 
-# Offense count: 1
-Lint/UselessComparison:
-  Exclude:
-    - 'spec/models/blacklight/document/active_model_shim_spec.rb'
-
-# Offense count: 60
+# Offense count: 57
+# Configuration parameters: IgnoredMethods.
 Metrics/AbcSize:
-  Max: 49
+  Max: 59
 
 # Offense count: 2
-# Configuration parameters: CountComments, ExcludedMethods.
+# Configuration parameters: CountComments, CountAsOne, ExcludedMethods.
 # ExcludedMethods: refine
 Metrics/BlockLength:
   Max: 30
@@ -193,32 +206,34 @@ Metrics/BlockNesting:
   Max: 4
 
 # Offense count: 2
-# Configuration parameters: CountComments.
+# Configuration parameters: CountComments, CountAsOne.
 Metrics/ClassLength:
   Max: 169
 
-# Offense count: 19
+# Offense count: 26
+# Configuration parameters: IgnoredMethods.
 Metrics/CyclomaticComplexity:
-  Max: 11
+  Max: 14
 
-# Offense count: 56
-# Configuration parameters: CountComments, ExcludedMethods.
+# Offense count: 61
+# Configuration parameters: CountComments, CountAsOne, ExcludedMethods.
 Metrics/MethodLength:
   Max: 30
 
 # Offense count: 8
-# Configuration parameters: CountComments.
+# Configuration parameters: CountComments, CountAsOne.
 Metrics/ModuleLength:
-  Max: 212
+  Max: 213
 
-# Offense count: 5
+# Offense count: 3
 # Configuration parameters: CountKeywordArgs.
 Metrics/ParameterLists:
-  Max: 7
+  Max: 6
 
-# Offense count: 16
+# Offense count: 22
+# Configuration parameters: IgnoredMethods.
 Metrics/PerceivedComplexity:
-  Max: 13
+  Max: 16
 
 # Offense count: 4
 # Configuration parameters: EnforcedStyleForLeadingUnderscores.
@@ -230,12 +245,11 @@ Naming/MemoizedInstanceVariableName:
     - 'app/models/concerns/blacklight/document/semantic_fields.rb'
     - 'lib/blacklight/solr/response.rb'
 
-# Offense count: 14
+# Offense count: 13
 # Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames.
-# AllowedNames: io, id, to, by, on, in, at, ip, db
-Naming/UncommunicativeMethodParamName:
+# AllowedNames: at, by, db, id, in, io, ip, of, on, os, pp, to
+Naming/MethodParameterName:
   Exclude:
-    - 'app/models/blacklight/facet_paginator.rb'
     - 'app/models/concerns/blacklight/document.rb'
     - 'app/presenters/blacklight/rendering/link_to_facet.rb'
     - 'lib/blacklight/nested_open_struct_with_hash_access.rb'
@@ -253,19 +267,6 @@ Naming/VariableNumber:
     - 'spec/views/catalog/_index.html.erb_spec.rb'
     - 'spec/views/catalog/_show.html.erb_spec.rb'
 
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: AutoCorrect.
-Performance/TimesMap:
-  Exclude:
-    - 'spec/views/catalog/index.atom.builder_spec.rb'
-
-# Offense count: 2
-Performance/UnfreezeString:
-  Exclude:
-    - 'lib/generators/blacklight/install_generator.rb'
-    - 'spec/helpers/blacklight_helper_spec.rb'
-
 # Offense count: 9
 RSpec/BeforeAfterAll:
   Exclude:
@@ -281,23 +282,24 @@ RSpec/BeforeAfterAll:
     - 'spec/models/blacklight/document/sms_spec.rb'
     - 'spec/models/blacklight/solr/document_spec.rb'
 
-# Offense count: 77
+# Offense count: 81
 # Configuration parameters: Prefixes.
 # Prefixes: when, with, without
 RSpec/ContextWording:
   Enabled: false
 
-# Offense count: 56
+# Offense count: 42
 RSpec/DescribeClass:
   Enabled: false
 
-# Offense count: 1
+# Offense count: 2
 # Configuration parameters: CustomIncludeMethods.
 RSpec/EmptyExampleGroup:
   Exclude:
+    - 'spec/helpers/blacklight_helper_spec.rb'
     - 'spec/models/blacklight/solr/search_builder_spec.rb'
 
-# Offense count: 130
+# Offense count: 134
 # Configuration parameters: Max.
 RSpec/ExampleLength:
   Enabled: false
@@ -312,7 +314,7 @@ RSpec/ExpectInHook:
     - 'spec/helpers/catalog_helper_spec.rb'
 
 # Offense count: 5
-# Configuration parameters: CustomTransform, IgnoreMethods.
+# Configuration parameters: CustomTransform, IgnoreMethods, SpecSuffixOnly.
 RSpec/FilePath:
   Exclude:
     - 'spec/controllers/blacklight/catalog/component_configuration_spec.rb'
@@ -371,12 +373,16 @@ RSpec/MessageSpies:
     - 'spec/presenters/blacklight/field_presenter_spec.rb'
     - 'spec/presenters/thumbnail_presenter_spec.rb'
 
-# Offense count: 343
-# Configuration parameters: AggregateFailuresByDefault.
+# Offense count: 363
 RSpec/MultipleExpectations:
   Max: 16
 
-# Offense count: 341
+# Offense count: 160
+# Configuration parameters: AllowSubject.
+RSpec/MultipleMemoizedHelpers:
+  Max: 14
+
+# Offense count: 337
 # Configuration parameters: IgnoreSharedExamples.
 RSpec/NamedSubject:
   Enabled: false
@@ -385,7 +391,7 @@ RSpec/NamedSubject:
 RSpec/NestedGroups:
   Max: 5
 
-# Offense count: 8
+# Offense count: 11
 RSpec/RepeatedDescription:
   Exclude:
     - 'spec/features/search_results_spec.rb'
@@ -399,20 +405,29 @@ RSpec/RepeatedExample:
     - 'spec/models/blacklight/solr/document_spec.rb'
 
 # Offense count: 4
+RSpec/RepeatedExampleGroupDescription:
+  Exclude:
+    - 'spec/helpers/blacklight/facets_helper_behavior_spec.rb'
+    - 'spec/services/blacklight/search_service_spec.rb'
+
+# Offense count: 4
+# Cop supports --auto-correct.
 RSpec/ScatteredLet:
   Exclude:
     - 'spec/helpers/catalog_helper_spec.rb'
     - 'spec/models/blacklight/solr/search_builder_spec.rb'
     - 'spec/views/catalog/index.atom.builder_spec.rb'
 
-# Offense count: 10
+# Offense count: 13
 RSpec/SubjectStub:
   Exclude:
+    - 'spec/controllers/catalog_controller_spec.rb'
     - 'spec/lib/blacklight/search_state_spec.rb'
+    - 'spec/models/blacklight/document/cache_key_spec.rb'
     - 'spec/models/blacklight/search_builder_spec.rb'
     - 'spec/services/blacklight/search_service_spec.rb'
 
-# Offense count: 118
+# Offense count: 121
 # Configuration parameters: IgnoreNameless, IgnoreSymbolicNames.
 RSpec/VerifiedDoubles:
   Enabled: false
@@ -422,6 +437,13 @@ RSpec/VoidExpect:
   Exclude:
     - 'spec/lib/blacklight/configuration/facet_field_spec.rb'
 
+# Offense count: 8
+# Cop supports --auto-correct.
+Rails/ContentTag:
+  Exclude:
+    - 'app/components/blacklight/document_component.rb'
+    - 'app/components/blacklight/facet_item_pivot_component.rb'
+
 # Offense count: 4
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: strict, flexible
@@ -429,12 +451,25 @@ Rails/Date:
   Exclude:
     - 'spec/models/search_spec.rb'
 
-# Offense count: 1
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: strict, flexible
-Rails/TimeZone:
+# Offense count: 31
+# Configuration parameters: Include.
+# Include: app/helpers/**/*.rb
+Rails/HelperInstanceVariable:
   Exclude:
-    - 'spec/models/blacklight/solr/search_builder_spec.rb'
+    - 'app/helpers/blacklight/blacklight_helper_behavior.rb'
+    - 'app/helpers/blacklight/catalog_helper_behavior.rb'
+    - 'app/helpers/blacklight/component_helper_behavior.rb'
+    - 'app/helpers/blacklight/facets_helper_behavior.rb'
+    - 'app/helpers/blacklight/render_partials_helper_behavior.rb'
+
+# Offense count: 11
+Rails/OutputSafety:
+  Exclude:
+    - 'app/helpers/blacklight/catalog_helper_behavior.rb'
+    - 'app/helpers/blacklight/configuration_helper_behavior.rb'
+    - 'app/helpers/blacklight/icon_helper_behavior.rb'
+    - 'app/helpers/blacklight/url_helper_behavior.rb'
+    - 'app/presenters/blacklight/rendering/join.rb'
 
 # Offense count: 13
 Security/Eval:
@@ -456,8 +491,8 @@ Style/Alias:
 
 # Offense count: 3
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, ProceduralMethods, FunctionalMethods, IgnoredMethods.
-# SupportedStyles: line_count_based, semantic, braces_for_chaining
+# Configuration parameters: EnforcedStyle, ProceduralMethods, FunctionalMethods, IgnoredMethods, AllowBracesOnProceduralOneLiners, BracesRequiredMethods.
+# SupportedStyles: line_count_based, semantic, braces_for_chaining, always_braces
 # ProceduralMethods: benchmark, bm, bmbm, create, each_with_object, measure, new, realtime, tap, with_object
 # FunctionalMethods: let, let!, subject, watch
 # IgnoredMethods: lambda, proc, it
@@ -466,19 +501,9 @@ Style/BlockDelimiters:
     - 'app/views/catalog/index.rss.builder'
     - 'app/views/catalog/opensearch.xml.builder'
 
-# Offense count: 3
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: braces, no_braces, context_dependent
-Style/BracesAroundHashParameters:
-  Exclude:
-    - 'lib/blacklight/solr/repository.rb'
-    - 'lib/blacklight/solr/response/facets.rb'
-    - 'lib/generators/blacklight/test_support_generator.rb'
-
 # Offense count: 51
 # Cop supports --auto-correct.
-# Configuration parameters: AutoCorrect, EnforcedStyle.
+# Configuration parameters: EnforcedStyle.
 # SupportedStyles: nested, compact
 Style/ClassAndModuleChildren:
   Enabled: false
@@ -497,16 +522,11 @@ Style/ConditionalAssignment:
   Exclude:
     - 'lib/blacklight/solr/response/spelling.rb'
 
-# Offense count: 99
+# Offense count: 105
 Style/Documentation:
   Enabled: false
 
-# Offense count: 1
-Style/DoubleNegation:
-  Exclude:
-    - 'lib/blacklight/search_builder.rb'
-
-# Offense count: 9
+# Offense count: 10
 # Cop supports --auto-correct.
 Style/ExpandPathArguments:
   Exclude:
@@ -517,6 +537,7 @@ Style/ExpandPathArguments:
     - 'lib/generators/blacklight/install_generator.rb'
     - 'lib/generators/blacklight/models_generator.rb'
     - 'lib/generators/blacklight/search_builder_generator.rb'
+    - 'lib/generators/blacklight/solr_generator.rb'
     - 'lib/generators/blacklight/test_support_generator.rb'
     - 'lib/generators/blacklight/user_generator.rb'
 
@@ -542,13 +563,6 @@ Style/GuardClause:
 Style/IfUnlessModifier:
   Enabled: false
 
-# Offense count: 122
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: require_parentheses, require_no_parentheses, require_no_parentheses_except_multiline
-Style/MethodDefParentheses:
-  Enabled: false
-
 # Offense count: 5
 # Cop supports --auto-correct.
 Style/MultilineIfModifier:
@@ -564,13 +578,15 @@ Style/MultipleComparison:
 
 # Offense count: 2
 # Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: literals, strict
 Style/MutableConstant:
   Exclude:
     - 'lib/blacklight/solr/request.rb'
 
 # Offense count: 9
 # Cop supports --auto-correct.
-# Configuration parameters: AutoCorrect, EnforcedStyle, IgnoredMethods.
+# Configuration parameters: EnforcedStyle, IgnoredMethods.
 # SupportedStyles: predicate, comparison
 Style/NumericPredicate:
   Exclude:
@@ -590,12 +606,11 @@ Style/ParenthesesAroundCondition:
   Exclude:
     - 'app/views/catalog/_document.atom.builder'
 
-# Offense count: 5
+# Offense count: 3
 # Cop supports --auto-correct.
 # Configuration parameters: PreferredDelimiters.
 Style/PercentLiteralDelimiters:
   Exclude:
-    - 'lib/blacklight/configuration.rb'
     - 'lib/blacklight/engine.rb'
     - 'lib/blacklight/solr/request.rb'
 
@@ -612,8 +627,8 @@ Style/RescueStandardError:
 
 # Offense count: 12
 # Cop supports --auto-correct.
-# Configuration parameters: ConvertCodeThatCanStartToReturnNil, Whitelist.
-# Whitelist: present?, blank?, presence, try, try!
+# Configuration parameters: ConvertCodeThatCanStartToReturnNil, AllowedMethods.
+# AllowedMethods: present?, blank?, presence, try, try!
 Style/SafeNavigation:
   Exclude:
     - 'app/controllers/concerns/blacklight/bookmarks.rb'