deimos-ruby 2.4.0.pre.beta14 → 2.4.0.pre.beta16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e7b5d2bdf8cccca9230dd94d03d806d6049b8e83c79544742a582adf80e8e2a
-  data.tar.gz: 1006fd3b7ede588433731881e3e7cfbb9f8536183922dfb7805972a55151e4f5
+  metadata.gz: '0480e92662f530ae3818ab423af8cd4781cdc689153299362eb8dd5e12b3e5e9'
+  data.tar.gz: 6efd89ca7fa5a4f2cee1297535f0136df8f332652468349dcc0d77e1d6e45eb1
 SHA512:
-  metadata.gz: f3e63d30275bdc6b162f2afbd566c6701d75923e64c9b906b19c8bc8e79fabc7b4121cb75644937a1d127c93fe6c1c9778135ed335d1214fa2ac2a481ee7526c
-  data.tar.gz: 67a0e9fc9981ff1c32cd904b626f3c55c2fbd0aadf1ab6f5d808846a70fc0fe65745c5b8a12b5bf59730aba214b67696a33712684a900a922f6de85feaaf5dfd
+  metadata.gz: 8feb6ff4bff7a9519ca93b2927593e5405cbeec3535d8eb1af3df5ffab4ef44827001cb0cb6c3605533c092ed0e3a493a8804d828285c9a7ae4e1380a4e42693
+  data.tar.gz: 3b866a9d1b72326bf43d4d232b7761e5394800afcbc4d779ca1ab53df55837ceed20cbc2b6a34079d2e9593917ccd63fe96ab76d2f56ec42790f0c5ca05c79dc

data/lib/deimos/schema_backends/proto_base.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require_relative 'base'
-require 'schema_registry_client'
 
 module Deimos
   module SchemaBackends

data/lib/deimos/schema_backends/proto_schema_registry.rb

@@ -15,38 +15,38 @@ module Deimos
 
       # @override
       def decode_payload(payload, schema:)
-        self.class.schema_registry.decode(payload)
+        self.schema_registry.decode(payload)
       end
 
       # @override
       def encode_payload(payload, schema: nil, subject: nil)
         msg = payload.is_a?(Hash) ? proto_schema.msgclass.new(**payload) : payload
-        encoder = subject&.ends_with?('-key') ? self.class.key_schema_registry : self.class.schema_registry
+        encoder = subject&.ends_with?('-key') ? self.key_schema_registry : self.schema_registry
         encoder.encode(msg, subject: subject)
       end
 
       # @override
       def encode_proto_key(key, topic: nil, field: nil)
         schema_text = SchemaRegistry::Output::JsonSchema.output(proto_schema.to_proto, path: field)
-        self.class.key_schema_registry.encode(key, subject: "#{topic}-key", schema_text: schema_text)
+        self.key_schema_registry.encode(key, subject: "#{topic}-key", schema_text: schema_text)
       end
 
       # @override
       def decode_proto_key(payload)
-        self.class.key_schema_registry.decode(payload)
+        self.key_schema_registry.decode(payload)
       end
 
       # @return [SchemaRegistry::Client]
-      def self.schema_registry
+      def schema_registry
         @schema_registry ||= SchemaRegistry::Client.new(
-          registry_url: Deimos.config.schema.registry_url,
-          user: Deimos.config.schema.user,
-          password: Deimos.config.schema.password,
+          registry_url: @registry_info&.url || Deimos.config.schema.registry_url,
+          user: @registry_info&.user || Deimos.config.schema.user,
+          password: @registry_info&.password || Deimos.config.schema.password,
           logger: Karafka.logger
         )
       end
 
-      def self.key_schema_registry
+      def key_schema_registry
         @key_schema_registry ||= SchemaRegistry::Client.new(
           registry_url: @registry_info&.url || Deimos.config.schema.registry_url,
           user: @registry_info&.user || Deimos.config.schema.user,

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, including: false|
+    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)
@@ -156,7 +156,7 @@ module Deimos
     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)
+        expect(topic).to have_sent(msg, key, partition_key, headers, true)
       end
       failure_message do |topic|
         _frk_failure_message(topic, message, key, partition_key)

data/lib/deimos/version.rb

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

data/spec/schema_backends/proto_schema_registry_spec.rb

@@ -23,8 +23,8 @@ RSpec.describe Deimos::SchemaBackends::ProtoSchemaRegistry do
   let(:backend) { described_class.new(schema: 'sample.v1.SampleMessage') }
 
   before(:each) do
-    allow(described_class).to receive_messages(schema_registry: schema_registry,
-                                               key_schema_registry: key_schema_registry)
+    allow(backend).to receive_messages(schema_registry: schema_registry,
+                                       key_schema_registry: key_schema_registry)
   end
 
   describe 'payload encoding and decoding' do
@@ -124,8 +124,8 @@ RSpec.describe Deimos::SchemaBackends::ProtoSchemaRegistry do
 
     before(:each) do
       # For key_backend tests, mock both schema_registry instances
-      allow(described_class).to receive_messages(schema_registry: schema_registry_for_test,
-                                                 key_schema_registry: key_schema_registry_for_test)
+      allow(key_backend).to receive_messages(schema_registry: schema_registry_for_test,
+                                             key_schema_registry: key_schema_registry_for_test)
     end
 
     it 'should encode a protobuf key message using the key schema' do

metadata

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