deimos-ruby 1.22 → 1.22.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f8d5ac90c65bc034c6ddcd9992cdc2244100e0c6ac8f7091e253055094580ad
-  data.tar.gz: 385c04f21fd913f4c913e851010c8a27915e6cb253643fc334b6a73497c0312f
+  metadata.gz: b1819694e6ec5bc9cad69f0a3d7edaad53d4daae80ee0af95312044d503e40d1
+  data.tar.gz: 1577ab483b8fc8a16dc614c12156e2161a3ab2d372b45ee7825f30837fdc36e4
 SHA512:
-  metadata.gz: 33edfce1a07f88bd039cde29a33b63e59411b50237c8869ab06432e9d2622d8c2c506d7311d163adc4bc5ee05344ee379cb5c2e32d99661568446c77c93abf5e
-  data.tar.gz: ed6f9cff6af0cd6e391c4f891e46874628cdbe41702d6114925417872231b2961d18b2239b83312f2f4fa45105a8d3d29282693252111eb0271a9e83ed2a98a6
+  metadata.gz: 1fc162b425d00a308679662d4a48753dbe1fac0ab252d329ad10622f894301de2e35dcc2ca3c0d9366b516ebbce7e8d008fd37ee1c2526d9f5a5be3188d6380f
+  data.tar.gz: b09c3c0a0c7980b9bd2431754001c8b3f18d6a21981dbb7dd5b1336f60a3411e26c5c938b3d55e48039c2306ffac54bc2f95c4beac4700b994fdcf4168900ddc

data/CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## UNRELEASED
 
+# 1.22.1 - 2023-05-01
+
+- Fix: Bug introduced with 1.22 when associations are not used
+
 # 1.22 - 2023-05-01
 
 - Feature: Added `replace_associations` and changed default behavior for multi-table consuming. No longer relies on Rails direct associations and wonky magic for new vs. existing records.

data/lib/deimos/active_record_consume/batch_consumption.rb

@@ -183,9 +183,13 @@ module Deimos
           attrs = attrs.merge(record_key(m.key))
           next unless attrs
 
+          col = if @klass.column_names.include?(self.class.bulk_import_id_column.to_s)
+                  self.class.bulk_import_id_column
+                end
+
           BatchRecord.new(klass: @klass,
                           attributes: attrs,
-                          bulk_import_column: self.class.bulk_import_id_column)
+                          bulk_import_column: col)
         end
         BatchRecordList.new(records.compact)
       end

data/lib/deimos/active_record_consume/batch_record.rb

@@ -26,7 +26,6 @@ module Deimos
         @klass = klass
         if bulk_import_column
           self.bulk_import_column = bulk_import_column
-          validate_import_id!
           self.bulk_import_id = SecureRandom.uuid
           attributes[bulk_import_column] = bulk_import_id
         end
@@ -35,6 +34,7 @@ module Deimos
         assoc_keys = attributes.keys.select { |k| klass.reflect_on_association(k) }
         # a hash with just the association keys, removing all actual column information.
         self.associations = attributes.slice(*assoc_keys)
+        validate_import_id! if self.associations.any?
       end
 
       # Checks whether the entities has necessary columns for association saving to work

data/lib/deimos/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Deimos
-  VERSION = '1.22'
+  VERSION = '1.22.1'
 end

data/spec/active_record_batch_consumer_association_spec.rb

@@ -74,7 +74,9 @@ module ActiveRecordBatchConsumerTest # rubocop:disable Metrics/ModuleLength
     end
 
     prepend_before(:each) do
+      consumer_class.config[:bulk_import_id_column] = :bulk_import_id
       stub_const('MyBatchConsumer', consumer_class)
+      stub_const('ConsumerTest::MyBatchConsumer', consumer_class)
     end
 
     # Helper to publish a list of messages and call the consumer
@@ -157,7 +159,6 @@ module ActiveRecordBatchConsumerTest # rubocop:disable Metrics/ModuleLength
       end
 
       it 'should raise error when bulk_import_id is not found' do
-        stub_const('MyBatchConsumer', consumer_class)
         expect {
           publish_batch([{ key: 2,
                            payload: { test_id: 'xyz', some_int: 5, title: 'Widget Title' } }])
@@ -169,6 +170,7 @@ module ActiveRecordBatchConsumerTest # rubocop:disable Metrics/ModuleLength
     context 'with one-to-one relation in association and custom bulk_import_id' do
       before(:each) do
         consumer_class.config[:bulk_import_id_column] = :custom_id
+        consumer_class.config[:replace_associations] = false
       end
 
       before(:all) do
@@ -177,7 +179,6 @@ module ActiveRecordBatchConsumerTest # rubocop:disable Metrics/ModuleLength
       end
 
       it 'should save item to widget and associated detail' do
-        stub_const('MyBatchConsumer', consumer_class)
         publish_batch([{ key: 2,
                          payload: { test_id: 'xyz', some_int: 5, title: 'Widget Title' } }])
         expect(Widget.count).to eq(2)
@@ -188,7 +189,6 @@ module ActiveRecordBatchConsumerTest # rubocop:disable Metrics/ModuleLength
 
     context 'with one-to-many relationship in association and default bulk_import_id' do
       before(:each) do
-        consumer_class.config[:bulk_import_id_column] = :bulk_import_id
         consumer_class.config[:replace_associations] = false
         consumer_class.record_attributes_proc = proc do |payload|
           {
@@ -209,7 +209,7 @@ module ActiveRecordBatchConsumerTest # rubocop:disable Metrics/ModuleLength
       end
 
       it 'should save item to widget and associated details' do
-        stub_const('MyBatchConsumer', consumer_class)
+        consumer_class.config[:replace_associations] = false
         publish_batch([{ key: 2,
                          payload: { test_id: 'xyz', some_int: 5, title: 'Widget Title' } }])
         expect(Widget.count).to eq(2)
@@ -229,7 +229,6 @@ module ActiveRecordBatchConsumerTest # rubocop:disable Metrics/ModuleLength
 
     context 'with replace_associations on' do
       before(:each) do
-        consumer_class.config[:bulk_import_id_column] = :bulk_import_id
         consumer_class.config[:replace_associations] = true
         consumer_class.record_attributes_proc = proc do |payload|
           {
@@ -250,7 +249,6 @@ module ActiveRecordBatchConsumerTest # rubocop:disable Metrics/ModuleLength
       end
 
       it 'should save item to widget and replace associated details' do
-        stub_const('MyBatchConsumer', consumer_class)
         publish_batch([{ key: 2,
                          payload: { test_id: 'xyz', some_int: 5, title: 'Widget Title' } }])
         expect(Widget.count).to eq(2)
@@ -271,12 +269,10 @@ module ActiveRecordBatchConsumerTest # rubocop:disable Metrics/ModuleLength
 
     context 'with invalid models' do
       before(:each) do
-        consumer_class.config[:bulk_import_id_column] = :bulk_import_id
         consumer_class.should_consume_proc = proc { |val| val.some_int <= 10 }
       end
 
       it 'should only save valid models' do
-        stub_const('MyBatchConsumer', consumer_class)
         publish_batch([{ key: 2,
                          payload: { test_id: 'xyz', some_int: 5, title: 'Widget Title' } },
                        { key: 3,

data/spec/active_record_batch_consumer_spec.rb

@@ -32,6 +32,8 @@ module ActiveRecordBatchConsumerTest
 
     prepend_before(:each) do
       stub_const('MyBatchConsumer', consumer_class)
+      stub_const('ConsumerTest::MyBatchConsumer', consumer_class)
+      consumer_class.config[:bulk_import_id_column] = :bulk_import_id # default
     end
 
     around(:each) do |ex|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deimos-ruby
 version: !ruby/object:Gem::Version
-  version: '1.22'
+  version: 1.22.1
 platform: ruby
 authors:
 - Daniel Orner
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-01 00:00:00.000000000 Z
+date: 2023-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avro_turf