deimos-ruby 2.0.0.pre.beta5 → 2.0.0.pre.beta7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec1175b32af9a438344b507df915824244ac3c2f0756465bf9c032795aad65a6
-  data.tar.gz: de5ded4703fd546c3257a8e5bdd52f502df9e755272588bd8636d5057e6f5279
+  metadata.gz: 4aeb59ae53a1c0b617581b477fd035fc76182fb2662e2c1655b4f9814747a26a
+  data.tar.gz: 58c80ee0fde7651ac46c8d99a8652598500c04757ce5364aa0ddda7b4ca02f9c
 SHA512:
-  metadata.gz: 7e9db7f92753f6b3d4433ab8545f91f43e7179c9438849766567b88247216f159413c7ec6048ea58681bad5478d9a569da5ce1ab58cc72147ccecdd800130ce0
-  data.tar.gz: a12e93d3db8bc7f9fb9f35afe43c9ec23ed3203a6fc4e80a1d1832403b1b77b664d6abdfa95da4d220bb1b4e348c215fa9e35c247de0e4a2d933b680e3cea544
+  metadata.gz: 7b366555ec5a9fd5f11a54e12c6db102c14a7675da3bfb6afc07b57729bfe21adf643505fb1290c28dcf072e451926d6e2c8cd55ae3ee58713630809d13c01ce
+  data.tar.gz: 48104ebcafa8ac7b0b911928e9aa65ad897747acf8f51279d6ae4bc4b66f26dba471c7329207bf723ec738eea645203cc8546d8f26fccfd204b652ee8eb70cf1

data/Gemfile

@@ -4,4 +4,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in boilerplate.gemspec
 gemspec
-gem 'karafka', git: 'https://github.com/dorner/karafka', branch: 'redraw'

data/lib/deimos/ext/producer_middleware.rb

@@ -18,6 +18,10 @@ module Deimos
                                   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

data/lib/deimos/logging.rb

@@ -36,22 +36,42 @@ module Deimos
 
       end
 
+      def payload(m)
+        return nil if m.nil?
+
+        if m.respond_to?(:payload)
+          m.payload
+        elsif m[:label]
+          m.dig(:label, :raw_payload)
+        else
+          m[:payload]
+        end
+      end
+
+      def key(m)
+        return nil if m.nil?
+
+        if m.respond_to?(:payload) && m.payload
+          m.key || m.payload['message_id']
+        elsif m.respond_to?(:[])
+          if m[:label]
+            m.dig(:label, :original_key)
+          elsif m[:payload].is_a?(String)
+            m[:key] || m[:payload_key]
+          else
+            payload = m[:payload]&.with_indifferent_access
+            m[:key] || m[:payload_key] || payload[:payload_key] || payload[:message_id]
+          end
+        end
+      end
+
       def messages_log_text(payload_log, messages)
         log_message = {}
 
         case payload_log
         when :keys
           keys = messages.map do |m|
-            if m.respond_to?(:payload)
-              m.key || m.payload['message_id']
-            elsif m
-              if m[:payload].is_a?(String)
-                m[:key] || m[:payload_key]
-              else
-                payload = m[:payload]&.with_indifferent_access
-                m[:key] || m[:payload_key] || payload[:payload_key] || payload[:message_id]
-              end
-            end
+            key(m)
           end
           log_message.merge!(
             payload_keys: keys
@@ -68,8 +88,8 @@ module Deimos
           log_message.merge!(
             payloads: messages.map do |m|
               {
-                payload: m.respond_to?(:payload) ? m.payload : m[:payload],
-                key: m.respond_to?(:payload) ? m.key : m[:key]
+                payload: payload(m),
+                key: key(m)
               }
             end
           )

data/lib/deimos/schema_class/base.rb

@@ -36,6 +36,8 @@ module Deimos
         comparison == self.as_json
       end
 
+      alias_method :eql?, :==
+
       # @return [String]
       def inspect
         klass = self.class

data/lib/deimos/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Deimos
-  VERSION = '2.0.0-beta5'
+  VERSION = '2.0.0-beta7'
 end

data/spec/active_record_consume/batch_consumption_spec.rb

@@ -100,4 +100,50 @@ RSpec.describe Deimos::ActiveRecordConsume::BatchConsumption do
       end
     end
   end
+
+  describe '#compact_messages' do
+    it 'for scalars' do
+      message_1 = Deimos::Message.new({ v: "first" }, key: 1234)
+      message_2 = Deimos::Message.new({ v: "last" }, key: 1234)
+      result = batch_consumer.send(:compact_messages, [message_1, message_2])
+      expect(result.size).to eq(1)
+      expect(result.first.equal?(message_2)).to eq(true)
+    end
+
+    it 'for hashes' do
+      message_1 = Deimos::Message.new({ v: "first" }, key: { a: 1, b:2.0, c: "c"})
+      message_2 = Deimos::Message.new({ v: "last" }, key: { a: 1, b:2.0, c: "c"})
+      result = batch_consumer.send(:compact_messages, [message_1, message_2])
+      expect(result.size).to eq(1)
+      expect(result.first.equal?(message_2)).to eq(true)
+    end
+
+    it 'for schema classes' do
+      module Schemas
+        class Key < Deimos::SchemaClass::Record
+          attr_accessor :some_name
+
+          # @override
+          def initialize(some_name: "")
+            super
+            self.some_name = some_name
+          end
+
+          # @override
+          def as_json(_opts={})
+            {
+              'some_name' => @some_name
+            }
+          end
+        end
+      end
+
+      message_1 = Deimos::Message.new({ v: "first" }, key: Schemas::Key.new(some_name: "2"))
+      message_2 = Deimos::Message.new({ v: "last" }, key: Schemas::Key.new(some_name: "2"))
+
+      result = batch_consumer.send(:compact_messages, [message_1, message_2])
+      expect(result.size).to eq(1)
+      expect(result.first.equal?(message_2)).to eq(true) # The object is same as the latest one in the batch
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 $LOAD_PATH.unshift(File.expand_path('../lib', __dir__))
+require 'logger' # https://stackoverflow.com/questions/79360526/uninitialized-constant-activesupportloggerthreadsafelevellogger-nameerror
 require 'active_record'
 require 'action_controller/railtie'
 require 'database_cleaner'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deimos-ruby
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.beta5
+  version: 2.0.0.pre.beta7
 platform: ruby
 authors:
 - Daniel Orner
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-19 00:00:00.000000000 Z
+date: 2025-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avro_turf