Fix offenses exposed by RuboCop 1.87 and keep ~> 1.80 version pin

Author: nnc

.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config --no-auto-gen-timestamp`
-# using RuboCop version 1.80.2.
+# using RuboCop version 1.87.0.
 # 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
@@ -161,7 +161,7 @@ Naming/MethodParameterName:
 # Offense count: 2
 # Configuration parameters: Mode, AllowedMethods, AllowedPatterns, AllowBangMethods, WaywardPredicates.
 # AllowedMethods: call
-# WaywardPredicates: nonzero?
+# WaywardPredicates: infinite?, nonzero?
 Naming/PredicateMethod:
   Exclude:
     - 'lib/xeroizer/models/invoice.rb'
@@ -345,7 +345,7 @@ Style/ZeroLengthPredicate:
 
 # Offense count: 23
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowHeredoc, AllowURI, AllowQualifiedName, URISchemes, IgnoreCopDirectives, AllowedPatterns, SplitStrings.
+# Configuration parameters: AllowHeredoc, AllowURI, AllowQualifiedName, URISchemes, AllowRBSInlineAnnotation, AllowCopDirectives, AllowedPatterns, SplitStrings.
 # URISchemes: http, https
 Layout/LineLength:
   Max: 380

lib/xeroizer/record/model_definition_helper.rb

@@ -62,11 +62,11 @@ def define_simple_attribute(field_name, field_type, options, value_if_nil = nil)
           self.fields ||= {}
 
           internal_field_name = options[:internal_name] || field_name
-          self.fields[field_name] = options.merge({
-                                                    internal_name: internal_field_name,
-                                                    api_name: options[:api_name] || field_name.to_s.camelize,
-                                                    type: field_type
-                                                  })
+          fields[field_name] = options.merge({
+                                               internal_name: internal_field_name,
+                                               api_name: options[:api_name] || field_name.to_s.camelize,
+                                               type: field_type
+                                             })
           define_method internal_field_name do
             @attributes[field_name].nil? ? value_if_nil : @attributes[field_name]
           end

lib/xeroizer/record/validation_helper.rb

@@ -19,7 +19,7 @@ def validates_with_validator(validator, args)
 
           self.validators ||= []
           args.flatten.each do |attribute|
-            self.validators << validator.new(attribute, options)
+            validators << validator.new(attribute, options)
           end
         end
 

test/integration/bank_transaction_reference_data.rb

@@ -16,11 +16,13 @@ def new_bank_transaction
       type: 'SPEND',
       contact: { name: 'Jazz Kang' },
       line_items: [
-        description: 'Bike shorts made of clear, unbreathable material',
-        quantity: 1,
-        unit_amount: 39.99,
-        account_code: account.code,
-        tax_type: account.tax_type
+        {
+          description: 'Bike shorts made of clear, unbreathable material',
+          quantity: 1,
+          unit_amount: 39.99,
+          account_code: account.code,
+          tax_type: account.tax_type
+        }
       ],
       bank_account: { account_id: bank_account.account_id },
       reference: 'BTF323'