deimos-ruby 1.14.0 → 1.14.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +12 -0
- data/lib/deimos/active_record_consume/batch_consumption.rb +4 -6
- data/lib/deimos/active_record_consume/message_consumption.rb +2 -1
- data/lib/deimos/utils/schema_class.rb +3 -1
- data/lib/deimos/version.rb +1 -1
- data/spec/active_record_consumer_spec.rb +21 -0
- data/spec/schemas/com/my-namespace/MySchemaId_key.avsc +12 -0
- metadata +4 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: '0876f9454cd35ecb35310f57f9539dbb6d952aa2c5ab5b0503725de4620d7a1e'
|
4
|
+
data.tar.gz: 24fa6921f189d44aa36655338683992c1522ada69644c8570032df99e5d4ffc4
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: b5f8824b1ba370408d1cc58c6a33ee72ad15118453274a0e65bce6f421a4228b92e654cd54eac8771063ced121e93633e95b9244d046e35869c65609e34f077f
|
7
|
+
data.tar.gz: 0cfe69f0af3dfc463895fc1bbe16658efdb54a9afb45270cc4836235785e7137d7be36bab3a4b99503348cdfe118f63a39a18bc1dc718ec8411c4c80e57a2b98
|
data/CHANGELOG.md
CHANGED
@@ -7,6 +7,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
|
7
7
|
|
8
8
|
## UNRELEASED
|
9
9
|
|
10
|
+
# 1.14.3 - 2022-06-17
|
11
|
+
|
12
|
+
- Fix issue with ActiveRecordConsumer double-decoding keys in batch mode.
|
13
|
+
|
14
|
+
# 1.14.2 - 2022-05-26
|
15
|
+
|
16
|
+
- Fix crash with `test_consume_message` when passing in an instance of a schema class instead of a hash.
|
17
|
+
|
18
|
+
# 1.14.1 - 2022-05-25
|
19
|
+
|
20
|
+
- Fix: When using key schemas, ActiveRecordConsumers were not finding the record by default.
|
21
|
+
|
10
22
|
# 1.14.0 - 2022-05-16
|
11
23
|
|
12
24
|
- **Breaking Change**: Nest sub-schemas by default into their parent schemas when generating classes.
|
@@ -44,14 +44,12 @@ module Deimos
|
|
44
44
|
# @param key [String] The encoded key.
|
45
45
|
# @return [Hash] The key attributes.
|
46
46
|
def record_key(key)
|
47
|
-
|
48
|
-
|
49
|
-
if decoded_key.nil?
|
47
|
+
if key.nil?
|
50
48
|
{}
|
51
|
-
elsif
|
52
|
-
@key_converter.convert(
|
49
|
+
elsif key.is_a?(Hash)
|
50
|
+
@key_converter.convert(key)
|
53
51
|
else
|
54
|
-
{ @klass.primary_key =>
|
52
|
+
{ @klass.primary_key => key }
|
55
53
|
end
|
56
54
|
end
|
57
55
|
|
@@ -13,7 +13,8 @@ module Deimos
|
|
13
13
|
# @param key [Object]
|
14
14
|
# @return [ActiveRecord::Base]
|
15
15
|
def fetch_record(klass, _payload, key)
|
16
|
-
|
16
|
+
fetch_key = key.is_a?(Hash) && key.size == 1 ? key.values.first : key
|
17
|
+
klass.unscoped.where(klass.primary_key => fetch_key).first
|
17
18
|
end
|
18
19
|
|
19
20
|
# Assign a key to a new record.
|
@@ -6,10 +6,12 @@ module Deimos
|
|
6
6
|
module SchemaClass
|
7
7
|
class << self
|
8
8
|
# Converts a raw payload into an instance of the Schema Class
|
9
|
-
# @param payload [Hash]
|
9
|
+
# @param payload [Hash, Deimos::SchemaClass::Base]
|
10
10
|
# @param schema [String]
|
11
11
|
# @return [Deimos::SchemaClass::Record]
|
12
12
|
def instance(payload, schema)
|
13
|
+
return payload if payload.is_a?(Deimos::SchemaClass::Base)
|
14
|
+
|
13
15
|
klass = "Schemas::#{schema.underscore.camelize}".safe_constantize
|
14
16
|
return payload if klass.nil? || payload.nil?
|
15
17
|
|
data/lib/deimos/version.rb
CHANGED
@@ -39,6 +39,14 @@ module ActiveRecordConsumerTest
|
|
39
39
|
end
|
40
40
|
stub_const('MyConsumer', consumer_class)
|
41
41
|
|
42
|
+
consumer_class = Class.new(Deimos::ActiveRecordConsumer) do
|
43
|
+
schema 'MySchemaWithDateTimes'
|
44
|
+
namespace 'com.my-namespace'
|
45
|
+
key_config schema: 'MySchemaId_key'
|
46
|
+
record_class Widget
|
47
|
+
end
|
48
|
+
stub_const('MyConsumerWithKey', consumer_class)
|
49
|
+
|
42
50
|
consumer_class = Class.new(Deimos::ActiveRecordConsumer) do
|
43
51
|
schema 'MySchema'
|
44
52
|
namespace 'com.my-namespace'
|
@@ -126,6 +134,19 @@ module ActiveRecordConsumerTest
|
|
126
134
|
travel_back
|
127
135
|
end
|
128
136
|
|
137
|
+
it 'should find widgets with a schema key' do
|
138
|
+
widget1 = Widget.create!(test_id: 'id1')
|
139
|
+
expect(widget1.some_int).to be_nil
|
140
|
+
test_consume_message(MyConsumerWithKey, {
|
141
|
+
test_id: 'id1',
|
142
|
+
some_int: 3
|
143
|
+
},
|
144
|
+
key: { id: widget1.id },
|
145
|
+
call_original: true)
|
146
|
+
expect(widget1.reload.some_int).to eq(3)
|
147
|
+
expect(Widget.count).to eq(1)
|
148
|
+
end
|
149
|
+
|
129
150
|
it 'should find widgets by custom logic' do
|
130
151
|
widget1 = Widget.create!(test_id: 'id1')
|
131
152
|
expect(widget1.some_int).to be_nil
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: deimos-ruby
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.14.
|
4
|
+
version: 1.14.3
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Daniel Orner
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2022-
|
11
|
+
date: 2022-06-17 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: avro_turf
|
@@ -499,6 +499,7 @@ files:
|
|
499
499
|
- spec/schemas/com/my-namespace/MyNestedSchema.avsc
|
500
500
|
- spec/schemas/com/my-namespace/MySchema.avsc
|
501
501
|
- spec/schemas/com/my-namespace/MySchemaCompound_key.avsc
|
502
|
+
- spec/schemas/com/my-namespace/MySchemaId_key.avsc
|
502
503
|
- spec/schemas/com/my-namespace/MySchemaWithBooleans.avsc
|
503
504
|
- spec/schemas/com/my-namespace/MySchemaWithCircularReference.avsc
|
504
505
|
- spec/schemas/com/my-namespace/MySchemaWithComplexTypes.avsc
|
@@ -605,6 +606,7 @@ test_files:
|
|
605
606
|
- spec/schemas/com/my-namespace/MyNestedSchema.avsc
|
606
607
|
- spec/schemas/com/my-namespace/MySchema.avsc
|
607
608
|
- spec/schemas/com/my-namespace/MySchemaCompound_key.avsc
|
609
|
+
- spec/schemas/com/my-namespace/MySchemaId_key.avsc
|
608
610
|
- spec/schemas/com/my-namespace/MySchemaWithBooleans.avsc
|
609
611
|
- spec/schemas/com/my-namespace/MySchemaWithCircularReference.avsc
|
610
612
|
- spec/schemas/com/my-namespace/MySchemaWithComplexTypes.avsc
|