deimos-ruby 2.3.0 → 2.3.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 9811f05eec0d9b6777e2ed047a2e81b0a23bd770b52866bf8c8a79f84c8ec586
4
- data.tar.gz: c84cba2ecf750f4349ba86e47ddab2d01a4dd8e5f8fd9ab008b3fcfeb14b1425
3
+ metadata.gz: 11656e5d925198470fb1c6918808e2dda7b769d98397e9b0f973316a21fe1616
4
+ data.tar.gz: 4f34eae61a408809aaa6c0d70d0fe535c27ea300e479612c8273bd63cf553b62
5
5
  SHA512:
6
- metadata.gz: b8319ada2f2b715e750e7de5caf6c6117d6154da6277988e12851f420c69a2f3adc0ab30594a23bca86ec8ffa57ef2cc3e5ab9758421e26fbe91cf682ad28e04
7
- data.tar.gz: 2174b8d776b547689422d6af381f423680d61df368be813e53f213eb8d084971b338a3382d8775e07ef324b9443fc1f5427fed834c54629d52c88728d016fd49
6
+ metadata.gz: 60c5d0fe69d3787c972c647d907de9159c4f33a63c8f1e3913c9816bd18e056f24721549377bf3ebdc25578c800c62ad7ab2f5a056e0562cacd1026858ea5d2f
7
+ data.tar.gz: 252a59f9db351029fd2cd67c679bddd50a854e4797855a8c7b5e7248e6b0ab71aad041d7b7e3dd900eb5c90c6cc5f82301461f58a749fe997f99d8f65d8b3f3e
data/CHANGELOG.md CHANGED
@@ -7,6 +7,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
7
7
 
8
8
  ## UNRELEASED
9
9
 
10
+ # 2.3.2 - 2026-02-20
11
+
12
+ - Feature: Add overridable process_message? for batch consumption.
13
+ - Feature: Add overridable post_process_batch for batch consumption.
14
+
15
+ # 2.3.1 - 2026-01-22
16
+
17
+ - Feature: Allow strings to be used in the `record_class` declaration.
18
+
10
19
  # 2.3.0 - 2026-01-13
11
20
 
12
21
  - Feature: Support broker setting per topic in producer configs.
data/README.md CHANGED
@@ -398,6 +398,8 @@ class MyProducer < Deimos::ActiveRecordProducer
398
398
  # using the default functionality and don't need to override it)
399
399
  # by setting `refetch` to false. This will avoid extra database fetches.
400
400
  record_class Widget, refetch: false
401
+
402
+ # You can use a string here instead to avoid eager loading: record_class 'Widget'
401
403
 
402
404
  # Optionally override this if you want the message to be
403
405
  # sent even if fields that aren't in the schema are changed.
@@ -485,6 +487,7 @@ A sample consumer would look as follows:
485
487
  ```ruby
486
488
  class MyConsumer < Deimos::ActiveRecordConsumer
487
489
  record_class Widget
490
+ # or use a string: record_class 'Widget'
488
491
 
489
492
  # Optional override of the way to fetch records based on payload and
490
493
  # key. Default is to use the key to search the primary key of the table.
@@ -562,6 +565,7 @@ A sample batch consumer would look as follows:
562
565
  ```ruby
563
566
  class MyConsumer < Deimos::ActiveRecordConsumer
564
567
  record_class Widget
568
+ # or use a string: record_class 'Widget'
565
569
 
566
570
  # Controls whether the batch is compacted before consuming.
567
571
  # If true, only the last message for each unique key in a batch will be
data/deimos-ruby.gemspec CHANGED
@@ -34,6 +34,7 @@ Gem::Specification.new do |spec|
34
34
  spec.add_development_dependency('karafka-testing', '~> 2.0')
35
35
  spec.add_development_dependency('pg', '~> 1.1')
36
36
  spec.add_development_dependency('proto_turf')
37
+ spec.add_development_dependency('pry', '~> 0.14.1')
37
38
  spec.add_development_dependency('rails', '~> 8.0')
38
39
  spec.add_development_dependency('rake', '~> 13')
39
40
  spec.add_development_dependency('rspec', '~> 3')
@@ -25,7 +25,15 @@ module Deimos
25
25
  # they are split
26
26
  # @return [void]
27
27
  def consume_batch
28
- deimos_messages = messages.map { |p| Deimos::Message.new(p.payload, key: p.key) }
28
+ filtered = messages.select { |p| process_message?(p.payload) }
29
+ skipped_count = messages.size - filtered.size
30
+ if skipped_count.positive?
31
+ Deimos::Logging.log_debug(
32
+ message: 'Skipping processing of messages in batch',
33
+ skipped_count: skipped_count
34
+ )
35
+ end
36
+ deimos_messages = filtered.map { |p| Deimos::Message.new(p.payload, key: p.key) }
29
37
 
30
38
  tag = topic.name
31
39
  Deimos.config.tracer.active_span.set_tag('topic', tag)
@@ -37,6 +45,8 @@ module Deimos
37
45
  uncompacted_update(deimos_messages)
38
46
  end
39
47
  end
48
+
49
+ post_process_batch(deimos_messages)
40
50
  end
41
51
 
42
52
  protected
@@ -94,6 +104,14 @@ module Deimos
94
104
  true
95
105
  end
96
106
 
107
+ # Perform any post-processing after a batch has been consumed.
108
+ # Called once per batch with the list of Deimos::Message that were processed (after filtering and compaction).
109
+ # @param messages [Array<Deimos::Message>] The batch of messages that were processed
110
+ # @return [void]
111
+ def post_process_batch(_messages)
112
+ nil
113
+ end
114
+
97
115
  private
98
116
 
99
117
  # Compact a batch of messages, taking only the last message for each
@@ -72,6 +72,7 @@ module Deimos
72
72
  # Setup
73
73
  def initialize
74
74
  @klass = self.class.config[:record_class]
75
+ @klass = @klass.constantize if @klass.is_a?(String)
75
76
  @compacted = self.class.config[:compacted] != false
76
77
  end
77
78
 
@@ -13,18 +13,24 @@ module Deimos
13
13
  class ActiveRecordProducer < Producer
14
14
  class << self
15
15
  # Indicate the class this producer is working on.
16
- # @param klass [Class]
16
+ # @param klass [Class,String]
17
17
  # @param refetch [Boolean] if true, and we are given a hash instead of
18
18
  # a record object, refetch the record to pass into the `generate_payload`
19
19
  # method.
20
20
  # @return [void]
21
21
  def record_class(klass=nil, refetch: true)
22
- return @record_class if klass.nil?
22
+ return record_klass if klass.nil?
23
23
 
24
24
  @record_class = klass
25
25
  @refetch_record = refetch
26
26
  end
27
27
 
28
+ # @return [Class,nil]
29
+ def record_klass
30
+ @record_class = @record_class.constantize if @record_class.is_a?(String)
31
+ @record_class
32
+ end
33
+
28
34
  # @param record [ActiveRecord::Base]
29
35
  # @param force_send [Boolean]
30
36
  # @return [void]
@@ -38,14 +44,14 @@ module Deimos
38
44
  def send_events(records, force_send: false)
39
45
  return if Deimos.producers_disabled?(self)
40
46
 
41
- primary_key = @record_class&.primary_key
47
+ primary_key = record_klass&.primary_key
42
48
  messages = records.map do |record|
43
49
  if record.respond_to?(:attributes)
44
50
  attrs = record.attributes.with_indifferent_access
45
51
  else
46
52
  attrs = record.with_indifferent_access
47
53
  if @refetch_record && attrs[primary_key]
48
- record = @record_class.find(attrs[primary_key])
54
+ record = record_klass.find(attrs[primary_key])
49
55
  end
50
56
  end
51
57
  generate_payload(attrs, record).with_indifferent_access
@@ -96,7 +102,7 @@ module Deimos
96
102
  # than this value).
97
103
  # @return [ActiveRecord::Relation]
98
104
  def poll_query(time_from:, time_to:, min_id:, column_name: :updated_at)
99
- klass = @record_class
105
+ klass = record_klass
100
106
  table = ActiveRecord::Base.connection.quote_table_name(klass.table_name)
101
107
  column = ActiveRecord::Base.connection.quote_column_name(column_name)
102
108
  primary = ActiveRecord::Base.connection.quote_column_name(klass.primary_key)
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module Deimos
4
- VERSION = '2.3.0'
4
+ VERSION = '2.3.2'
5
5
  end
@@ -70,7 +70,7 @@ module ActiveRecordBatchConsumerTest # rubocop:disable Metrics/ModuleLength
70
70
  end
71
71
 
72
72
  before(:each) do
73
- ActiveRecord::Base.connection.truncate_tables(%i(widgets details locales))
73
+ ActiveRecord::Base.connection.truncate_tables(:widgets, :details, :locales)
74
74
  Widget.create!(test_id: 'bad_id', some_int: 100) # should not show up
75
75
  end
76
76
 
@@ -57,6 +57,12 @@ module ActiveRecordBatchConsumerTest
57
57
  Class.new(described_class) do
58
58
  record_class Widget
59
59
  compacted false
60
+
61
+ def process_message?(payload)
62
+ return true if payload.nil?
63
+
64
+ payload['test_id'] != 'skipme'
65
+ end
60
66
  end
61
67
  end
62
68
 
@@ -103,6 +109,27 @@ module ActiveRecordBatchConsumerTest
103
109
  )
104
110
  end
105
111
 
112
+ it 'should not create records for messages that return false from process_message?' do
113
+ publish_batch(
114
+ [
115
+ { key: 1,
116
+ payload: { test_id: 'abc', some_int: 3 } },
117
+ { key: 2,
118
+ payload: { test_id: 'skipme', some_int: 4 } },
119
+ { key: 3,
120
+ payload: { test_id: 'ghi', some_int: 5 } }
121
+ ]
122
+ )
123
+
124
+ expect(all_widgets).
125
+ to contain_exactly(
126
+ have_attributes(id: 1, test_id: 'abc', some_int: 3, updated_at: start,
127
+ created_at: start),
128
+ have_attributes(id: 3, test_id: 'ghi', some_int: 5, updated_at: start,
129
+ created_at: start)
130
+ )
131
+ end
132
+
106
133
  it 'should handle deleting a record that doesn\'t exist' do
107
134
  publish_batch(
108
135
  [
@@ -805,6 +832,64 @@ module ActiveRecordBatchConsumerTest
805
832
 
806
833
  end
807
834
 
835
+ describe 'post_process_batch' do
836
+ before(:each) do
837
+ register_consumer(consumer_class,
838
+ 'MySchema',
839
+ key_config: { plain: true })
840
+ MyBatchConsumer.last_post_process_batch = nil
841
+ end
842
+
843
+ let(:consumer_class) do
844
+ Class.new(described_class) do
845
+ class << self
846
+ attr_accessor :last_post_process_batch
847
+ end
848
+
849
+ record_class Widget
850
+ compacted false
851
+
852
+ def post_process_batch(messages)
853
+ self.class.last_post_process_batch = messages
854
+ end
855
+
856
+ def process_message?(payload)
857
+ payload['test_id'] != 'skipme'
858
+ end
859
+ end
860
+ end
861
+
862
+ it 'is called after the batch is processed with the processed messages' do
863
+ publish_batch(
864
+ [
865
+ { key: 1,
866
+ payload: { test_id: 'abc', some_int: 3 } },
867
+ { key: 2,
868
+ payload: { test_id: 'def', some_int: 4 } }
869
+ ]
870
+ )
871
+ expect(MyBatchConsumer.last_post_process_batch.map(&:payload).map do |p|
872
+ p[:test_id]
873
+ end).to contain_exactly('abc', 'def')
874
+ end
875
+
876
+ it 'is called with filtered messages when process_message? excludes some' do
877
+ publish_batch(
878
+ [
879
+ { key: 1,
880
+ payload: { test_id: 'abc', some_int: 3 } },
881
+ { key: 2,
882
+ payload: { test_id: 'skipme', some_int: 4 } },
883
+ { key: 3,
884
+ payload: { test_id: 'ghi', some_int: 5 } }
885
+ ]
886
+ )
887
+
888
+ expect(MyBatchConsumer.last_post_process_batch.size).to eq(2)
889
+ expect(MyBatchConsumer.last_post_process_batch.map(&:key).map(&:to_i)).to contain_exactly(1, 3)
890
+ end
891
+ end
892
+
808
893
  end
809
894
  end
810
895
  # rubocop:enable Lint/ConstantDefinitionInBlock
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: deimos-ruby
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.3.0
4
+ version: 2.3.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Daniel Orner
@@ -245,6 +245,20 @@ dependencies:
245
245
  - - ">="
246
246
  - !ruby/object:Gem::Version
247
247
  version: '0'
248
+ - !ruby/object:Gem::Dependency
249
+ name: pry
250
+ requirement: !ruby/object:Gem::Requirement
251
+ requirements:
252
+ - - "~>"
253
+ - !ruby/object:Gem::Version
254
+ version: 0.14.1
255
+ type: :development
256
+ prerelease: false
257
+ version_requirements: !ruby/object:Gem::Requirement
258
+ requirements:
259
+ - - "~>"
260
+ - !ruby/object:Gem::Version
261
+ version: 0.14.1
248
262
  - !ruby/object:Gem::Dependency
249
263
  name: rails
250
264
  requirement: !ruby/object:Gem::Requirement