rspec-sql 0.0.0 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b432f8fb44ff4ca401c638737b32836ffe8d6e1f4af9cfe11ad7ee5c6131c557
-  data.tar.gz: '090f57ea9432f75110f666e57e8df787b203c53d2793c6b7ca24af05a4ed49a8'
+  metadata.gz: 5bcabc5d90f3ad9fbdecc557c3604203ae859cf4725664a18819d1290ced63e2
+  data.tar.gz: '09e1ba8a94a2e92355414104384bc7de76e7aa42bdf1c2f0bc5311c29ecc66a8'
 SHA512:
-  metadata.gz: ff5a40e0967222a5163d273ff77ef94f2bbf58318d6189e38d063dcded3b070ac29c93fc2c4923c27b824ce6f4d686ed3eaebe893d615397c355f9ab66e3adf3
-  data.tar.gz: 199a52a03863bb1a699835cc4de38fa91b0a12c77d0df111ff57dcf0ac1b1bda00f62f97bf11ef9b3e70b5e6bd8d607ee659977327b97a346da10696271f6643
+  metadata.gz: ff5a4cdf9a0c27921a32ca65da0c682b6412652cf78b6d155309e6e97b7cb13702086f183d1d6ed88f2083e57fc99e6b5e4c799867b5e5a1f659363ecbda1df5
+  data.tar.gz: 3af870e827e52cfc8e1a548d9ff456c26521291de6bd4fb093172537f4f46ca551b84bdd2dc3306b0b665eecb1f838ff9687b2f699d9acf12b9fbe42352cfa63

data/lib/rspec/sql/query_summary.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+module RSpec
+  module Sql
+    # Converts a list of queries into a summary hash.
+    class QuerySummary
+      QUERY_TYPES = %i[delete insert select update].freeze
+
+      attr_reader :summary
+
+      def initialize(queries)
+        @summary = {}
+        queries.each do |payload|
+          type = get_type(payload[:sql])
+          next if QUERY_TYPES.exclude?(type) || pg_query?(payload[:sql])
+
+          table = get_table(payload[:sql])
+          @summary[type] ||= {}
+          @summary[type][table] ||= 0
+          @summary[type][table] += 1
+        end
+      end
+
+      private
+
+      def get_table(sql)
+        sql_parts = sql.split
+        case get_type(sql)
+        when :insert
+          sql_parts[2]
+        when :update
+          sql_parts[1]
+        else
+          table_index = sql_parts.index("FROM")
+          sql_parts[table_index + 1]
+        end.gsub(/(\\|")/, "").to_sym
+      end
+
+      def get_type(sql)
+        sql.split[0].downcase.to_sym
+      end
+
+      def pg_query?(sql)
+        sql.include?("SELECT a.attname") || sql.include?("pg_attribute")
+      end
+    end
+  end
+end

data/lib/rspec/sql.rb

@@ -3,10 +3,15 @@
 require "active_support"
 require "rspec"
 
+require_relative "sql/query_summary"
+
+# We are building within the RSpec namespace for consistency and convenience.
+# We are not part of the RSpec team though.
 module RSpec
+  # RSpec::Sql contains our code.
   module Sql; end
 
-  RSpec::Matchers.define :query_database do |expected = nil|
+  Matchers.define :query_database do |expected = nil|
     match do |block|
       @queries = scribe_queries(&block)
 
@@ -18,12 +23,18 @@ module RSpec
         @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
     end
 
     failure_message do |_block|
+      if expected.is_a?(Enumerator) && expected.inspect.match?(/:times>$/)
+        expected = expected.size
+      end
+
       <<~MESSAGE
         Expected database queries: #{expected}
         Actual database queries:   #{query_names}
@@ -37,7 +48,11 @@ module RSpec
     end
 
     failure_message_when_negated do |_block|
-      "Expected no database queries but observed:\n\n#{query_descriptions.join("\n")}"
+      <<~TXT
+        Expected no database queries but observed:
+
+        #{query_descriptions.join("\n")}
+      TXT
     end
 
     def supports_block_expectations?
@@ -52,12 +67,16 @@ module RSpec
       @queries.map { |q| "#{q[:name]}  #{q[:sql]}" }
     end
 
+    def query_summary
+      Sql::QuerySummary.new(@queries).summary
+    end
+
     def scribe_queries(&)
       queries = []
 
-      logger = ->(_name, _started, _finished, _unique_id, payload) {
+      logger = lambda do |_name, _started, _finished, _unique_id, payload|
         queries << payload unless %w[CACHE SCHEMA].include?(payload[:name])
-      }
+      end
 
       ActiveSupport::Notifications.subscribed(logger, "sql.active_record", &)
 

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: rspec-sql
 version: !ruby/object:Gem::Version
-  version: 0.0.0
+  version: 0.0.2
 platform: ruby
 authors:
 - Maikel Linke
-autorequire:
+- Open Food Network contributors
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-02-29 00:00:00.000000000 Z
+date: 2024-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -45,11 +46,15 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/rspec/sql.rb
+- lib/rspec/sql/query_summary.rb
 homepage: https://github.com/openfoodfoundation/rspec-sql
 licenses:
 - AGPL-3.0-or-later
-metadata: {}
-post_install_message:
+metadata:
+  changelog_uri: https://github.com/datafoodconsortium/connector-ruby/blob/main/CHANGELOG.md
+  source_code_uri: https://github.com/datafoodconsortium/connector-ruby/
+  rubygems_mfa_required: 'true'
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -68,7 +73,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.3.26
-signing_key:
+signing_key: 
 specification_version: 4
 summary: RSpec::Sql matcher
 test_files: []