query_matchers 0.0.6 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e6f6dc2a56c09d35cc394dccb5d55c466060dd3b
-  data.tar.gz: 28b655a1df343198af4c5b6b36c176586fe4b5d6
+SHA256:
+  metadata.gz: d28aef64bb82469c2a69de6dc16ce385aba2bd7d5d00f4fbef09445188ff62bb
+  data.tar.gz: 691c45802a5e3d2831dbde542e4117f7230831a2e5c92ba82b4e600d4d35b554
 SHA512:
-  metadata.gz: 9eb90f54833387296a597342fcadaa3b9feb23f5eabd9783bf4491ba832b9a2904b0d4cc362da8092b5cc363bfacf967b1e95d00450beb36421aebbfc34280bd
-  data.tar.gz: 9afdea8cc696e6a09399da094b8a5910a684e1e50f440a53ed125b2ba53f94c5f4859e926c542334dc6480ff3d30d354189d424e044141455a5f764e8892515b
+  metadata.gz: 53023a711f67eb7e07ff5456549585bdae5f178fc696d6e1a5f337be536e79a48498e11259d87ff2068390a284d10385b9b31d71ce0367f53dd6b94dba032ddf
+  data.tar.gz: bbc6cb2cfcc9248ac45182578c5f07620db6f432131df12be3747d0bbe3c3b04a20490463d37f450c18813de8eed6dc6e7c1f182675fa9624822ed72ae8f016b

data/lib/query_matchers/query_counter.rb

@@ -1,6 +1,7 @@
 module QueryMatchers
   class QueryCounter
     OPERATIONS = %w(SELECT INSERT UPDATE DELETE)
+    RAILS5_INFORMATION_SCHEMA_REGEX = /^\s*SELECT.+FROM information_schema\./m
 
     def initialize
       @events = []
@@ -28,7 +29,11 @@ module QueryMatchers
     end
 
     def count_query?(sql)
-      OPERATIONS.any? {|op| sql.start_with?(op) }
+      OPERATIONS.any? {|op| sql.lstrip.start_with?(op) } && !ignore_query?(sql)
+    end
+
+    def ignore_query?(sql)
+      sql.match?(RAILS5_INFORMATION_SCHEMA_REGEX)
     end
   end
 end

data/lib/query_matchers/version.rb

@@ -1,3 +1,3 @@
 module QueryMatchers
-  VERSION = "0.0.6"
+  VERSION = "0.0.11"
 end

data/query_matchers.gemspec

@@ -17,9 +17,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "activesupport", ["> 3.0", "< 5.0"]
+  spec.add_runtime_dependency "activesupport", ["> 3.0"]
 
-  spec.add_development_dependency "bundler", "~> 1.5"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec", "~> 2.14.0"
+  spec.add_development_dependency "rspec"
 end

data/spec/query_counter_spec.rb

@@ -8,44 +8,63 @@ describe QueryMatchers::QueryCounter do
     query = "SELECT * FROM somewhere"
     counter.execute!(sql_target(query))
 
-    counter.queries.should == [query]
+    expect(counter.queries).to eq([query])
   end
 
   it "counts the number of queries performed in the target block" do
     target = proc { 3.times { perform_sql("INSERT INTO jokes") } }
     counter.execute!(target)
 
-    counter.query_count.should == 3
+    expect(counter.query_count).to eq(3)
   end
 
   it "counts INSERT queries" do
     counter.execute!(sql_target("INSERT INTO jokes"))
 
-    counter.query_count.should == 1
+    expect(counter.query_count).to eq(1)
   end
 
   it "counts UPDATE queries" do
     counter.execute!(sql_target("UPDATE mood SET laughing = 0"))
 
-    counter.query_count.should == 1
+    expect(counter.query_count).to eq(1)
   end
 
   it "counts DELETE queries" do
     counter.execute!(sql_target("DELETE FROM goodwill"))
 
-    counter.query_count.should == 1
+    expect(counter.query_count).to eq(1)
   end
 
   it "counts SELECT queries" do
     counter.execute!(sql_target("SELECT FROM inventory"))
 
-    counter.query_count.should == 1
+    expect(counter.query_count).to eq(1)
+  end
+
+  it "counts queries with a bit of whitespace" do
+    counter.execute!(sql_target("  SELECT FROM inventory"))
+
+    expect(counter.query_count).to eq(1)
   end
 
   it "doesn't count any other type of query" do
     counter.execute!(sql_target("BREAKDANCE"))
 
-    counter.query_count.should == 0
+    expect(counter.query_count).to eq(0)
+  end
+
+  it "ignores Rails 5's schema queries" do
+    counter.execute!(sql_target(<<-SQL))
+      SELECT column_name
+        FROM information_schema.key_column_usage
+       WHERE constraint_name = 'PRIMARY'
+         AND table_schema = DATABASE()
+         AND table_name = 'jokes'
+       ORDER BY ordinal_position
+    SQL
+
+    expect(counter.query_count).to eq(0)
   end
 
   def sql_target(sql)

data/spec/query_execution_matcher_spec.rb

@@ -7,22 +7,22 @@ describe QueryMatchers::QueryExecutionMatcher do
 
   describe "#matches?" do
     before do
-      counter.stub(:execute!)
+      allow(counter).to receive(:execute!)
     end
 
     it "executes the target" do
       matcher.matches?(:whatever)
-      counter.should have_received(:execute!).with(:whatever)
+      expect(counter).to have_received(:execute!).with(:whatever)
     end
 
     it "returns true if the number of queries performed matched the expectation" do
-      counter.stub(:query_count) { 4 }
-      matcher.matches?(:whatever).should == true
+      allow(counter).to receive(:query_count) { 4 }
+      expect(matcher.matches?(:whatever)).to eq(true)
     end
 
     it "returns false if the number of queries performed doesn't match the expectation" do
-      counter.stub(:query_count) { 3 }
-      matcher.matches?(:whatever).should == false
+      allow(counter).to receive(:query_count) { 3 }
+      expect(matcher.matches?(:whatever)).to eq(false)
     end
   end
 
@@ -31,10 +31,10 @@ describe QueryMatchers::QueryExecutionMatcher do
       query1 = "SELECT FROM jokes WHERE puns > 3"
       query2 = "DELETE FROM jokes WHERE inappropriate = 1"
 
-      counter.stub(:query_count) { 99 }
-      counter.stub(:queries) { [query1, query2] }
+      allow(counter).to receive(:query_count) { 99 }
+      allow(counter).to receive(:queries) { [query1, query2] }
 
-      matcher.failure_message.should == <<-MESSAGE.strip_heredoc.chomp
+      expect(matcher.failure_message).to eq <<-MESSAGE.strip_heredoc.chomp
         expected block to execute 4 SQL queries, but executed 99: 
 
          - SELECT FROM jokes WHERE puns > 3

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: query_matchers
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.11
 platform: ruby
 authors:
 - Daniel Schierbeck
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-02-11 00:00:00.000000000 Z
+date: 2020-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -17,9 +17,6 @@ dependencies:
     - - ">"
       - !ruby/object:Gem::Version
         version: '3.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,23 +24,20 @@ dependencies:
     - - ">"
       - !ruby/object:Gem::Version
         version: '3.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -62,17 +56,17 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.14.0
-description: 
+        version: '0'
+description:
 email:
 - dasch@zendesk.com
 executables: []
@@ -95,7 +89,7 @@ homepage: https://github.com/dasch/query_matchers
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -110,12 +104,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
-signing_key: 
+rubygems_version: 3.2.2
+signing_key:
 specification_version: 4
 summary: Match the number of queries performed in any block of code
 test_files:
 - spec/query_counter_spec.rb
 - spec/query_execution_matcher_spec.rb
-has_rdoc: