deimos-ruby 1.8.4 → 1.9.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +33 -0
- data/Gemfile.lock +123 -118
- data/deimos-ruby.gemspec +4 -4
- data/lib/deimos.rb +2 -0
- data/lib/deimos/config/configuration.rb +1 -1
- data/lib/deimos/kafka_source.rb +8 -12
- data/lib/deimos/kafka_topic_info.rb +2 -5
- data/lib/deimos/test_helpers.rb +1 -1
- data/lib/deimos/utils/db_poller.rb +3 -2
- data/lib/deimos/version.rb +1 -1
- data/spec/generators/active_record_generator_spec.rb +1 -1
- data/spec/kafka_source_spec.rb +69 -0
- data/spec/kafka_topic_info_spec.rb +6 -6
- data/spec/spec_helper.rb +1 -1
- metadata +23 -17
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 96d4d5c0b33f644a070ecd29d3e1060a63b7563e6e753ccf595e10a3126c9597
|
4
|
+
data.tar.gz: 8908d289256d3297599eb4be447d3858a69f98eb2ca85a0de3b8339f6f105362
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: ab1508cee3db45b7f2674aaef4e7182c0f32ee11711802e11866b129651ac989f56ec47f11c7526e47c7dba02fc0cf399d1186d7a2dfbc0eeb579b290137857b
|
7
|
+
data.tar.gz: e95a3dbb7b8e60db19796c906d21897f28174cc39c986078778e1ea612d4ab103e2fb94361429b59660dcde24dd55e417dfbe50a2bed1ce76608e86788794e8c
|
data/CHANGELOG.md
CHANGED
@@ -7,6 +7,39 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
|
7
7
|
|
8
8
|
## UNRELEASED
|
9
9
|
|
10
|
+
## 1.9.1 - 2021-01-29
|
11
|
+
|
12
|
+
- ### Fixes :wrench:
|
13
|
+
|
14
|
+
Fix for `uninitialized constant ActiveSupport::Autoload` in certain circumstances
|
15
|
+
|
16
|
+
## 1.9.0 - 2021-01-28
|
17
|
+
|
18
|
+
- ### Roadmap :car:
|
19
|
+
|
20
|
+
- Bumped the version of ruby-kafka to latest
|
21
|
+
|
22
|
+
- ### Fixes :wrench:
|
23
|
+
|
24
|
+
- Prevents DB Poller from reconnecting to DB if there is an open transaction
|
25
|
+
- Replaces `before` by `prepend_before` for more consistent test setups.
|
26
|
+
- Adds validation in the `kafka_producers` method (fixes [#90](https://github.com/flipp-oss/deimos/issues/90))
|
27
|
+
|
28
|
+
## 1.8.7 - 2021-01-14
|
29
|
+
|
30
|
+
- ### Roadmap :car:
|
31
|
+
- Update Phobos version to allow version 1.9 or 2.x.
|
32
|
+
|
33
|
+
## 1.8.6 - 2021-01-14
|
34
|
+
|
35
|
+
- ### Fixes :wrench:
|
36
|
+
- Fix for configuration bug with Ruby 3.0 (** instead of passing hash)
|
37
|
+
|
38
|
+
## 1.8.5 - 2021-01-13
|
39
|
+
|
40
|
+
- ### Fixes :wrench:
|
41
|
+
- Fixes for Rails 6.1 (remove usage of `update_attributes!`)
|
42
|
+
|
10
43
|
## 1.8.4 - 2020-12-02
|
11
44
|
|
12
45
|
### Features :star:
|
data/Gemfile.lock
CHANGED
@@ -1,73 +1,77 @@
|
|
1
1
|
PATH
|
2
2
|
remote: .
|
3
3
|
specs:
|
4
|
-
deimos-ruby (1.
|
4
|
+
deimos-ruby (1.9.0)
|
5
5
|
avro_turf (~> 0.11)
|
6
|
-
phobos (
|
7
|
-
ruby-kafka (
|
6
|
+
phobos (>= 1.9, < 3.0)
|
7
|
+
ruby-kafka (< 2)
|
8
8
|
sigurd (= 0.0.1)
|
9
9
|
|
10
10
|
GEM
|
11
11
|
remote: https://rubygems.org/
|
12
12
|
specs:
|
13
|
-
actioncable (6.
|
14
|
-
actionpack (= 6.
|
13
|
+
actioncable (6.1.1)
|
14
|
+
actionpack (= 6.1.1)
|
15
|
+
activesupport (= 6.1.1)
|
15
16
|
nio4r (~> 2.0)
|
16
17
|
websocket-driver (>= 0.6.1)
|
17
|
-
actionmailbox (6.
|
18
|
-
actionpack (= 6.
|
19
|
-
activejob (= 6.
|
20
|
-
activerecord (= 6.
|
21
|
-
activestorage (= 6.
|
22
|
-
activesupport (= 6.
|
18
|
+
actionmailbox (6.1.1)
|
19
|
+
actionpack (= 6.1.1)
|
20
|
+
activejob (= 6.1.1)
|
21
|
+
activerecord (= 6.1.1)
|
22
|
+
activestorage (= 6.1.1)
|
23
|
+
activesupport (= 6.1.1)
|
23
24
|
mail (>= 2.7.1)
|
24
|
-
actionmailer (6.
|
25
|
-
actionpack (= 6.
|
26
|
-
actionview (= 6.
|
27
|
-
activejob (= 6.
|
25
|
+
actionmailer (6.1.1)
|
26
|
+
actionpack (= 6.1.1)
|
27
|
+
actionview (= 6.1.1)
|
28
|
+
activejob (= 6.1.1)
|
29
|
+
activesupport (= 6.1.1)
|
28
30
|
mail (~> 2.5, >= 2.5.4)
|
29
31
|
rails-dom-testing (~> 2.0)
|
30
|
-
actionpack (6.
|
31
|
-
actionview (= 6.
|
32
|
-
activesupport (= 6.
|
33
|
-
rack (~> 2.0, >= 2.0.
|
32
|
+
actionpack (6.1.1)
|
33
|
+
actionview (= 6.1.1)
|
34
|
+
activesupport (= 6.1.1)
|
35
|
+
rack (~> 2.0, >= 2.0.9)
|
34
36
|
rack-test (>= 0.6.3)
|
35
37
|
rails-dom-testing (~> 2.0)
|
36
38
|
rails-html-sanitizer (~> 1.0, >= 1.2.0)
|
37
|
-
actiontext (6.
|
38
|
-
actionpack (= 6.
|
39
|
-
activerecord (= 6.
|
40
|
-
activestorage (= 6.
|
41
|
-
activesupport (= 6.
|
39
|
+
actiontext (6.1.1)
|
40
|
+
actionpack (= 6.1.1)
|
41
|
+
activerecord (= 6.1.1)
|
42
|
+
activestorage (= 6.1.1)
|
43
|
+
activesupport (= 6.1.1)
|
42
44
|
nokogiri (>= 1.8.5)
|
43
|
-
actionview (6.
|
44
|
-
activesupport (= 6.
|
45
|
+
actionview (6.1.1)
|
46
|
+
activesupport (= 6.1.1)
|
45
47
|
builder (~> 3.1)
|
46
48
|
erubi (~> 1.4)
|
47
49
|
rails-dom-testing (~> 2.0)
|
48
50
|
rails-html-sanitizer (~> 1.1, >= 1.2.0)
|
49
|
-
activejob (6.
|
50
|
-
activesupport (= 6.
|
51
|
+
activejob (6.1.1)
|
52
|
+
activesupport (= 6.1.1)
|
51
53
|
globalid (>= 0.3.6)
|
52
|
-
activemodel (6.
|
53
|
-
activesupport (= 6.
|
54
|
-
activerecord (6.
|
55
|
-
activemodel (= 6.
|
56
|
-
activesupport (= 6.
|
57
|
-
activerecord-import (1.0.
|
54
|
+
activemodel (6.1.1)
|
55
|
+
activesupport (= 6.1.1)
|
56
|
+
activerecord (6.1.1)
|
57
|
+
activemodel (= 6.1.1)
|
58
|
+
activesupport (= 6.1.1)
|
59
|
+
activerecord-import (1.0.7)
|
58
60
|
activerecord (>= 3.2)
|
59
|
-
activestorage (6.
|
60
|
-
actionpack (= 6.
|
61
|
-
activejob (= 6.
|
62
|
-
activerecord (= 6.
|
61
|
+
activestorage (6.1.1)
|
62
|
+
actionpack (= 6.1.1)
|
63
|
+
activejob (= 6.1.1)
|
64
|
+
activerecord (= 6.1.1)
|
65
|
+
activesupport (= 6.1.1)
|
63
66
|
marcel (~> 0.3.1)
|
64
|
-
|
67
|
+
mimemagic (~> 0.3.2)
|
68
|
+
activesupport (6.1.1)
|
65
69
|
concurrent-ruby (~> 1.0, >= 1.0.2)
|
66
|
-
i18n (>=
|
67
|
-
minitest (
|
68
|
-
tzinfo (~>
|
69
|
-
zeitwerk (~> 2.
|
70
|
-
ast (2.4.
|
70
|
+
i18n (>= 1.6, < 2)
|
71
|
+
minitest (>= 5.1)
|
72
|
+
tzinfo (~> 2.0)
|
73
|
+
zeitwerk (~> 2.3)
|
74
|
+
ast (2.4.2)
|
71
75
|
avro (1.9.2)
|
72
76
|
multi_json
|
73
77
|
avro_turf (0.11.0)
|
@@ -75,21 +79,21 @@ GEM
|
|
75
79
|
excon (~> 0.45)
|
76
80
|
builder (3.2.4)
|
77
81
|
coderay (1.1.3)
|
78
|
-
concurrent-ruby (1.1.
|
79
|
-
concurrent-ruby-ext (1.1.
|
80
|
-
concurrent-ruby (= 1.1.
|
82
|
+
concurrent-ruby (1.1.8)
|
83
|
+
concurrent-ruby-ext (1.1.8)
|
84
|
+
concurrent-ruby (= 1.1.8)
|
81
85
|
crass (1.0.6)
|
82
86
|
database_cleaner (1.8.5)
|
83
|
-
ddtrace (0.
|
87
|
+
ddtrace (0.45.0)
|
84
88
|
msgpack
|
85
89
|
diff-lcs (1.4.4)
|
86
|
-
digest-crc (0.6.
|
87
|
-
rake (
|
88
|
-
dogstatsd-ruby (4.8.
|
89
|
-
erubi (1.
|
90
|
-
excon (0.
|
90
|
+
digest-crc (0.6.3)
|
91
|
+
rake (>= 12.0.0, < 14.0.0)
|
92
|
+
dogstatsd-ruby (4.8.2)
|
93
|
+
erubi (1.10.0)
|
94
|
+
excon (0.78.1)
|
91
95
|
exponential-backoff (0.0.4)
|
92
|
-
ffi (1.
|
96
|
+
ffi (1.14.2)
|
93
97
|
formatador (0.2.5)
|
94
98
|
globalid (0.4.2)
|
95
99
|
activesupport (>= 4.2.0)
|
@@ -107,22 +111,22 @@ GEM
|
|
107
111
|
guard (~> 2.1)
|
108
112
|
guard-compat (~> 1.1)
|
109
113
|
rspec (>= 2.99.0, < 4.0)
|
110
|
-
guard-rubocop (1.
|
114
|
+
guard-rubocop (1.4.0)
|
111
115
|
guard (~> 2.0)
|
112
|
-
rubocop (
|
113
|
-
i18n (1.8.
|
116
|
+
rubocop (< 2.0)
|
117
|
+
i18n (1.8.7)
|
114
118
|
concurrent-ruby (~> 1.0)
|
115
|
-
listen (3.
|
119
|
+
listen (3.4.1)
|
116
120
|
rb-fsevent (~> 0.10, >= 0.10.3)
|
117
121
|
rb-inotify (~> 0.9, >= 0.9.10)
|
118
122
|
little-plugger (1.1.4)
|
119
123
|
logging (2.3.0)
|
120
124
|
little-plugger (~> 1.1)
|
121
125
|
multi_json (~> 1.14)
|
122
|
-
loofah (2.
|
126
|
+
loofah (2.9.0)
|
123
127
|
crass (~> 1.0.2)
|
124
128
|
nokogiri (>= 1.5.9)
|
125
|
-
lumberjack (1.2.
|
129
|
+
lumberjack (1.2.8)
|
126
130
|
mail (2.7.1)
|
127
131
|
mini_mime (>= 0.1.1)
|
128
132
|
marcel (0.3.3)
|
@@ -130,23 +134,24 @@ GEM
|
|
130
134
|
method_source (1.0.0)
|
131
135
|
mimemagic (0.3.5)
|
132
136
|
mini_mime (1.0.2)
|
133
|
-
mini_portile2 (2.
|
134
|
-
minitest (5.14.
|
135
|
-
msgpack (1.
|
137
|
+
mini_portile2 (2.5.0)
|
138
|
+
minitest (5.14.3)
|
139
|
+
msgpack (1.4.1)
|
136
140
|
multi_json (1.15.0)
|
137
141
|
mysql2 (0.5.3)
|
138
142
|
nenv (0.3.0)
|
139
|
-
nio4r (2.5.
|
140
|
-
nokogiri (1.
|
141
|
-
mini_portile2 (~> 2.
|
143
|
+
nio4r (2.5.4)
|
144
|
+
nokogiri (1.11.1)
|
145
|
+
mini_portile2 (~> 2.5.0)
|
146
|
+
racc (~> 1.4)
|
142
147
|
notiffany (0.1.3)
|
143
148
|
nenv (~> 0.1)
|
144
149
|
shellany (~> 0.0)
|
145
|
-
parallel (1.
|
146
|
-
parser (
|
150
|
+
parallel (1.20.1)
|
151
|
+
parser (3.0.0.0)
|
147
152
|
ast (~> 2.4.1)
|
148
153
|
pg (1.2.3)
|
149
|
-
phobos (
|
154
|
+
phobos (2.0.2)
|
150
155
|
activesupport (>= 3.0.0)
|
151
156
|
concurrent-ruby (>= 1.0.2)
|
152
157
|
concurrent-ruby-ext (>= 1.0.2)
|
@@ -157,63 +162,64 @@ GEM
|
|
157
162
|
pry (0.13.1)
|
158
163
|
coderay (~> 1.1)
|
159
164
|
method_source (~> 1.0)
|
165
|
+
racc (1.5.2)
|
160
166
|
rack (2.2.3)
|
161
167
|
rack-test (1.1.0)
|
162
168
|
rack (>= 1.0, < 3)
|
163
|
-
rails (6.
|
164
|
-
actioncable (= 6.
|
165
|
-
actionmailbox (= 6.
|
166
|
-
actionmailer (= 6.
|
167
|
-
actionpack (= 6.
|
168
|
-
actiontext (= 6.
|
169
|
-
actionview (= 6.
|
170
|
-
activejob (= 6.
|
171
|
-
activemodel (= 6.
|
172
|
-
activerecord (= 6.
|
173
|
-
activestorage (= 6.
|
174
|
-
activesupport (= 6.
|
175
|
-
bundler (>= 1.
|
176
|
-
railties (= 6.
|
169
|
+
rails (6.1.1)
|
170
|
+
actioncable (= 6.1.1)
|
171
|
+
actionmailbox (= 6.1.1)
|
172
|
+
actionmailer (= 6.1.1)
|
173
|
+
actionpack (= 6.1.1)
|
174
|
+
actiontext (= 6.1.1)
|
175
|
+
actionview (= 6.1.1)
|
176
|
+
activejob (= 6.1.1)
|
177
|
+
activemodel (= 6.1.1)
|
178
|
+
activerecord (= 6.1.1)
|
179
|
+
activestorage (= 6.1.1)
|
180
|
+
activesupport (= 6.1.1)
|
181
|
+
bundler (>= 1.15.0)
|
182
|
+
railties (= 6.1.1)
|
177
183
|
sprockets-rails (>= 2.0.0)
|
178
184
|
rails-dom-testing (2.0.3)
|
179
185
|
activesupport (>= 4.2.0)
|
180
186
|
nokogiri (>= 1.6)
|
181
187
|
rails-html-sanitizer (1.3.0)
|
182
188
|
loofah (~> 2.3)
|
183
|
-
railties (6.
|
184
|
-
actionpack (= 6.
|
185
|
-
activesupport (= 6.
|
189
|
+
railties (6.1.1)
|
190
|
+
actionpack (= 6.1.1)
|
191
|
+
activesupport (= 6.1.1)
|
186
192
|
method_source
|
187
193
|
rake (>= 0.8.7)
|
188
|
-
thor (
|
194
|
+
thor (~> 1.0)
|
189
195
|
rainbow (3.0.0)
|
190
|
-
rake (13.0.
|
196
|
+
rake (13.0.3)
|
191
197
|
rb-fsevent (0.10.4)
|
192
198
|
rb-inotify (0.10.1)
|
193
199
|
ffi (~> 1.0)
|
194
|
-
regexp_parser (
|
200
|
+
regexp_parser (2.0.3)
|
195
201
|
rexml (3.2.4)
|
196
|
-
rspec (3.
|
197
|
-
rspec-core (~> 3.
|
198
|
-
rspec-expectations (~> 3.
|
199
|
-
rspec-mocks (~> 3.
|
200
|
-
rspec-core (3.
|
201
|
-
rspec-support (~> 3.
|
202
|
-
rspec-expectations (3.
|
202
|
+
rspec (3.10.0)
|
203
|
+
rspec-core (~> 3.10.0)
|
204
|
+
rspec-expectations (~> 3.10.0)
|
205
|
+
rspec-mocks (~> 3.10.0)
|
206
|
+
rspec-core (3.10.1)
|
207
|
+
rspec-support (~> 3.10.0)
|
208
|
+
rspec-expectations (3.10.1)
|
203
209
|
diff-lcs (>= 1.2.0, < 2.0)
|
204
|
-
rspec-support (~> 3.
|
205
|
-
rspec-mocks (3.
|
210
|
+
rspec-support (~> 3.10.0)
|
211
|
+
rspec-mocks (3.10.1)
|
206
212
|
diff-lcs (>= 1.2.0, < 2.0)
|
207
|
-
rspec-support (~> 3.
|
208
|
-
rspec-rails (4.0.
|
213
|
+
rspec-support (~> 3.10.0)
|
214
|
+
rspec-rails (4.0.2)
|
209
215
|
actionpack (>= 4.2)
|
210
216
|
activesupport (>= 4.2)
|
211
217
|
railties (>= 4.2)
|
212
|
-
rspec-core (~> 3.
|
213
|
-
rspec-expectations (~> 3.
|
214
|
-
rspec-mocks (~> 3.
|
215
|
-
rspec-support (~> 3.
|
216
|
-
rspec-support (3.
|
218
|
+
rspec-core (~> 3.10)
|
219
|
+
rspec-expectations (~> 3.10)
|
220
|
+
rspec-mocks (~> 3.10)
|
221
|
+
rspec-support (~> 3.10)
|
222
|
+
rspec-support (3.10.1)
|
217
223
|
rspec_junit_formatter (0.4.1)
|
218
224
|
rspec-core (>= 2, < 4, != 2.12.0)
|
219
225
|
rubocop (0.88.0)
|
@@ -225,13 +231,13 @@ GEM
|
|
225
231
|
rubocop-ast (>= 0.1.0, < 1.0)
|
226
232
|
ruby-progressbar (~> 1.7)
|
227
233
|
unicode-display_width (>= 1.4.0, < 2.0)
|
228
|
-
rubocop-ast (0.
|
229
|
-
parser (>= 2.7.
|
234
|
+
rubocop-ast (0.8.0)
|
235
|
+
parser (>= 2.7.1.5)
|
230
236
|
rubocop-rspec (1.42.0)
|
231
237
|
rubocop (>= 0.87.0)
|
232
|
-
ruby-kafka (
|
238
|
+
ruby-kafka (1.3.0)
|
233
239
|
digest-crc
|
234
|
-
ruby-progressbar (1.
|
240
|
+
ruby-progressbar (1.11.0)
|
235
241
|
shellany (0.0.1)
|
236
242
|
sigurd (0.0.1)
|
237
243
|
concurrent-ruby (~> 1)
|
@@ -239,20 +245,19 @@ GEM
|
|
239
245
|
sprockets (4.0.2)
|
240
246
|
concurrent-ruby (~> 1.0)
|
241
247
|
rack (> 1, < 3)
|
242
|
-
sprockets-rails (3.2.
|
248
|
+
sprockets-rails (3.2.2)
|
243
249
|
actionpack (>= 4.0)
|
244
250
|
activesupport (>= 4.0)
|
245
251
|
sprockets (>= 3.0.0)
|
246
252
|
sqlite3 (1.4.2)
|
247
|
-
thor (1.0
|
248
|
-
|
249
|
-
|
250
|
-
thread_safe (~> 0.1)
|
253
|
+
thor (1.1.0)
|
254
|
+
tzinfo (2.0.4)
|
255
|
+
concurrent-ruby (~> 1.0)
|
251
256
|
unicode-display_width (1.7.0)
|
252
257
|
websocket-driver (0.7.3)
|
253
258
|
websocket-extensions (>= 0.1.0)
|
254
259
|
websocket-extensions (0.1.5)
|
255
|
-
zeitwerk (2.4.
|
260
|
+
zeitwerk (2.4.2)
|
256
261
|
|
257
262
|
PLATFORMS
|
258
263
|
ruby
|
@@ -274,9 +279,9 @@ DEPENDENCIES
|
|
274
279
|
rspec (~> 3)
|
275
280
|
rspec-rails (~> 4)
|
276
281
|
rspec_junit_formatter (~> 0.3)
|
277
|
-
rubocop (
|
278
|
-
rubocop-rspec (
|
282
|
+
rubocop (= 0.88.0)
|
283
|
+
rubocop-rspec (= 1.42.0)
|
279
284
|
sqlite3 (~> 1.3)
|
280
285
|
|
281
286
|
BUNDLED WITH
|
282
|
-
2.
|
287
|
+
2.2.5
|
data/deimos-ruby.gemspec
CHANGED
@@ -19,8 +19,8 @@ Gem::Specification.new do |spec|
|
|
19
19
|
spec.require_paths = ['lib']
|
20
20
|
|
21
21
|
spec.add_runtime_dependency('avro_turf', '~> 0.11')
|
22
|
-
spec.add_runtime_dependency('phobos', '
|
23
|
-
spec.add_runtime_dependency('ruby-kafka', '
|
22
|
+
spec.add_runtime_dependency('phobos', '>= 1.9', '< 3.0')
|
23
|
+
spec.add_runtime_dependency('ruby-kafka', '< 2')
|
24
24
|
spec.add_runtime_dependency('sigurd', '0.0.1')
|
25
25
|
|
26
26
|
spec.add_development_dependency('activerecord-import')
|
@@ -38,7 +38,7 @@ Gem::Specification.new do |spec|
|
|
38
38
|
spec.add_development_dependency('rspec', '~> 3')
|
39
39
|
spec.add_development_dependency('rspec_junit_formatter', '~>0.3')
|
40
40
|
spec.add_development_dependency('rspec-rails', '~> 4')
|
41
|
-
spec.add_development_dependency('rubocop', '
|
42
|
-
spec.add_development_dependency('rubocop-rspec', '
|
41
|
+
spec.add_development_dependency('rubocop', '0.88.0')
|
42
|
+
spec.add_development_dependency('rubocop-rspec', '1.42.0')
|
43
43
|
spec.add_development_dependency('sqlite3', '~> 1.3')
|
44
44
|
end
|
data/lib/deimos.rb
CHANGED
@@ -67,7 +67,7 @@ module Deimos
|
|
67
67
|
topic(kafka_config.topic) if kafka_config.topic.present? && klass.respond_to?(:topic)
|
68
68
|
schema(kafka_config.schema) if kafka_config.schema.present?
|
69
69
|
namespace(kafka_config.namespace) if kafka_config.namespace.present?
|
70
|
-
key_config(kafka_config.key_config) if kafka_config.key_config.present?
|
70
|
+
key_config(**kafka_config.key_config) if kafka_config.key_config.present?
|
71
71
|
end
|
72
72
|
end
|
73
73
|
|
data/lib/deimos/kafka_source.rb
CHANGED
@@ -6,6 +6,9 @@ module Deimos
|
|
6
6
|
module KafkaSource
|
7
7
|
extend ActiveSupport::Concern
|
8
8
|
|
9
|
+
DEPRECATION_WARNING = 'The kafka_producer interface will be deprecated ' \
|
10
|
+
'in future releases. Please use kafka_producers instead.'
|
11
|
+
|
9
12
|
included do
|
10
13
|
after_create(:send_kafka_event_on_create)
|
11
14
|
after_update(:send_kafka_event_on_update)
|
@@ -64,19 +67,12 @@ module Deimos
|
|
64
67
|
|
65
68
|
# @return [Array<Deimos::ActiveRecordProducer>] the producers to run.
|
66
69
|
def kafka_producers
|
67
|
-
|
68
|
-
|
69
|
-
|
70
|
-
|
71
|
-
end
|
72
|
-
|
73
|
-
# Deprecated - use #kafka_producers instead.
|
74
|
-
# @return [Deimos::ActiveRecordProducer] the producer to use.
|
75
|
-
def kafka_producer
|
76
|
-
raise NotImplementedError if self.method(:kafka_producers).
|
77
|
-
owner == Deimos::KafkaSource
|
70
|
+
if self.respond_to?(:kafka_producer)
|
71
|
+
Deimos.config.logger.warn(message: DEPRECATION_WARNING)
|
72
|
+
return [self.kafka_producer]
|
73
|
+
end
|
78
74
|
|
79
|
-
|
75
|
+
raise NotImplementedError
|
80
76
|
end
|
81
77
|
|
82
78
|
# This is an internal method, part of the activerecord_import gem. It's
|
@@ -85,11 +85,8 @@ module Deimos
|
|
85
85
|
locked_at: Time.zone.now,
|
86
86
|
error: true,
|
87
87
|
retries: record.retries + 1 }
|
88
|
-
|
89
|
-
|
90
|
-
else
|
91
|
-
record.update_attributes!(attr_hash)
|
92
|
-
end
|
88
|
+
record.attributes = attr_hash
|
89
|
+
record.save!
|
93
90
|
end
|
94
91
|
|
95
92
|
# Update the locked_at timestamp to indicate that the producer is still
|
data/lib/deimos/test_helpers.rb
CHANGED
@@ -68,7 +68,7 @@ module Deimos
|
|
68
68
|
|
69
69
|
# Grab the PollInfo or create if it doesn't exist.
|
70
70
|
def retrieve_poll_info
|
71
|
-
ActiveRecord::Base.connection.reconnect!
|
71
|
+
ActiveRecord::Base.connection.reconnect! unless ActiveRecord::Base.connection.open_transactions.positive?
|
72
72
|
new_time = @config.start_from_beginning ? Time.new(0) : Time.zone.now
|
73
73
|
@info = Deimos::PollInfo.find_by_producer(@config.producer_class) ||
|
74
74
|
Deimos::PollInfo.create!(producer: @config.producer_class,
|
@@ -142,7 +142,8 @@ module Deimos
|
|
142
142
|
last_id = record.public_send(id_method)
|
143
143
|
last_updated_at = last_updated(record)
|
144
144
|
@producer.send_events(batch)
|
145
|
-
@info.
|
145
|
+
@info.attributes = { last_sent: last_updated_at, last_sent_id: last_id }
|
146
|
+
@info.save!
|
146
147
|
end
|
147
148
|
end
|
148
149
|
end
|
data/lib/deimos/version.rb
CHANGED
@@ -16,7 +16,7 @@ RSpec.describe Deimos::Generators::ActiveRecordGenerator do
|
|
16
16
|
files = Dir['db/migrate/*.rb']
|
17
17
|
expect(files.length).to eq(1)
|
18
18
|
results = <<~MIGRATION
|
19
|
-
class CreateGeneratedTable < ActiveRecord::Migration[6.
|
19
|
+
class CreateGeneratedTable < ActiveRecord::Migration[6.1]
|
20
20
|
def up
|
21
21
|
if table_exists?(:generated_table)
|
22
22
|
warn "generated_table already exists, exiting"
|
data/spec/kafka_source_spec.rb
CHANGED
@@ -308,5 +308,74 @@ module KafkaSourceSpec
|
|
308
308
|
}, widgets[1].id)
|
309
309
|
end
|
310
310
|
end
|
311
|
+
|
312
|
+
context 'with AR models that implement the kafka_producer interface' do
|
313
|
+
before(:each) do
|
314
|
+
# Dummy class we can include the mixin in. Has a backing table created
|
315
|
+
# earlier and has the import hook disabled
|
316
|
+
deprecated_class = Class.new(ActiveRecord::Base) do
|
317
|
+
include Deimos::KafkaSource
|
318
|
+
self.table_name = 'widgets'
|
319
|
+
|
320
|
+
# :nodoc:
|
321
|
+
def self.kafka_config
|
322
|
+
{
|
323
|
+
update: true,
|
324
|
+
delete: true,
|
325
|
+
import: false,
|
326
|
+
create: true
|
327
|
+
}
|
328
|
+
end
|
329
|
+
|
330
|
+
# :nodoc:
|
331
|
+
def self.kafka_producer
|
332
|
+
WidgetProducer
|
333
|
+
end
|
334
|
+
end
|
335
|
+
stub_const('WidgetDeprecated', deprecated_class)
|
336
|
+
WidgetDeprecated.reset_column_information
|
337
|
+
end
|
338
|
+
|
339
|
+
it 'logs a warning and sends the message as usual' do
|
340
|
+
expect(Deimos.config.logger).to receive(:warn).with({ message: WidgetDeprecated::DEPRECATION_WARNING })
|
341
|
+
widget = WidgetDeprecated.create(widget_id: 1, name: 'Widget 1')
|
342
|
+
expect('my-topic').to have_sent({
|
343
|
+
widget_id: 1,
|
344
|
+
name: 'Widget 1',
|
345
|
+
id: widget.id,
|
346
|
+
created_at: anything,
|
347
|
+
updated_at: anything
|
348
|
+
}, widget.id)
|
349
|
+
end
|
350
|
+
end
|
351
|
+
|
352
|
+
context 'with AR models that do not implement any producer interface' do
|
353
|
+
before(:each) do
|
354
|
+
# Dummy class we can include the mixin in. Has a backing table created
|
355
|
+
# earlier and has the import hook disabled
|
356
|
+
buggy_class = Class.new(ActiveRecord::Base) do
|
357
|
+
include Deimos::KafkaSource
|
358
|
+
self.table_name = 'widgets'
|
359
|
+
|
360
|
+
# :nodoc:
|
361
|
+
def self.kafka_config
|
362
|
+
{
|
363
|
+
update: true,
|
364
|
+
delete: true,
|
365
|
+
import: false,
|
366
|
+
create: true
|
367
|
+
}
|
368
|
+
end
|
369
|
+
end
|
370
|
+
stub_const('WidgetBuggy', buggy_class)
|
371
|
+
WidgetBuggy.reset_column_information
|
372
|
+
end
|
373
|
+
|
374
|
+
it 'raises a NotImplementedError exception' do
|
375
|
+
expect {
|
376
|
+
WidgetBuggy.create(widget_id: 1, name: 'Widget 1')
|
377
|
+
}.to raise_error(NotImplementedError)
|
378
|
+
end
|
379
|
+
end
|
311
380
|
end
|
312
381
|
end
|
@@ -51,13 +51,13 @@ each_db_config(Deimos::KafkaTopicInfo) do
|
|
51
51
|
expect(record.locked_at).to eq(nil)
|
52
52
|
expect(record.error).to eq(false)
|
53
53
|
expect(record.retries).to eq(0)
|
54
|
-
expect(record.last_processed_at.to_s).to eq(Time.zone.now.to_s)
|
54
|
+
expect(record.last_processed_at.in_time_zone.to_s).to eq(Time.zone.now.to_s)
|
55
55
|
record = Deimos::KafkaTopicInfo.last
|
56
56
|
expect(record.locked_by).not_to eq(nil)
|
57
57
|
expect(record.locked_at).not_to eq(nil)
|
58
58
|
expect(record.error).not_to eq(false)
|
59
59
|
expect(record.retries).not_to eq(0)
|
60
|
-
expect(record.last_processed_at.to_s).to eq(20.seconds.ago.to_s)
|
60
|
+
expect(record.last_processed_at.in_time_zone.to_s).to eq(20.seconds.ago.to_s)
|
61
61
|
end
|
62
62
|
end
|
63
63
|
|
@@ -70,11 +70,11 @@ each_db_config(Deimos::KafkaTopicInfo) do
|
|
70
70
|
locked_by: 'me', locked_at: 1.minute.ago)
|
71
71
|
|
72
72
|
expect(Deimos::KafkaTopicInfo.count).to eq(3)
|
73
|
-
Deimos::KafkaTopicInfo.all.each { |t| expect(t.last_processed_at.to_s).to eq(old_time) }
|
73
|
+
Deimos::KafkaTopicInfo.all.each { |t| expect(t.last_processed_at.in_time_zone.to_s).to eq(old_time) }
|
74
74
|
Deimos::KafkaTopicInfo.ping_empty_topics(%w(topic1))
|
75
|
-
expect(t1.reload.last_processed_at.to_s).to eq(old_time) # was passed as an exception
|
76
|
-
expect(t2.reload.last_processed_at.to_s).to eq(Time.zone.now.to_s)
|
77
|
-
expect(t3.reload.last_processed_at.to_s).to eq(old_time) # is locked
|
75
|
+
expect(t1.reload.last_processed_at.in_time_zone.to_s).to eq(old_time) # was passed as an exception
|
76
|
+
expect(t2.reload.last_processed_at.in_time_zone.to_s).to eq(Time.zone.now.to_s)
|
77
|
+
expect(t3.reload.last_processed_at.in_time_zone.to_s).to eq(old_time) # is locked
|
78
78
|
end
|
79
79
|
end
|
80
80
|
|
data/spec/spec_helper.rb
CHANGED
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.
|
4
|
+
version: 1.9.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Daniel Orner
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2021-01-29 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: avro_turf
|
@@ -28,30 +28,36 @@ dependencies:
|
|
28
28
|
name: phobos
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
30
30
|
requirements:
|
31
|
-
- - "
|
31
|
+
- - ">="
|
32
32
|
- !ruby/object:Gem::Version
|
33
33
|
version: '1.9'
|
34
|
+
- - "<"
|
35
|
+
- !ruby/object:Gem::Version
|
36
|
+
version: '3.0'
|
34
37
|
type: :runtime
|
35
38
|
prerelease: false
|
36
39
|
version_requirements: !ruby/object:Gem::Requirement
|
37
40
|
requirements:
|
38
|
-
- - "
|
41
|
+
- - ">="
|
39
42
|
- !ruby/object:Gem::Version
|
40
43
|
version: '1.9'
|
44
|
+
- - "<"
|
45
|
+
- !ruby/object:Gem::Version
|
46
|
+
version: '3.0'
|
41
47
|
- !ruby/object:Gem::Dependency
|
42
48
|
name: ruby-kafka
|
43
49
|
requirement: !ruby/object:Gem::Requirement
|
44
50
|
requirements:
|
45
|
-
- - "
|
51
|
+
- - "<"
|
46
52
|
- !ruby/object:Gem::Version
|
47
|
-
version: '
|
53
|
+
version: '2'
|
48
54
|
type: :runtime
|
49
55
|
prerelease: false
|
50
56
|
version_requirements: !ruby/object:Gem::Requirement
|
51
57
|
requirements:
|
52
|
-
- - "
|
58
|
+
- - "<"
|
53
59
|
- !ruby/object:Gem::Version
|
54
|
-
version: '
|
60
|
+
version: '2'
|
55
61
|
- !ruby/object:Gem::Dependency
|
56
62
|
name: sigurd
|
57
63
|
requirement: !ruby/object:Gem::Requirement
|
@@ -280,30 +286,30 @@ dependencies:
|
|
280
286
|
name: rubocop
|
281
287
|
requirement: !ruby/object:Gem::Requirement
|
282
288
|
requirements:
|
283
|
-
- -
|
289
|
+
- - '='
|
284
290
|
- !ruby/object:Gem::Version
|
285
|
-
version:
|
291
|
+
version: 0.88.0
|
286
292
|
type: :development
|
287
293
|
prerelease: false
|
288
294
|
version_requirements: !ruby/object:Gem::Requirement
|
289
295
|
requirements:
|
290
|
-
- -
|
296
|
+
- - '='
|
291
297
|
- !ruby/object:Gem::Version
|
292
|
-
version:
|
298
|
+
version: 0.88.0
|
293
299
|
- !ruby/object:Gem::Dependency
|
294
300
|
name: rubocop-rspec
|
295
301
|
requirement: !ruby/object:Gem::Requirement
|
296
302
|
requirements:
|
297
|
-
- -
|
303
|
+
- - '='
|
298
304
|
- !ruby/object:Gem::Version
|
299
|
-
version:
|
305
|
+
version: 1.42.0
|
300
306
|
type: :development
|
301
307
|
prerelease: false
|
302
308
|
version_requirements: !ruby/object:Gem::Requirement
|
303
309
|
requirements:
|
304
|
-
- -
|
310
|
+
- - '='
|
305
311
|
- !ruby/object:Gem::Version
|
306
|
-
version:
|
312
|
+
version: 1.42.0
|
307
313
|
- !ruby/object:Gem::Dependency
|
308
314
|
name: sqlite3
|
309
315
|
requirement: !ruby/object:Gem::Requirement
|
@@ -492,7 +498,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
492
498
|
- !ruby/object:Gem::Version
|
493
499
|
version: '0'
|
494
500
|
requirements: []
|
495
|
-
rubygems_version: 3.
|
501
|
+
rubygems_version: 3.0.9
|
496
502
|
signing_key:
|
497
503
|
specification_version: 4
|
498
504
|
summary: Kafka libraries for Ruby.
|