Rubocop using 2.7

Author: ecoologic

.rubocop.yml

@@ -13,11 +13,11 @@ Layout/EndAlignment:
   EnforcedStyleAlignWith: variable
 
 # Align the elements of a hash literal if they span more than one line.
-Layout/AlignHash:
+Layout/HashAlignment:
   EnforcedLastArgumentHashStyle: ignore_implicit
 
 # Align the parameters of a method call if they span more than one line.
-Layout/AlignParameters:
+Layout/ParameterAlignment:
   EnforcedStyle: with_fixed_indentation
 
 # Checks the indentation of hanging closing parentheses.

.rubocop_todo.yml

@@ -28,10 +28,13 @@ Gemspec/OrderedDependencies:
 # SupportedHashRocketStyles: key, separator, table
 # SupportedColonStyles: key, separator, table
 # SupportedLastArgumentHashStyles: always_inspect, always_ignore, ignore_implicit, ignore_explicit
-Layout/AlignHash:
+Layout/HashAlignment:
   Exclude:
     - 'spec/live/user_view_spec.rb'
 
+Layout/LineLength:
+  Max: 160
+
 # Offense count: 17
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
@@ -106,7 +109,7 @@ Lint/DuplicateMethods:
     - 'lib/zendesk_api/resource.rb'
 
 # Offense count: 3
-Lint/HandleExceptions:
+Lint/SuppressedException:
   Exclude:
     - 'Rakefile'
     - 'spec/core/collection_spec.rb'
@@ -138,7 +141,7 @@ Lint/ShadowingOuterLocalVariable:
 
 # Offense count: 10
 # Cop supports --auto-correct.
-Lint/StringConversionInInterpolation:
+Lint/RedundantStringCoercion:
   Exclude:
     - 'lib/zendesk_api/middleware/response/logger.rb'
     - 'spec/live/macro_spec.rb'
@@ -192,26 +195,6 @@ Naming/PredicateName:
     - 'spec/**/*'
     - 'lib/zendesk_api/associations.rb'
 
-# Offense count: 1
-Performance/Caller:
-  Exclude:
-    - 'lib/zendesk_api/resource.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-Performance/RedundantBlockCall:
-  Exclude:
-    - 'lib/zendesk_api/collection.rb'
-
-# Offense count: 10
-# Cop supports --auto-correct.
-# Configuration parameters: MaxKeyValuePairs.
-Performance/RedundantMerge:
-  Exclude:
-    - 'lib/zendesk_api/associations.rb'
-    - 'lib/zendesk_api/collection.rb'
-    - 'spec/macros/resource_macros.rb'
-
 # Offense count: 1
 # Cop supports --auto-correct.
 Security/YAMLLoad:

Gemfile

@@ -8,7 +8,7 @@ gem "yard"
 gem "json", ">= 2.3.0", platforms: :ruby
 gem "scrub_rb"
 
-gem "rubocop", "~> 0.64.0", require: false
+gem "rubocop", "~> 0.79.0", require: false # Handling of Ruby 2.7 syntax
 
 group :test do
   gem "webmock"

lib/zendesk_api/client.rb

@@ -170,7 +170,12 @@ def build_connection
         builder.use ZendeskAPI::Middleware::Request::EncodeJson
 
         # Should always be first in the stack
-        builder.use ZendeskAPI::Middleware::Request::Retry, :logger => config.logger, :retry_codes => config.retry_codes, :retry_on_exception => config.retry_on_exception if config.retry
+        if config.retry
+          builder.use ZendeskAPI::Middleware::Request::Retry,
+                      :logger => config.logger,
+                      :retry_codes => config.retry_codes,
+                      :retry_on_exception => config.retry_on_exception
+        end
         if config.raise_error_when_rate_limited
           builder.use ZendeskAPI::Middleware::Request::RaiseRateLimited, :logger => config.logger
         end

spec/core/bulk_actions_spec.rb

@@ -33,7 +33,7 @@
 
     it 'calls the create_many endpoint' do
       assert_requested(:post, %r{bulk_test_resources/create_many},
-        :body => json(:bulk_test_resources => attributes)
+                       :body => json(:bulk_test_resources => attributes)
       )
     end
 
@@ -57,7 +57,7 @@
 
         it 'calls the update_many endpoint' do
           assert_requested(:put, %r{bulk_test_resources/update_many\?ids=1,2,3$},
-            :body => json(:bulk_test_resource => attributes)
+                           :body => json(:bulk_test_resource => attributes)
           )
         end
 
@@ -77,7 +77,7 @@
 
         it 'calls the update_many endpoint' do
           assert_requested(:put, %r{bulk_test_resources/update_many$},
-            :body => json(:bulk_test_resources => attributes)
+                           :body => json(:bulk_test_resources => attributes)
           )
         end
 
@@ -107,7 +107,7 @@
         subject
 
         assert_requested(:post, %r{bulk_test_resources/create_or_update_many$},
-          :body => json(:bulk_test_resources => attributes)
+                         :body => json(:bulk_test_resources => attributes)
         )
       end