Lint: Fix hardest offenses

These changes were all done manually.

Also, add .git-blame-ignore-revs to make `git blame` ignore purely style
changing commits.

Author: bquorning

.git-blame-ignore-revs

@@ -0,0 +1,26 @@
+# .git-blame-ignore-revs
+
+# What is this file?
+
+# To limit the impact of 'unimportant' bulk commits, like big a PR full of rubocop fixes, git 2.23 adds a new option to git blame.
+# Using --ignore-rev, or this file, one can specify a commit to be ignored by git blame.
+# Lines changed by the ignored commit will be attributed to the previous commit touching that line instead.
+# This means that even after our bulk style change, we can get back a meaningful context for the 'real' changes to our code.
+
+# How do I use it?
+
+# The file should contain the full (40 character) commit hashes.
+# Lines starting with a # are considered comments and can be used to explain what makes the given commit(s) unimportant.
+# Commit order in the file is not important.
+
+# Lint: Fix Style/StringLiterals etc. offenses
+afbf222941a6afbc9ac0a4db49534fa15436ae69
+
+# Lint: Fix layout offenses
+3db45d38aa28dbbd7830658254ec9c59c02a29e0
+
+# Lint: Fix simple offenses
+0221a908fec6d2a55ce645c5a17a074c93957be3
+
+# Move require of spec_helper into .rspec
+8f09a851fb6feae50769ffb5430b3f0ebe3053b4

.standard_todo.yml

@@ -2,25 +2,13 @@
 # Remove from this list as you refactor files.
 ---
 ignore:
-- lib/zendesk_api/actions.rb:
-  - Lint/AssignmentInCondition
-- lib/zendesk_api/association.rb:
-  - Lint/AssignmentInCondition
-  - Lint/ShadowedArgument
-- lib/zendesk_api/associations.rb:
-  - Lint/AssignmentInCondition
 - lib/zendesk_api/client.rb:
   - Style/MissingRespondToMissing
-  - Lint/AssignmentInCondition
 - lib/zendesk_api/resource.rb:
   - Style/TrivialAccessors
-  - Lint/DuplicateMethods
-- lib/zendesk_api/resources.rb:
-  - Lint/AssignmentInCondition
 - spec/core/collection_spec.rb:
   - Lint/ConstantDefinitionInBlock
 - spec/core/resource_spec.rb:
   - Lint/ConstantDefinitionInBlock
 - spec/core/spec_helper.rb:
   - Style/GlobalVars
-  - Style/MixinUsage

lib/zendesk_api/actions.rb

@@ -66,7 +66,7 @@ def save_associations
       self.class.associations.each do |association_data|
         association_name = association_data[:name]
 
-        next unless send("#{association_name}_used?") && association = send(association_name)
+        next unless send("#{association_name}_used?") && (association = send(association_name))
 
         inline_creation = association_data[:inline] == :create && new_record?
         changed = association.is_a?(Collection) || association.changed?

lib/zendesk_api/association.rb

@@ -66,7 +66,7 @@ def generate_path(*args)
         namespace[0] = @options.path || @options[:class].resource_path
       end
 
-      if id = extract_id(instance, options, original_options)
+      if (id = extract_id(instance, options, original_options))
         namespace << id
       end
 
@@ -106,7 +106,7 @@ def _side_load(resource, side_loads)
       end
     end
 
-    def side_load_from_parent_id(resource, side_loads, key)
+    def side_load_from_parent_id(resource, side_loads, _key)
       key = "#{resource.class.singular_resource_name}_id"
 
       resource.send("#{options.name}=", _side_load(resource, side_loads.select { |side_load|

lib/zendesk_api/associations.rb

@@ -73,7 +73,7 @@ module Has
         # @param [Symbol] resource_name_or_class The underlying resource name or a class to get it from
         # @param [Hash] class_level_options The options to pass to the method definition.
         def has(resource_name_or_class, class_level_options = {})
-          if klass = class_level_options.delete(:class)
+          if (klass = class_level_options.delete(:class))
             resource_name = resource_name_or_class
           else
             klass = resource_name_or_class
@@ -105,9 +105,9 @@ def define_has_getter(association)
 
             # find and cache association
             instance_association = Association.new(association.merge(parent: self))
-            resource = if klass.respond_to?(:find) && resource_id = method_missing(association[:id_column])
+            resource = if klass.respond_to?(:find) && (resource_id = method_missing(association[:id_column]))
               klass.find(@client, id: resource_id, association: instance_association)
-            elsif found = method_missing(association[:name].to_sym)
+            elsif (found = method_missing(association[:name].to_sym))
               wrap_resource(found, association, include_key: association[:include_key])
             elsif klass.superclass == DataResource && !association[:inline]
               response = @client.connection.get(instance_association.generate_path(with_parent: true))
@@ -133,7 +133,7 @@ module HasMany
         # @param [Symbol] resource_name_or_class The underlying resource name or class to get it from
         # @param [Hash] class_level_options The options to pass to the method definition.
         def has_many(resource_name_or_class, class_level_options = {})
-          if klass = class_level_options.delete(:class)
+          if (klass = class_level_options.delete(:class))
             resource_name = resource_name_or_class
           else
             klass = resource_name_or_class

lib/zendesk_api/client.rb

@@ -245,10 +245,10 @@ def set_default_logger
     end
 
     def add_warning_callback
-      return unless logger = config.logger
+      return unless (logger = config.logger)
 
       insert_callback do |env|
-        if warning = env[:response_headers]["X-Zendesk-API-Warn"]
+        if (warning = env[:response_headers]["X-Zendesk-API-Warn"])
           logger.warn "WARNING: #{warning}"
         end
       end

lib/zendesk_api/resource.rb

@@ -76,14 +76,6 @@ def initialize(client, attributes = {})
       @attributes.clear_changes unless new_record?
     end
 
-    def self.new_from_response(client, response, includes = nil)
-      new(client).tap do |resource|
-        resource.handle_response(response)
-        resource.set_includes(resource, includes, response.body) if includes
-        resource.attributes.clear_changes
-      end
-    end
-
     # Passes the method onto the attributes hash.
     # If the attributes are nested (e.g. { :tickets => { :id => 1 } }), passes the method onto the nested hash.
     def method_missing(*args, &)
@@ -127,7 +119,6 @@ def to_json(*args)
     def to_s
       "#{self.class.singular_resource_name}: #{attributes.inspect}"
     end
-    alias_method :inspect, :to_s
 
     # Compares resources by class and id. If id is nil, then by object_id
     def ==(other)

lib/zendesk_api/resources.rb

@@ -1036,7 +1036,7 @@ def initialize(client, attributes = {})
     end
 
     def self.create!(client, attributes = {}, &)
-      if file_path = attributes.delete(:upload)
+      if (file_path = attributes.delete(:upload))
         attributes[:upload_id] = client.apps.uploads.create!(file: file_path).id
       end
 

spec/core/middleware/request/retry_spec.rb

@@ -84,7 +84,7 @@ def runtime
       end
 
       it "should not fail without a logger" do
-        client.config.logger = false
+        client.config.logger = nil
         client.connection.get("blergh")
       end
     end
@@ -113,7 +113,7 @@ def runtime
       end
 
       it "should not fail without a logger" do
-        client.config.logger = false
+        client.config.logger = nil
         client.connection.get("blergh")
       end
     end

spec/core/spec_helper.rb

@@ -6,6 +6,7 @@
 require "vcr"
 require "logger"
 require "stringio"
+require "webmock/rspec"
 
 begin
   require "byebug"
@@ -165,5 +166,3 @@ def stub_json_request(verb, path_matcher, body = json, options = {})
   # In development, this helps debugging.
   c.allow_http_connections_when_no_cassette = true
 end
-
-include WebMock::API