db-query-matchers 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b13241f75531009aac9480f467cf9849bdd5662e
-  data.tar.gz: 5a376d1a5644be97711acf93e80a54ffee517b2b
+  metadata.gz: 925bff06ef9935be2331dd9b77a65ad752562f48
+  data.tar.gz: 360c88c71a9579b16962bba539feee9100deeaba
 SHA512:
-  metadata.gz: bf6a832bb56db03a4a6d65fd4e637307511a891ddf3a0686afeb9b6383bd43bc37fd6bd64273f8e8f9c88ad9abf7356c141fab4b78a793158284a2e1386aece7
-  data.tar.gz: bdf68f005f05a44b2b4e55777df4aff4ab7eadcdc287def9d54e9dc42e344b8d0e157732a8fd6806e63d70a98f317f19f671c8cce6654b6b4c4712cde00582ff
+  metadata.gz: f07ed0ee62f115735a0d446c2e5274e5104fc60987bf733ff0d45e74e3acb6d7c945e7f290bb3e86e4d72335daa9bb198fa8fefb8a5261e94089bf132adc3393
+  data.tar.gz: fd6999559fee12c8d1e6c1941c8e79bf3f0e29cd4ecb0f7b9ce20c2b3fdb7e895b692e50a2772554416b3c7f46d017e44ad3509c8d02ecc45a9e9e00860f7dd4

data/lib/db_query_matchers/configuration.rb

@@ -1,12 +1,14 @@
 module DBQueryMatchers
   # Configuration for the DBQueryMatcher module.
   class Configuration
-    attr_accessor :ignores, :on_query_counted, :schemaless
+    attr_accessor :ignores, :on_query_counted, :schemaless, :log_backtrace, :backtrace_filter
 
     def initialize
       @ignores = []
       @on_query_counted = Proc.new { }
       @schemaless = false
+      @log_backtrace = false
+      @backtrace_filter = Proc.new { |backtrace| backtrace }
     end
   end
 end

data/lib/db_query_matchers/make_database_queries.rb

@@ -69,8 +69,8 @@ RSpec::Matchers.define :make_database_queries do |options = {}|
 
   failure_message_when_negated do |_|
     <<-EOS
-      expected no queries, but #{@counter.count} were made:
-      #{@counter.log.join("\n")}
+expected no queries, but #{@counter.count} were made:
+#{@counter.log.join("\n")}
     EOS
   end
 

data/lib/db_query_matchers/query_counter.rb

@@ -42,8 +42,10 @@ module DBQueryMatchers
       return if @matches && !any_match?(@matches, payload[:sql])
       return if any_match?(DBQueryMatchers.configuration.ignores, payload[:sql])
       return if DBQueryMatchers.configuration.schemaless && payload[:name] == "SCHEMA"
-      @count += 1
-      @log << payload[:sql]
+
+      count_query
+      log_query(payload[:sql])
+
       DBQueryMatchers.configuration.on_query_counted.call(payload)
     end
 
@@ -52,5 +54,21 @@ module DBQueryMatchers
     def any_match?(patterns, sql)
       patterns.any? { |pattern| sql =~ pattern }
     end
+
+    def count_query
+      @count += 1
+    end
+
+    def log_query(sql)
+      log_entry = sql.strip
+
+      if DBQueryMatchers.configuration.log_backtrace
+        raw_backtrace = caller
+        filtered_backtrace = DBQueryMatchers.configuration.backtrace_filter.call(raw_backtrace)
+        log_entry += "\n#{filtered_backtrace.join("\n")}\n"
+      end
+
+      @log << log_entry
+    end
   end
 end

data/lib/db_query_matchers/version.rb

@@ -1,4 +1,4 @@
 # Defines the gem version.
 module DBQueryMatchers
-  VERSION = '0.5.0'
+  VERSION = '0.6.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: db-query-matchers
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Brigade Engineering
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-10 00:00:00.000000000 Z
+date: 2016-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec