prosopite 1.1.4 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df639c665fefc84471086093056a2588fa173b81c66ac43e332fba52ba536408
-  data.tar.gz: f2fee55c16bf971f4cbba8d6b522ed097f807590024d5ec386ab8fc8f5b7b984
+  metadata.gz: 708963d4cc79982fc4345088cf7a60449ee2964f0065cc2adadccd41c804dc54
+  data.tar.gz: 9f7e85e4a52286339b16399125be61d3c91815b01d036d7512b224eec1cd8c9d
 SHA512:
-  metadata.gz: d57e66ffe211db8c38a7188e23bc5d82aa1f30b78e0ae1564831a8fe51f85dd7f9a0a8f1c09d619d2c8754bd2dde93d6b9b1bdc95399aa215daee98a0be697f0
-  data.tar.gz: 4a621d14b33c5943038fcc401b2d8caaa49767ffa4b3c3de5df2316dc452ae80c106c4d1150718d5318a8ee9e866903fc4b7767a32f2d288d62e35485ede182d
+  metadata.gz: d35c2ca3bd71b1bdc1f3ad00cf81a570b86648ac8b939220804f8538bd916cda82f4899e7ba9d72845df0a3d334c22be934f0688b15e03b496b4169f49d46d6d
+  data.tar.gz: b27b3c3babb72f29882e024db65303cf35243da04af0c89d093519d9f35f00aebfd047f13c63f00bfaf67c51ab18c9cbe65d73a589df650c311153a2c0a99954

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    prosopite (1.1.4)
+    prosopite (1.2.1)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -115,6 +115,7 @@ Or install it yourself as:
 
 The preferred type of notifications can be configured with:
 
+* `Prosopite.min_n_queries`: Minimum number of N queries to report per N+1 case. Defaults to 2.
 * `Prosopite.raise = true`: Raise warnings as exceptions
 * `Prosopite.rails_logger = true`: Send warnings to the Rails log
 * `Prosopite.prosopite_logger = true`: Send warnings to `log/prosopite.log`
@@ -269,6 +270,8 @@ end
 Prosopite.finish
 ```
 
+Pauses can be ignored with `Prosopite.ignore_pauses = true` in case you want to remember their N+1 queries.
+
 An example of when you might use this is if you are [testing Active Jobs inline](https://guides.rubyonrails.org/testing.html#testing-jobs),
 and don't want to run Prosopite on background job code, just foreground app code. In that case you could write an [Active Job callback](https://edgeguides.rubyonrails.org/active_job_basics.html#callbacks) that pauses the scan while the job is running.
 

data/lib/prosopite/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Prosopite
-  VERSION = "1.1.4"
+  VERSION = "1.2.1"
 end

data/lib/prosopite.rb

@@ -10,7 +10,9 @@ module Prosopite
                 :prosopite_logger,
                 :custom_logger,
                 :allow_stack_paths,
-                :ignore_queries
+                :ignore_queries,
+                :ignore_pauses,
+                :min_n_queries
 
     def allow_list=(value)
       puts "Prosopite.allow_list= is deprecated. Use Prosopite.allow_stack_paths= instead."
@@ -29,6 +31,8 @@ module Prosopite
       tc[:prosopite_query_caller] = {}
 
       @allow_stack_paths ||= []
+      @ignore_pauses ||= false
+      @min_n_queries ||= 2
 
       tc[:prosopite_scan] = true
 
@@ -48,6 +52,10 @@ module Prosopite
     end
 
     def pause
+      if @ignore_pauses
+        return block_given? ? yield : nil
+      end
+
       if block_given?
         begin
           previous = tc[:prosopite_scan]
@@ -83,8 +91,8 @@ module Prosopite
       tc[:prosopite_notifications] = {}
 
       tc[:prosopite_query_counter].each do |location_key, count|
-        if count > 1
-          fingerprints = tc[:prosopite_query_holder][location_key].map do |q|
+        if count >= @min_n_queries
+          fingerprints = tc[:prosopite_query_holder][location_key].group_by do |q|
             begin
               fingerprint(q)
             rescue
@@ -92,15 +100,18 @@ module Prosopite
             end
           end
 
-          next unless fingerprints.uniq.size == 1
+          queries = fingerprints.values.select { |q| q.size >= @min_n_queries }
+
+          next unless queries.any?
 
           kaller = tc[:prosopite_query_caller][location_key]
           allow_list = (@allow_stack_paths + DEFAULT_ALLOW_LIST)
           is_allowed = kaller.any? { |f| allow_list.any? { |s| f.match?(s) } }
 
           unless is_allowed
-            queries = tc[:prosopite_query_holder][location_key]
-            tc[:prosopite_notifications][queries] = kaller
+            queries.each do |q|
+              tc[:prosopite_notifications][q] = kaller
+            end
           end
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prosopite
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.2.1
 platform: ruby
 authors:
 - Mpampis Kostas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-18 00:00:00.000000000 Z
+date: 2022-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry