prosopite 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 708963d4cc79982fc4345088cf7a60449ee2964f0065cc2adadccd41c804dc54
-  data.tar.gz: 9f7e85e4a52286339b16399125be61d3c91815b01d036d7512b224eec1cd8c9d
+  metadata.gz: 71358661958f67bb09075fa89db0f0c09868c0a53780afa3780a8cc7d4ded49a
+  data.tar.gz: 1de6a0ab099524457cf49c60d1f5ae0041dffc1b9e281202ccea77cb2cd89ba9
 SHA512:
-  metadata.gz: d35c2ca3bd71b1bdc1f3ad00cf81a570b86648ac8b939220804f8538bd916cda82f4899e7ba9d72845df0a3d334c22be934f0688b15e03b496b4169f49d46d6d
-  data.tar.gz: b27b3c3babb72f29882e024db65303cf35243da04af0c89d093519d9f35f00aebfd047f13c63f00bfaf67c51ab18c9cbe65d73a589df650c311153a2c0a99954
+  metadata.gz: 8478248b48b55a59eedfde1c472382eccc543a0f2ce03a891174c326d03a17db19cd3c9a393a2f1a89568a2c275e04ae8ca71d13f30cf67fef64870ed5531494
+  data.tar.gz: de26d196d0a767511b7a9e1f6cf5c87b00c838e17dc2e630f3689a0d43b7a47542c5c0e28f70f3b49a9dca7b577349c6dc66c97b14535cd9e010f83be9f2c58c

data/.github/workflows/ci.yml

@@ -4,7 +4,7 @@ jobs:
   test:
     strategy:
       matrix:
-        ruby: [2.5, 2.6, 2.7, '3.0', 3.1, head]
+        ruby: [2.7, '3.0', 3.1, head]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2

data/Gemfile.lock

@@ -1,11 +1,24 @@
 PATH
   remote: .
   specs:
-    prosopite (1.2.1)
+    prosopite (1.3.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    actionpack (6.1.3)
+      actionview (= 6.1.3)
+      activesupport (= 6.1.3)
+      rack (~> 2.0, >= 2.0.9)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actionview (6.1.3)
+      activesupport (= 6.1.3)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
     activemodel (6.1.3)
       activesupport (= 6.1.3)
     activerecord (6.1.3)
@@ -17,20 +30,55 @@ GEM
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
+    ansi (1.5.0)
+    builder (3.2.4)
     coderay (1.1.3)
     concurrent-ruby (1.1.8)
+    crass (1.0.6)
+    erubi (1.12.0)
     factory_bot (6.1.0)
       activesupport (>= 5.0.0)
     i18n (1.8.9)
       concurrent-ruby (~> 1.0)
+    loofah (2.19.1)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
     method_source (1.0.0)
+    mini_portile2 (2.8.1)
     minitest (5.14.3)
+    minitest-reporters (1.5.0)
+      ansi
+      builder
+      minitest (>= 5.0)
+      ruby-progressbar
+    nokogiri (1.14.1)
+      mini_portile2 (~> 2.8.0)
+      racc (~> 1.4)
+    nokogiri (1.14.1-x86_64-linux)
+      racc (~> 1.4)
     pg_query (1.3.0)
     pry (0.14.0)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    rake (13.0.3)
+    racc (1.6.2)
+    rack (2.2.6.2)
+    rack-test (2.0.2)
+      rack (>= 1.3)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.5.0)
+      loofah (~> 2.19, >= 2.19.1)
+    railties (6.1.3)
+      actionpack (= 6.1.3)
+      activesupport (= 6.1.3)
+      method_source
+      rake (>= 0.8.7)
+      thor (~> 1.0)
+    rake (13.0.6)
+    ruby-progressbar (1.11.0)
     sqlite3 (1.4.2)
+    thor (1.2.1)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
     zeitwerk (2.4.2)
@@ -43,9 +91,11 @@ DEPENDENCIES
   activerecord
   factory_bot
   minitest
+  minitest-reporters
   pg_query
   prosopite!
   pry
+  railties
   rake (~> 13.0)
   sqlite3
 

data/README.md

@@ -121,6 +121,7 @@ The preferred type of notifications can be configured with:
 * `Prosopite.prosopite_logger = true`: Send warnings to `log/prosopite.log`
 * `Prosopite.stderr_logger = true`: Send warnings to STDERR
 * `Prosopite.custom_logger = my_custom_logger`:
+* `Prosopite.backtrace_cleaner = my_custom_backtrace_cleaner`: use a different [ActiveSupport::BacktraceCleaner](https://api.rubyonrails.org/classes/ActiveSupport/BacktraceCleaner.html). Default to `Rails.backtrace_cleaner` if present.
 
 ### Custom Logging Configuration
 

data/lib/prosopite/version.rb

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

data/lib/prosopite.rb

@@ -12,7 +12,8 @@ module Prosopite
                 :allow_stack_paths,
                 :ignore_queries,
                 :ignore_pauses,
-                :min_n_queries
+                :min_n_queries,
+                :backtrace_cleaner
 
     def allow_list=(value)
       puts "Prosopite.allow_list= is deprecated. Use Prosopite.allow_stack_paths= instead."
@@ -20,6 +21,10 @@ module Prosopite
       self.allow_stack_paths = value
     end
 
+    def backtrace_cleaner
+      @backtrace_cleaner ||= Rails.backtrace_cleaner
+    end
+
     def scan
       tc[:prosopite_scan] ||= false
       return if scan?
@@ -85,6 +90,10 @@ module Prosopite
 
       create_notifications
       send_notifications if tc[:prosopite_notifications].present?
+
+      tc[:prosopite_query_counter] = nil
+      tc[:prosopite_query_holder] = nil
+      tc[:prosopite_query_caller] = nil
     end
 
     def create_notifications
@@ -189,11 +198,15 @@ module Prosopite
 
       tc[:prosopite_notifications].each do |queries, kaller|
         notifications_str << "N+1 queries detected:\n"
+
         queries.each { |q| notifications_str << "  #{q}\n" }
+
         notifications_str << "Call stack:\n"
+        kaller = backtrace_cleaner.clean(kaller)
         kaller.each do |f|
-          notifications_str << "  #{f}\n" unless f.include?(Bundler.bundle_path.to_s)
+          notifications_str << "  #{f}\n"
         end
+
         notifications_str << "\n"
       end
 

data/prosopite.gemspec

@@ -28,5 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "minitest"
   spec.add_development_dependency "factory_bot"
   spec.add_development_dependency "activerecord"
+  spec.add_development_dependency "railties"
   spec.add_development_dependency "sqlite3"
+  spec.add_development_dependency "minitest-reporters"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prosopite
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Mpampis Kostas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-01 00:00:00.000000000 Z
+date: 2023-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: railties
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest-reporters
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: N+1 auto-detection for Rails with zero false positives / false negatives
 email:
 - charkost.rb@gmail.com