deimos-ruby 1.22.5 → 1.23.3

data/spec/active_record_producer_spec.rb

@@ -69,7 +69,10 @@ describe Deimos::ActiveRecordProducer do
     SCHEMA_CLASS_SETTINGS.each do |setting, use_schema_classes|
       context "with Schema Class consumption #{setting}" do
         before(:each) do
-          Deimos.configure { |config| config.schema.use_schema_classes = use_schema_classes }
+          Deimos.configure do |config|
+            config.schema.use_schema_classes = use_schema_classes
+            config.schema.generate_namespace_folders = true
+          end
         end
 
         it 'should send events correctly' do

data/spec/batch_consumer_spec.rb

@@ -40,7 +40,10 @@ module ConsumerTest
           end
 
           before(:each) do
-            Deimos.configure { |config| config.schema.use_schema_classes = use_schema_classes }
+            Deimos.configure do |config|
+              config.schema.use_schema_classes = use_schema_classes
+              config.schema.generate_namespace_folders = true
+            end
           end
 
           it 'should provide backwards compatibility for BatchConsumer class' do

data/spec/config/configuration_spec.rb

@@ -91,7 +91,8 @@ describe Deimos, 'configuration' do
           heartbeat_interval: 10,
           handler: 'ConsumerTest::MyConsumer',
           use_schema_classes: nil,
-          max_db_batch_size: nil
+          max_db_batch_size: nil,
+          bulk_import_id_generator: nil
         }, {
           topic: 'my_batch_consume_topic',
           group_id: 'my_batch_group_id',
@@ -109,7 +110,8 @@ describe Deimos, 'configuration' do
           heartbeat_interval: 10,
           handler: 'ConsumerTest::MyBatchConsumer',
           use_schema_classes: nil,
-          max_db_batch_size: nil
+          max_db_batch_size: nil,
+          bulk_import_id_generator: nil
         }
       ],
       producer: {
@@ -261,7 +263,8 @@ describe Deimos, 'configuration' do
             heartbeat_interval: 13,
             handler: 'MyConfigConsumer',
             use_schema_classes: false,
-            max_db_batch_size: nil
+            max_db_batch_size: nil,
+            bulk_import_id_generator: nil
           }
         ],
         producer: {
@@ -279,4 +282,40 @@ describe Deimos, 'configuration' do
         }
       )
   end
+
+  it 'should override global configurations' do
+    described_class.configure do
+      consumers.bulk_import_id_generator(-> { 'global' })
+      consumers.replace_associations true
+
+      consumer do
+        class_name 'MyConfigConsumer'
+        schema 'blah'
+        topic 'blah'
+        group_id 'myconsumerid'
+        bulk_import_id_generator(-> { 'consumer' })
+        replace_associations false
+      end
+
+      consumer do
+        class_name 'MyConfigConsumer2'
+        schema 'blah'
+        topic 'blah'
+        group_id 'myconsumerid'
+      end
+    end
+
+    consumers = described_class.config.consumers
+    expect(consumers.replace_associations).to eq(true)
+    expect(consumers.bulk_import_id_generator.call).to eq('global')
+
+    custom = MyConfigConsumer.config
+    expect(custom[:replace_associations]).to eq(false)
+    expect(custom[:bulk_import_id_generator].call).to eq('consumer')
+
+    default = MyConfigConsumer2.config
+    expect(default[:replace_associations]).to eq(true)
+    expect(default[:bulk_import_id_generator].call).to eq('global')
+
+  end
 end

data/spec/consumer_spec.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 # :nodoc:
+# rubocop:disable Metrics/ModuleLength
 module ConsumerTest
   describe Deimos::Consumer, 'Message Consumer' do
     prepend_before(:each) do
@@ -26,8 +27,12 @@ module ConsumerTest
     describe 'consume' do
       SCHEMA_CLASS_SETTINGS.each do |setting, use_schema_classes|
         context "with Schema Class consumption #{setting}" do
+
           before(:each) do
-            Deimos.configure { |config| config.schema.use_schema_classes = use_schema_classes }
+            Deimos.configure do |config|
+              config.schema.use_schema_classes = use_schema_classes
+              config.schema.generate_namespace_folders = true
+            end
           end
 
           it 'should consume a message' do
@@ -127,6 +132,41 @@ module ConsumerTest
           end
         end
       end
+
+      context 'with overriden schema classes' do
+
+        before(:each) do
+          Deimos.configure do |config|
+            config.schema.use_schema_classes = true
+            config.schema.generate_namespace_folders = true
+          end
+        end
+
+        prepend_before(:each) do
+          consumer_class = Class.new(described_class) do
+            schema 'MyUpdatedSchema'
+            namespace 'com.my-namespace'
+            key_config field: 'test_id'
+
+            # :nodoc:
+            def consume(_payload, _metadata)
+              raise 'This should not be called unless call_original is set'
+            end
+          end
+          stub_const('ConsumerTest::MyConsumer', consumer_class)
+        end
+
+        it 'should consume messages' do
+          test_consume_message('my_consume_topic',
+                               { 'test_id' => 'foo',
+                                 'some_int' => 1 }) do |payload, _metadata|
+            expect(payload['test_id']).to eq('foo')
+            expect(payload['some_int']).to eq(1)
+            expect(payload['super_int']).to eq(9000)
+                                 end
+        end
+
+      end
     end
 
     describe 'decode_key' do
@@ -218,3 +258,4 @@ module ConsumerTest
     end
   end
 end
+# rubocop:enable Metrics/ModuleLength

data/spec/schemas/my_namespace/my_updated_schema.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+# This file is autogenerated by Deimos, Do NOT modify
+module Schemas; module MyNamespace
+  ### Primary Schema Class ###
+  # Autogenerated Schema for Record at com.my-namespace.MySchema
+  class MyUpdatedSchema < Schemas::MyNamespace::MySchema
+
+    attr_accessor :super_int
+
+    def initialize(test_id: nil,
+                   some_int: nil)
+      super
+      self.super_int = some_int.nil? ? 10 : some_int * 9000
+    end
+  end
+end
+end

data/spec/utils/db_poller_spec.rb

@@ -191,6 +191,48 @@ each_db_config(Deimos::Utils::DbPoller::Base) do
         expect(Deimos.config.tracer).to have_received(:finish).with('a span')
       end
 
+      context 'with skip_too_large_messages on' do
+        before(:each) { config.skip_too_large_messages = true }
+
+        it 'should skip and move on' do
+          error = Kafka::MessageSizeTooLarge.new('OH NOES')
+          allow(poller).to receive(:sleep)
+          allow(poller).to receive(:process_batch) do
+            raise error
+          end
+          poller.retrieve_poll_info
+          poller.process_batch_with_span(widgets, status)
+          expect(poller).not_to have_received(:sleep)
+          expect(Deimos.config.tracer).to have_received(:set_error).with('a span', error)
+          expect(status.batches_errored).to eq(1)
+          expect(status.batches_processed).to eq(0)
+          expect(status.messages_processed).to eq(3)
+
+        end
+      end
+
+      context 'with skip_too_large_messages off' do
+        it 'should retry forever' do
+          called_once = false
+          allow(poller).to receive(:sleep)
+          allow(poller).to receive(:process_batch) do
+            unless called_once
+              called_once = true
+              raise Kafka::MessageSizeTooLarge, 'OH NOES'
+            end
+          end
+          poller.retrieve_poll_info
+          poller.process_batch_with_span(widgets, status)
+          expect(poller).to have_received(:sleep).once.with(0.5)
+          expect(Deimos.config.tracer).to have_received(:finish).with('a span')
+          expect(status.batches_errored).to eq(0)
+          expect(status.batches_processed).to eq(1)
+          expect(status.messages_processed).to eq(3)
+
+        end
+
+      end
+
       it 'should retry on Kafka error' do
         called_once = false
         allow(poller).to receive(:sleep)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deimos-ruby
 version: !ruby/object:Gem::Version
-  version: 1.22.5
+  version: 1.23.3
 platform: ruby
 authors:
 - Daniel Orner
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-18 00:00:00.000000000 Z
+date: 2024-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avro_turf
@@ -579,6 +579,7 @@ files:
 - spec/schemas/my_namespace/my_schema_with_date_time.rb
 - spec/schemas/my_namespace/my_schema_with_id.rb
 - spec/schemas/my_namespace/my_schema_with_unique_id.rb
+- spec/schemas/my_namespace/my_updated_schema.rb
 - spec/schemas/my_namespace/wibble.rb
 - spec/schemas/my_namespace/widget.rb
 - spec/schemas/my_namespace/widget_the_second.rb
@@ -632,7 +633,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.20
+rubygems_version: 3.1.2
 signing_key:
 specification_version: 4
 summary: Kafka libraries for Ruby.
@@ -706,6 +707,7 @@ test_files:
 - spec/schemas/my_namespace/my_schema_with_date_time.rb
 - spec/schemas/my_namespace/my_schema_with_id.rb
 - spec/schemas/my_namespace/my_schema_with_unique_id.rb
+- spec/schemas/my_namespace/my_updated_schema.rb
 - spec/schemas/my_namespace/wibble.rb
 - spec/schemas/my_namespace/widget.rb
 - spec/schemas/my_namespace/widget_the_second.rb