sbmt-kafka_consumer 2.7.0 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4db2a1a6eecab6ef429ef1591991a38e19d5996f1881f8e21e1382513ccd972b
-  data.tar.gz: 490e1c37ce5029efe299119cd7a879fbdb7e0ee3be8e1bc49f4c18a7ad0a0b4c
+  metadata.gz: 5c5c4115c8a5cc26e7d4798244f8e3052f1b6abdddb11a4a96699a1e4f950659
+  data.tar.gz: 7e6d290f5d0866f4e6ea0b424e07afd95770840d6a5a1324ee4d01b28c62b49d
 SHA512:
-  metadata.gz: 11ab3951c1caa9cf2975199c4815838058c719038f77cdc8d563ef36248eebf312cf06e66d9b43058918f3042f88312144f36183f0cddfe882c3b9c03b5e5c8d
-  data.tar.gz: 5eedd592dd638ac22181e2bd5717e8ef63ca2e4b23cfa1c79c05c0fb3c1596586492eff32c3a5b1475ce997dd8f184e0e6e9024252922409fc3dee5d474e7d8b
+  metadata.gz: 4f07ac9ad6a9e65898e9d3a48ed86b0df7fdd52f38ea04b2e41aa0406351d314f0a5aa72e33334e9a619779564afb6105481d19ec2a27706adf197346af66776
+  data.tar.gz: 1d65a2e194afade6fc2230bd9d031c457101f799342ea688be292a119ae0661754f4cbca62ce66d8257af2616faef675bdc638ef03059a4eaa9611f41de8a674

data/CHANGELOG.md

@@ -13,6 +13,18 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Fixed
 
+## [2.8.0] - 2024-09-09
+
+### Fixed
+
+- Refactor consumer class initialization
+
+## [2.7.1] - 2024-08-01
+
+### Fixed
+
+- Add mock `mark_as_consumed` for tests
+
 ## [2.7.0] - 2024-07-30
 
 ### Changed

data/lib/sbmt/kafka_consumer/base_consumer.rb

@@ -3,15 +3,20 @@
 module Sbmt
   module KafkaConsumer
     class BaseConsumer < Karafka::BaseConsumer
-      def self.consumer_klass(skip_on_error: false, middlewares: [])
-        Class.new(self) do
-          const_set(:SKIP_ON_ERROR, skip_on_error)
-          const_set(:MIDDLEWARES, middlewares.map(&:constantize))
+      class_attribute :skip_on_error, instance_writer: false, default: false
+      class_attribute :middlewares, instance_writer: false, default: []
 
+      def self.consumer_klass(skip_on_error: nil, middlewares: nil)
+        klass = Class.new(self) do
           def self.name
             superclass.name
           end
         end
+
+        # defaults are set in class_attribute definition
+        klass.skip_on_error = skip_on_error if skip_on_error
+        klass.middlewares = middlewares.map(&:constantize) if middlewares
+        klass
       end
 
       def consume
@@ -112,14 +117,6 @@ module Sbmt
         end
       end
 
-      def skip_on_error
-        self.class::SKIP_ON_ERROR
-      end
-
-      def middlewares
-        self.class::MIDDLEWARES
-      end
-
       # can be overridden in consumer to enable message logging
       def log_payload?
         false

data/lib/sbmt/kafka_consumer/inbox_consumer.rb

@@ -6,17 +6,20 @@ module Sbmt
       IDEMPOTENCY_HEADER_NAME = "Idempotency-Key"
       DEFAULT_SOURCE = "KAFKA"
 
-      def self.consumer_klass(inbox_item:, event_name: nil, skip_on_error: false, name: nil, middlewares: [])
-        Class.new(self) do
-          const_set(:INBOX_ITEM_CLASS_NAME, inbox_item)
-          const_set(:EVENT_NAME, event_name)
-          const_set(:SKIP_ON_ERROR, skip_on_error)
-          const_set(:MIDDLEWARES, middlewares.map(&:constantize))
-
-          def self.name
-            superclass.name
-          end
-        end
+      class_attribute :inbox_item_class, instance_writer: false, default: nil
+      class_attribute :event_name, instance_writer: false, default: nil
+
+      def self.consumer_klass(inbox_item:, event_name: nil, skip_on_error: nil, name: nil, middlewares: nil)
+        # defaults are set in class_attribute definition
+        klass = super(skip_on_error: skip_on_error, middlewares: middlewares)
+        klass.inbox_item_class = inbox_item.constantize
+        klass.event_name = event_name if event_name
+        klass
+      end
+
+      def initialize
+        raise Sbmt::KafkaConsumer::Error, "inbox_item param is not set" if inbox_item_class.blank?
+        super
       end
 
       def extra_message_attrs(_message)
@@ -101,14 +104,6 @@ module Sbmt
         message.metadata.headers.fetch(IDEMPOTENCY_HEADER_NAME, nil).presence
       end
 
-      def inbox_item_class
-        @inbox_item_class ||= self.class::INBOX_ITEM_CLASS_NAME.constantize
-      end
-
-      def event_name
-        @event_name ||= self.class::EVENT_NAME
-      end
-
       def inbox_name
         inbox_item_class.box_name
       end

data/lib/sbmt/kafka_consumer/testing/shared_contexts/with_sbmt_karafka_consumer.rb

@@ -16,14 +16,14 @@ RSpec.shared_context "with sbmt karafka consumer" do
   let(:kafka_client) { instance_double(Karafka::Connection::Client) }
   let(:null_deserializer) { Sbmt::KafkaConsumer::Serialization::NullDeserializer.new }
 
-  let(:consumer) {
-    build_consumer(described_class.new)
-  }
+  let(:consumer_class) { described_class.consumer_klass }
+  let(:consumer) { build_consumer(consumer_class.new) }
 
   before {
     Sbmt::KafkaConsumer::ClientConfigurer.configure!
     allow(kafka_client).to receive(:assignment_lost?).and_return(false)
     allow(kafka_client).to receive(:mark_as_consumed!).and_return(true)
+    allow(kafka_client).to receive(:mark_as_consumed).and_return(true)
   }
 
   def publish_to_sbmt_karafka(raw_payload, opts = {})

data/lib/sbmt/kafka_consumer/version.rb

@@ -2,6 +2,6 @@
 
 module Sbmt
   module KafkaConsumer
-    VERSION = "2.7.0"
+    VERSION = "2.8.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sbmt-kafka_consumer
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.8.0
 platform: ruby
 authors:
 - Sbermarket Ruby-Platform Team
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-08-01 00:00:00.000000000 Z
+date: 2024-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -570,7 +570,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Ruby gem for consuming Kafka messages