deimos-ruby 1.14.0 → 1.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c810f924fa9af51458b4c30e0d6b9101e05094713b3550190f60d7e088119cf0
-  data.tar.gz: 027e3362abf78a4f60cd2613956b8920e537a28f34fcd3c02f94d48648b85b5b
+  metadata.gz: 1d94fcbeb955de22fde06b29f63809cae7305d91f029ba8ec0b36e4dbbe037a2
+  data.tar.gz: 611e5cc68a5d9e661ff692f05692d7ba24e4804f5761479802a632cbdd2a0fd7
 SHA512:
-  metadata.gz: 8b2a64227cf35a8e86f7ad1b142f25bfce7d1c0e9c5e0bded07f6058b811609f4a315c3f48903a672093a1084c0a7c395198e4524d629b9610995a2629959550
-  data.tar.gz: 80ad055761417ad27f5be9c7a6fd2ffdeaed5b3e2aaf7b0d6b6956d4567f60f4f0d7f7dda9e24640ef67d5e3636f7c9ef0b176de342ceb254840b41ce2639ce0
+  metadata.gz: 5100b19ede901f0b7a4e20f0aa6c15d487e9355d95ea46d984c8fcb587039be4be9529991197148e630ad3670c65d79ab0653ff57c28e224236a4d966bebe7e1
+  data.tar.gz: '082ad2e7be4d85fa3e8e242cdc7f192a35f99424675f5bddc3e11a3c19477ce5abf0df629117ca4f714ca107ea5be0a93a8aa5041a1f67cc628517f451005bb1'

data/CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## UNRELEASED
 
+# 1.14.1 - 2022-05-25
+
+- Fix: When using key schemas, ActiveRecordConsumers were not finding the record by default.
+
 # 1.14.0 - 2022-05-16
 
 - **Breaking Change**: Nest sub-schemas by default into their parent schemas when generating classes.

data/lib/deimos/active_record_consume/message_consumption.rb

@@ -13,7 +13,8 @@ module Deimos
       # @param key [Object]
       # @return [ActiveRecord::Base]
       def fetch_record(klass, _payload, key)
-        klass.unscoped.where(klass.primary_key => key).first
+        fetch_key = key.is_a?(Hash) && key.size == 1 ? key.values.first : key
+        klass.unscoped.where(klass.primary_key => fetch_key).first
       end
 
       # Assign a key to a new record.

data/lib/deimos/version.rb

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

data/spec/active_record_consumer_spec.rb

@@ -39,6 +39,14 @@ module ActiveRecordConsumerTest
       end
       stub_const('MyConsumer', consumer_class)
 
+      consumer_class = Class.new(Deimos::ActiveRecordConsumer) do
+        schema 'MySchemaWithDateTimes'
+        namespace 'com.my-namespace'
+        key_config schema: 'MySchemaId_key'
+        record_class Widget
+      end
+      stub_const('MyConsumerWithKey', consumer_class)
+
       consumer_class = Class.new(Deimos::ActiveRecordConsumer) do
         schema 'MySchema'
         namespace 'com.my-namespace'
@@ -126,6 +134,19 @@ module ActiveRecordConsumerTest
             travel_back
           end
 
+          it 'should find widgets with a schema key' do
+            widget1 = Widget.create!(test_id: 'id1')
+            expect(widget1.some_int).to be_nil
+            test_consume_message(MyConsumerWithKey, {
+                                   test_id: 'id1',
+                                   some_int: 3
+                                 },
+                                 key: { id: widget1.id },
+                                 call_original: true)
+            expect(widget1.reload.some_int).to eq(3)
+            expect(Widget.count).to eq(1)
+          end
+
           it 'should find widgets by custom logic' do
             widget1 = Widget.create!(test_id: 'id1')
             expect(widget1.some_int).to be_nil

data/spec/schemas/com/my-namespace/MySchemaId_key.avsc

@@ -0,0 +1,12 @@
+{
+  "namespace": "com.my-namespace",
+  "name": "MySchemaId_key",
+  "type": "record",
+  "doc": "Test schema",
+  "fields": [
+    {
+      "name": "id",
+      "type": "integer"
+    }
+  ]
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deimos-ruby
 version: !ruby/object:Gem::Version
-  version: 1.14.0
+  version: 1.14.1
 platform: ruby
 authors:
 - Daniel Orner
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-16 00:00:00.000000000 Z
+date: 2022-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avro_turf
@@ -499,6 +499,7 @@ files:
 - spec/schemas/com/my-namespace/MyNestedSchema.avsc
 - spec/schemas/com/my-namespace/MySchema.avsc
 - spec/schemas/com/my-namespace/MySchemaCompound_key.avsc
+- spec/schemas/com/my-namespace/MySchemaId_key.avsc
 - spec/schemas/com/my-namespace/MySchemaWithBooleans.avsc
 - spec/schemas/com/my-namespace/MySchemaWithCircularReference.avsc
 - spec/schemas/com/my-namespace/MySchemaWithComplexTypes.avsc
@@ -605,6 +606,7 @@ test_files:
 - spec/schemas/com/my-namespace/MyNestedSchema.avsc
 - spec/schemas/com/my-namespace/MySchema.avsc
 - spec/schemas/com/my-namespace/MySchemaCompound_key.avsc
+- spec/schemas/com/my-namespace/MySchemaId_key.avsc
 - spec/schemas/com/my-namespace/MySchemaWithBooleans.avsc
 - spec/schemas/com/my-namespace/MySchemaWithCircularReference.avsc
 - spec/schemas/com/my-namespace/MySchemaWithComplexTypes.avsc