Fix Rubocop issues

Author: fuzzyrichie

lib/ar_query_matchers.rb

@@ -329,25 +329,14 @@ def supports_block_expectations?
     module MatcherErrors
       def create_display_string(max_key_length, key, left, right, show_values)
         diff_array = right - left
-        if diff_array.empty?
-          diff_array = left - right
-        end
+        diff_array = left - right if diff_array.empty?
         "#{key.rjust(max_key_length, ' ')} – expected: #{left}, got: #{right} #{"(difference: #{diff_array})" if show_values}"
       end
 
-      # Show the difference between expected and actual values with one value
-      # per line. This is done by hand because as of this writing the author
-      # doesn't understand how RSpec does its nice hash diff printing.
-      def difference(keys, show_values: false)
+      def loop_through_keys(keys, transformed_expected, show_values)
         max_key_length = keys.reduce(0) { |max, key| [max, key.size].max }
-
-        _expected = expected
-        if show_values
-          _expected = expected.transform_values { |v| v.is_a?(Array) ? v : [v] }
-        end
-
         keys.map do |key|
-          left = _expected.fetch(key, show_values ? [] : 0)
+          left = transformed_expected.fetch(key, show_values ? [] : 0)
           left = [left] unless left.is_a?(Array) || show_values
 
           right = @query_stats.queries.fetch(key, {})
@@ -357,6 +346,18 @@ def difference(keys, show_values: false)
         end.compact
       end
 
+      # Show the difference between expected and actual values with one value
+      # per line. This is done by hand because as of this writing the author
+      # doesn't understand how RSpec does its nice hash diff printing.
+      def difference(keys, show_values: false)
+        transformed_expected = expected
+        if show_values
+          transformed_expected = expected.transform_values { |v| v.is_a?(Array) ? v : [v] }
+        end
+
+        loop_through_keys keys, transformed_expected, show_values
+      end
+
       def source_lines(keys)
         line_frequency = @query_stats.query_lines_by_frequency
         keys_with_source_lines = keys.select { |key| line_frequency[key].present? }
@@ -391,8 +392,8 @@ def reject_record(subset, current_expected, key, ignore_missing)
       def filter_model_names(subset, show_values, ignore_missing)
         all_model_names = expected.keys + @query_stats.queries.keys
         if show_values
-          _expected = expected.transform_values { |v| v.is_a?(Array) ? v : [v] }
-          all_model_names.reject { |key| reject_record(subset, _expected, key, ignore_missing) }.uniq
+          transformed_expected = expected.transform_values { |v| v.is_a?(Array) ? v : [v] }
+          all_model_names.reject { |key| reject_record(subset, transformed_expected, key, ignore_missing) }.uniq
         else
           all_model_names.reject { |key| expected[key] == @query_stats.queries[key][:count] }.uniq
         end

lib/ar_query_matchers/queries/query_counter.rb

@@ -87,7 +87,7 @@ def add_to_query(queries, payload, model_obj, finish, start)
         comment = payload[:sql].match(MARGINALIA_SQL_COMMENT_PATTERN)
         queries[model_name][:lines] << comment[:line] if comment
         queries[model_name][:count] += 1
-        queries[model_name][:values].append(model_obj&.model_value) if model_obj.respond_to?(:model_value) and !queries[model_name][:values].include?(model_obj&.model_value)
+        queries[model_name][:values].append(model_obj&.model_value) if model_obj.respond_to?(:model_value) && !queries[model_name][:values].include?(model_obj&.model_value)
         queries[model_name][:time] += (finish - start).round(6) # Round to microseconds
       end