prosopite 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e45d47e93e239165f045462c1247f33b4dae5796e1c852fd7a2a6ade0977ef2a
-  data.tar.gz: 25c2afb9c1340d3e16c3fcd2ba880becdfc674c54aaecba4d83566c6585998de
+  metadata.gz: 77a2d861398e1f7a76cc71705f68d1f7287ca1343b3bd8fcf7e909f941682125
+  data.tar.gz: 586d0e356edfb83152c538bc4b017d9e8009d6fcd1ba746ec2cf677a97ea7f23
 SHA512:
-  metadata.gz: 3eb734873fc1c396b5312dc70fe91a4c10a8adb4658bce2302559e8d61db22cc6e54429806e99e3014308b1e236b69a34f75e59bd3b789f36145843390776998
-  data.tar.gz: 626d2a7ebaf7553647672f137696adfe2aa70fe67589b7380c2366862c85022ee560dfbe2665f7580c4cd930a95d7c94e1a59557d4674c563379fef94e197846
+  metadata.gz: 3c4e9d238b5f10d8f57531d84024758d3a6e05b4b3cefb49317c1576a0cbcf71287bcd77050ddfc073b1f03cdb3a601bb6f33a49f4488f7ab4483f51f19e7af0
+  data.tar.gz: 3f22640ed22014cd38f47e770de44253314e134192745fc3abf43d14374d815d249929f4e1dd754c46318e579ee40cf1b76ba90aa7009dd18c15f42a642aa39c

data/LICENSE.txt

@@ -187,7 +187,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [yyyy] [name of copyright owner]
+   Copyright 2021 Mpampis Kostas
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

data/README.md

@@ -168,12 +168,12 @@ end
 
 WARNING: scan/finish should run before/after **each** test and NOT before/after the whole suite.
 
-## Whitelisting
+## Allow list
 
 Ignore notifications for call stacks containing one or more substrings:
 
 ```ruby
-Prosopite.whitelist = ['substring_in_call_stack']
+Prosopite.allow_list = ['substring_in_call_stack']
 ```
 
 ## Scanning code outside controllers or tests

data/lib/prosopite.rb

@@ -7,42 +7,46 @@ module Prosopite
                 :stderr_logger,
                 :rails_logger,
                 :prosopite_logger,
-                :whitelist
+                :allow_list
 
     def scan
-      @scan ||= false
+      tc[:prosopite_scan] ||= false
       return if scan?
 
       subscribe
 
-      @query_counter = Hash.new(0)
-      @query_holder = Hash.new { |h, k| h[k] = [] }
-      @query_caller = {}
+      tc[:prosopite_query_counter] = Hash.new(0)
+      tc[:prosopite_query_holder] = Hash.new { |h, k| h[k] = [] }
+      tc[:prosopite_query_caller] = {}
 
-      @whitelist ||= []
+      @allow_list ||= []
 
-      @scan = true
+      tc[:prosopite_scan] = true
+    end
+
+    def tc
+      Thread.current
     end
 
     def scan?
-      @scan
+      tc[:prosopite_scan]
     end
 
     def finish
       return unless scan?
 
-      @scan = false
+      tc[:prosopite_scan] = false
 
       create_notifications
-      send_notifications if @notifications.present?
+      send_notifications if tc[:prosopite_notifications].present?
     end
 
     def create_notifications
-      @notifications = {}
+      tc[:prosopite_notifications] = {}
 
-      @query_counter.each do |location_key, count|
+      tc[:prosopite_query_counter].each do |location_key, count|
         if count > 1
-          fingerprints = @query_holder[location_key].map do |q|
+          fingerprints = tc[:prosopite_query_holder][location_key].map do |q|
             begin
               fingerprint(q)
             rescue
@@ -50,13 +54,13 @@ module Prosopite
             end
           end
 
-          kaller = @query_caller[location_key]
+          kaller = tc[:prosopite_query_caller][location_key]
 
-          if fingerprints.uniq.size == 1 && !kaller.any? { |f| @whitelist.any? { |s| f.include?(s) } }
-            queries = @query_holder[location_key]
+          if fingerprints.uniq.size == 1 && !kaller.any? { |f| @allow_list.any? { |s| f.include?(s) } }
+            queries = tc[:prosopite_query_holder][location_key]
 
             unless kaller.any? { |f| f.include?('active_record/validations/uniqueness') }
-              @notifications[queries] = kaller
+              tc[:prosopite_notifications][queries] = kaller
             end
           end
         end
@@ -126,7 +130,7 @@ module Prosopite
 
       notifications_str = ''
 
-      @notifications.each do |queries, kaller|
+      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"
@@ -149,8 +153,8 @@ module Prosopite
     end
 
     def subscribe
-      @subscribed ||= false
-      return if @subscribed
+      tc[:prosopite_subscribed] ||= false
+      return if tc[:prosopite_subscribed]
 
       ActiveSupport::Notifications.subscribe 'sql.active_record' do |_, _, _, _, data|
         sql = data[:sql]
@@ -158,16 +162,16 @@ module Prosopite
         if scan? && sql.include?('SELECT') && data[:cached].nil?
           location_key = Digest::SHA1.hexdigest(caller.join)
 
-          @query_counter[location_key] += 1
-          @query_holder[location_key] << sql
+          tc[:prosopite_query_counter][location_key] += 1
+          tc[:prosopite_query_holder][location_key] << sql
 
-          if @query_counter[location_key] > 1
-            @query_caller[location_key] = caller.dup
+          if tc[:prosopite_query_counter][location_key] > 1
+            tc[:prosopite_query_caller][location_key] = caller.dup
           end
         end
       end
 
-      @subscribed = true
+      tc[:prosopite_subscribed] = true
     end
   end
 end

data/lib/prosopite/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prosopite
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Mpampis Kostas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-27 00:00:00.000000000 Z
+date: 2021-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg_query