ar-query-matchers 0.5.0 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9417b8df83d90ae005521933b474f67d8ceda0b5fe6124d97d204f13090b1d81
-  data.tar.gz: 7b176c647a61a5a7bb7b12a14ef98857f2871abfdae2887e362d9bd13cf901e3
+  metadata.gz: f8890df1fae037a9adc6cfd2ee413c4c405a05fd31e680ed7ec69f26cccddfa9
+  data.tar.gz: ee84a0a237c35d6f315e868002382c600c06ecbcbc542ccd4f1c19e4d71730c6
 SHA512:
-  metadata.gz: 5ac839a12e7c6685d087e54b1a476b26f9688c8811373c7a7bfec26f03ba2b60eee59369b3072fefb542d2f35e3584b0d89f26cff6bae1b7e4c020270b84430d
-  data.tar.gz: 0ef9444001eac1f3a49324370d752ff1733af1ccf5d61f8dcf1cd4b5f08878aeb989b2785db9ca31bc31ccbc0e77ab842e51c8ce2e3287c7b1a07e15214f97cb
+  metadata.gz: 7bdf3296e2c16cc60425f3eede226c25ab210270203443d0eef62ab1f34a8c5640d9b34ebf5b6239f24f0e56064528fbfabbd7e344ae11f2d9c48c41c1d30bd7
+  data.tar.gz: a0464fd47a18b306958468e511e782f4e0c5aa5457da6d0120277da2a2b54d82218a9c668868dd875dfcdf4b4934752f9542f02d119f95ba26c500014bde7072

data/CHANGELOG.md

@@ -6,6 +6,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.5.3] - 2021-05-26
+### Changed
+- Re-release of previous version due to accidental premature release
+
+## [0.5.2] - 2021-05-26
+### Changed
+- Update MODEL_SQL_PATTERN to allow for more accurate matches against SQL strings
+
+## [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 +39,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

data/lib/ar_query_matchers.rb

@@ -7,6 +7,12 @@ require 'bigdecimal'
 
 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 ArQueryMatchers
 
         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 ArQueryMatchers
 
         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 @@ module ArQueryMatchers
 
         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

data/lib/ar_query_matchers/queries/load_counter.rb

@@ -21,7 +21,7 @@ module ArQueryMatchers
 
         # Matches unnamed SQL operations like the following:
         # "SELECT COUNT(*) FROM `users` ..."
-        MODEL_SQL_PATTERN = /SELECT .* FROM [`"](?<table_name>[^`"]+)[`"]/.freeze
+        MODEL_SQL_PATTERN = /SELECT (?:(?!SELECT).)* FROM [`"](?<table_name>[^`"]+)[`"]/.freeze
 
         def filter_map(name, sql)
           # First check for a `SELECT * FROM` query that ActiveRecord has

data/lib/ar_query_matchers/queries/query_counter.rb

@@ -79,7 +79,7 @@ module ArQueryMatchers
           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
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ar-query-matchers
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.3
 platform: ruby
 authors:
 - Matan Zruya
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-27 00:00:00.000000000 Z
+date: 2021-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -190,7 +190,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Ruby test matchers for instrumenting ActiveRecord query counts