deimos-ruby 2.4.0.pre.beta10 → 2.4.0.pre.beta12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2bfb935df5a67962364fbb6774c4dd03e2e56cbdb4d6dad7d15cb034b9522dee
-  data.tar.gz: c55979be4de60e902b02f80c48bce656d550d89fdb712938462d1f8b1af1f38b
+  metadata.gz: 695f64519c50cc4d06e435e3705fb101030621f3143fb6343c4c10429eb57508
+  data.tar.gz: d8ef51c23c10b0c5d471b4975e9a4189d7453432ec0e6ce3a86ba89b9f97c48d
 SHA512:
-  metadata.gz: 9fc0b3ed398049f73002d77c8b103f69b1b569616a9bfa960921edc3947702fc3affdc7d39676db43e8e935df2e08b2bb97726ea93060503d3f53f00a36a79bc
-  data.tar.gz: cae1f740a93966da3076095c1adbb1e9fd125ee4531947d15913d98795d460c21d3a98a6840137ef40a1d8d13374833065a59ee6e04196cb58e1c9b3f4acc1b8
+  metadata.gz: 732f88b2ba9af76b9747297f7ac7be73d9757d2e3f90ce3652cfaedb352c89f806fc6217037f4283ea07a3ea7fe1f76bc26b21b50526de8fa4e31dcc0efdcc7d
+  data.tar.gz: 6647929e70a709b223085542516694dbe871428ba7e018e857c0758a4420aa58a0882587055464ac36755f70fb4d548157fe2dc8ba5d566bb12cec1102284d71

data/CHANGELOG.md

@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## UNRELEASED
 
 - Major change: Switch from using `avro_turf` and `proto_turf` to use `schema_registry_client`, which handles both Avro and Protobuf.
+- Added `have_sent_including` RSpec matcher to allow for Protobuf messages that use default values to be checked.
 
 # 2.3.0 - 2026-01-13
 

data/README.md

@@ -1074,6 +1074,18 @@ end
 # topic, without having to know which class produced it.                         
 expect(topic_name).to have_sent(payload, key=nil, partition_key=nil, headers=nil)
 
+# You can use regular hash matching:
+expect(topic_name).to have_sent({'some_key' => 'some-value', 'message_id' => anything})
+
+# For Protobufs, default values are stripped from the hash so you need to use actual Protobuf
+# objects:
+expect(topic.name).to have_sent(MyMessage.new(some_key: 'some-value', message_id: 'my-message-id'))
+
+# However, Protobufs don't allow RSpec-style matching, so you can at least do a 
+# simple `include`-style matcher:
+
+expect(topic.name).to have_sent_including(MyMessage.new(some_key: 'some-value'))
+
 # Inspect sent messages
 message = Deimos::TestHelpers.sent_messages[0]
 expect(message).to eq({

data/lib/deimos/schema_backends/avro_base.rb

@@ -34,7 +34,7 @@ module Deimos
         end
         field_name = _field_name_from_schema(@key_schema)
         payload = key.is_a?(Hash) ? key : { field_name => key }
-        encode(payload, schema: @key_schema['name'], topic: topic)
+        encode(payload, schema: @key_schema['name'], topic: topic, is_key: true)
       end
 
       # @override

data/lib/deimos/schema_backends/avro_schema_registry.rb

@@ -25,9 +25,8 @@ module Deimos
           logger: Karafka.logger,
           user: Deimos.config.schema.user,
           password: Deimos.config.schema.password,
-          schema_type: SchemaRegistry::Schema::Avro
+          schema_type: SchemaRegistry::Schema::Avro.new(schema_store: @schema_store)
         )
-        SchemaRegistry.avro_schema_path = Deimos.config.schema.path
         @schema_registry
       end
     end

data/lib/deimos/test_helpers.rb

@@ -115,7 +115,7 @@ module Deimos
       str + "\nAll Messages received:\n#{message_string}"
     end
 
-    RSpec::Matchers.define :have_sent do |msg, key=nil, partition_key=nil, headers=nil|
+    RSpec::Matchers.define :have_sent do |msg, key=nil, partition_key=nil, headers=nil, including: false|
       message = Deimos::TestHelpers.normalize_message(msg)
       match do |topic|
         message_key = Deimos::TestHelpers.normalize_message(key)
@@ -127,8 +127,12 @@ module Deimos
           if m.respond_to?(:[]) && m[:payload].respond_to?(:[]) && m[:payload][:payload_key].nil?
             m[:payload].delete(:payload_key)
           end
-          hash_matcher.send(:match, message, m[:payload]) &&
-            topic == m[:topic] &&
+          if including
+            next false unless RSpec::Matchers::BuiltIn::Include.new(message).matches?(m[:payload])
+          else
+            next false unless hash_matcher.send(:match, message, m[:payload])
+          end
+          topic == m[:topic] &&
             (key.present? ? message_key == m[:key] : true) &&
             (partition_key.present? ? partition_key == m[:partition_key] : true) &&
             if headers.present?
@@ -149,6 +153,19 @@ module Deimos
       end
     end
 
+    RSpec::Matchers.define :have_sent_including do |msg, key=nil, partition_key=nil, headers=nil|
+      message = Deimos::TestHelpers.normalize_message(msg)
+      match do |topic|
+        expect(topic).to have_sent(msg, key, partition_key, headers, including: true)
+      end
+      failure_message do |topic|
+        _frk_failure_message(topic, message, key, partition_key)
+      end
+      failure_message_when_negated do |topic|
+        _frk_failure_message(topic, message, key, partition_key, true)
+      end
+    end
+
     # Clear all sent messages - e.g. if we want to check that
     # particular messages were sent or not sent after a point in time.
     # @return [void]

data/lib/deimos/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Deimos
-  VERSION = '2.4.0-beta10'
+  VERSION = '2.4.0-beta12'
 end

data/spec/schema_backends/avro_base_shared.rb

@@ -65,7 +65,7 @@ RSpec.shared_examples_for('an Avro backend') do
     allow(backend).to receive(:encode).and_return('itsme')
     expect(backend.encode_key('test_id', 1, topic: 'topic')).to eq('itsme')
     expect(backend).to have_received(:encode).
-      with({ 'test_id' => 1 }, { schema: 'MySchema_key', topic: 'topic' })
+      with({ 'test_id' => 1 }, { schema: 'MySchema_key', topic: 'topic', is_key: true })
     expect(backend.schema_store.find('com.my-namespace.MySchema_key').to_avro).
       to eq(
         'doc' => 'Key for com.my-namespace.MySchema - autogenerated by Deimos',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deimos-ruby
 version: !ruby/object:Gem::Version
-  version: 2.4.0.pre.beta10
+  version: 2.4.0.pre.beta12
 platform: ruby
 authors:
 - Daniel Orner