active_record_query_trace 1.6.1 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 065d0d118eb1db21b6095e817d3d2644a833aa191014650f0aa761cdcdde1f67
-  data.tar.gz: c68672567f6b98fc6d58a6aa4cdfce6b8f53c9171a14c6ed72b12793ebb0241c
+  metadata.gz: b58e5acd23e046a98d5f4ab7bd558ecab9bb02b23aa0edf948942d9af0547c21
+  data.tar.gz: 94684eb961ff681969356cba534b78bee8ee4bca1eb925566e6daa56d8b98d7b
 SHA512:
-  metadata.gz: 2dae585f11b61adf9333ae499bcd8739d3675fc7ab1e3e9a669f8a5d3ab133b80ce8e0afdf534eabca4241576146ddb43ded36c4e4f3b8b3e4d1f65949d82dfa
-  data.tar.gz: 57822d872644b5ddea72c2b1e1bbd9a01084af37bc0e71a97e87c209403de7cd9c88eb7364574bb58cf24819e0f4f30319dc3e5d156fa2b493d121eb54e2ed31
+  metadata.gz: 47362f8e90ea73124e054bb313155101fb9c972bf1eec07e97678b4e43edf6307744ce4a9cb3d8c7fa959ee8b1963a7fda2725b589d8b438c0e8c292b155724d
+  data.tar.gz: 2d95048c71b93ef3ef7ddf3003e4463a61feec2c1f82dd28113f32bc65d5d4275ddc6ebe9053b5232e0a543d74d75647de4505d8834b1f58b2621d7702ab7c4d

data/lib/active_record_query_trace.rb

@@ -35,7 +35,7 @@ module ActiveRecordQueryTrace
     attr_accessor :suppress_logging_of_db_reads
   end
 
-  class CustomLogSubscriber < ActiveRecord::LogSubscriber
+  class CustomLogSubscriber < ActiveRecord::LogSubscriber # rubocop:disable Metrics/ClassLength
     def initialize
       super
       ActiveRecordQueryTrace.enabled = false
@@ -129,11 +129,15 @@ module ActiveRecordQueryTrace
     # application lines.
     def setup_backtrace_cleaner
       setup_backtrace_cleaner_path
-      return unless ActiveRecordQueryTrace.level == :rails
-      Rails.backtrace_cleaner.remove_filters!
-      Rails.backtrace_cleaner.remove_silencers!
-      Rails.backtrace_cleaner.add_silencer do |line|
-        line.match(%r{#{Regexp.escape(Rails.root.to_s)}(?!/vendor)})
+      return if ActiveRecordQueryTrace.level == :full
+
+      remove_filters_and_silencers
+
+      case ActiveRecordQueryTrace.level
+      when :app
+        Rails.backtrace_cleaner.add_silencer { |line| !line.match(rails_root_regexp) }
+      when :rails
+        Rails.backtrace_cleaner.add_silencer { |line| line.match(rails_root_regexp) }
       end
     end
 
@@ -146,6 +150,11 @@ module ActiveRecordQueryTrace
       Rails.backtrace_cleaner.instance_variable_set :@root, Rails.root.to_s
     end
 
+    def remove_filters_and_silencers
+      Rails.backtrace_cleaner.remove_filters!
+      Rails.backtrace_cleaner.remove_silencers!
+    end
+
     # Allow query to be colorized in the terminal
     def colorize_text(text)
       return text unless ActiveRecordQueryTrace.colorize
@@ -175,6 +184,12 @@ module ActiveRecordQueryTrace
     def valid_color_code?(color_code)
       /\A\d+(;\d+)?\Z/.match(color_code)
     end
+
+    # This cannot be set in a constant as Rails.root is not yet available when
+    # this file is loaded.
+    def rails_root_regexp
+      %r{#{Regexp.escape(Rails.root.to_s)}(?!\/vendor)}
+    end
   end
 end
 

data/lib/active_record_query_trace/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveRecordQueryTrace
-  VERSION = '1.6.1'
+  VERSION = '1.6.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record_query_trace
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.6.2
 platform: ruby
 authors:
 - Cody Caughlan
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-10 00:00:00.000000000 Z
+date: 2019-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -142,9 +142,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="