Updated with cleaning of expectation counts that are zero (#24)

* Updated with cleaning of expectation counts that are zero

* Updated change log

* Incorporated commentary from PR review

* Updated with some fixes from build errors

* Updated with another fix from build errors

* Adjusted rubocop rules and regenerated todo YAML file

Author: glenoliff

.rubocop.yml

@@ -1,4 +1,19 @@
 inherit_from: .rubocop_todo.yml
 AllCops:
   Exclude:
-    - 'gemfiles/**/*'
+    - 'gemfiles/**/*'
+
+Metrics/AbcSize:
+  Enabled: false
+
+Metrics/BlockLength:
+  Enabled: false
+
+Lint/MixedRegexpCaptureTypes:
+  Enabled: false
+
+Gemspec/RequiredRubyVersion:
+  Enabled: false
+
+Lint/ConstantDefinitionInBlock:
+  Enabled: false

.rubocop_todo.yml

@@ -1,35 +1,25 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2019-07-27 09:03:07 -0700 using RuboCop version 0.73.0.
+# on 2020-11-23 21:52:22 UTC using RuboCop version 1.3.1.
 # 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
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 2
-Metrics/AbcSize:
-  Max: 20
-
-# Offense count: 3
-# Configuration parameters: CountComments, ExcludedMethods.
-# ExcludedMethods: refine
-Metrics/BlockLength:
-  Max: 121
-
 # Offense count: 1
-# Configuration parameters: CountComments, ExcludedMethods.
+# Configuration parameters: CountComments, CountAsOne, ExcludedMethods.
 Metrics/MethodLength:
   Max: 11
 
 # Offense count: 4
-# Configuration parameters: EnforcedStyle.
+# Configuration parameters: EnforcedStyle, CheckMethodNames, CheckSymbols, AllowedIdentifiers.
 # SupportedStyles: snake_case, normalcase, non_integer
 Naming/VariableNumber:
   Exclude:
     - 'spec/ar_query_matchers/queries/create_counter_spec.rb'
     - 'spec/ar_query_matchers/queries/update_counter_spec.rb'
 
-# Offense count: 8
+# Offense count: 9
 Style/Documentation:
   Exclude:
     - 'spec/**/*'
@@ -52,9 +42,9 @@ Style/IfUnlessModifier:
   Exclude:
     - 'spec/ar_query_matchers/mock_data_model.rb'
 
-# Offense count: 52
+# Offense count: 7
 # Cop supports --auto-correct.
 # Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
-Metrics/LineLength:
+Layout/LineLength:
   Max: 282

CHANGELOG.md

@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.5.1] - 2020-11-19
+### Changed
+- Removes zero count expectations from hash before comparing
+
 ## [0.5.0] - 2020-07-23
 ### Changed
 - Add time information to query counter
@@ -27,7 +31,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - First versions as a public ruby gem.
 
-[Unreleased]: https://github.com/gusto/ar-query-matchers/compare/v0.5.0...HEAD
+[Unreleased]: https://github.com/gusto/ar-query-matchers/compare/v0.5.1...HEAD
+[0.5.1]: https://github.com/gusto/ar-query-matchers/releases/tag/v0.5.1
 [0.5.0]: https://github.com/gusto/ar-query-matchers/releases/tag/v0.5.0
 [0.4.0]: https://github.com/gusto/ar-query-matchers/releases/tag/v0.4.0
 [0.3.0]: https://github.com/gusto/ar-query-matchers/releases/tag/v0.3.0

VERSION

@@ -1 +1 @@
-0.5.0
+0.5.1

lib/ar_query_matchers.rb

@@ -7,6 +7,12 @@
 
 module ArQueryMatchers
   module ArQueryMatchers
+    class Utility
+      def self.remove_superfluous_expectations(expected)
+        expected.select { |_, v| v.positive? }
+      end
+    end
+
     module CreateModels
       # The following will succeed:
       #    expect {
@@ -23,7 +29,7 @@ module CreateModels
 
         match do |block|
           @query_stats = Queries::CreateCounter.instrument(&block)
-          expected == @query_stats.query_counts
+          Utility.remove_superfluous_expectations(expected) == @query_stats.query_counts
         end
 
         def failure_text
@@ -83,7 +89,7 @@ module LoadModels
 
         match do |block|
           @query_stats = Queries::LoadCounter.instrument(&block)
-          expected == @query_stats.query_counts
+          Utility.remove_superfluous_expectations(expected) == @query_stats.query_counts
         end
 
         def failure_text
@@ -147,7 +153,7 @@ class UpdateModels
 
         match do |block|
           @query_stats = Queries::UpdateCounter.instrument(&block)
-          expected == @query_stats.query_counts
+          Utility.remove_superfluous_expectations(expected) == @query_stats.query_counts
         end
 
         def failure_text

lib/ar_query_matchers/queries/query_counter.rb

@@ -79,7 +79,7 @@ def to_proc(queries)
           return if payload[:cached]
 
           # Given a `sql.active_record` event, figure out which model is being
-          # accessed. Some of the simpler queries have a :ame key that makes this
+          # accessed. Some of the simpler queries have a :name key that makes this
           # really easy. Others require parsing the SQL by hand.
           model_name = @query_filter.filter_map(payload[:name] || '', payload[:sql] || '')&.model_name
 

spec/ar_query_matchers/query_matchers_spec.rb

@@ -90,6 +90,14 @@ def updates(amount)
       end.to only_update_models('MockUser' => 5)
     end
 
+    it 'succeeds after cleaning the 0 count expectation' do
+      expect do
+        updates(5)
+        loads(1)
+        creates(1)
+      end.to only_update_models({ 'MockPost' => 0, 'MockUser' => 5 })
+    end
+
     it 'fails' do
       expect do
         expect do
@@ -111,6 +119,14 @@ def updates(amount)
       end.to only_create_models('MockUser' => 5)
     end
 
+    it 'succeeds after cleaning the 0 count expectation' do
+      expect do
+        updates(1)
+        loads(1)
+        creates(5)
+      end.to only_create_models({ 'MockPost' => 0, 'MockUser' => 5 })
+    end
+
     it 'fails' do
       expect do
         expect do
@@ -129,7 +145,15 @@ def updates(amount)
         updates(1)
         loads(5)
         creates(1)
-      end.to only_load_models('MockUser' => 5)
+      end.to only_load_models({ 'MockUser' => 5 })
+    end
+
+    it 'succeeds after cleaning the 0 count expectation' do
+      expect do
+        updates(1)
+        loads(5)
+        creates(1)
+      end.to only_load_models({ 'MockPost' => 0, 'MockUser' => 5 })
     end
 
     it 'fails' do