Upgrade Rubocop to 1.45.

.github/workflows/test.yml

@@ -11,7 +11,7 @@ jobs:
           - { ruby: '2.7', faraday: '0.9.0' }
           - { ruby: '2.7', faraday: '0.17.0' }
           - { ruby: '2.7', faraday: '~> 1.0' }
-          - { ruby: 'jruby-9.2.21.0' }
+          - { ruby: 'jruby-9.3' }
           - { ruby: 'ruby-head', allowed-failure: true }
           - { ruby: 'jruby-head', allowed-failure: true }
     name: test (${{ matrix.entry.ruby }}, ${{ matrix.entry.faraday || 'default' }})

.rubocop.yml

@@ -1,6 +1,11 @@
 inherit_from: .rubocop_todo.yml
 
+require:
+  - rubocop-rake
+  - rubocop-minitest
+
 AllCops:
+  NewCops: enable
   TargetRubyVersion: 2.3
 
 Metrics:

.rubocop_todo.yml

@@ -1,21 +1,51 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2020-12-03 14:08:14 -0500 using RuboCop version 0.81.0.
+# on 2023-02-16 15:23:43 UTC using RuboCop version 1.45.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
 # versions of RuboCop, may require this file to be generated again.
 
+# Offense count: 1
+# Configuration parameters: Severity, Include.
+# Include: **/*.gemspec
+Gemspec/RequiredRubyVersion:
+  Exclude:
+    - 'hyperclient.gemspec'
+
+# Offense count: 1
+# Configuration parameters: AllowComments, AllowEmptyLambdas.
+Lint/EmptyBlock:
+  Exclude:
+    - 'test/hyperclient/entry_point_test.rb'
+
+# Offense count: 4
+Lint/MissingSuper:
+  Exclude:
+    - 'lib/hyperclient/attributes.rb'
+    - 'lib/hyperclient/entry_point.rb'
+    - 'lib/hyperclient/link_collection.rb'
+    - 'lib/hyperclient/resource_collection.rb'
+
+# Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: AllowedMethods.
+# AllowedMethods: instance_of?, kind_of?, is_a?, eql?, respond_to?, equal?
+Lint/RedundantSafeNavigation:
+  Exclude:
+    - 'lib/hyperclient/link.rb'
+
 # Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: AutoCorrect, EnforcedStyle.
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: EnforcedStyle.
 # SupportedStyles: nested, compact
 Style/ClassAndModuleChildren:
   Exclude:
     - 'features/steps/api_navigation.rb'
     - 'features/steps/default_config.rb'
 
 # Offense count: 4
+# Configuration parameters: AllowedConstants.
 Style/Documentation:
   Exclude:
     - 'spec/**/*'
@@ -24,29 +54,3 @@ Style/Documentation:
     - 'features/steps/default_config.rb'
     - 'features/support/api.rb'
     - 'features/support/fixtures.rb'
-
-# Offense count: 2
-Style/DoubleNegation:
-  Exclude:
-    - 'lib/hyperclient/curie.rb'
-    - 'lib/hyperclient/link.rb'
-
-# Offense count: 3
-# Cop supports --auto-correct.
-Style/IfUnlessModifier:
-  Exclude:
-    - 'lib/hyperclient/link_collection.rb'
-    - 'lib/hyperclient/resource.rb'
-    - 'lib/hyperclient/resource_collection.rb'
-
-# Offense count: 1
-Style/MethodMissingSuper:
-  Exclude:
-    - 'lib/hyperclient/collection.rb'
-
-# Offense count: 101
-# Cop supports --auto-correct.
-# Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
-# URISchemes: http, https
-Layout/LineLength:
-  Max: 147

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 * [#268](https://github.com/codegram/hyperclient/pull/268): Replace Travis-CI with GHA - [@dblock](https://github.com/dblock).
 * [#269](https://github.com/codegram/hyperclient/pull/269): Re-add code coverage - [@dblock](https://github.com/dblock).
+* [#270](https://github.com/codegram/hyperclient/pull/270): Upgrade Rubocop to 1.45 - [@dblock](https://github.com/dblock).
 * Your contribution here.
 
 ### 1.0.1 (2021/01/02)

Gemfile

@@ -15,7 +15,9 @@ end
 
 group :development, :test do
   gem 'rake'
-  gem 'rubocop', '0.81.0', require: false
+  gem 'rubocop', '~> 1.45.1', require: false
+  gem 'rubocop-minitest', require: false
+  gem 'rubocop-rake', require: false
   gem 'simplecov', require: false
   gem 'simplecov-lcov', require: false
 end

features/support/api.rb

@@ -7,17 +7,28 @@ module API
   before do
     WebMock::Config.instance.query_values_notation = :flat_array
 
-    stub_request(:any, /api.example.org*/).to_return(body: root_response, headers: { 'Content-Type' => 'application/hal+json' })
-    stub_request(:get, 'api.example.org').to_return(body: root_response, headers: { 'Content-Type' => 'application/hal+json' })
-    stub_request(:get, 'api.example.org/authors').to_return(body: authors_response, headers: { 'Content-Type' => 'application/hal+json' })
-    stub_request(:get, 'api.example.org/posts').to_return(body: posts_response, headers: { 'Content-Type' => 'application/hal+json' })
-    stub_request(:get, 'api.example.org/posts?page=2').to_return(body: posts_page2_response, headers: { 'Content-Type' => 'application/hal+json' })
-    stub_request(:get, 'api.example.org/posts?page=3').to_return(body: posts_page3_response, headers: { 'Content-Type' => 'application/hal+json' })
-    stub_request(:get, 'api.example.org/posts/1').to_return(body: post1_response, headers: { 'Content-Type' => 'application/hal+json' })
-    stub_request(:get, 'api.example.org/posts/2').to_return(body: post2_response, headers: { 'Content-Type' => 'application/hal+json' })
-    stub_request(:get, 'api.example.org/posts/3').to_return(body: post3_response, headers: { 'Content-Type' => 'application/hal+json' })
-    stub_request(:get, 'api.example.org/page2').to_return(body: page2_response, headers: { 'Content-Type' => 'application/hal+json' })
-    stub_request(:get, 'api.example.org/page3').to_return(body: page3_response, headers: { 'Content-Type' => 'application/hal+json' })
+    stub_request(:any, /api.example.org*/).to_return(body: root_response,
+                                                     headers: { 'Content-Type' => 'application/hal+json' })
+    stub_request(:get, 'api.example.org').to_return(body: root_response,
+                                                    headers: { 'Content-Type' => 'application/hal+json' })
+    stub_request(:get, 'api.example.org/authors').to_return(body: authors_response,
+                                                            headers: { 'Content-Type' => 'application/hal+json' })
+    stub_request(:get, 'api.example.org/posts').to_return(body: posts_response,
+                                                          headers: { 'Content-Type' => 'application/hal+json' })
+    stub_request(:get, 'api.example.org/posts?page=2').to_return(body: posts_page2_response,
+                                                                 headers: { 'Content-Type' => 'application/hal+json' })
+    stub_request(:get, 'api.example.org/posts?page=3').to_return(body: posts_page3_response,
+                                                                 headers: { 'Content-Type' => 'application/hal+json' })
+    stub_request(:get, 'api.example.org/posts/1').to_return(body: post1_response,
+                                                            headers: { 'Content-Type' => 'application/hal+json' })
+    stub_request(:get, 'api.example.org/posts/2').to_return(body: post2_response,
+                                                            headers: { 'Content-Type' => 'application/hal+json' })
+    stub_request(:get, 'api.example.org/posts/3').to_return(body: post3_response,
+                                                            headers: { 'Content-Type' => 'application/hal+json' })
+    stub_request(:get, 'api.example.org/page2').to_return(body: page2_response,
+                                                          headers: { 'Content-Type' => 'application/hal+json' })
+    stub_request(:get, 'api.example.org/page3').to_return(body: page3_response,
+                                                          headers: { 'Content-Type' => 'application/hal+json' })
   end
 
   def api

hyperclient.gemspec

@@ -8,7 +8,6 @@ Gem::Specification.new do |gem|
   gem.homepage      = 'https://github.com/codegram/hyperclient/'
   gem.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   gem.files         = `git ls-files`.split("\n")
-  gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   gem.name          = 'hyperclient'
   gem.require_paths = ['lib']
   gem.version       = Hyperclient::VERSION
@@ -17,4 +16,5 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'faraday', '>= 0.9.0'
   gem.add_dependency 'faraday_hal_middleware'
   gem.add_dependency 'faraday_middleware'
+  gem.metadata['rubygems_mfa_required'] = 'true'
 end

lib/hyperclient/resource.rb

@@ -111,9 +111,7 @@ def method_missing(method, *args, &block)
       elsif !Array.method_defined?(method)
         %i[_attributes _embedded _links].each do |target|
           target = send(target)
-          if target.respond_to?(method.to_s)
-            return target.send(method, *args, &block)
-          end
+          return target.send(method, *args, &block) if target.respond_to?(method.to_s)
         end
         super
       end

lib/hyperclient/resource_collection.rb

@@ -23,9 +23,7 @@ def initialize(collection, entry_point)
     private
 
     def build_resource(representation)
-      if representation.is_a?(Array)
-        return representation.map(&method(:build_resource))
-      end
+      return representation.map(&method(:build_resource)) if representation.is_a?(Array)
 
       Resource.new(representation, @entry_point)
     end

test/hyperclient/resource_test.rb

@@ -60,7 +60,8 @@ module Hyperclient
 
     describe '_links' do
       it '_expand' do
-        resource = Resource.new({ '_links' => { 'orders' => { 'href' => '/orders/{id}', 'templated' => true } } }, entry_point)
+        resource = Resource.new({ '_links' => { 'orders' => { 'href' => '/orders/{id}', 'templated' => true } } },
+                                entry_point)
         _(resource._links.orders._expand(id: 1)._url).must_equal '/orders/1'
         _(resource.orders._expand(id: 1)._url).must_equal '/orders/1'
         _(resource.orders(id: 1)._url).must_equal '/orders/1'