prosopite 0.2.1 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5c95516b64f760903487cb161f0e507cd960a21770bd2729d39fd219526ce99
-  data.tar.gz: 890f117df692947849ffb243dff96ddfb1b808b0728bd5a5e613969eb2b11838
+  metadata.gz: faaeeb7c0908320a1eade29fde52c959c756f30d390bf3251427aca0d5737ea4
+  data.tar.gz: 9843d2c7d5991d992299197b5121a68adc8cd8bc0ba7f4878f89e6eba1c00565
 SHA512:
-  metadata.gz: 991261e0e5cb2002e2031e4d2a53c620732752425a77dee6d3fd63b06acb779cdba11aebd61531922beafc67492cc41eaa222f33a53c843e01660fe1a7b268f2
-  data.tar.gz: 6a09687449111aabcea1cc7d58a64b325e8115504b557b41fd8bf313666eb8098713eda6aaa9d37f83716159c62cfcdce78444ed422dc6a43e40c8568e8237a8
+  metadata.gz: a6e47da136f7e071d1d5466ee2e60fc6f571e8c129ca3f4331a200398b824891ec4dbdadcc7e244f2f51957df386aa3b20bf2b5b7e84a77510e64a3cba6fd465
+  data.tar.gz: b53e5014b44e8fbef56088cb15e4a6cbf1fc4e596316425cc1c5ce0a09eda29b9aa98ea94900eb3be3c2772bb0c77b7a4433f2650119ef20e4125718a3b8e812

data/Gemfile

@@ -5,3 +5,4 @@ source "https://rubygems.org"
 gemspec
 
 gem "rake", "~> 13.0"
+gem 'pg_query'

data/Gemfile.lock

@@ -1,8 +1,7 @@
 PATH
   remote: .
   specs:
-    prosopite (0.2.0)
-      pg_query (~> 1.3)
+    prosopite (1.0.3)
 
 GEM
   remote: https://rubygems.org/
@@ -44,6 +43,7 @@ DEPENDENCIES
   activerecord
   factory_bot
   minitest
+  pg_query
   prosopite!
   pry
   rake (~> 13.0)

data/README.md

@@ -97,6 +97,12 @@ Add this line to your application's Gemfile:
 gem 'prosopite'
 ```
 
+If you're **not** using MySQL/MariaDB, you should also add:
+
+```ruby
+gem 'pg_query'
+```
+
 And then execute:
 
     $ bundle install
@@ -188,6 +194,14 @@ Prosopite.scan
 Prosopite.finish
 ```
 
+or 
+
+```ruby
+Prosopite.scan do
+<code to scan>
+end
+```
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/charkost/prosopite.

data/lib/prosopite/version.rb

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

data/lib/prosopite.rb

@@ -1,6 +1,7 @@
-require 'pg_query'
 
 module Prosopite
+  DEFAULT_ALLOW_LIST = %w(active_record/associations/preloader active_record/validations/uniqueness)
+
   class NPlusOneQueriesError < StandardError; end
   class << self
     attr_writer :raise,
@@ -22,6 +23,15 @@ module Prosopite
       @allow_list ||= []
 
       tc[:prosopite_scan] = true
+
+      if block_given?
+        begin
+          yield
+          finish
+        ensure
+          tc[:prosopite_scan] = false
+        end
+      end
     end
 
     def tc
@@ -56,12 +66,10 @@ module Prosopite
 
           kaller = tc[:prosopite_query_caller][location_key]
 
-          if fingerprints.uniq.size == 1 && !kaller.any? { |f| @allow_list.any? { |s| f.include?(s) } }
+          is_allowed = kaller.any? { |f| @allow_list.concat(DEFAULT_ALLOW_LIST).any? { |s| f.include?(s) } }
+          if fingerprints.uniq.size == 1 && !is_allowed
             queries = tc[:prosopite_query_holder][location_key]
-
-            unless kaller.any? { |f| f.include?('active_record/validations/uniqueness') }
-              tc[:prosopite_notifications][queries] = kaller
-            end
+            tc[:prosopite_notifications][queries] = kaller
           end
         end
       end
@@ -71,6 +79,12 @@ module Prosopite
       if ActiveRecord::Base.connection.adapter_name.downcase.include?('mysql')
         mysql_fingerprint(query)
       else
+        begin
+          require 'pg_query'
+        rescue LoadError => e
+          msg = "Could not load the 'pg_query' gem. Add `gem 'pg_query'` to your Gemfile"
+          raise LoadError, msg, e.backtrace
+        end
         PgQuery.fingerprint(query)
       end
     end
@@ -100,7 +114,7 @@ module Prosopite
 
       query.gsub!(/\btrue\b|\bfalse\b/i, "?")
 
-      query.gsub!(/[0-9+-][0-9a-f.xb+-]*/, "?")
+      query.gsub!(/[0-9+-][0-9a-f.x+-]*/, "?")
       query.gsub!(/[xb.+-]\?/, "?")
 
       query.strip!
@@ -161,9 +175,9 @@ module Prosopite
       return if @subscribed
 
       ActiveSupport::Notifications.subscribe 'sql.active_record' do |_, _, _, _, data|
-        sql = data[:sql]
+        sql, name = data[:sql], data[:name]
 
-        if scan? && sql.include?('SELECT') && data[:cached].nil?
+        if scan? && name != "SCHEMA" && sql.include?('SELECT') && data[:cached].nil?
           location_key = Digest::SHA1.hexdigest(caller.join)
 
           tc[:prosopite_query_counter][location_key] += 1

data/prosopite.gemspec

@@ -24,8 +24,6 @@ Gem::Specification.new do |spec|
   end
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency 'pg_query', '~> 1.3'
-
   spec.add_development_dependency "pry"
   spec.add_development_dependency "minitest"
   spec.add_development_dependency "factory_bot"

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: prosopite
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 1.0.3
 platform: ruby
 authors:
 - Mpampis Kostas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-10 00:00:00.000000000 Z
+date: 2021-09-25 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: pg_query
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement