deimos-ruby 2.2.0.pre.beta5 → 2.2.1

data/spec/schemas/my_namespace/my_schema_with_union_type.rb

@@ -9,13 +9,13 @@ module Schemas; module MyNamespace
     ### Secondary Schema Classes ###
     # Autogenerated Schema for Record at com.flipp.content.Record1
     class Record1 < Deimos::SchemaClass::Record
-  
+
       ### Attribute Accessors ###
       # @return [Hash<String, Integer>]
       attr_accessor :record1_map
       # @return [Integer]
       attr_accessor :record1_id
-  
+
       # @override
       def initialize(_from_message: false, record1_map: {},
                      record1_id: 0)
@@ -24,17 +24,17 @@ module Schemas; module MyNamespace
         self.record1_map = record1_map
         self.record1_id = record1_id
       end
-  
+
       # @override
       def schema
         'Record1'
       end
-  
+
       # @override
       def namespace
         'com.flipp.content'
       end
-  
+
       # @override
       def as_json(_opts={})
         {
@@ -46,28 +46,28 @@ module Schemas; module MyNamespace
 
     # Autogenerated Schema for Record at com.flipp.content.Record2
     class Record2 < Deimos::SchemaClass::Record
-  
+
       ### Attribute Accessors ###
       # @return [String]
       attr_accessor :record2_id
-  
+
       # @override
-      def initialize(_from_message: false, record2_id: "")
+      def initialize(_from_message: false, record2_id: '')
         @_from_message = _from_message
         super
         self.record2_id = record2_id
       end
-  
+
       # @override
       def schema
         'Record2'
       end
-  
+
       # @override
       def namespace
         'com.flipp.content'
       end
-  
+
       # @override
       def as_json(_opts={})
         {
@@ -78,28 +78,28 @@ module Schemas; module MyNamespace
 
     # Autogenerated Schema for Record at com.flipp.content.Record3
     class Record3 < Deimos::SchemaClass::Record
-  
+
       ### Attribute Accessors ###
       # @return [Float]
       attr_accessor :record3_id
-  
+
       # @override
       def initialize(_from_message: false, record3_id: 0.0)
         @_from_message = _from_message
         super
         self.record3_id = record3_id
       end
-  
+
       # @override
       def schema
         'Record3'
       end
-  
+
       # @override
       def namespace
         'com.flipp.content'
       end
-  
+
       # @override
       def as_json(_opts={})
         {
@@ -110,28 +110,28 @@ module Schemas; module MyNamespace
 
     # Autogenerated Schema for Record at com.flipp.content.Record4
     class Record4 < Deimos::SchemaClass::Record
-  
+
       ### Attribute Accessors ###
       # @return [Integer]
       attr_accessor :record4_id
-  
+
       # @override
       def initialize(_from_message: false, record4_id: 0)
         @_from_message = _from_message
         super
         self.record4_id = record4_id
       end
-  
+
       # @override
       def schema
         'Record4'
       end
-  
+
       # @override
       def namespace
         'com.flipp.content'
       end
-  
+
       # @override
       def as_json(_opts={})
         {
@@ -140,7 +140,6 @@ module Schemas; module MyNamespace
       end
     end
 
-
     ### Attribute Readers ###
     # @return [nil, Record1, Record2, Record3, Record4, Integer, Array<String>]
     attr_reader :test_union_type
@@ -173,7 +172,7 @@ module Schemas; module MyNamespace
     end
 
     # @override
-    def initialize(_from_message: false, test_id: "",
+    def initialize(_from_message: false, test_id: '',
                    test_long: nil,
                    test_union_type: nil)
       @_from_message = _from_message

data/spec/spec_helper.rb

@@ -16,8 +16,6 @@ require 'handlers/my_consumer'
 require 'rspec/rails'
 require 'rspec/snapshot'
 require 'karafka/testing/rspec/helpers'
-require "trilogy_adapter/connection"
-ActiveRecord::Base.public_send :extend, TrilogyAdapter::Connection
 Dir['./spec/schemas/**/*.rb'].sort.each { |f| require f }
 
 # Constants used for consumer specs
@@ -31,18 +29,17 @@ end
 DeimosApp.initialize!
 
 module Helpers
-
   def set_karafka_config(method, val)
     Deimos.karafka_configs.each { |c| c.send(method.to_sym, val) }
   end
 
-  def register_consumer(klass, schema, namespace='com.my-namespace', key_config:{none: true}, configs: {})
+  def register_consumer(klass, schema, namespace='com.my-namespace', key_config: { none: true }, configs: {})
     Karafka::App.routes.redraw do
-      topic 'my-topic' do
-        consumer klass
-        schema schema
-        namespace namespace
-        key_config key_config
+      topic('my-topic') do
+        consumer(klass)
+        schema(schema)
+        namespace(namespace)
+        key_config(key_config)
         configs.each do |k, v|
           public_send(k, v)
         end
@@ -99,7 +96,7 @@ module DbConfigs
   # @param topic [String]
   # @param key [String]
   def build_message(payload, topic, key)
-    { payload: payload, topic: topic, key: key}
+    { payload: payload, topic: topic, key: key }
   end
 
   DB_OPTIONS = [
@@ -201,7 +198,7 @@ RSpec.configure do |config|
 
   config.before(:all) do
     Time.zone = 'Eastern Time (US & Canada)'
-    ActiveRecord::Base.logger = Logger.new('/dev/null')
+    ActiveRecord::Base.logger = Logger.new(File::NULL)
     ActiveRecord::Base.establish_connection(
       'adapter' => 'sqlite3',
       'database' => 'test.sqlite3'
@@ -229,7 +226,7 @@ RSpec.configure do |config|
       deimos_config.schema.nest_child_schemas = true
       deimos_config.schema.path = File.join(File.expand_path(__dir__), 'schemas')
       deimos_config.schema.registry_url = ENV['SCHEMA_REGISTRY'] || 'http://localhost:8081'
-      deimos_config.logger = Logger.new('/dev/null')
+      deimos_config.logger = Logger.new(File::NULL)
       deimos_config.logger.level = Logger::INFO
       deimos_config.schema.backend = :avro_validation
       deimos_config.schema.generated_class_path = 'spec/schemas'
@@ -263,7 +260,7 @@ RSpec.shared_context('with widgets') do
     end
 
     # :nodoc:
-    class Widget < ActiveRecord::Base
+    class Widget < ActiveRecord::Base # rubocop:disable Lint/ConstantDefinitionInBlock
       # @return [String]
       def generated_id
         'generated_id'
@@ -287,7 +284,7 @@ RSpec.shared_context('with widget_with_union_types') do
     end
 
     # :nodoc:
-    class WidgetWithUnionType < ActiveRecord::Base
+    class WidgetWithUnionType < ActiveRecord::Base # rubocop:disable Lint/ConstantDefinitionInBlock
       # @return [String]
       def generated_id
         'generated_id'
@@ -300,7 +297,6 @@ RSpec.shared_context('with widget_with_union_types') do
   end
 end
 
-
 RSpec.shared_context('with DB') do
   before(:all) do
     setup_db(self.class.metadata[:db_config] || DbConfigs::DB_OPTIONS.last)
@@ -346,7 +342,7 @@ end
 
 RSpec::Matchers.define :match_message do |msg|
   match do |actual|
-    begin
+
       return false unless actual.is_a?(Hash)
 
       actual[:payloads]&.each do |p|
@@ -354,6 +350,6 @@ RSpec::Matchers.define :match_message do |msg|
         p[:payload].delete('message_id')
       end
       expect(actual).to match(a_hash_including(msg))
-    end
+
   end
 end

data/spec/utils/db_poller_spec.rb

@@ -44,7 +44,7 @@ each_db_config(Deimos::Utils::DbPoller::Base) do
     end
 
     it 'should raise an error if no pollers configured' do
-      Deimos.configure {}
+      Deimos.configure {} # rubocop:disable Lint/EmptyBlock
       expect { Deimos::Utils::DbPoller.start! }.to raise_error('No pollers configured!')
     end
 
@@ -159,17 +159,17 @@ each_db_config(Deimos::Utils::DbPoller::Base) do
 
       # run_every is set to 1 minute
       travel_to time_value(secs: 62)
-      expect(poller.should_run?).to eq(true)
+      expect(poller.should_run?).to be(true)
 
       travel_to time_value(secs: 30)
-      expect(poller.should_run?).to eq(false)
+      expect(poller.should_run?).to be(false)
 
       travel_to time_value(mins: -1) # this shouldn't be possible but meh
-      expect(poller.should_run?).to eq(false)
+      expect(poller.should_run?).to be(false)
 
       # take the 2 seconds of delay_time into account
       travel_to time_value(secs: 60)
-      expect(poller.should_run?).to eq(false)
+      expect(poller.should_run?).to be(false)
     end
 
     describe '#process_batch' do

data/spec/utils/deadlock_retry_spec.rb

@@ -52,10 +52,7 @@ RSpec.describe Deimos::Utils::DeadlockRetry do
         Widget.create(test_id: 'second')
       end
 
-      expect(Widget.all).to match_array([
-                                          have_attributes(test_id: 'first'),
-                                          have_attributes(test_id: 'second')
-                                        ])
+      expect(Widget.all).to contain_exactly(have_attributes(test_id: 'first'), have_attributes(test_id: 'second'))
     end
 
     it 'should not retry non-deadlock exceptions' do

data/spec/utils/outbox_producer_spec.rb

@@ -7,7 +7,7 @@ each_db_config(Deimos::Utils::OutboxProducer) do
     producer
   end
 
-  let(:logger) { instance_double(Logger, error: nil, info: nil, debug: nil )}
+  let(:logger) { instance_double(Logger, error: nil, info: nil, debug: nil) }
 
   before(:each) do
     stub_const('Deimos::Utils::OutboxProducer::BATCH_SIZE', 2)
@@ -15,11 +15,15 @@ each_db_config(Deimos::Utils::OutboxProducer) do
   end
 
   specify '#process_next_messages' do
-    expect(producer).to receive(:retrieve_topics).and_return(%w(topic1 topic2))
-    expect(producer).to receive(:process_topic).twice
-    expect(Deimos::KafkaTopicInfo).to receive(:ping_empty_topics).with(%w(topic1 topic2))
-    expect(producer).to receive(:sleep).with(0.5)
+    allow(producer).to receive(:retrieve_topics).and_return(%w(topic1 topic2))
+    allow(producer).to receive(:process_topic)
+    allow(Deimos::KafkaTopicInfo).to receive(:ping_empty_topics)
+    allow(producer).to receive(:sleep)
     producer.process_next_messages
+    expect(producer).to have_received(:retrieve_topics)
+    expect(producer).to have_received(:process_topic).twice
+    expect(Deimos::KafkaTopicInfo).to have_received(:ping_empty_topics).with(%w(topic1 topic2))
+    expect(producer).to have_received(:sleep).with(0.5)
   end
 
   specify '#retrieve_topics' do
@@ -45,7 +49,7 @@ each_db_config(Deimos::Utils::OutboxProducer) do
     producer.current_topic = 'topic1'
     messages = producer.retrieve_messages
     expect(messages.size).to eq(3)
-    expect(messages).to all(be_a_kind_of(Deimos::KafkaMessage))
+    expect(messages).to all(be_a(Deimos::KafkaMessage))
   end
 
   describe '#produce_messages' do
@@ -125,13 +129,16 @@ each_db_config(Deimos::Utils::OutboxProducer) do
     end
 
     it 'should do nothing if lock fails' do
-      expect(Deimos::KafkaTopicInfo).to receive(:lock).
-        with('my-topic', 'abc').and_return(false)
-      expect(producer).not_to receive(:retrieve_messages)
+      allow(Deimos::KafkaTopicInfo).to receive(:lock).and_return(false)
+      allow(producer).to receive(:retrieve_messages)
       producer.process_topic('my-topic')
+      expect(Deimos::KafkaTopicInfo).to have_received(:lock).with('my-topic', 'abc')
+      expect(producer).not_to have_received(:retrieve_messages)
     end
 
-    it 'should complete successfully' do
+    # using expect(x).to have_received(:y).ordered doesn't work
+    # rubocop:disable RSpec/StubbedMock
+    it 'should complete successfully' do # rubocop:disable RSpec/ExampleLength
       messages = (1..4).map do |i|
         Deimos::KafkaMessage.new(
           topic: 'my-topic',
@@ -196,13 +203,16 @@ each_db_config(Deimos::Utils::OutboxProducer) do
         with('my-topic', 'abc').once
       producer.process_topic('my-topic')
     end
+    # rubocop:enable RSpec/StubbedMock
 
     it 'should register an error if it gets an error' do
-      expect(producer).to receive(:retrieve_messages).and_raise('OH NOES')
-      expect(Deimos::KafkaTopicInfo).to receive(:register_error).
-        with('my-topic', 'abc')
-      expect(producer).not_to receive(:produce_messages)
+      allow(producer).to receive(:retrieve_messages).and_raise('OH NOES')
+      allow(Deimos::KafkaTopicInfo).to receive(:register_error)
+      allow(producer).to receive(:produce_messages)
       producer.process_topic('my-topic')
+      expect(producer).to have_received(:retrieve_messages)
+      expect(Deimos::KafkaTopicInfo).to have_received(:register_error).with('my-topic', 'abc')
+      expect(producer).not_to have_received(:produce_messages)
     end
 
     it 'should move on if it gets a partial batch' do
@@ -225,10 +235,9 @@ each_db_config(Deimos::Utils::OutboxProducer) do
         )
       end
 
-      expect(Deimos::KafkaTopicInfo).to receive(:lock).
-        with('my-topic', 'abc').and_return(true)
-      expect(producer).to receive(:produce_messages).and_raise('OH NOES')
-      expect(producer).to receive(:retrieve_messages).and_return(messages)
+      allow(Deimos::KafkaTopicInfo).to receive(:lock).and_return(true)
+      allow(producer).to receive(:produce_messages).and_raise('OH NOES')
+      allow(producer).to receive(:retrieve_messages).and_return(messages)
       expect(Deimos::KafkaTopicInfo).to receive(:register_error)
 
       expect(Deimos::KafkaMessage.count).to eq(4)
@@ -237,6 +246,9 @@ each_db_config(Deimos::Utils::OutboxProducer) do
         expect(event.payload[:messages]).to eq(messages)
       end
       producer.process_topic('my-topic')
+      expect(Deimos::KafkaTopicInfo).to have_received(:lock).with('my-topic', 'abc')
+      expect(producer).to have_received(:produce_messages)
+      expect(producer).to have_received(:retrieve_messages)
       # don't delete for regular errors
       expect(Deimos::KafkaMessage.count).to eq(4)
       Karafka.monitor.notifications_bus.clear('deimos.outbox.produce')
@@ -269,14 +281,14 @@ each_db_config(Deimos::Utils::OutboxProducer) do
         m.call(*args)
       end
 
-      expect(Deimos::KafkaTopicInfo).to receive(:lock).
-        with('my-topic', 'abc').and_return(true)
+      allow(Deimos::KafkaTopicInfo).to receive(:lock).and_return(true)
       expect(producer).to receive(:retrieve_messages).ordered.and_return(messages)
       expect(producer).to receive(:retrieve_messages).ordered.and_return([])
       expect(Karafka.producer).to receive(:produce_many_sync).once.with(messages.map(&:karafka_message))
 
       expect(Deimos::KafkaMessage.count).to eq(8)
       producer.process_topic('my-topic')
+      expect(Deimos::KafkaTopicInfo).to have_received(:lock).with('my-topic', 'abc')
       expect(Deimos::KafkaMessage.count).to eq(4)
     end
 
@@ -340,9 +352,9 @@ each_db_config(Deimos::Utils::OutboxProducer) do
   end
 
   example 'Full integration test' do
-    Deimos::KafkaMessage.create!(topic: "topic1",
-                                 message: "mess1",
-                                 partition_key: "key1")
+    Deimos::KafkaMessage.create!(topic: 'topic1',
+                                 message: 'mess1',
+                                 partition_key: 'key1')
     producer.process_next_messages
     expect(Deimos::KafkaTopicInfo.count).to eq(1)
     expect(Deimos::KafkaTopicInfo.first.topic).to eq('topic1')
@@ -350,7 +362,7 @@ each_db_config(Deimos::Utils::OutboxProducer) do
     expect('topic1').to have_sent('mess1')
   end
 
-  example 'Integration test - batching' do
+  example 'Integration test - batching' do # rubocop:disable RSpec/ExampleLength
     (1..4).each do |i|
       (1..2).each do |j|
         Deimos::KafkaMessage.create!(topic: "topic#{j}",