Merge branch 'main' into dependabot/bundler/public_suffix-gte-4-and-lt-6

.github/workflows/ci.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:

.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2020-11-30 03:53:13 UTC using RuboCop version 1.3.0.
+# on 2022-08-09 15:39:12 UTC using RuboCop version 1.34.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
@@ -13,19 +13,26 @@ Gemspec/RequiredRubyVersion:
   Exclude:
     - 'site-inspector.gemspec'
 
+# Offense count: 1
+# Configuration parameters: AllowedMethods, AllowedPatterns, IgnoredMethods.
+Lint/AmbiguousBlockAssociation:
+  Exclude:
+    - 'script/benchmark'
+
 # Offense count: 3
 # Configuration parameters: AllowComments, AllowEmptyLambdas.
 Lint/EmptyBlock:
   Exclude:
     - 'spec/site_inspector/domain_spec.rb'
 
-# Offense count: 1
+# Offense count: 2
 Lint/NoReturnInBeginEndBlocks:
   Exclude:
     - 'lib/site-inspector/endpoint.rb'
+    - 'lib/site-inspector/endpoint/content.rb'
 
 # Offense count: 2
-# Configuration parameters: IgnoredMethods.
+# Configuration parameters: AllowedMethods, AllowedPatterns, IgnoredMethods.
 Metrics/PerceivedComplexity:
   Max: 9
 
@@ -34,22 +41,15 @@ Metrics/PerceivedComplexity:
 # SupportedStylesForLeadingUnderscores: disallowed, required, optional
 Naming/MemoizedInstanceVariableName:
   Exclude:
-    - 'lib/site-inspector/checks/accessibility.rb'
-    - 'lib/site-inspector/checks/wappalyzer.rb'
+    - 'lib/site-inspector/endpoint/accessibility.rb'
+    - 'lib/site-inspector/endpoint/wappalyzer.rb'
 
 # Offense count: 1
 # Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames.
 # AllowedNames: at, by, db, id, in, io, ip, of, on, os, pp, to
 Naming/MethodParameterName:
   Exclude:
-    - 'lib/site-inspector/checks/well_known.rb'
-
-# Offense count: 2
-# Cop supports --auto-correct.
-Performance/InefficientHashSearch:
-  Exclude:
-    - 'lib/site-inspector/checks/content.rb'
-    - 'lib/site-inspector/checks/well_known.rb'
+    - 'lib/site-inspector/endpoint/well_known.rb'
 
 # Offense count: 23
 # Configuration parameters: Prefixes.
@@ -65,28 +65,19 @@ RSpec/ContextWording:
 # Offense count: 2
 RSpec/EmptyExampleGroup:
   Exclude:
-    - 'spec/site_inspector/endpoint/accessibility_spec.rb'
+    - 'spec/site_inspector/endpoint/wappalyzer_spec.rb'
     - 'spec/site_inspector/endpoint/well_known_spec.rb'
 
-# Offense count: 24
-# Configuration parameters: Max.
+# Offense count: 23
+# Configuration parameters: CountAsOne.
 RSpec/ExampleLength:
-  Exclude:
-    - 'spec/site_inspector/disk_cache_spec.rb'
-    - 'spec/site_inspector/domain_spec.rb'
-    - 'spec/site_inspector/endpoint/dns_spec.rb'
-    - 'spec/site_inspector/endpoint/hsts_spec.rb'
-    - 'spec/site_inspector/endpoint/https_spec.rb'
-    - 'spec/site_inspector/endpoint/sniffer_spec.rb'
-    - 'spec/site_inspector/endpoint/wappalyzer_spec.rb'
-    - 'spec/site_inspector/endpoint_spec.rb'
-    - 'spec/site_inspector_spec.rb'
+  Max: 20
 
 # Offense count: 54
 RSpec/MultipleExpectations:
   Max: 5
 
-# Offense count: 237
+# Offense count: 235
 # Configuration parameters: IgnoreSharedExamples.
 RSpec/NamedSubject:
   Exclude:
@@ -102,7 +93,6 @@ RSpec/NamedSubject:
     - 'spec/site_inspector/endpoint/hsts_spec.rb'
     - 'spec/site_inspector/endpoint/https_spec.rb'
     - 'spec/site_inspector/endpoint/sniffer_spec.rb'
-    - 'spec/site_inspector/endpoint/wappalyzer_spec.rb'
     - 'spec/site_inspector/endpoint/whois_spec.rb'
     - 'spec/site_inspector/endpoint_spec.rb'
 
@@ -123,6 +113,11 @@ RSpec/RepeatedExampleGroupDescription:
   Exclude:
     - 'spec/site_inspector/domain_spec.rb'
 
+# Offense count: 2
+RSpec/ScatteredSetup:
+  Exclude:
+    - 'spec/site_inspector/endpoint/accessibility_spec.rb'
+
 # Offense count: 30
 RSpec/SubjectStub:
   Exclude:
@@ -132,9 +127,3 @@ RSpec/SubjectStub:
     - 'spec/site_inspector/endpoint/hsts_spec.rb'
     - 'spec/site_inspector/endpoint/https_spec.rb'
     - 'spec/site_inspector/endpoint_spec.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/HashEachMethods:
-  Exclude:
-    - 'lib/site-inspector/checks/well_known.rb'