deimos-ruby 2.2.0.pre.beta5 → 2.2.1

data/spec/kafka_source_spec.rb

@@ -5,6 +5,7 @@ require 'activerecord-import'
 # Wrap in a module so our classes don't leak out afterwards
 module KafkaSourceSpec
   RSpec.describe Deimos::KafkaSource do
+    # rubocop:disable Lint/ConstantDefinitionInBlock
     before(:all) do
       ActiveRecord::Base.connection.create_table(:widgets, force: true) do |t|
         t.integer(:widget_id)
@@ -40,8 +41,8 @@ module KafkaSourceSpec
         end
       end
       Widget.reset_column_information
-
     end
+    # rubocop:enable Lint/ConstantDefinitionInBlock
 
     after(:all) do
       ActiveRecord::Base.connection.drop_table(:widgets)
@@ -111,22 +112,24 @@ module KafkaSourceSpec
       expect('my-topic-the-second').to have_sent(nil, widget.id)
     end
 
-    context 'multi-producer model using two different key fields' do
+    describe 'multi-producer model using two different key fields' do
       before(:each) do
-        class MultiKeyWidget < ActiveRecord::Base
+        klass = Class.new(ActiveRecord::Base) do
           include Deimos::KafkaSource
+
           self.table_name = 'widgets'
 
           def self.kafka_producers
             [WidgetProducer, WidgetStringKeyProducer]
           end
         end
+        stub_const('MultiKeyWidget', klass)
 
-        class WidgetStringKeyProducer < Deimos::ActiveRecordProducer
+        klass = Class.new(Deimos::ActiveRecordProducer) do
           class << self
 
             def generate_payload(attributes, record)
-              payload = super(attributes, record)
+              payload = super
               payload.merge('id' => record.model_id)
             end
 
@@ -135,6 +138,7 @@ module KafkaSourceSpec
             end
           end
         end
+        stub_const('WidgetStringKeyProducer', klass)
 
         Karafka::App.routes.redraw do
           topic 'my-topic' do
@@ -365,8 +369,9 @@ module KafkaSourceSpec
       before(:each) do
         # Dummy class we can include the mixin in. Has a backing table created
         # earlier and has the import hook disabled
-        class WidgetNoImportHook < ActiveRecord::Base
+        klass = Class.new(ActiveRecord::Base) do
           include Deimos::KafkaSource
+
           self.table_name = 'widgets'
 
           # :nodoc:
@@ -385,6 +390,7 @@ module KafkaSourceSpec
           end
         end
 
+        stub_const('WidgetNoImportHook', klass)
         WidgetNoImportHook.reset_column_information
       end
 
@@ -451,6 +457,7 @@ module KafkaSourceSpec
         # earlier and has the import hook disabled
         buggy_class = Class.new(ActiveRecord::Base) do
           include Deimos::KafkaSource
+
           self.table_name = 'widgets'
 
           # :nodoc:

data/spec/kafka_topic_info_spec.rb

@@ -33,7 +33,7 @@ each_db_config(Deimos::KafkaTopicInfo) do
                             locked_at: nil, error: true)
     expect(described_class.lock('my-topic', 'abc')).to be_falsey
     expect(described_class.count).to eq(1)
-    expect(described_class.first.locked_by).to eq(nil)
+    expect(described_class.first.locked_by).to be_nil
   end
 
   specify '#clear_lock' do
@@ -47,15 +47,15 @@ each_db_config(Deimos::KafkaTopicInfo) do
       Deimos::KafkaTopicInfo.clear_lock('my-topic', 'abc')
       expect(Deimos::KafkaTopicInfo.count).to eq(2)
       record = Deimos::KafkaTopicInfo.first
-      expect(record.locked_by).to eq(nil)
-      expect(record.locked_at).to eq(nil)
-      expect(record.error).to eq(false)
+      expect(record.locked_by).to be_nil
+      expect(record.locked_at).to be_nil
+      expect(record.error).to be(false)
       expect(record.retries).to eq(0)
       expect(record.last_processed_at.in_time_zone.to_s).to eq(Time.zone.now.to_s)
       record = Deimos::KafkaTopicInfo.last
-      expect(record.locked_by).not_to eq(nil)
-      expect(record.locked_at).not_to eq(nil)
-      expect(record.error).not_to eq(false)
+      expect(record.locked_by).not_to be_nil
+      expect(record.locked_at).not_to be_nil
+      expect(record.error).not_to be(false)
       expect(record.retries).not_to eq(0)
       expect(record.last_processed_at.in_time_zone.to_s).to eq(20.seconds.ago.to_s)
     end

data/spec/karafka/karafka.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class KarafkaApp < Karafka::App
   setup do |config|
     config.kafka = { 'bootstrap.servers': '127.0.0.1:9092' }
@@ -52,11 +53,11 @@ class KarafkaApp < Karafka::App
     # You need to define the topic per each queue name you use
     # active_job_topic :default
     #    topic :example do
-      # Uncomment this if you want Karafka to manage your topics configuration
-      # Managing topics configuration via routing will allow you to ensure config consistency
-      # across multiple environments
-      #
-      # config(partitions: 2, 'cleanup.policy': 'compact')
+    # Uncomment this if you want Karafka to manage your topics configuration
+    # Managing topics configuration via routing will allow you to ensure config consistency
+    # across multiple environments
+    #
+    # config(partitions: 2, 'cleanup.policy': 'compact')
     # consumer ExampleConsumer
     # end
   end

data/spec/karafka_config/karafka_spec.rb

@@ -1,4 +1,7 @@
-RSpec.describe 'Karafka configs' do
+# frozen_string_literal: true
+
+# rubocop:disable Style/GlobalVars
+RSpec.describe Karafka::Routing::Topic do
   before(:each) do
     KarafkaApp.routes.clear
     $found_stuff = nil
@@ -13,8 +16,7 @@ RSpec.describe 'Karafka configs' do
   end
 
   let(:producer_class) do
-    Class.new(Deimos::Producer) do
-    end
+    Class.new(Deimos::Producer)
   end
 
   describe 'producers' do
@@ -31,8 +33,8 @@ RSpec.describe 'Karafka configs' do
           key_config(none: true)
         end
       end
-      producer_class.publish({test_id: "id1", some_int: 5})
-      expect('MyTopic').to have_sent({test_id: "id1", some_int: 5})
+      producer_class.publish({ test_id: 'id1', some_int: 5 })
+      expect('MyTopic').to have_sent({ test_id: 'id1', some_int: 5 })
     end
 
     it 'should work with key plain' do
@@ -41,11 +43,11 @@ RSpec.describe 'Karafka configs' do
           producer_class MyProducer
           schema 'MySchema'
           namespace 'com.my-namespace'
-          key_config({plain: true})
+          key_config({ plain: true })
         end
       end
-      producer_class.publish({test_id: "id1", some_int: 5, payload_key: 'key'})
-      expect('MyTopic').to have_sent({test_id: "id1", some_int: 5}, 'key')
+      producer_class.publish({ test_id: 'id1', some_int: 5, payload_key: 'key' })
+      expect('MyTopic').to have_sent({ test_id: 'id1', some_int: 5 }, 'key')
     end
 
     it 'should work with key field' do
@@ -54,11 +56,11 @@ RSpec.describe 'Karafka configs' do
           producer_class MyProducer
           schema 'MySchema'
           namespace 'com.my-namespace'
-          key_config({field: :test_id})
+          key_config({ field: :test_id })
         end
       end
-      producer_class.publish({test_id: "id1", some_int: 5})
-      expect('MyTopic').to have_sent({test_id: "id1", some_int: 5}, 'id1')
+      producer_class.publish({ test_id: 'id1', some_int: 5 })
+      expect('MyTopic').to have_sent({ test_id: 'id1', some_int: 5 }, 'id1')
     end
 
     it 'should work with key schema' do
@@ -67,11 +69,11 @@ RSpec.describe 'Karafka configs' do
           producer_class MyProducer
           schema 'MySchema'
           namespace 'com.my-namespace'
-          key_config({schema: 'MySchema_key'})
+          key_config({ schema: 'MySchema_key' })
         end
       end
-      producer_class.publish({test_id: "id1", some_int: 5, payload_key: {test_id: 'id3'}})
-      expect('MyTopic').to have_sent({test_id: "id1", some_int: 5}, { test_id: 'id3'})
+      producer_class.publish({ test_id: 'id1', some_int: 5, payload_key: { test_id: 'id3' } })
+      expect('MyTopic').to have_sent({ test_id: 'id1', some_int: 5 }, { test_id: 'id3' })
     end
 
   end
@@ -83,15 +85,16 @@ RSpec.describe 'Karafka configs' do
         consumer MyConsumer
         schema 'MySchema'
         namespace 'com.my-namespace'
-        key_config({field: :test_id})
+        key_config({ field: :test_id })
       end
     end
 
-    test_consume_message('MyTopic', {test_id: "id1", some_int: 5}, key: "id1")
-    expect($found_stuff).to eq({'test_id' => "id1", 'some_int' => 5})
+    test_consume_message('MyTopic', { test_id: 'id1', some_int: 5 }, key: 'id1')
+    expect($found_stuff).to eq({ 'test_id' => 'id1', 'some_int' => 5 })
     $found_stuff = nil
-    test_consume_message(MyConsumer, {test_id: "id1", some_int: 5}, key: "id1")
-    expect($found_stuff).to eq({'test_id' => "id1", 'some_int' => 5})
+    test_consume_message(MyConsumer, { test_id: 'id1', some_int: 5 }, key: 'id1')
+    expect($found_stuff).to eq({ 'test_id' => 'id1', 'some_int' => 5 })
   end
 
 end
+# rubocop:enable Style/GlobalVars

data/spec/logging_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.describe Deimos::Logging do
   include_context 'with publish_backend'
   describe '#messages_log_text' do

data/spec/producer_spec.rb

@@ -5,10 +5,10 @@ module ProducerTest
   describe Deimos::Producer do
 
     prepend_before(:each) do
-      producer_class = Class.new(Deimos::Producer)
+      producer_class = Class.new(described_class)
       stub_const('MyProducer', producer_class)
 
-      producer_class = Class.new(Deimos::Producer)
+      producer_class = Class.new(described_class)
       stub_const('MyProducerWithID', producer_class)
 
       producer_class = Class.new(Deimos::Producer) do
@@ -19,16 +19,16 @@ module ProducerTest
       end
       stub_const('MyNonEncodedProducer', producer_class)
 
-      producer_class = Class.new(Deimos::Producer)
+      producer_class = Class.new(described_class)
       stub_const('MyNoKeyProducer', producer_class)
 
-      producer_class = Class.new(Deimos::Producer)
+      producer_class = Class.new(described_class)
       stub_const('MyNestedSchemaProducer', producer_class)
 
-      producer_class = Class.new(Deimos::Producer)
+      producer_class = Class.new(described_class)
       stub_const('MySchemaProducer', producer_class)
 
-      producer_class = Class.new(Deimos::Producer)
+      producer_class = Class.new(described_class)
       stub_const('MyErrorProducer', producer_class)
 
       Karafka::App.routes.redraw do
@@ -84,7 +84,7 @@ module ProducerTest
     end
 
     it 'should fail on invalid message' do
-      expect(Deimos::ProducerMiddleware).to receive(:call).and_raise('OH NOES')
+      allow(Deimos::ProducerMiddleware).to receive(:call).and_raise('OH NOES')
       expect { MyProducer.publish({ 'invalid' => 'key', :payload_key => 'key' }) }.
         to raise_error('OH NOES')
     end
@@ -110,7 +110,7 @@ module ProducerTest
         [{ 'test_id' => 'foo', 'some_int' => 123 },
          { 'test_id' => 'bar', 'some_int' => 124 }]
       )
-      expect('my-topic').to have_sent({'test_id' => 'foo', 'some_int' => 123}, 'foo', 'foo')
+      expect('my-topic').to have_sent({ 'test_id' => 'foo', 'some_int' => 123 }, 'foo', 'foo')
       expect('your-topic').not_to have_sent('test_id' => 'foo', 'some_int' => 123)
       expect('my-topic').not_to have_sent('test_id' => 'foo2', 'some_int' => 123)
     end
@@ -277,12 +277,13 @@ module ProducerTest
         allow(Karafka.logger).to receive(:info)
         allow(Karafka.logger).to receive(:tagged).and_yield(Karafka.logger)
       end
+
       context 'with default / full' do
         it 'should log full payload' do
           MyProducerWithID.publish_list(
             [
               { 'test_id' => 'foo', 'some_int' => 123, :payload_key => 'key' },
-              { 'test_id' => 'foo2', 'some_int' => 123, :payload_key => 'key2' },
+              { 'test_id' => 'foo2', 'some_int' => 123, :payload_key => 'key2' }
             ]
           )
           expect(Karafka.logger).to have_received(:info).with(match_message({
@@ -303,7 +304,7 @@ module ProducerTest
 
       context 'with count' do
         it 'should log only count' do
-          Deimos.karafka_config_for(topic: 'my-topic-with-id').payload_log :count
+          Deimos.karafka_config_for(topic: 'my-topic-with-id').payload_log(:count)
           MyProducerWithID.publish_list(
             [
               { 'test_id' => 'foo', 'some_int' => 123, :payload_key => 'key' },
@@ -320,7 +321,7 @@ module ProducerTest
 
     context 'with Schema Class payloads' do
       it 'should fail on invalid message with error handler' do
-        expect(Deimos::ProducerMiddleware).to receive(:call).and_raise('OH NOES')
+        allow(Deimos::ProducerMiddleware).to receive(:call).and_raise('OH NOES')
         expect { MyProducer.publish(Schemas::MyNamespace::MySchema.new(test_id: 'foo', some_int: 'invalid')) }.
           to raise_error('OH NOES')
       end
@@ -332,7 +333,7 @@ module ProducerTest
             hash_including({
               payload: { 'test_id' => 'foo', 'some_int' => 123, 'payload_key' => nil },
               topic: 'my-topic',
-              partition_key: nil,
+              partition_key: nil
             }),
             hash_including({
               payload: { 'test_id' => 'bar', 'some_int' => 124, 'payload_key' => nil },
@@ -364,17 +365,21 @@ module ProducerTest
       it 'should encode the key' do
         Deimos.configure { |c| c.producers.topic_prefix = nil }
 
-        MyProducer.publish_list(
-          [Schemas::MyNamespace::MySchema.new(test_id: 'foo', some_int: 123),
-           Schemas::MyNamespace::MySchema.new(test_id: 'bar', some_int: 124)]
-        )
+        expect {
+          MyProducer.publish_list(
+            [Schemas::MyNamespace::MySchema.new(test_id: 'foo', some_int: 123),
+             Schemas::MyNamespace::MySchema.new(test_id: 'bar', some_int: 124)]
+          )
+        }.not_to raise_error
       end
 
       it 'should encode with a schema' do
-        MySchemaProducer.publish_list(
-          [Schemas::MyNamespace::MySchema.new(test_id: 'foo', some_int: 123, payload_key: { 'test_id' => 'foo_key' }),
-           Schemas::MyNamespace::MySchema.new(test_id: 'bar', some_int: 124, payload_key: { 'test_id' => 'bar_key' })]
-        )
+        expect {
+          MySchemaProducer.publish_list(
+            [Schemas::MyNamespace::MySchema.new(test_id: 'foo', some_int: 123, payload_key: { 'test_id' => 'foo_key' }),
+             Schemas::MyNamespace::MySchema.new(test_id: 'bar', some_int: 124, payload_key: { 'test_id' => 'bar_key' })]
+          )
+        }.not_to raise_error
       end
 
       it 'should properly encode and coerce values with a nested record' do

data/spec/schema_backends/avro_base_shared.rb

@@ -62,9 +62,10 @@ RSpec.shared_examples_for('an Avro backend') do
   end
 
   specify('#encode_key') do
-    expect(backend).to receive(:encode).
-      with({ 'test_id' => 1 }, { schema: 'MySchema_key', topic: 'topic' }).and_return('itsme')
+    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' })
     expect(backend.schema_store.find('MySchema_key', 'com.my-namespace').to_avro).
       to eq(
         'doc' => 'Key for com.my-namespace.MySchema - autogenerated by Deimos',
@@ -78,10 +79,9 @@ RSpec.shared_examples_for('an Avro backend') do
   end
 
   specify('#decode_key') do
-    expect(backend).to receive(:decode).
-      with('payload', schema: 'MySchema_key').
-      and_return('test_id' => 1)
+    allow(backend).to receive(:decode).and_return('test_id' => 1)
     expect(backend.decode_key('payload', 'test_id')).to eq(1)
+    expect(backend).to have_received(:decode).with('payload', schema: 'MySchema_key')
   end
 
   describe('#validate') do
@@ -126,8 +126,8 @@ RSpec.shared_examples_for('an Avro backend') do
       expect(result['long-field']).to eq(11_111_111_111_111_111_111)
       expect(result['float-field']).to eq(1.0)
       expect(result['double-field']).to eq(2.0)
-      expect(result['boolean-field']).to eq(true)
-      expect(result['union-field']).to eq(nil)
+      expect(result['boolean-field']).to be(true)
+      expect(result['union-field']).to be_nil
     end
 
     it 'should coerce strings to numbers' do
@@ -177,7 +177,7 @@ RSpec.shared_examples_for('an Avro backend') do
 
     it 'should convert null to false' do
       result = backend.coerce(payload.merge('boolean-field' => nil))
-      expect(result['boolean-field']).to eq(false)
+      expect(result['boolean-field']).to be(false)
     end
 
     it 'should convert unions' do

data/spec/schema_backends/avro_local_spec.rb

@@ -16,17 +16,16 @@ RSpec.describe Deimos::SchemaBackends::AvroLocal do
 
   it 'should encode and decode correctly' do
     avro_turf = instance_double(AvroTurf)
-    expect(avro_turf).to receive(:encode).
-      with(payload, schema_name: 'MySchema', namespace: 'com.my-namespace').
-      and_return('encoded-payload')
-    expect(avro_turf).to receive(:decode).
-      with('encoded-payload', schema_name: 'MySchema', namespace: 'com.my-namespace').
-      and_return(payload)
+    allow(avro_turf).to receive_messages(encode: 'encoded-payload', decode: payload)
     allow(backend).to receive(:avro_turf).and_return(avro_turf)
     results = backend.encode(payload)
     expect(results).to eq('encoded-payload')
     results = backend.decode(results)
     expect(results).to eq(payload)
+    expect(avro_turf).to have_received(:encode).
+      with(payload, schema_name: 'MySchema', namespace: 'com.my-namespace')
+    expect(avro_turf).to have_received(:decode).
+      with('encoded-payload', schema_name: 'MySchema', namespace: 'com.my-namespace')
   end
 
 end

data/spec/schema_backends/avro_schema_registry_spec.rb

@@ -16,17 +16,16 @@ RSpec.describe Deimos::SchemaBackends::AvroSchemaRegistry do
 
   it 'should encode and decode correctly' do
     avro_turf = instance_double(AvroTurf::Messaging)
-    expect(avro_turf).to receive(:encode).
-      with(payload, schema_name: 'MySchema', subject: 'topic').
-      and_return('encoded-payload')
-    expect(avro_turf).to receive(:decode).
-      with('encoded-payload', schema_name: 'MySchema').
-      and_return(payload)
+    allow(avro_turf).to receive_messages(encode: 'encoded-payload', decode: payload)
     allow(backend).to receive(:avro_turf_messaging).and_return(avro_turf)
     results = backend.encode(payload, topic: 'topic')
     expect(results).to eq('encoded-payload')
     results = backend.decode(results)
     expect(results).to eq(payload)
+    expect(avro_turf).to have_received(:encode).
+      with(payload, schema_name: 'MySchema', subject: 'topic')
+    expect(avro_turf).to have_received(:decode).
+      with('encoded-payload', schema_name: 'MySchema')
   end
 
 end

data/spec/schema_backends/proto_schema_registry_spec.rb

@@ -6,14 +6,14 @@ require_relative "#{__dir__}/../gen/sample/v1/sample_pb"
 RSpec.describe Deimos::SchemaBackends::ProtoSchemaRegistry do
   let(:payload) do
     Sample::V1::SampleMessage.new(
-      str: "string",
+      str: 'string',
       num: 123,
-      str_arr: %w[one two],
+      str_arr: %w(one two),
       flag: true,
       timestamp: Time.utc(2017, 1, 1),
-      nested: Sample::V1::NestedMessage.new(nested_str: "string"),
+      nested: Sample::V1::NestedMessage.new(nested_str: 'string'),
       non_union_nested: Sample::V1::NestedMessage.new(nested_num: 456),
-      str_map: {'foo' => 'bar'}
+      str_map: { 'foo' => 'bar' }
     )
   end
 
@@ -22,29 +22,26 @@ RSpec.describe Deimos::SchemaBackends::ProtoSchemaRegistry do
   specify('#encode_key') do
     expect(backend.encode_key(nil, 789)).to eq('789')
     expect(backend.encode_key(nil, 'string')).to eq('string')
-    expect(backend.encode_key(nil, {foo: 'bar'})).to eq('{"foo":"bar"}')
+    expect(backend.encode_key(nil, { foo: 'bar' })).to eq('{"foo":"bar"}')
     expect(backend.encode_key(:foo, 'bar')).to eq('bar')
   end
 
   specify('#decode_key') do
     expect(backend.decode_key('789', nil)).to eq(789)
     expect(backend.decode_key('{"foo":"bar"}', :foo)).to eq('bar')
-    expect(backend.decode_key('{"foo":"bar"}', nil)).to eq({"foo" => 'bar'})
+    expect(backend.decode_key('{"foo":"bar"}', nil)).to eq({ 'foo' => 'bar' })
   end
 
   it 'should encode and decode correctly' do
     proto_turf = instance_double(ProtoTurf)
-    expect(proto_turf).to receive(:encode).
-      with(payload, subject: 'topic').
-      and_return('encoded-payload')
-    expect(proto_turf).to receive(:decode).
-      with('encoded-payload').
-      and_return(payload)
+    allow(proto_turf).to receive_messages(encode: 'encoded-payload', decode: payload)
     allow(described_class).to receive(:proto_turf).and_return(proto_turf)
     results = backend.encode(payload, topic: 'topic')
     expect(results).to eq('encoded-payload')
     results = backend.decode(results)
     expect(results).to eq(payload)
+    expect(proto_turf).to have_received(:encode).with(payload, subject: 'topic')
+    expect(proto_turf).to have_received(:decode).with('encoded-payload')
   end
 
 end

data/spec/schemas/my_namespace/generated.rb

@@ -44,8 +44,7 @@ module Schemas; module MyNamespace
       # @override
       def symbols
         %w(sym1 sym2)
-      end
-  
+      end  
       
       def sym1?
         @value == 'sym1'

data/spec/schemas/my_namespace/my_schema_with_complex_type.rb

@@ -44,8 +44,7 @@ module Schemas; module MyNamespace
       # @override
       def symbols
         %w(sym1 sym2)
-      end
-  
+      end  
       
       def sym1?
         @value == 'sym1'
@@ -62,8 +61,7 @@ module Schemas; module MyNamespace
       # @override
       def symbols
         %w(sym3 sym4)
-      end
-  
+      end  
       
       def sym3?
         @value == 'sym3'
@@ -80,8 +78,7 @@ module Schemas; module MyNamespace
       # @override
       def symbols
         %w(sym5 sym6)
-      end
-  
+      end  
       
       def sym5?
         @value == 'sym5'
@@ -175,8 +172,8 @@ module Schemas; module MyNamespace
                    test_string_array: ["test"],
                    test_int_array: [123],
                    test_optional_int: 123,
-                   some_integer_map: {"abc"=>123},
-                   some_record: {"a_record_field"=>"Test String"},
+                   some_integer_map: { "abc"=>123 },
+                   some_record: { "a_record_field"=>"Test String" },
                    some_optional_record: nil,
                    some_record_array: nil,
                    some_record_map: nil,