db-query-matchers 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e1172f88f20bbbc9c437ff4f4f0f8cc39647265
-  data.tar.gz: 317c16fbe2d356a93596427ec0d08c025ed9c467
+  metadata.gz: c7c9f607891bbb0b674c410baae4a3fe9456e83c
+  data.tar.gz: 8d6f264f879659422b69ac07c3b4b0441952d7a6
 SHA512:
-  metadata.gz: 8e82a658b056699b88c9b13ecc76089367c8138150f9e3bf5d9375675fb18443057c3eef7ac576cf99e44d8555b37d5e35f63149216779f8b99e016ddea8e11d
-  data.tar.gz: eb4da12508affb0086fb89d9baca061af701a99ee176e4d1fbef4b8bec3c612f4023d5a1355bb3840fd75a10960d12cd6d5faa67d473ace897a022907b57ceeb
+  metadata.gz: 23b5db77346a98ecd7c9ab0db61bd3cec815f42532e819a3310847c8241211c6dbc9b0aae21acf7e803d8243c195bcb15c49dd666bf377db96561ef657bb92b5
+  data.tar.gz: 12217e1be76989c510ce4b46665b6ff8e0b7ffb6caa334b441eda7c23de0aced5cae097aaaf3a4e88fe86733692a3e13792ff678abfbd915d070fbc4d7eb81bb

data/lib/db_query_matchers/make_database_queries.rb

@@ -10,9 +10,26 @@ require 'rspec/mocks'
 # @example
 #   expect { subject }.to make_database_queries(count: 1)
 #
+# @example
+#   expect { subject }.to make_database_queries(manipulative: true)
+#
 # @see DBQueryMatchers::QueryCounter
 RSpec::Matchers.define :make_database_queries do |options = {}|
-  supports_block_expectations
+  if RSpec::Core::Version::STRING =~ /^2/
+    def self.failure_message_when_negated(&block)
+      failure_message_for_should_not(&block)
+    end
+
+    def self.failure_message(&block)
+      failure_message_for_should(&block)
+    end
+
+    def supports_block_expectations?
+      true
+    end
+  else
+    supports_block_expectations
+  end
 
   # Taken from ActionView::Helpers::TextHelper
   def pluralize(count, singular, plural = nil)
@@ -26,7 +43,11 @@ RSpec::Matchers.define :make_database_queries do |options = {}|
   end
 
   match do |block|
-    @counter = DBQueryMatchers::QueryCounter.new
+    counter_options = {}
+    if options[:manipulative]
+      counter_options[:matches] = [/^\ *(INSERT|UPDATE|DELETE\ FROM)/]
+    end
+    @counter = DBQueryMatchers::QueryCounter.new(counter_options)
     ActiveSupport::Notifications.subscribed(@counter.to_proc,
                                             'sql.active_record',
                                             &block)

data/lib/db_query_matchers/query_counter.rb

@@ -16,7 +16,8 @@ module DBQueryMatchers
   class QueryCounter
     attr_reader :count, :log
 
-    def initialize
+    def initialize(options = {})
+      @matches = options[:matches]
       @count = 0
       @log   = []
     end
@@ -38,11 +39,16 @@ module DBQueryMatchers
     # @param _message_id [String] unique ID for this notification
     # @param payload    [Hash]   the payload
     def callback(_name, _start,  _finish, _message_id, payload)
-      return if DBQueryMatchers.configuration.ignores.any? do |pattern|
-        payload[:sql] =~ pattern
-      end
+      return if @matches && !any_match?(@matches, payload[:sql])
+      return if any_match?(DBQueryMatchers.configuration.ignores, payload[:sql])
       @count += 1
       @log << payload[:sql]
     end
+
+    private
+
+    def any_match?(patterns, sql)
+      patterns.any? { |pattern| sql =~ pattern }
+    end
   end
 end

data/lib/db_query_matchers/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: db-query-matchers
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Causes Engineering
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-12 00:00:00.000000000 Z
+date: 2015-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -103,8 +103,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: RSpec matchers for database queries
 test_files: []
+has_rdoc: