deimos-ruby 1.11.2 → 1.12.3

data/spec/active_record_batch_consumer_spec.rb

@@ -2,7 +2,7 @@
 
 # Wrapped in a module to prevent class leakage
 module ActiveRecordBatchConsumerTest
-  describe Deimos::ActiveRecordConsumer do
+  describe Deimos::ActiveRecordConsumer, 'Batch Consumer' do
     # Create ActiveRecord table and model
     before(:all) do
       ActiveRecord::Base.connection.create_table(:widgets, force: true) do |t|
@@ -68,133 +68,143 @@ module ActiveRecordBatchConsumerTest
       test_consume_batch(MyBatchConsumer, payloads, keys: keys, call_original: true)
     end
 
-    it 'should handle an empty batch' do
-      expect { publish_batch([]) }.not_to raise_error
-    end
+    describe 'consume_batch' 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 }
+          end
 
-    it 'should create records from a batch' do
-      publish_batch(
-        [
-          { key: 1,
-            payload: { test_id: 'abc', some_int: 3 } },
-          { key: 2,
-            payload: { test_id: 'def', some_int: 4 } }
-        ]
-      )
-
-      expect(all_widgets).
-        to match_array(
-          [
-            have_attributes(id: 1, test_id: 'abc', some_int: 3, updated_at: start, created_at: start),
-            have_attributes(id: 2, test_id: 'def', some_int: 4, updated_at: start, created_at: start)
-          ]
-        )
-    end
+          it 'should handle an empty batch' do
+            expect { publish_batch([]) }.not_to raise_error
+          end
 
-    it 'should handle deleting a record that doesn\'t exist' do
-      publish_batch(
-        [
-          { key: 1,
-            payload: nil }
-        ]
-      )
+          it 'should create records from a batch' do
+            publish_batch(
+              [
+                { key: 1,
+                  payload: { test_id: 'abc', some_int: 3 } },
+                { key: 2,
+                  payload: { test_id: 'def', some_int: 4 } }
+              ]
+            )
 
-      expect(all_widgets).to be_empty
-    end
+            expect(all_widgets).
+              to match_array(
+                [
+                  have_attributes(id: 1, test_id: 'abc', some_int: 3, updated_at: start, created_at: start),
+                  have_attributes(id: 2, test_id: 'def', some_int: 4, updated_at: start, created_at: start)
+                ]
+              )
+          end
 
-    it 'should handle an update, followed by a delete in the correct order' do
-      Widget.create!(id: 1, test_id: 'abc', some_int: 2)
+          it 'should handle deleting a record that doesn\'t exist' do
+            publish_batch(
+              [
+                { key: 1,
+                  payload: nil }
+              ]
+            )
 
-      publish_batch(
-        [
-          { key: 1,
-            payload: { test_id: 'abc', some_int: 3 } },
-          { key: 1,
-            payload: nil }
-        ]
-      )
+            expect(all_widgets).to be_empty
+          end
 
-      expect(all_widgets).to be_empty
-    end
+          it 'should handle an update, followed by a delete in the correct order' do
+            Widget.create!(id: 1, test_id: 'abc', some_int: 2)
+
+            publish_batch(
+              [
+                { key: 1,
+                  payload: { test_id: 'abc', some_int: 3 } },
+                { key: 1,
+                  payload: nil }
+              ]
+            )
 
-    it 'should handle a delete, followed by an update in the correct order' do
-      Widget.create!(id: 1, test_id: 'abc', some_int: 2)
+            expect(all_widgets).to be_empty
+          end
 
-      travel 1.day
+          it 'should handle a delete, followed by an update in the correct order' do
+            Widget.create!(id: 1, test_id: 'abc', some_int: 2)
 
-      publish_batch(
-        [
-          { key: 1,
-            payload: nil },
-          { key: 1,
-            payload: { test_id: 'abc', some_int: 3 } }
-        ]
-      )
+            travel 1.day
 
-      expect(all_widgets).
-        to match_array(
-          [
-            have_attributes(id: 1, test_id: 'abc', some_int: 3, updated_at: Time.zone.now, created_at: Time.zone.now)
-          ]
-        )
-    end
+            publish_batch(
+              [
+                { key: 1,
+                  payload: nil },
+                { key: 1,
+                  payload: { test_id: 'abc', some_int: 3 } }
+              ]
+            )
 
-    it 'should handle a double update' do
-      Widget.create!(id: 1, test_id: 'abc', some_int: 2)
+            expect(all_widgets).
+              to match_array(
+                [
+                  have_attributes(id: 1, test_id: 'abc', some_int: 3, updated_at: Time.zone.now, created_at: Time.zone.now)
+                ]
+              )
+          end
 
-      travel 1.day
+          it 'should handle a double update' do
+            Widget.create!(id: 1, test_id: 'abc', some_int: 2)
 
-      publish_batch(
-        [
-          { key: 1,
-            payload: { test_id: 'def', some_int: 3 } },
-          { key: 1,
-            payload: { test_id: 'ghi', some_int: 4 } }
-        ]
-      )
+            travel 1.day
 
-      expect(all_widgets).
-        to match_array(
-          [
-            have_attributes(id: 1, test_id: 'ghi', some_int: 4, updated_at: Time.zone.now, created_at: start)
-          ]
-        )
-    end
+            publish_batch(
+              [
+                { key: 1,
+                  payload: { test_id: 'def', some_int: 3 } },
+                { key: 1,
+                  payload: { test_id: 'ghi', some_int: 4 } }
+              ]
+            )
 
-    it 'should handle a double deletion' do
-      Widget.create!(id: 1, test_id: 'abc', some_int: 2)
+            expect(all_widgets).
+              to match_array(
+                [
+                  have_attributes(id: 1, test_id: 'ghi', some_int: 4, updated_at: Time.zone.now, created_at: start)
+                ]
+              )
+          end
 
-      publish_batch(
-        [
-          { key: 1,
-            payload: nil },
-          { key: 1,
-            payload: nil }
-        ]
-      )
+          it 'should handle a double deletion' do
+            Widget.create!(id: 1, test_id: 'abc', some_int: 2)
 
-      expect(all_widgets).to be_empty
-    end
+            publish_batch(
+              [
+                { key: 1,
+                  payload: nil },
+                { key: 1,
+                  payload: nil }
+              ]
+            )
 
-    it 'should ignore default scopes' do
-      Widget.create!(id: 1, test_id: 'abc', some_int: 2, deleted: true)
-      Widget.create!(id: 2, test_id: 'def', some_int: 3, deleted: true)
-
-      publish_batch(
-        [
-          { key: 1,
-            payload: nil },
-          { key: 2,
-            payload: { test_id: 'def', some_int: 5 } }
-        ]
-      )
-
-      expect(all_widgets).
-        to match_array(
-          [
-            have_attributes(id: 2, test_id: 'def', some_int: 5)
-          ]
-        )
+            expect(all_widgets).to be_empty
+          end
+
+          it 'should ignore default scopes' do
+            Widget.create!(id: 1, test_id: 'abc', some_int: 2, deleted: true)
+            Widget.create!(id: 2, test_id: 'def', some_int: 3, deleted: true)
+
+            publish_batch(
+              [
+                { key: 1,
+                  payload: nil },
+                { key: 2,
+                  payload: { test_id: 'def', some_int: 5 } }
+              ]
+            )
+
+            expect(all_widgets).
+              to match_array(
+                [
+                  have_attributes(id: 2, test_id: 'def', some_int: 5)
+                ]
+              )
+          end
+        end
+      end
     end
 
     describe 'compacted mode' do

data/spec/active_record_consumer_spec.rb

@@ -5,7 +5,6 @@ require 'date'
 # Wrapped in a module to prevent class leakage
 module ActiveRecordConsumerTest
   describe Deimos::ActiveRecordConsumer, 'Message Consumer' do
-
     before(:all) do
       ActiveRecord::Base.connection.create_table(:widgets, force: true) do |t|
         t.string(:test_id)
@@ -61,94 +60,104 @@ module ActiveRecordConsumerTest
       Time.zone = 'Eastern Time (US & Canada)'
     end
 
-    it 'should receive events correctly' do
-      travel 1.day do
-        expect(Widget.count).to eq(0)
-        test_consume_message(MyConsumer, {
-                               test_id: 'abc',
-                               some_int: 3,
-                               updated_at: 1.day.ago.to_i,
-                               some_datetime_int: Time.zone.now.to_i,
-                               timestamp: 2.minutes.ago.to_s
-                             }, { call_original: true, key: 5 })
-
-        expect(Widget.count).to eq(1)
-        widget = Widget.last
-        expect(widget.id).to eq(5)
-        expect(widget.test_id).to eq('abc')
-        expect(widget.some_int).to eq(3)
-        expect(widget.some_datetime_int).to eq(Time.zone.now)
-        expect(widget.some_bool).to eq(false)
-        expect(widget.updated_at).to eq(Time.zone.now)
-
-        # test unscoped
-        widget.update_attribute(:some_bool, true)
-
-        # test update
-        test_consume_message(MyConsumer, {
-                               test_id: 'abcd',
-                               some_int: 3,
-                               some_datetime_int: Time.zone.now.to_i,
-                               timestamp: 2.minutes.ago.to_s
-                             }, { call_original: true, key: 5 })
-        expect(Widget.unscoped.count).to eq(1)
-        widget = Widget.unscoped.last
-        expect(widget.id).to eq(5)
-        expect(widget.test_id).to eq('abcd')
-        expect(widget.some_int).to eq(3)
-
-        # test delete
-        test_consume_message(MyConsumer, nil, call_original: true, key: 5)
-        expect(Widget.count).to eq(0)
-
+    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 }
+          end
+
+          it 'should receive events correctly' do
+            travel 1.day do
+              expect(Widget.count).to eq(0)
+              test_consume_message(MyConsumer, {
+                                     test_id: 'abc',
+                                     some_int: 3,
+                                     updated_at: 1.day.ago.to_i,
+                                     some_datetime_int: Time.zone.now.to_i,
+                                     timestamp: 2.minutes.ago.to_s
+                                   }, { call_original: true, key: 5 })
+
+              expect(Widget.count).to eq(1)
+              widget = Widget.last
+              expect(widget.id).to eq(5)
+              expect(widget.test_id).to eq('abc')
+              expect(widget.some_int).to eq(3)
+              expect(widget.some_datetime_int).to eq(Time.zone.now)
+              expect(widget.some_bool).to eq(false)
+              expect(widget.updated_at).to eq(Time.zone.now)
+
+              # test unscoped
+              widget.update_attribute(:some_bool, true)
+
+              # test update
+              test_consume_message(MyConsumer, {
+                                     test_id: 'abcd',
+                                     some_int: 3,
+                                     some_datetime_int: Time.zone.now.to_i,
+                                     timestamp: 2.minutes.ago.to_s
+                                   }, { call_original: true, key: 5 })
+              expect(Widget.unscoped.count).to eq(1)
+              widget = Widget.unscoped.last
+              expect(widget.id).to eq(5)
+              expect(widget.test_id).to eq('abcd')
+              expect(widget.some_int).to eq(3)
+
+              # test delete
+              test_consume_message(MyConsumer, nil, call_original: true, key: 5)
+              expect(Widget.count).to eq(0)
+
+            end
+
+          end
+
+          it 'should update only updated_at' do
+            travel_to Time.local(2020, 5, 5, 5, 5, 5)
+            widget1 = Widget.create!(test_id: 'id1', some_int: 3)
+            expect(widget1.updated_at.in_time_zone).to eq(Time.local(2020, 5, 5, 5, 5, 5))
+
+            travel 1.day
+            test_consume_message(MyCustomFetchConsumer, {
+                                   test_id: 'id1',
+                                   some_int: 3
+                                 }, { call_original: true })
+            expect(widget1.reload.updated_at.in_time_zone).
+              to eq(Time.local(2020, 5, 6, 5, 5, 5))
+            travel_back
+          end
+
+          it 'should find widgets by custom logic' do
+            widget1 = Widget.create!(test_id: 'id1')
+            expect(widget1.some_int).to be_nil
+            test_consume_message(MyCustomFetchConsumer, {
+                                   test_id: 'id1',
+                                   some_int: 3
+                                 }, { call_original: true })
+            expect(widget1.reload.some_int).to eq(3)
+            expect(Widget.count).to eq(1)
+            test_consume_message(MyCustomFetchConsumer, {
+                                   test_id: 'id2',
+                                   some_int: 4
+                                 }, { call_original: true })
+            expect(Widget.count).to eq(2)
+            expect(Widget.find_by_test_id('id1').some_int).to eq(3)
+            expect(Widget.find_by_test_id('id2').some_int).to eq(4)
+          end
+
+          it 'should not create record of process_message returns false' do
+            allow_any_instance_of(MyConsumer).to receive(:process_message?).and_return(false)
+            expect(Widget.count).to eq(0)
+            test_consume_message(MyConsumer, {
+                                   test_id: 'abc',
+                                   some_int: 3,
+                                   updated_at: 1.day.ago.to_i,
+                                   some_datetime_int: Time.zone.now.to_i,
+                                   timestamp: 2.minutes.ago.to_s
+                                 }, { call_original: true, key: 5 })
+            expect(Widget.count).to eq(0)
+          end
+        end
       end
-
-    end
-
-    it 'should update only updated_at' do
-      travel_to Time.local(2020, 5, 5, 5, 5, 5)
-      widget1 = Widget.create!(test_id: 'id1', some_int: 3)
-      expect(widget1.updated_at.in_time_zone).to eq(Time.local(2020, 5, 5, 5, 5, 5))
-
-      travel 1.day
-      test_consume_message(MyCustomFetchConsumer, {
-                             test_id: 'id1',
-                             some_int: 3
-                           }, { call_original: true })
-      expect(widget1.reload.updated_at.in_time_zone).
-        to eq(Time.local(2020, 5, 6, 5, 5, 5))
-      travel_back
-    end
-
-    it 'should find widgets by custom logic' do
-      widget1 = Widget.create!(test_id: 'id1')
-      expect(widget1.some_int).to be_nil
-      test_consume_message(MyCustomFetchConsumer, {
-                             test_id: 'id1',
-                             some_int: 3
-                           }, { call_original: true })
-      expect(widget1.reload.some_int).to eq(3)
-      expect(Widget.count).to eq(1)
-      test_consume_message(MyCustomFetchConsumer, {
-                             test_id: 'id2',
-                             some_int: 4
-                           }, { call_original: true })
-      expect(Widget.count).to eq(2)
-      expect(Widget.find_by_test_id('id1').some_int).to eq(3)
-      expect(Widget.find_by_test_id('id2').some_int).to eq(4)
-    end
-
-    it 'should not create record of process_message returns false' do
-      MyConsumer.any_instance.stub(:process_message?).and_return(false)
-      expect(Widget.count).to eq(0)
-      test_consume_message(MyConsumer, {
-                             test_id: 'abc',
-                             some_int: 3,
-                             updated_at: 1.day.ago.to_i,
-                             some_datetime_int: Time.zone.now.to_i,
-                             timestamp: 2.minutes.ago.to_s
-                           }, { call_original: true, key: 5 })
-      expect(Widget.count).to eq(0)
     end
   end
 end

data/spec/active_record_producer_spec.rb

@@ -47,35 +47,46 @@ describe Deimos::ActiveRecordProducer do
     stub_const('MyProducerWithUniqueID', producer_class)
   end
 
-  it 'should send events correctly' do
-    MyProducer.send_event(Widget.new(test_id: 'abc', some_int: 3))
-    expect('my-topic').to have_sent(test_id: 'abc', some_int: 3)
-  end
+  describe 'produce' 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 }
+        end
 
-  it 'should coerce values' do
-    MyProducer.send_event(Widget.new(test_id: 'abc', some_int: '3'))
-    MyProducer.send_event(Widget.new(test_id: 'abc', some_int: 4.5))
-    expect('my-topic').to have_sent(test_id: 'abc', some_int: 3)
-    expect('my-topic').to have_sent(test_id: 'abc', some_int: 4)
-    expect {
-      MyProducer.send_event(Widget.new(test_id: 'abc', some_int: nil))
-    }.to raise_error(Avro::SchemaValidator::ValidationError)
-
-    MyBooleanProducer.send_event(Widget.new(test_id: 'abc', some_bool: nil))
-    MyBooleanProducer.send_event(Widget.new(test_id: 'abc', some_bool: true))
-    expect('my-topic-with-boolean').to have_sent(test_id: 'abc', some_bool: false)
-    expect('my-topic-with-boolean').to have_sent(test_id: 'abc', some_bool: true)
-  end
+        it 'should send events correctly' do
+          MyProducer.send_event(Widget.new(test_id: 'abc', some_int: 3))
+          expect('my-topic').to have_sent(test_id: 'abc', some_int: 3)
+        end
+
+        it 'should coerce values' do
+          MyProducer.send_event(Widget.new(test_id: 'abc', some_int: '3'))
+          MyProducer.send_event(Widget.new(test_id: 'abc', some_int: 4.5))
+          expect('my-topic').to have_sent(test_id: 'abc', some_int: 3)
+          expect('my-topic').to have_sent(test_id: 'abc', some_int: 4)
+          expect {
+            MyProducer.send_event(Widget.new(test_id: 'abc', some_int: nil))
+          }.to raise_error(Avro::SchemaValidator::ValidationError)
+
+          MyBooleanProducer.send_event(Widget.new(test_id: 'abc', some_bool: nil))
+          MyBooleanProducer.send_event(Widget.new(test_id: 'abc', some_bool: true))
+          expect('my-topic-with-boolean').to have_sent(test_id: 'abc', some_bool: false)
+          expect('my-topic-with-boolean').to have_sent(test_id: 'abc', some_bool: true)
+        end
 
-  it 'should be able to call the record' do
-    widget = Widget.create!(test_id: 'abc2', some_int: 3)
-    MyProducerWithID.send_event(id: widget.id, test_id: 'abc2', some_int: 3)
-    expect('my-topic-with-id').to have_sent(
-      test_id: 'abc2',
-      some_int: 3,
-      message_id: 'generated_id',
-      timestamp: anything
-    )
+        it 'should be able to call the record' do
+          widget = Widget.create!(test_id: 'abc2', some_int: 3)
+          MyProducerWithID.send_event(id: widget.id, test_id: 'abc2', some_int: 3)
+          expect('my-topic-with-id').to have_sent(
+            test_id: 'abc2',
+            some_int: 3,
+            message_id: 'generated_id',
+            timestamp: anything
+          )
+        end
+
+      end
+    end
   end
 
   specify '#watched_attributes' do

data/spec/batch_consumer_spec.rb

@@ -3,7 +3,6 @@
 # :nodoc:
 module ConsumerTest
   describe Deimos::Consumer, 'Batch Consumer' do
-
     prepend_before(:each) do
       # :nodoc:
       consumer_class = Class.new(described_class) do
@@ -30,40 +29,50 @@ module ConsumerTest
       batch.concat([{ 'invalid' => 'key' }])
     end
 
-    it 'should provide backwards compatibility for BatchConsumer class' do
-      consumer_class = Class.new(Deimos::BatchConsumer) do
-        schema 'MySchema'
-        namespace 'com.my-namespace'
-        key_config field: 'test_id'
+    describe 'consume_batch' 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 }
+          end
 
-        # :nodoc:
-        def consume_batch(_payloads, _metadata)
-          raise 'This should not be called unless call_original is set'
-        end
-      end
-      stub_const('ConsumerTest::MyOldBatchConsumer', consumer_class)
+          it 'should provide backwards compatibility for BatchConsumer class' do
+            consumer_class = Class.new(Deimos::BatchConsumer) do
+              schema 'MySchema'
+              namespace 'com.my-namespace'
+              key_config field: 'test_id'
+
+              # :nodoc:
+              def consume_batch(_payloads, _metadata)
+                raise 'This should not be called unless call_original is set'
+              end
+            end
+            stub_const('ConsumerTest::MyOldBatchConsumer', consumer_class)
+
+            test_consume_batch(MyOldBatchConsumer, batch) do |received, _metadata|
+              expect(received).to eq(batch)
+            end
+          end
 
-      test_consume_batch(MyOldBatchConsumer, batch) do |received, _metadata|
-        expect(received).to eq(batch)
-      end
-    end
+          it 'should consume a batch of messages' do
+            test_consume_batch(MyBatchConsumer, batch) do |received, _metadata|
+              expect(received).to eq(batch)
+            end
+          end
 
-    it 'should consume a batch of messages' do
-      test_consume_batch(MyBatchConsumer, batch) do |received, _metadata|
-        expect(received).to eq(batch)
-      end
-    end
+          it 'should consume a message on a topic' do
+            test_consume_batch('my_batch_consume_topic', batch) do |received, _metadata|
+              expect(received).to eq(batch)
+            end
+          end
 
-    it 'should consume a message on a topic' do
-      test_consume_batch('my_batch_consume_topic', batch) do |received, _metadata|
-        expect(received).to eq(batch)
+          it 'should fail on an invalid message in the batch' do
+            test_consume_batch_invalid_message(MyBatchConsumer, batch.concat(invalid_payloads))
+          end
+        end
       end
     end
 
-    it 'should fail on an invalid message in the batch' do
-      test_consume_batch_invalid_message(MyBatchConsumer, batch.concat(invalid_payloads))
-    end
-
     describe 'when reraising errors is disabled' do
       before(:each) do
         Deimos.configure { |config| config.consumers.reraise_errors = false }