rspec-sql 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5bcabc5d90f3ad9fbdecc557c3604203ae859cf4725664a18819d1290ced63e2
-  data.tar.gz: '09e1ba8a94a2e92355414104384bc7de76e7aa42bdf1c2f0bc5311c29ecc66a8'
+  metadata.gz: 9cfbb9dfa6686fc934767248d98c65a3ffa0647f9674df74792ab344109b2899
+  data.tar.gz: 576dce207bae8bdb03585dc0234a898bf12d4b8e9e27f22f55817ce03babb4d8
 SHA512:
-  metadata.gz: ff5a4cdf9a0c27921a32ca65da0c682b6412652cf78b6d155309e6e97b7cb13702086f183d1d6ed88f2083e57fc99e6b5e4c799867b5e5a1f659363ecbda1df5
-  data.tar.gz: 3af870e827e52cfc8e1a548d9ff456c26521291de6bd4fb093172537f4f46ca551b84bdd2dc3306b0b665eecb1f838ff9687b2f699d9acf12b9fbe42352cfa63
+  metadata.gz: 8d50829389362c678403a0ddaf982e44232aa2b884159f8928f07943b351ca00b015d48854e953f977ac6f5f3eefd6e47b168e2c732311e7187f677e97753ed5
+  data.tar.gz: aff99ef38190a45774eb0ada50daaba8f9182d2f89f3ebcdfb35ed3781210b4e19941b3bedcc5ef736c186474c6ccec41bd0c9149918e38c1c773087a3b9673d

data/lib/rspec/sql/query_matcher.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+require_relative "query_summary"
+
+module RSpec
+  module Sql
+    # Compares expectations with actual queries.
+    class QueryMatcher
+      attr_reader :expected
+
+      def initialize(queries, expected)
+        @queries = queries
+        @expected = sanitize_number(expected)
+      end
+
+      def matches?
+        # Simple presence validation.
+        return !@queries.empty? if expected.nil?
+
+        actual == expected
+      end
+
+      def actual
+        @actual ||= actual_compared_to_expected
+      end
+
+      private
+
+      # Support writing: `is_expected.to query_database 5.times`
+      def sanitize_number(expected)
+        if expected.is_a?(Enumerator) && expected.inspect.match?(/:times>$/)
+          expected.size
+        else
+          expected
+        end
+      end
+
+      def actual_compared_to_expected
+        case expected
+        when Integer
+          @queries.size
+        when Array
+          query_names
+        when Hash
+          query_summary
+        else
+          raise "What are you expecting?"
+        end
+      end
+
+      def query_names
+        @queries.map { |q| q[:name] || q[:sql].split.take(2).join(" ") }
+      end
+
+      def query_summary
+        QuerySummary.new(@queries).summary
+      end
+    end
+  end
+end

data/lib/rspec/sql.rb

@@ -3,7 +3,7 @@
 require "active_support"
 require "rspec"
 
-require_relative "sql/query_summary"
+require_relative "sql/query_matcher"
 
 # We are building within the RSpec namespace for consistency and convenience.
 # We are not part of the RSpec team though.
@@ -14,32 +14,22 @@ module RSpec
   Matchers.define :query_database do |expected = nil|
     match do |block|
       @queries = scribe_queries(&block)
+      @matcher = Sql::QueryMatcher.new(@queries, expected)
+      expected = matcher.expected
 
-      if expected.nil?
-        !@queries.empty?
-      elsif expected.is_a?(Integer)
-        @queries.size == expected
-      elsif expected.is_a?(Enumerator) && expected.inspect.match?(/:times>$/)
-        @queries.size == expected.size
-      elsif expected.is_a?(Array)
-        query_names == expected
-      elsif expected.is_a?(Hash)
-        query_summary == expected
-      else
-        raise "What are you expecting?"
-      end
+      matcher.matches?
     end
 
     failure_message do |_block|
-      if expected.is_a?(Enumerator) && expected.inspect.match?(/:times>$/)
-        expected = expected.size
+      if expected.nil?
+        return "Expected at least one database query but observed none."
       end
 
       <<~MESSAGE
         Expected database queries: #{expected}
-        Actual database queries:   #{query_names}
+        Actual database queries:   #{matcher.actual}
 
-        Diff: #{Expectations.differ.diff_as_object(query_names, expected)}
+        Diff: #{diff(matcher.actual, expected)}
 
         Full query log:
 
@@ -59,16 +49,21 @@ module RSpec
       true
     end
 
-    def query_names
-      @queries.map { |q| q[:name] || q[:sql].split.take(2).join(" ") }
-    end
-
     def query_descriptions
       @queries.map { |q| "#{q[:name]}  #{q[:sql]}" }
     end
 
-    def query_summary
-      Sql::QuerySummary.new(@queries).summary
+    def matcher
+      @matcher
+    end
+
+    def diff(actual, expected)
+      if expected.is_a?(Numeric)
+        change = actual - expected
+        format("%+d", change)
+      else
+        Expectations.differ.diff_as_object(actual, expected)
+      end
     end
 
     def scribe_queries(&)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-sql
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Maikel Linke
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-04-16 00:00:00.000000000 Z
+date: 2024-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -46,13 +46,14 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/rspec/sql.rb
+- lib/rspec/sql/query_matcher.rb
 - lib/rspec/sql/query_summary.rb
 homepage: https://github.com/openfoodfoundation/rspec-sql
 licenses:
 - AGPL-3.0-or-later
 metadata:
-  changelog_uri: https://github.com/datafoodconsortium/connector-ruby/blob/main/CHANGELOG.md
-  source_code_uri: https://github.com/datafoodconsortium/connector-ruby/
+  changelog_uri: https://github.com/openfoodfoundation/rspec-sql/releases
+  source_code_uri: https://github.com/openfoodfoundation/rspec-sql/
   rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []