Lint: Fix harder offenses

These changes were all done with `standardrb --fix-unsafely`.

Author: bquorning

.standard_todo.yml

@@ -7,32 +7,20 @@ ignore:
 - lib/zendesk_api/association.rb:
   - Lint/AssignmentInCondition
   - Lint/ShadowedArgument
-  - Style/SafeNavigation
 - lib/zendesk_api/associations.rb:
   - Lint/AssignmentInCondition
-  - Performance/RedundantMerge
 - lib/zendesk_api/client.rb:
   - Style/MissingRespondToMissing
   - Lint/AssignmentInCondition
-- lib/zendesk_api/collection.rb:
-  - Performance/RedundantMerge
-  - Style/SafeNavigation
-- lib/zendesk_api/middleware/request/retry.rb:
-  - Style/SafeNavigation
 - lib/zendesk_api/resource.rb:
   - Style/TrivialAccessors
   - Lint/DuplicateMethods
 - lib/zendesk_api/resources.rb:
   - Lint/AssignmentInCondition
 - spec/core/collection_spec.rb:
   - Lint/ConstantDefinitionInBlock
-  - Lint/InheritException
 - spec/core/resource_spec.rb:
   - Lint/ConstantDefinitionInBlock
 - spec/core/spec_helper.rb:
   - Style/GlobalVars
   - Style/MixinUsage
-- spec/live/target_spec.rb:
-  - Lint/BooleanSymbol
-- spec/macros/resource_macros.rb:
-  - Performance/RedundantMerge

lib/zendesk_api/association.rb

@@ -178,7 +178,7 @@ def extract_parent_id(parent_class, instance, options, original_options)
 
     def extract_id(instance, options, original_options)
       if options[:with_id] && !@options[:class].ancestors.include?(SingularResource)
-        if instance && instance.id
+        if instance&.id
           instance.id
         elsif options[:id]
           original_options.delete(:id) || original_options.delete("id")

lib/zendesk_api/associations.rb

@@ -81,7 +81,8 @@ def has(resource_name_or_class, class_level_options = {})
           end
 
           class_level_association = build_association(klass, resource_name, class_level_options)
-          class_level_association.merge!(singular: true, id_column: "#{resource_name}_id")
+          class_level_association[:singular] = true
+          class_level_association[:id_column] = "#{resource_name}_id"
 
           associations << class_level_association
 
@@ -140,7 +141,8 @@ def has_many(resource_name_or_class, class_level_options = {})
           end
 
           class_level_association = build_association(klass, resource_name, class_level_options)
-          class_level_association.merge!(singular: false, id_column: "#{resource_name}_ids")
+          class_level_association[:singular] = false
+          class_level_association[:id_column] = "#{resource_name}_ids"
 
           associations << class_level_association
 

lib/zendesk_api/collection.rb

@@ -61,7 +61,7 @@ def initialize(client, resource, options = {})
         end
 
         args << {} unless args.last.is_a?(Hash)
-        args.last.merge!(association: @association)
+        args.last[:association] = @association
 
         @resource_class.send(deferrable, @client, *args)
       end
@@ -161,7 +161,7 @@ def path
     def fetch!(reload = false)
       if @resources && (!@fetchable || !reload)
         return @resources
-      elsif association && association.options.parent && association.options.parent.new_record?
+      elsif association&.options&.parent&.new_record?
         return (@resources = [])
       end
 
@@ -389,7 +389,7 @@ def get_response(path)
       @client.connection.send(@verb || "get", path) do |req|
         opts = @options.delete_if { |_, v| v.nil? }
 
-        req.params.merge!(include: @includes.join(",")) if @includes.any?
+        req.params[:include] = @includes.join(",") if @includes.any?
 
         if %w[put post].include?(@verb.to_s)
           req.body = opts
@@ -444,7 +444,7 @@ def wrap_resource(res, with_association = with_association?)
         @resource_class.new(@client, res)
       else
         res = {id: res}
-        res.merge!(association: @association) if with_association
+        res[:association] = @association if with_association
         @resource_class.new(@client, res)
       end
     end
@@ -464,7 +464,8 @@ def array_method(name, ...)
     # If you call client.tickets.foo - and foo is not an attribute nor an association, it ends up here, as a new collection
     def next_collection(name, *args, &)
       opts = args.last.is_a?(Hash) ? args.last : {}
-      opts.merge!(collection_path: [*@collection_path, name], page: nil)
+      opts[:collection_path] = [*@collection_path, name]
+      opts[:page] = nil
       # Why `page: nil`?
       # when you do client.tickets.fetch followed by client.tickets.foos => the request to /tickets/foos will
       # have the options page set to whatever the last options were for the tickets collection

lib/zendesk_api/middleware/request/retry.rb

@@ -34,20 +34,20 @@ def call(env)
 
             if exception_happened
               seconds_left = DEFAULT_RETRY_AFTER.to_i
-              @logger.warn "An exception happened, waiting #{seconds_left} seconds... #{e}" if @logger
+              @logger&.warn "An exception happened, waiting #{seconds_left} seconds... #{e}"
             else
               seconds_left = (response.env[:response_headers][:retry_after] || DEFAULT_RETRY_AFTER).to_i
             end
 
-            @logger.warn "You have been rate limited. Retrying in #{seconds_left} seconds..." if @logger
+            @logger&.warn "You have been rate limited. Retrying in #{seconds_left} seconds..."
 
             seconds_left.times do |i|
               sleep 1
               time_left = seconds_left - i
-              @logger.warn "#{time_left}..." if time_left > 0 && time_left % 5 == 0 && @logger
+              @logger&.warn "#{time_left}..." if time_left > 0 && time_left % 5 == 0
             end
 
-            @logger.warn "" if @logger
+            @logger&.warn ""
 
             @app.call(original_env)
           else

spec/core/collection_spec.rb

@@ -274,7 +274,7 @@
       end
 
       it "should retry from the same page" do
-        class SearchError < Exception; end
+        class SearchError < RuntimeError; end
 
         expect do |b|
           client.insert_callback do |env|

spec/live/target_spec.rb

@@ -10,7 +10,7 @@ def valid_attributes
     }
   end
 
-  it_should_be_readable :targets, create: :true
+  it_should_be_readable :targets, create: true
   it_should_be_creatable
   it_should_be_updatable :active, false
   it_should_be_deletable

spec/macros/resource_macros.rb

@@ -32,7 +32,7 @@ def it_should_be_creatable(options = {})
 
       it "should be findable", unless: metadata[:not_findable] do
         options = default_options
-        options.merge!(id: @creatable_object.id) unless described_class.ancestors.include?(ZendeskAPI::SingularResource)
+        options[:id] = @creatable_object.id unless described_class.ancestors.include?(ZendeskAPI::SingularResource)
         expect(described_class.find(client, options)).to eq(@creatable_object)
       end
 
@@ -76,7 +76,7 @@ def it_should_be_updatable(attribute, value = "TESTDATA", extra = {})
 
         it "should be findable", unless: metadata[:not_findable] do
           options = default_options
-          options.merge!(id: @updatable_object.id) unless described_class.ancestors.include?(ZendeskAPI::SingularResource)
+          options[:id] = @updatable_object.id unless described_class.ancestors.include?(ZendeskAPI::SingularResource)
           expect(described_class.find(client, options)).to eq(@updatable_object)
         end
       end
@@ -108,7 +108,7 @@ def it_should_be_deletable(options = {})
         expect(@deletable_object.destroyed?).to be(true)
         if (!options.key?(:find) || options[:find]) && !example.metadata[:not_findable]
           opts = default_options
-          opts.merge!(id: @deletable_object.id) unless described_class.ancestors.include?(ZendeskAPI::SingularResource)
+          opts[:id] = @deletable_object.id unless described_class.ancestors.include?(ZendeskAPI::SingularResource)
           obj = described_class.find(client, opts)
 
           if options[:find]
@@ -169,7 +169,7 @@ def it_should_be_readable(*args)
 
         if described_class.respond_to?(:find) && !example.metadata[:not_findable]
           options = default_options
-          options.merge!(id: object.id) unless described_class.ancestors.include?(ZendeskAPI::SingularResource)
+          options[:id] = object.id unless described_class.ancestors.include?(ZendeskAPI::SingularResource)
           expect(described_class.find(client, options)).to_not be_nil
         end
       end