deimos-ruby 2.2.0.pre.beta5 → 2.2.1

data/lib/deimos/config/configuration.rb

@@ -6,7 +6,7 @@ require_relative '../tracing/mock'
 require 'active_support/core_ext/object'
 
 # :nodoc:
-module Deimos # rubocop:disable Metrics/ModuleLength
+module Deimos
   include FigTree
 
   # :nodoc:
@@ -24,14 +24,14 @@ module Deimos # rubocop:disable Metrics/ModuleLength
       Deimos.karafka_configs.each do |config|
         transcoder = config.deserializers[:key]
 
-        if transcoder.respond_to?(:key_field) &&
-           transcoder.key_field &&
-           transcoder.backend.supports_key_schemas?
-            transcoder.backend = Deimos.schema_backend(schema: config.schema,
-                                                       namespace: config.namespace,
-                                                       backend: transcoder.backend_type)
-            transcoder.backend.generate_key_schema(transcoder.key_field)
-        end
+        next unless transcoder.respond_to?(:key_field) &&
+                    transcoder.key_field &&
+                    transcoder.backend.supports_key_schemas?
+
+        transcoder.backend = Deimos.schema_backend(schema: config.schema,
+                                                   namespace: config.namespace,
+                                                   backend: transcoder.backend_type)
+        transcoder.backend.generate_key_schema(transcoder.key_field)
       end
     end
 
@@ -39,37 +39,39 @@ module Deimos # rubocop:disable Metrics/ModuleLength
     # @return [void]
     def load_generated_schema_classes
       if Deimos.config.schema.generated_class_path.nil?
-        raise 'Cannot use schema classes without schema.generated_class_path. Please provide a directory.'
+        raise 'Cannot use schema classes without schema.generated_class_path. ' \
+              'Please provide a directory.'
       end
 
-      Dir["./#{Deimos.config.schema.generated_class_path}/**/*.rb"].sort.each { |f| require f }
+      Dir["./#{Deimos.config.schema.generated_class_path}/**/*.rb"].sort.
+        each { |f| require f }
     rescue LoadError
-      raise 'Cannot load schema classes. Please regenerate classes with rake deimos:generate_schema_models.'
+      raise 'Cannot load schema classes. Please regenerate classes with' \
+            'rake deimos:generate_schema_models.'
     end
 
     # Ensure everything is set up correctly for the DB backend.
     # @!visibility private
     def validate_outbox_backend
-      begin
         require 'activerecord-import'
-      rescue LoadError
-        raise 'Cannot set producers.backend to :outbox without activerecord-import! Please add it to your Gemfile.'
-      end
+    rescue LoadError
+        raise 'Cannot set producers.backend to :outbox without activerecord-import! ' \
+              'Please add it to your Gemfile.'
     end
   end
 
-  # rubocop:enable Metrics/PerceivedComplexity, Metrics/AbcSize
-
   define_settings do
     setting :logger, removed: 'Use "logger" in Karafka setup block.'
     setting :payload_log, removed: 'Use topic.payload_log in Karafka settings'
     setting :phobos_logger, removed: 'Separate logger for Phobos is no longer supported'
 
     setting :kafka do
-      setting :logger, Logger.new(STDOUT), removed: "Karafka uses Rails logger by default"
-      setting :seed_brokers, ['localhost:9092'], removed: 'Use kafka(bootstrap.servers) in Karafka settings'
+      setting :logger, Logger.new(STDOUT), removed: 'Karafka uses Rails logger by default'
+      setting :seed_brokers, ['localhost:9092'], removed: 'Use kafka(bootstrap.servers)' \
+                                                          'in Karafka settings'
       setting :client_id, 'phobos', removed: 'Use client_id in Karafka setup block.'
-      setting :connect_timeout, 15, removed: 'Use kafka(socket.connection.setup.timeout.ms) in Karafka settings'
+      setting :connect_timeout, 15, removed: 'Use kafka(socket.connection.setup.timeout.ms)' \
+                                             'in Karafka settings'
       setting :socket_timeout, 15, removed: 'Use kafka(socket.timeout.ms) in Karafka settings'
 
       setting :ssl do
@@ -77,12 +79,14 @@ module Deimos # rubocop:disable Metrics/ModuleLength
         setting :ca_cert, removed: 'Use kafka(ssl.ca.pem) in Karafka settings'
         setting :client_cert, removed: 'Use kafka(ssl.certificate.pem) in Karafka settings'
         setting :client_cert_key, removed: 'Use kafka(ssl.key.pem) in Karafka settings'
-        setting :verify_hostname, removed: 'Use kafka(ssl.endpoint.identification.algorithm=https) in Karafka settings'
+        setting :verify_hostname, removed: 'Use kafka(ssl.endpoint.identification.algorithm=https)' \
+                                           'in Karafka settings'
         setting :ca_certs_from_system, removed: 'Should not be necessary with librdkafka.'
       end
 
       setting :sasl do
-        setting :enabled, removed: 'Use kafka(security.protocol=sasl_ssl or sasl_plaintext) in Karafka settings'
+        setting :enabled, removed: 'Use kafka(security.protocol=sasl_ssl or sasl_plaintext)' \
+                                   'in Karafka settings'
         setting :gssapi_principal, removed: 'Use kafka(sasl.kerberos.principal) in Karafka settings'
         setting :gssapi_keytab, removed: 'Use kafka(sasl.kerberos.keytab) in Karafka settings'
         setting :plain_authzid, removed: 'No longer needed with rdkafka'
@@ -99,26 +103,28 @@ module Deimos # rubocop:disable Metrics/ModuleLength
     setting :consumers do
       setting :reraise_errors, removed: 'Use topic.reraise_errors in Karafka settings'
       setting :report_lag, removed: "Use Karafka's built in lag reporting"
-      setting(:fatal_error, removed: "Use topic.fatal_error in Karafka settings")
-      setting(:bulk_import_id_generator, removed: "Use topic.bulk_import_id_generator in Karafka settings")
-      setting :save_associations_first, removed: "Use topic.save_associations_first"
-      setting :replace_associations, removed: "Use topic.replace_associations in Karafka settings"
+      setting(:fatal_error, removed: 'Use topic.fatal_error in Karafka settings')
+      setting(:bulk_import_id_generator, removed: 'Use topic.bulk_import_id_generator ' \
+                                                  'in Karafka settings')
+      setting :save_associations_first, removed: 'Use topic.save_associations_first'
+      setting :replace_associations, removed: 'Use topic.replace_associations in Karafka settings'
     end
 
     setting :producers do
-      setting :ack_timeout, removed: "Not supported in rdkafka"
-      setting :required_acks, 1, removed: "Use kafka(request.required.acks) in Karafka settings"
-      setting :max_retries, removed: "Use kafka(message.send.max.retries) in Karafka settings"
-      setting :retry_backoff, removed: "Use kafka(retry.backoff.ms) in Karafka settings"
-      setting :max_buffer_size, removed: "Not relevant with Karafka. You may want to see the queue.buffering.max.messages setting."
-      setting :max_buffer_bytesize, removed: "Not relevant with Karafka."
-      setting :compression_codec, removed: "Use kafka(compression.codec) in Karafka settings"
-      setting :compression_threshold, removed: "Not supported in Karafka."
-      setting :max_queue_size, removed: "Not relevant to Karafka."
-      setting :delivery_threshold, removed: "Not relevant to Karafka."
-      setting :delivery_interval, removed: "Not relevant to Karafka."
-      setting :persistent_connections, removed: "Karafka connections are always persistent."
-      setting :schema_namespace, removed: "Use topic.namespace in Karafka settings"
+      setting :ack_timeout, removed: 'Not supported in rdkafka'
+      setting :required_acks, 1, removed: 'Use kafka(request.required.acks) in Karafka settings'
+      setting :max_retries, removed: 'Use kafka(message.send.max.retries) in Karafka settings'
+      setting :retry_backoff, removed: 'Use kafka(retry.backoff.ms) in Karafka settings'
+      setting :max_buffer_size, removed: 'Not relevant with Karafka. You may want to see ' \
+                                         'the queue.buffering.max.messages setting.'
+      setting :max_buffer_bytesize, removed: 'Not relevant with Karafka.'
+      setting :compression_codec, removed: 'Use kafka(compression.codec) in Karafka settings'
+      setting :compression_threshold, removed: 'Not supported in Karafka.'
+      setting :max_queue_size, removed: 'Not relevant to Karafka.'
+      setting :delivery_threshold, removed: 'Not relevant to Karafka.'
+      setting :delivery_interval, removed: 'Not relevant to Karafka.'
+      setting :persistent_connections, removed: 'Karafka connections are always persistent.'
+      setting :schema_namespace, removed: 'Use topic.namespace in Karafka settings'
 
       # Add a prefix to all topic names. This can be useful if you're using
       # the same Kafka broker for different environments that are producing
@@ -210,47 +216,53 @@ module Deimos # rubocop:disable Metrics/ModuleLength
     end
 
     setting :db_producer do
-      setting :logger, removed: "Use outbox.logger"
-      setting :log_topics, removed: "Use outbox.log_topics"
-      setting :compact_topics, removed: "Use outbox.compact_topics"
+      setting :logger, removed: 'Use outbox.logger'
+      setting :log_topics, removed: 'Use outbox.log_topics'
+      setting :compact_topics, removed: 'Use outbox.compact_topics'
     end
 
     setting_object :producer do
-      setting :class_name, removed: "Use topic.producer_class in Karafka settings."
-      setting :topic, removed: "Use Karafka settings."
-      setting :schema, removed: "Use topic.schema(schema:) in Karafka settings."
-      setting :namespace, removed: "Use topic.schema(namespace:) in Karafka settings."
-      setting :key_config, removed: "Use topic.schema(key_config:) in Karafka settings."
-      setting :use_schema_classes, removed: "Use topic.schema(use_schema_classes:) in Karafka settings."
+      setting :class_name, removed: 'Use topic.producer_class in Karafka settings.'
+      setting :topic, removed: 'Use Karafka settings.'
+      setting :schema, removed: 'Use topic.schema(schema:) in Karafka settings.'
+      setting :namespace, removed: 'Use topic.schema(namespace:) in Karafka settings.'
+      setting :key_config, removed: 'Use topic.schema(key_config:) in Karafka settings.'
+      setting :use_schema_classes, removed: 'Use topic.schema(use_schema_classes:) in ' \
+                                            'Karafka settings.'
     end
 
     setting_object :consumer do
-      setting :class_name, removed: "Use topic.consumer in Karafka settings."
-      setting :topic, removed: "Use Karafka settings."
-      setting :schema, removed: "Use topic.schema(schema:) in Karafka settings."
-      setting :namespace, removed: "Use topic.schema(namespace:) in Karafka settings."
-      setting :key_config, removed: "Use topic.schema(key_config:) in Karafka settings."
-      setting :disabled, removed: "Use topic.active in Karafka settings."
-      setting :use_schema_classes, removed: "Use topic.use_schema_classes in Karafka settings."
-      setting :max_db_batch_size, removed: "Use topic.max_db_batch_size in Karafka settings."
-      setting :bulk_import_id_column, removed: "Use topic.bulk_import_id_column in Karafka settings."
-      setting :replace_associations, removed: "Use topic.replace_associations in Karafka settings."
-      setting :bulk_import_id_generator, removed: "Use topic.bulk_import_id_generator in Karafka settings."
-      setting :save_associations_first, removed: "Use topic.save_associations_first"
-      setting :group_id, removed: "Use kafka(group.id) in Karafka settings."
+      setting :class_name, removed: 'Use topic.consumer in Karafka settings.'
+      setting :topic, removed: 'Use Karafka settings.'
+      setting :schema, removed: 'Use topic.schema(schema:) in Karafka settings.'
+      setting :namespace, removed: 'Use topic.schema(namespace:) in Karafka settings.'
+      setting :key_config, removed: 'Use topic.schema(key_config:) in Karafka settings.'
+      setting :disabled, removed: 'Use topic.active in Karafka settings.'
+      setting :use_schema_classes, removed: 'Use topic.use_schema_classes in Karafka settings.'
+      setting :max_db_batch_size, removed: 'Use topic.max_db_batch_size in Karafka settings.'
+      setting :bulk_import_id_column, removed: 'Use topic.bulk_import_id_column' \
+                                               'in Karafka settings.'
+      setting :replace_associations, removed: 'Use topic.replace_associations in Karafka settings.'
+      setting :bulk_import_id_generator, removed: 'Use topic.bulk_import_id_generator ' \
+                                                  'in Karafka settings.'
+      setting :save_associations_first, removed: 'Use topic.save_associations_first'
+      setting :group_id, removed: 'Use kafka(group.id) in Karafka settings.'
       setting :max_concurrency, removed: "Use Karafka's 'config.concurrency' in the setup block."
-      setting :start_from_beginning, removed: "Use initial_offset in the setup block, or kafka(auto.offset.reset) in topic settings."
-      setting :max_bytes_per_partition, removed: "Use max_messages in the setup block."
-      setting :min_bytes, removed: "Not supported in Karafka."
-      setting :max_wait_time, removed: "Use max_wait_time in the setup block."
-      setting :force_encoding, removed: "Not supported with Karafka."
-      setting :delivery, :batch, removed: "Use batch: true/false in Karafka topic configs."
-      setting :backoff, removed: "Use kafka(retry.backoff.ms) and retry.backoff.max.ms in Karafka settings."
-      setting :session_timeout, removed: "Use kafka(session.timeout.ms) in Karafka settings."
-      setting :offset_commit_interval, removed: "Use kafka(auto.commit.interval.ms) in Karafka settings."
-      setting :offset_commit_threshold, removed: "Not supported with Karafka."
-      setting :offset_retention_time, removed: "Not supported with Karafka."
-      setting :heartbeat_interval, removed: "Use kafka(heartbeat.interval.ms) in Karafka settings."
+      setting :start_from_beginning, removed: 'Use initial_offset in the setup block, or ' \
+                                              'kafka(auto.offset.reset) in topic settings.'
+      setting :max_bytes_per_partition, removed: 'Use max_messages in the setup block.'
+      setting :min_bytes, removed: 'Not supported in Karafka.'
+      setting :max_wait_time, removed: 'Use max_wait_time in the setup block.'
+      setting :force_encoding, removed: 'Not supported with Karafka.'
+      setting :delivery, :batch, removed: 'Use batch: true/false in Karafka topic configs.'
+      setting :backoff, removed: 'Use kafka(retry.backoff.ms) and retry.backoff.max.ms' \
+                                 'in Karafka settings.'
+      setting :session_timeout, removed: 'Use kafka(session.timeout.ms) in Karafka settings.'
+      setting :offset_commit_interval, removed: 'Use kafka(auto.commit.interval.ms) ' \
+                                                'in Karafka settings.'
+      setting :offset_commit_threshold, removed: 'Not supported with Karafka.'
+      setting :offset_retention_time, removed: 'Not supported with Karafka.'
+      setting :heartbeat_interval, removed: 'Use kafka(heartbeat.interval.ms) in Karafka settings.'
     end
 
     setting_object :db_poller do
@@ -290,7 +302,8 @@ module Deimos # rubocop:disable Metrics/ModuleLength
       # Value to set the state_column to if publishing fails - state-based only.
       setting :failed_state
 
-      # Inherited poller class name to use for publishing to multiple kafka topics from a single poller
+      # Inherited poller class name to use for publishing to multiple kafka topics
+      # from a single poller
       setting :poller_class, nil
     end
 

data/lib/deimos/consume/batch_consumption.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'benchmark'
+
 module Deimos
   module Consume
     # Helper methods used by batch consumers, i.e. those with "inline_batch"
@@ -16,14 +18,14 @@ module Deimos
 
       def _consume_batch
         _with_span do
-          begin
+
             benchmark = Benchmark.measure do
               consume_batch
             end
             _handle_batch_success(benchmark.real)
-          rescue StandardError => e
+        rescue StandardError => e
             _handle_batch_error(e)
-          end
+
         end
       end
 
@@ -49,9 +51,9 @@ module Deimos
             message: 'Finished processing Kafka batch event',
             time_elapsed: time_taken,
             metadata: Deimos::Logging.metadata_log_text(messages.metadata)
-          }.merge(Deimos::Logging.messages_log_text(self.topic.payload_log, messages)))
+          }.merge(Deimos::Logging.messages_log_text(self.topic.payload_log, messages))
+        )
       end
-
     end
   end
 end

data/lib/deimos/consume/message_consumption.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'benchmark'
+
 module Deimos
   module Consume
     # Methods used by message-by-message (non-batch) consumers. These consumers
@@ -18,7 +20,7 @@ module Deimos
 
       def _consume_messages
         messages.each do |message|
-          begin
+
             _with_span do
               _received_message(message)
               benchmark = Benchmark.measure do
@@ -28,7 +30,7 @@ module Deimos
             rescue StandardError => e
               _handle_message_error(e, message)
             end
-          end
+
         end
       end
 
@@ -53,7 +55,7 @@ module Deimos
             error_message: exception.message,
             error: exception.backtrace
           )
-        rescue # serialization issues
+        rescue StandardError # serialization issues
           Deimos::Logging.log_warn(
             message: 'Error consuming message',
             handler: self.class.name,

data/lib/deimos/ext/consumer_route.rb

@@ -1,7 +1,8 @@
+# frozen_string_literal: true
+
 module Deimos
   class ConsumerRoute < Karafka::Routing::Features::Base
     module Topic
-
       FIELDS = %i(max_db_batch_size
                   bulk_import_id_column
                   replace_associations
@@ -9,8 +10,7 @@ module Deimos
                   each_message
                   reraise_errors
                   fatal_error
-                  save_associations_first
-      )
+                  save_associations_first).freeze
       Config = Struct.new(*FIELDS, keyword_init: true)
 
       FIELDS.each do |field|

data/lib/deimos/ext/producer_metrics_listener.rb

@@ -2,10 +2,10 @@
 
 module Deimos
   class ProducerMetricsListener
-      %i[
+      %i(
         produced_sync
         produced_async
-      ].each do |event_scope|
+      ).each do |event_scope|
         define_method(:"on_message_#{event_scope}") do |event|
           Deimos.config.metrics&.increment(
             'publish',

data/lib/deimos/ext/producer_middleware.rb

@@ -1,7 +1,7 @@
-module Deimos
+# frozen_string_literal: true
 
+module Deimos
   module ProducerMiddleware
-
     class << self
 
       def allowed_classes
@@ -31,19 +31,7 @@ module Deimos
                                   headers: message[:headers],
                                   partition_key: message[:partition_key])
           _process_message(m, message, config)
-          message[:payload] = m.encoded_payload
-          message[:label] = {
-            original_payload: m.payload,
-            original_key: m.key
-          }
-          message[:key] = m.encoded_key
-          message[:partition_key] = if m.partition_key
-                                      m.partition_key.to_s
-                                    elsif m.key
-                                      m.key.to_s
-                                    else
-                                      nil
-                                    end
+          _assign_message(m, message)
           message[:topic] = "#{Deimos.config.producers.topic_prefix}#{config.name}"
 
           validate_key_config(config, message)
@@ -52,6 +40,22 @@ module Deimos
         end
       end
 
+      def _assign_message(deimos_message, message)
+        message[:payload] = deimos_message.encoded_payload
+        message[:label] = {
+          original_payload: deimos_message.payload,
+          original_key: deimos_message.key
+        }
+        message[:key] = deimos_message.encoded_key
+        message[:partition_key] = if deimos_message.partition_key
+                                    deimos_message.partition_key.to_s
+                                  elsif deimos_message.key
+                                    deimos_message.key.to_s
+                                  else
+                                    nil
+                                  end
+      end
+
       def validate_key_config(config, message)
         if message[:key].nil? && config.deserializers[:key].is_a?(Deimos::Transcoder)
            raise 'No key given but a key is required! Use `key_config none: true` to avoid using keys.'

data/lib/deimos/ext/producer_route.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 module Deimos
   class ProducerRoute < Karafka::Routing::Features::Base
-    FIELDS = %i(producer_classes payload_log disabled)
+    FIELDS = %i(producer_classes payload_log disabled).freeze
 
     Config = Struct.new(*FIELDS, keyword_init: true) do
       def producer_class=(val)

data/lib/deimos/ext/routing_defaults.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # This monkey patch was provided by Maciej, the maintainer of Karafka. This allows
 # configs to override each other on a more granular basis rather than each `configure` call
 # blowing away all fields. It also supports multiple default blocks.
@@ -46,11 +48,11 @@ class Matcher
   end
 
   def method_missing(m, *args, **kwargs)
-    if args.empty?
-      @applications << [m, kwargs]
-    else
-      @applications << [m, args]
-    end
+    @applications << if args.empty?
+      [m, kwargs]
+                     else
+      [m, args]
+                     end
   end
 end
 
@@ -72,5 +74,5 @@ module ConsumerGroup
   end
 end
 
-Karafka::Routing::Builder.prepend Builder
-Karafka::Routing::ConsumerGroup.prepend ConsumerGroup
+Karafka::Routing::Builder.prepend(Builder)
+Karafka::Routing::ConsumerGroup.prepend(ConsumerGroup)

data/lib/deimos/ext/schema_route.rb

@@ -1,6 +1,8 @@
-require "deimos/transcoder"
-require "deimos/ext/producer_middleware"
-require "deimos/schema_backends/plain"
+# frozen_string_literal: true
+
+require 'deimos/transcoder'
+require 'deimos/ext/producer_middleware'
+require 'deimos/schema_backends/plain'
 
 module Deimos
   class SchemaRoute < Karafka::Routing::Features::Base
@@ -9,9 +11,9 @@ module Deimos
       {
         schema: nil,
         namespace: nil,
-        key_config: {none: true},
+        key_config: { none: true },
         schema_backend: nil,
-        use_schema_classes: Deimos.config.schema.use_schema_classes
+        use_schema_classes: nil
       }.each do |field, default|
         define_method(field) do |*args|
           @_deimos_config ||= {}
@@ -23,14 +25,19 @@ module Deimos
           @_deimos_config[:schema][field] || default
         end
       end
-      def _deimos_setup_transcoders
+      def _deimos_setup_transcoders # rubocop:disable Metrics/AbcSize
+        use_classes = if use_schema_classes.nil?
+                        Deimos.config.schema.use_schema_classes
+                      else
+                        use_schema_classes
+                      end
         payload = Transcoder.new(
-            schema: schema,
-            namespace: namespace,
-            backend: schema_backend,
-            use_schema_classes: use_schema_classes,
-            topic: name
-          )
+          schema: schema,
+          namespace: namespace,
+          backend: schema_backend,
+          use_schema_classes: use_classes,
+          topic: name
+        )
 
         key = nil
 
@@ -39,7 +46,7 @@ module Deimos
             schema: schema,
             backend: schema_backend,
             namespace: namespace,
-            use_schema_classes: use_schema_classes,
+            use_schema_classes: use_classes,
             topic: name
           )
           key.backend = Deimos::SchemaBackends::Plain.new(schema: nil, namespace: nil)
@@ -49,7 +56,7 @@ module Deimos
               schema: schema,
               backend: schema_backend,
               namespace: namespace,
-              use_schema_classes: use_schema_classes,
+              use_schema_classes: use_classes,
               key_field: key_config[:field].to_s,
               topic: name
             )
@@ -58,7 +65,7 @@ module Deimos
               schema: key_config[:schema] || schema,
               backend: schema_backend,
               namespace: namespace,
-              use_schema_classes: use_schema_classes,
+              use_schema_classes: use_classes,
               topic: self.name
             )
           else

data/lib/deimos/kafka_message.rb

@@ -12,7 +12,7 @@ module Deimos
     # @param mess [Object]
     # @return [void]
     def message=(mess)
-      write_attribute(:message, mess ? mess.to_s : nil)
+      write_attribute(:message, mess&.to_s)
     end
 
     # Decoded payload for this message.

data/lib/deimos/kafka_source.rb

@@ -50,9 +50,11 @@ module Deimos
       return unless self.class.kafka_config[:delete]
 
       self.class.kafka_producers.each do |p|
-        generated = p.respond_to?(:generate_deletion_payload) ?
-                      p.generate_deletion_payload(self) :
-                      self.deletion_payload
+        generated = if p.respond_to?(:generate_deletion_payload)
+  p.generate_deletion_payload(self)
+                    else
+  self.deletion_payload
+end
         p.publish_list([generated])
       end
     end
@@ -88,7 +90,7 @@ module Deimos
       # @!visibility private
       def import_without_validations_or_callbacks(column_names,
                                                   array_of_attributes,
-                                                  options = {})
+                                                  options={})
         results = super
         if !self.kafka_config[:import] || array_of_attributes.empty?
           return results
@@ -96,40 +98,44 @@ module Deimos
 
         # This will contain an array of hashes, where each hash is the actual
         # attribute hash that created the object.
-        array_of_hashes = []
-        array_of_attributes.each do |array|
-          array_of_hashes << column_names.zip(array).to_h.with_indifferent_access
+        array_of_hashes = array_of_attributes.map do |array|
+          column_names.zip(array).to_h.with_indifferent_access
         end
         hashes_with_id, hashes_without_id = array_of_hashes.partition { |arr| arr[:id].present? }
 
         self.kafka_producers.each { |p| p.send_events(hashes_with_id) }
 
         if hashes_without_id.any?
-          if options[:on_duplicate_key_update].present? &&
-             options[:on_duplicate_key_update] != [:updated_at]
-            unique_columns = column_names.map(&:to_s) -
-                             options[:on_duplicate_key_update].map(&:to_s) - %w(id created_at)
-            records = hashes_without_id.map do |hash|
-              self.where(unique_columns.map { |c| [c, hash[c]] }.to_h).first
-            end
-            self.kafka_producers.each { |p| p.send_events(records) }
-          else
-            # re-fill IDs based on what was just entered into the DB.
-            last_id = if self.connection.adapter_name.downcase =~ /sqlite/
-                        self.connection.select_value('select last_insert_rowid()') -
-                          hashes_without_id.size + 1
-                      else
-                        # mysql
-                        self.connection.select_value('select LAST_INSERT_ID()')
-                      end
-            hashes_without_id.each_with_index do |attrs, i|
-              attrs[:id] = last_id + i
-            end
-            self.kafka_producers.each { |p| p.send_events(hashes_without_id) }
-          end
+          refill_records(column_names, options, hashes_without_id)
         end
         results
       end
+
+      # @!visibility private
+      def refill_records(column_names, options, hashes_without_id)
+        if options[:on_duplicate_key_update].present? &&
+           options[:on_duplicate_key_update] != [:updated_at]
+          unique_columns = column_names.map(&:to_s) -
+                           options[:on_duplicate_key_update].map(&:to_s) - %w(id created_at)
+          records = hashes_without_id.map do |hash|
+            self.where(unique_columns.map { |c| [c, hash[c]] }.to_h).first
+          end
+          self.kafka_producers.each { |p| p.send_events(records) }
+        else
+          # re-fill IDs based on what was just entered into the DB.
+          last_id = if self.connection.adapter_name.downcase =~ /sqlite/
+                      self.connection.select_value('select last_insert_rowid()') -
+                        hashes_without_id.size + 1
+                    else
+                      # mysql
+                      self.connection.select_value('select LAST_INSERT_ID()')
+                    end
+          hashes_without_id.each_with_index do |attrs, i|
+            attrs[:id] = last_id + i
+          end
+          self.kafka_producers.each { |p| p.send_events(hashes_without_id) }
+        end
+      end
     end
 
     # check if any field has value longer than the field limit
@@ -139,10 +145,9 @@ module Deimos
         next if self[col.name].blank?
 
         if self[col.name].to_s.length > col.limit
-          self[col.name] = self[col.name][0..col.limit - 1]
+          self[col.name] = self[col.name][0..(col.limit - 1)]
         end
       end
-      false
     end
   end
 end

data/lib/deimos/kafka_topic_info.rb

@@ -15,7 +15,7 @@ module Deimos
       # @param topic [String]
       # @param lock_id [String]
       # @return [Boolean]
-      def lock(topic, lock_id)
+      def lock(topic, lock_id) # rubocop:disable Naming/PredicateMethod
         # Try to create it - it's fine if it already exists
         begin
           self.create(topic: topic, last_processed_at: Time.zone.now)