roo_on_rails 1.20.0 → 1.21.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (13) hide show
  1. checksums.yaml +4 -4
  2. data/.circleci/config.yml +81 -261
  3. data/.circleci/config.yml.erb +8 -11
  4. data/Appraisals +8 -1
  5. data/CHANGELOG.md +7 -0
  6. data/gemfiles/rails_5_1.gemfile +1 -1
  7. data/gemfiles/rails_5_2.gemfile +14 -0
  8. data/lib/roo_on_rails.rb +1 -1
  9. data/lib/roo_on_rails/railties/http.rb +3 -3
  10. data/lib/roo_on_rails/railties/{sidekiq.rb → sidekiq_integration.rb} +9 -7
  11. data/lib/roo_on_rails/version.rb +1 -1
  12. data/roo_on_rails.gemspec +2 -2
  13. metadata +9 -8
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: b4613e4f2d71a1b6105071d8a1c283f97d89e0bb740165bc87088c26b403881b
4
- data.tar.gz: c13b32bd6d0bbe8fc47858352becf81ac684ba7f7f082e33145c54284a6f9b5c
3
+ metadata.gz: 04d813efb65227f43263c1802588635add6d27bb2a5c98c81c924ead208ef09d
4
+ data.tar.gz: c91116b30b641039133e69dd4c85e02d7df6c24e16f25841d36064037facf420
5
5
  SHA512:
6
- metadata.gz: 05dad7f1435d8d051d80df90b54dce24c447a468dbcb35090ddac4f962c1026d0059b1364f8a9219834e4e4f2c5b4cf5e3054a63061a950e3f433c44dfedb772
7
- data.tar.gz: 2f9304451d8320f02e59d80febff8a1f3065dc688f4f56d99ed502588004338341855b8aa5218eb82e2cc75ab4506d4578454ff00e8dc1345e5e47074208e9f7
6
+ metadata.gz: 9f49df0cd62c25ee965d761888a244f195b45eecc6237eeadf12359410c0833628a4e2b6b2575ebc43d0ab75fc4d1a613b5d2ee6ccab2c70fbc5d5183fb81ad6
7
+ data.tar.gz: 3a0fb95d6e34690932380b5a06de448bc12ba449b17988bd0ed8c0a641f42a09950780869d57019f2e6e49646d37a4180aaaeb1c417a608a20276eddc99a1e95
data/.circleci/config.yml CHANGED
@@ -4,7 +4,7 @@
4
4
  version: 2
5
5
  jobs:
6
6
 
7
- build_2.2.6_rails_3:
7
+ build_2.3.4_rails_3:
8
8
  docker:
9
9
  - image: deliveroo/multiruby
10
10
  - image: postgres:9.6-alpine
@@ -22,17 +22,17 @@ jobs:
22
22
  ln -s /dev/shm/tmp ~/project/tmp
23
23
 
24
24
  - run:
25
- name: Select build variant (Ruby 2.2.6, rails_3)
25
+ name: Select build variant (Ruby 2.3.4, rails_3)
26
26
  command: |
27
- rbenv local 2.2.6 ;
27
+ rbenv local 2.3.4 ;
28
28
  gem install bundler ;
29
29
  bundle config --local gemfile $PWD/gemfiles/rails_3.gemfile
30
30
 
31
31
  - restore_cache:
32
32
  keys:
33
- - v2-bundle-2.2.6-rails_3-{{ .Branch }}
34
- - v2-bundle-2.2.6-rails_3
35
- - v2-bundle-2.2.6
33
+ - v2-bundle-2.3.4-rails_3-{{ .Branch }}
34
+ - v2-bundle-2.3.4-rails_3
35
+ - v2-bundle-2.3.4
36
36
 
37
37
  - run:
38
38
  name: Install dependencies
@@ -47,22 +47,22 @@ jobs:
47
47
  bundle exec rspec
48
48
 
49
49
  - save_cache:
50
- key: v2-bundle-2.2.6-rails_3-{{ .Branch }}
50
+ key: v2-bundle-2.3.4-rails_3-{{ .Branch }}
51
51
  paths:
52
52
  - ~/project/vendor/bundle
53
53
  - ~/project/vendor/bundle-scaffold
54
54
  - save_cache:
55
- key: v2-bundle-2.2.6-rails_3
55
+ key: v2-bundle-2.3.4-rails_3
56
56
  paths:
57
57
  - ~/project/vendor/bundle
58
58
  - ~/project/vendor/bundle-scaffold
59
59
  - save_cache:
60
- key: v2-bundle-2.2.6
60
+ key: v2-bundle-2.3.4
61
61
  paths:
62
62
  - ~/project/vendor/bundle
63
63
  - ~/project/vendor/bundle-scaffold
64
64
 
65
- build_2.3.3_rails_3:
65
+ build_2.3.4_rails_4:
66
66
  docker:
67
67
  - image: deliveroo/multiruby
68
68
  - image: postgres:9.6-alpine
@@ -80,75 +80,17 @@ jobs:
80
80
  ln -s /dev/shm/tmp ~/project/tmp
81
81
 
82
82
  - run:
83
- name: Select build variant (Ruby 2.3.3, rails_3)
83
+ name: Select build variant (Ruby 2.3.4, rails_4)
84
84
  command: |
85
- rbenv local 2.3.3 ;
86
- gem install bundler ;
87
- bundle config --local gemfile $PWD/gemfiles/rails_3.gemfile
88
-
89
- - restore_cache:
90
- keys:
91
- - v2-bundle-2.3.3-rails_3-{{ .Branch }}
92
- - v2-bundle-2.3.3-rails_3
93
- - v2-bundle-2.3.3
94
-
95
- - run:
96
- name: Install dependencies
97
- command: |
98
- bundle install --jobs=3 --retry=3 --path=$PWD/vendor/bundle
99
-
100
- - run:
101
- name: Run test suite
102
- command: |
103
- unset RACK_ENV &&
104
- unset RAILS_ENV &&
105
- bundle exec rspec
106
-
107
- - save_cache:
108
- key: v2-bundle-2.3.3-rails_3-{{ .Branch }}
109
- paths:
110
- - ~/project/vendor/bundle
111
- - ~/project/vendor/bundle-scaffold
112
- - save_cache:
113
- key: v2-bundle-2.3.3-rails_3
114
- paths:
115
- - ~/project/vendor/bundle
116
- - ~/project/vendor/bundle-scaffold
117
- - save_cache:
118
- key: v2-bundle-2.3.3
119
- paths:
120
- - ~/project/vendor/bundle
121
- - ~/project/vendor/bundle-scaffold
122
-
123
- build_2.2.6_rails_4:
124
- docker:
125
- - image: deliveroo/multiruby
126
- - image: postgres:9.6-alpine
127
- environment:
128
- PGDATA: /dev/shm/pgdata
129
- - image: redis:3-alpine
130
- steps:
131
- - checkout
132
-
133
- - run:
134
- name: Setup RAM disk
135
- command: |
136
- rm -rf ~/project/tmp ;
137
- mkdir /dev/shm/tmp ;
138
- ln -s /dev/shm/tmp ~/project/tmp
139
-
140
- - run:
141
- name: Select build variant (Ruby 2.2.6, rails_4)
142
- command: |
143
- rbenv local 2.2.6 ;
85
+ rbenv local 2.3.4 ;
144
86
  gem install bundler ;
145
87
  bundle config --local gemfile $PWD/gemfiles/rails_4.gemfile
146
88
 
147
89
  - restore_cache:
148
90
  keys:
149
- - v2-bundle-2.2.6-rails_4-{{ .Branch }}
150
- - v2-bundle-2.2.6-rails_4
151
- - v2-bundle-2.2.6
91
+ - v2-bundle-2.3.4-rails_4-{{ .Branch }}
92
+ - v2-bundle-2.3.4-rails_4
93
+ - v2-bundle-2.3.4
152
94
 
153
95
  - run:
154
96
  name: Install dependencies
@@ -163,22 +105,22 @@ jobs:
163
105
  bundle exec rspec
164
106
 
165
107
  - save_cache:
166
- key: v2-bundle-2.2.6-rails_4-{{ .Branch }}
108
+ key: v2-bundle-2.3.4-rails_4-{{ .Branch }}
167
109
  paths:
168
110
  - ~/project/vendor/bundle
169
111
  - ~/project/vendor/bundle-scaffold
170
112
  - save_cache:
171
- key: v2-bundle-2.2.6-rails_4
113
+ key: v2-bundle-2.3.4-rails_4
172
114
  paths:
173
115
  - ~/project/vendor/bundle
174
116
  - ~/project/vendor/bundle-scaffold
175
117
  - save_cache:
176
- key: v2-bundle-2.2.6
118
+ key: v2-bundle-2.3.4
177
119
  paths:
178
120
  - ~/project/vendor/bundle
179
121
  - ~/project/vendor/bundle-scaffold
180
122
 
181
- build_2.3.3_rails_4:
123
+ build_2.4.1_rails_4:
182
124
  docker:
183
125
  - image: deliveroo/multiruby
184
126
  - image: postgres:9.6-alpine
@@ -196,17 +138,17 @@ jobs:
196
138
  ln -s /dev/shm/tmp ~/project/tmp
197
139
 
198
140
  - run:
199
- name: Select build variant (Ruby 2.3.3, rails_4)
141
+ name: Select build variant (Ruby 2.4.1, rails_4)
200
142
  command: |
201
- rbenv local 2.3.3 ;
143
+ rbenv local 2.4.1 ;
202
144
  gem install bundler ;
203
145
  bundle config --local gemfile $PWD/gemfiles/rails_4.gemfile
204
146
 
205
147
  - restore_cache:
206
148
  keys:
207
- - v2-bundle-2.3.3-rails_4-{{ .Branch }}
208
- - v2-bundle-2.3.3-rails_4
209
- - v2-bundle-2.3.3
149
+ - v2-bundle-2.4.1-rails_4-{{ .Branch }}
150
+ - v2-bundle-2.4.1-rails_4
151
+ - v2-bundle-2.4.1
210
152
 
211
153
  - run:
212
154
  name: Install dependencies
@@ -221,22 +163,22 @@ jobs:
221
163
  bundle exec rspec
222
164
 
223
165
  - save_cache:
224
- key: v2-bundle-2.3.3-rails_4-{{ .Branch }}
166
+ key: v2-bundle-2.4.1-rails_4-{{ .Branch }}
225
167
  paths:
226
168
  - ~/project/vendor/bundle
227
169
  - ~/project/vendor/bundle-scaffold
228
170
  - save_cache:
229
- key: v2-bundle-2.3.3-rails_4
171
+ key: v2-bundle-2.4.1-rails_4
230
172
  paths:
231
173
  - ~/project/vendor/bundle
232
174
  - ~/project/vendor/bundle-scaffold
233
175
  - save_cache:
234
- key: v2-bundle-2.3.3
176
+ key: v2-bundle-2.4.1
235
177
  paths:
236
178
  - ~/project/vendor/bundle
237
179
  - ~/project/vendor/bundle-scaffold
238
180
 
239
- build_2.4.0_rails_4:
181
+ build_2.3.4_rails_5:
240
182
  docker:
241
183
  - image: deliveroo/multiruby
242
184
  - image: postgres:9.6-alpine
@@ -254,75 +196,17 @@ jobs:
254
196
  ln -s /dev/shm/tmp ~/project/tmp
255
197
 
256
198
  - run:
257
- name: Select build variant (Ruby 2.4.0, rails_4)
199
+ name: Select build variant (Ruby 2.3.4, rails_5)
258
200
  command: |
259
- rbenv local 2.4.0 ;
260
- gem install bundler ;
261
- bundle config --local gemfile $PWD/gemfiles/rails_4.gemfile
262
-
263
- - restore_cache:
264
- keys:
265
- - v2-bundle-2.4.0-rails_4-{{ .Branch }}
266
- - v2-bundle-2.4.0-rails_4
267
- - v2-bundle-2.4.0
268
-
269
- - run:
270
- name: Install dependencies
271
- command: |
272
- bundle install --jobs=3 --retry=3 --path=$PWD/vendor/bundle
273
-
274
- - run:
275
- name: Run test suite
276
- command: |
277
- unset RACK_ENV &&
278
- unset RAILS_ENV &&
279
- bundle exec rspec
280
-
281
- - save_cache:
282
- key: v2-bundle-2.4.0-rails_4-{{ .Branch }}
283
- paths:
284
- - ~/project/vendor/bundle
285
- - ~/project/vendor/bundle-scaffold
286
- - save_cache:
287
- key: v2-bundle-2.4.0-rails_4
288
- paths:
289
- - ~/project/vendor/bundle
290
- - ~/project/vendor/bundle-scaffold
291
- - save_cache:
292
- key: v2-bundle-2.4.0
293
- paths:
294
- - ~/project/vendor/bundle
295
- - ~/project/vendor/bundle-scaffold
296
-
297
- build_2.2.6_rails_5:
298
- docker:
299
- - image: deliveroo/multiruby
300
- - image: postgres:9.6-alpine
301
- environment:
302
- PGDATA: /dev/shm/pgdata
303
- - image: redis:3-alpine
304
- steps:
305
- - checkout
306
-
307
- - run:
308
- name: Setup RAM disk
309
- command: |
310
- rm -rf ~/project/tmp ;
311
- mkdir /dev/shm/tmp ;
312
- ln -s /dev/shm/tmp ~/project/tmp
313
-
314
- - run:
315
- name: Select build variant (Ruby 2.2.6, rails_5)
316
- command: |
317
- rbenv local 2.2.6 ;
201
+ rbenv local 2.3.4 ;
318
202
  gem install bundler ;
319
203
  bundle config --local gemfile $PWD/gemfiles/rails_5.gemfile
320
204
 
321
205
  - restore_cache:
322
206
  keys:
323
- - v2-bundle-2.2.6-rails_5-{{ .Branch }}
324
- - v2-bundle-2.2.6-rails_5
325
- - v2-bundle-2.2.6
207
+ - v2-bundle-2.3.4-rails_5-{{ .Branch }}
208
+ - v2-bundle-2.3.4-rails_5
209
+ - v2-bundle-2.3.4
326
210
 
327
211
  - run:
328
212
  name: Install dependencies
@@ -337,22 +221,22 @@ jobs:
337
221
  bundle exec rspec
338
222
 
339
223
  - save_cache:
340
- key: v2-bundle-2.2.6-rails_5-{{ .Branch }}
224
+ key: v2-bundle-2.3.4-rails_5-{{ .Branch }}
341
225
  paths:
342
226
  - ~/project/vendor/bundle
343
227
  - ~/project/vendor/bundle-scaffold
344
228
  - save_cache:
345
- key: v2-bundle-2.2.6-rails_5
229
+ key: v2-bundle-2.3.4-rails_5
346
230
  paths:
347
231
  - ~/project/vendor/bundle
348
232
  - ~/project/vendor/bundle-scaffold
349
233
  - save_cache:
350
- key: v2-bundle-2.2.6
234
+ key: v2-bundle-2.3.4
351
235
  paths:
352
236
  - ~/project/vendor/bundle
353
237
  - ~/project/vendor/bundle-scaffold
354
238
 
355
- build_2.3.3_rails_5:
239
+ build_2.4.1_rails_5:
356
240
  docker:
357
241
  - image: deliveroo/multiruby
358
242
  - image: postgres:9.6-alpine
@@ -370,17 +254,17 @@ jobs:
370
254
  ln -s /dev/shm/tmp ~/project/tmp
371
255
 
372
256
  - run:
373
- name: Select build variant (Ruby 2.3.3, rails_5)
257
+ name: Select build variant (Ruby 2.4.1, rails_5)
374
258
  command: |
375
- rbenv local 2.3.3 ;
259
+ rbenv local 2.4.1 ;
376
260
  gem install bundler ;
377
261
  bundle config --local gemfile $PWD/gemfiles/rails_5.gemfile
378
262
 
379
263
  - restore_cache:
380
264
  keys:
381
- - v2-bundle-2.3.3-rails_5-{{ .Branch }}
382
- - v2-bundle-2.3.3-rails_5
383
- - v2-bundle-2.3.3
265
+ - v2-bundle-2.4.1-rails_5-{{ .Branch }}
266
+ - v2-bundle-2.4.1-rails_5
267
+ - v2-bundle-2.4.1
384
268
 
385
269
  - run:
386
270
  name: Install dependencies
@@ -395,22 +279,22 @@ jobs:
395
279
  bundle exec rspec
396
280
 
397
281
  - save_cache:
398
- key: v2-bundle-2.3.3-rails_5-{{ .Branch }}
282
+ key: v2-bundle-2.4.1-rails_5-{{ .Branch }}
399
283
  paths:
400
284
  - ~/project/vendor/bundle
401
285
  - ~/project/vendor/bundle-scaffold
402
286
  - save_cache:
403
- key: v2-bundle-2.3.3-rails_5
287
+ key: v2-bundle-2.4.1-rails_5
404
288
  paths:
405
289
  - ~/project/vendor/bundle
406
290
  - ~/project/vendor/bundle-scaffold
407
291
  - save_cache:
408
- key: v2-bundle-2.3.3
292
+ key: v2-bundle-2.4.1
409
293
  paths:
410
294
  - ~/project/vendor/bundle
411
295
  - ~/project/vendor/bundle-scaffold
412
296
 
413
- build_2.4.0_rails_5:
297
+ build_2.3.4_rails_5_1:
414
298
  docker:
415
299
  - image: deliveroo/multiruby
416
300
  - image: postgres:9.6-alpine
@@ -428,75 +312,17 @@ jobs:
428
312
  ln -s /dev/shm/tmp ~/project/tmp
429
313
 
430
314
  - run:
431
- name: Select build variant (Ruby 2.4.0, rails_5)
315
+ name: Select build variant (Ruby 2.3.4, rails_5_1)
432
316
  command: |
433
- rbenv local 2.4.0 ;
434
- gem install bundler ;
435
- bundle config --local gemfile $PWD/gemfiles/rails_5.gemfile
436
-
437
- - restore_cache:
438
- keys:
439
- - v2-bundle-2.4.0-rails_5-{{ .Branch }}
440
- - v2-bundle-2.4.0-rails_5
441
- - v2-bundle-2.4.0
442
-
443
- - run:
444
- name: Install dependencies
445
- command: |
446
- bundle install --jobs=3 --retry=3 --path=$PWD/vendor/bundle
447
-
448
- - run:
449
- name: Run test suite
450
- command: |
451
- unset RACK_ENV &&
452
- unset RAILS_ENV &&
453
- bundle exec rspec
454
-
455
- - save_cache:
456
- key: v2-bundle-2.4.0-rails_5-{{ .Branch }}
457
- paths:
458
- - ~/project/vendor/bundle
459
- - ~/project/vendor/bundle-scaffold
460
- - save_cache:
461
- key: v2-bundle-2.4.0-rails_5
462
- paths:
463
- - ~/project/vendor/bundle
464
- - ~/project/vendor/bundle-scaffold
465
- - save_cache:
466
- key: v2-bundle-2.4.0
467
- paths:
468
- - ~/project/vendor/bundle
469
- - ~/project/vendor/bundle-scaffold
470
-
471
- build_2.2.6_rails_5_1:
472
- docker:
473
- - image: deliveroo/multiruby
474
- - image: postgres:9.6-alpine
475
- environment:
476
- PGDATA: /dev/shm/pgdata
477
- - image: redis:3-alpine
478
- steps:
479
- - checkout
480
-
481
- - run:
482
- name: Setup RAM disk
483
- command: |
484
- rm -rf ~/project/tmp ;
485
- mkdir /dev/shm/tmp ;
486
- ln -s /dev/shm/tmp ~/project/tmp
487
-
488
- - run:
489
- name: Select build variant (Ruby 2.2.6, rails_5_1)
490
- command: |
491
- rbenv local 2.2.6 ;
317
+ rbenv local 2.3.4 ;
492
318
  gem install bundler ;
493
319
  bundle config --local gemfile $PWD/gemfiles/rails_5_1.gemfile
494
320
 
495
321
  - restore_cache:
496
322
  keys:
497
- - v2-bundle-2.2.6-rails_5_1-{{ .Branch }}
498
- - v2-bundle-2.2.6-rails_5_1
499
- - v2-bundle-2.2.6
323
+ - v2-bundle-2.3.4-rails_5_1-{{ .Branch }}
324
+ - v2-bundle-2.3.4-rails_5_1
325
+ - v2-bundle-2.3.4
500
326
 
501
327
  - run:
502
328
  name: Install dependencies
@@ -511,22 +337,22 @@ jobs:
511
337
  bundle exec rspec
512
338
 
513
339
  - save_cache:
514
- key: v2-bundle-2.2.6-rails_5_1-{{ .Branch }}
340
+ key: v2-bundle-2.3.4-rails_5_1-{{ .Branch }}
515
341
  paths:
516
342
  - ~/project/vendor/bundle
517
343
  - ~/project/vendor/bundle-scaffold
518
344
  - save_cache:
519
- key: v2-bundle-2.2.6-rails_5_1
345
+ key: v2-bundle-2.3.4-rails_5_1
520
346
  paths:
521
347
  - ~/project/vendor/bundle
522
348
  - ~/project/vendor/bundle-scaffold
523
349
  - save_cache:
524
- key: v2-bundle-2.2.6
350
+ key: v2-bundle-2.3.4
525
351
  paths:
526
352
  - ~/project/vendor/bundle
527
353
  - ~/project/vendor/bundle-scaffold
528
354
 
529
- build_2.3.3_rails_5_1:
355
+ build_2.4.1_rails_5_1:
530
356
  docker:
531
357
  - image: deliveroo/multiruby
532
358
  - image: postgres:9.6-alpine
@@ -544,17 +370,17 @@ jobs:
544
370
  ln -s /dev/shm/tmp ~/project/tmp
545
371
 
546
372
  - run:
547
- name: Select build variant (Ruby 2.3.3, rails_5_1)
373
+ name: Select build variant (Ruby 2.4.1, rails_5_1)
548
374
  command: |
549
- rbenv local 2.3.3 ;
375
+ rbenv local 2.4.1 ;
550
376
  gem install bundler ;
551
377
  bundle config --local gemfile $PWD/gemfiles/rails_5_1.gemfile
552
378
 
553
379
  - restore_cache:
554
380
  keys:
555
- - v2-bundle-2.3.3-rails_5_1-{{ .Branch }}
556
- - v2-bundle-2.3.3-rails_5_1
557
- - v2-bundle-2.3.3
381
+ - v2-bundle-2.4.1-rails_5_1-{{ .Branch }}
382
+ - v2-bundle-2.4.1-rails_5_1
383
+ - v2-bundle-2.4.1
558
384
 
559
385
  - run:
560
386
  name: Install dependencies
@@ -569,22 +395,22 @@ jobs:
569
395
  bundle exec rspec
570
396
 
571
397
  - save_cache:
572
- key: v2-bundle-2.3.3-rails_5_1-{{ .Branch }}
398
+ key: v2-bundle-2.4.1-rails_5_1-{{ .Branch }}
573
399
  paths:
574
400
  - ~/project/vendor/bundle
575
401
  - ~/project/vendor/bundle-scaffold
576
402
  - save_cache:
577
- key: v2-bundle-2.3.3-rails_5_1
403
+ key: v2-bundle-2.4.1-rails_5_1
578
404
  paths:
579
405
  - ~/project/vendor/bundle
580
406
  - ~/project/vendor/bundle-scaffold
581
407
  - save_cache:
582
- key: v2-bundle-2.3.3
408
+ key: v2-bundle-2.4.1
583
409
  paths:
584
410
  - ~/project/vendor/bundle
585
411
  - ~/project/vendor/bundle-scaffold
586
412
 
587
- build_2.4.0_rails_5_1:
413
+ build_2.4.1_rails_5_2:
588
414
  docker:
589
415
  - image: deliveroo/multiruby
590
416
  - image: postgres:9.6-alpine
@@ -602,17 +428,17 @@ jobs:
602
428
  ln -s /dev/shm/tmp ~/project/tmp
603
429
 
604
430
  - run:
605
- name: Select build variant (Ruby 2.4.0, rails_5_1)
431
+ name: Select build variant (Ruby 2.4.1, rails_5_2)
606
432
  command: |
607
- rbenv local 2.4.0 ;
433
+ rbenv local 2.4.1 ;
608
434
  gem install bundler ;
609
- bundle config --local gemfile $PWD/gemfiles/rails_5_1.gemfile
435
+ bundle config --local gemfile $PWD/gemfiles/rails_5_2.gemfile
610
436
 
611
437
  - restore_cache:
612
438
  keys:
613
- - v2-bundle-2.4.0-rails_5_1-{{ .Branch }}
614
- - v2-bundle-2.4.0-rails_5_1
615
- - v2-bundle-2.4.0
439
+ - v2-bundle-2.4.1-rails_5_2-{{ .Branch }}
440
+ - v2-bundle-2.4.1-rails_5_2
441
+ - v2-bundle-2.4.1
616
442
 
617
443
  - run:
618
444
  name: Install dependencies
@@ -627,17 +453,17 @@ jobs:
627
453
  bundle exec rspec
628
454
 
629
455
  - save_cache:
630
- key: v2-bundle-2.4.0-rails_5_1-{{ .Branch }}
456
+ key: v2-bundle-2.4.1-rails_5_2-{{ .Branch }}
631
457
  paths:
632
458
  - ~/project/vendor/bundle
633
459
  - ~/project/vendor/bundle-scaffold
634
460
  - save_cache:
635
- key: v2-bundle-2.4.0-rails_5_1
461
+ key: v2-bundle-2.4.1-rails_5_2
636
462
  paths:
637
463
  - ~/project/vendor/bundle
638
464
  - ~/project/vendor/bundle-scaffold
639
465
  - save_cache:
640
- key: v2-bundle-2.4.0
466
+ key: v2-bundle-2.4.1
641
467
  paths:
642
468
  - ~/project/vendor/bundle
643
469
  - ~/project/vendor/bundle-scaffold
@@ -648,25 +474,19 @@ workflows:
648
474
  test:
649
475
  jobs:
650
476
 
651
- - build_2.2.6_rails_3
652
-
653
- - build_2.3.3_rails_3
654
-
655
- - build_2.2.6_rails_4
656
-
657
- - build_2.3.3_rails_4
477
+ - build_2.3.4_rails_3
658
478
 
659
- - build_2.4.0_rails_4
479
+ - build_2.3.4_rails_4
660
480
 
661
- - build_2.2.6_rails_5
481
+ - build_2.4.1_rails_4
662
482
 
663
- - build_2.3.3_rails_5
483
+ - build_2.3.4_rails_5
664
484
 
665
- - build_2.4.0_rails_5
485
+ - build_2.4.1_rails_5
666
486
 
667
- - build_2.2.6_rails_5_1
487
+ - build_2.3.4_rails_5_1
668
488
 
669
- - build_2.3.3_rails_5_1
489
+ - build_2.4.1_rails_5_1
670
490
 
671
- - build_2.4.0_rails_5_1
491
+ - build_2.4.1_rails_5_2
672
492
 
data/.circleci/config.yml.erb CHANGED
@@ -2,17 +2,14 @@
2
2
  # erb .circleci/config.yml.erb > .circleci/config.yml
3
3
  <%
4
4
  builds = [
5
- ['2.2.6', 'rails_3'],
6
- ['2.3.3', 'rails_3'],
7
- ['2.2.6', 'rails_4'],
8
- ['2.3.3', 'rails_4'],
9
- ['2.4.0', 'rails_4'],
10
- ['2.2.6', 'rails_5'],
11
- ['2.3.3', 'rails_5'],
12
- ['2.4.0', 'rails_5'],
13
- ['2.2.6', 'rails_5_1'],
14
- ['2.3.3', 'rails_5_1'],
15
- ['2.4.0', 'rails_5_1'],
5
+ ['2.3.4', 'rails_3'],
6
+ ['2.3.4', 'rails_4'],
7
+ ['2.4.1', 'rails_4'],
8
+ ['2.3.4', 'rails_5'],
9
+ ['2.4.1', 'rails_5'],
10
+ ['2.3.4', 'rails_5_1'],
11
+ ['2.4.1', 'rails_5_1'],
12
+ ['2.4.1', 'rails_5_2']
16
13
  ]
17
14
  %>
18
15
  version: 2
data/Appraisals CHANGED
@@ -18,7 +18,14 @@ appraise 'rails-5' do
18
18
  end
19
19
 
20
20
  appraise 'rails-5-1' do
21
- gem 'rails', '~> 5.1'
21
+ gem 'rails', '~> 5.1.0'
22
+ gem 'sqlite3'
23
+ gem 'pg', '~> 0.18'
24
+ end
25
+
26
+ appraise 'rails-5-2' do
27
+ gem 'rails', '~> 5.2.0'
28
+ gem 'bootsnap', '>= 1.1.0', require: false
22
29
  gem 'sqlite3'
23
30
  gem 'pg', '~> 0.18'
24
31
  end
data/CHANGELOG.md CHANGED
@@ -1,3 +1,10 @@
1
+ # v1.21.0 (2018-03-27)
2
+
3
+ Features:
4
+
5
+ - Rails 5.2 compatibility
6
+
7
+
1
8
  # v1.20.0 (2018-03-27)
2
9
 
3
10
  Features:
data/gemfiles/rails_5_1.gemfile CHANGED
@@ -8,6 +8,6 @@ gem "appraisal"
8
8
  gem "webmock"
9
9
  gem "pg", "~> 0.18"
10
10
  gem "sqlite3"
11
- gem "rails", "~> 5.1"
11
+ gem "rails", "~> 5.1.0"
12
12
 
13
13
  gemspec path: "../"
data/gemfiles/rails_5_2.gemfile ADDED
@@ -0,0 +1,14 @@
1
+ # This file was generated by Appraisal
2
+
3
+ source "https://rubygems.org"
4
+
5
+ gem "guard"
6
+ gem "guard-rspec"
7
+ gem "appraisal"
8
+ gem "webmock"
9
+ gem "pg", "~> 0.18"
10
+ gem "sqlite3"
11
+ gem "rails", "~> 5.2.0"
12
+ gem "bootsnap", ">= 1.1.0", require: false
13
+
14
+ gemspec path: "../"
data/lib/roo_on_rails.rb CHANGED
@@ -10,7 +10,7 @@ if defined?(Rails)
10
10
  require 'roo_on_rails/railties/new_relic'
11
11
  require 'roo_on_rails/railties/database'
12
12
  require 'roo_on_rails/railties/http'
13
- require 'roo_on_rails/railties/sidekiq'
13
+ require 'roo_on_rails/railties/sidekiq_integration'
14
14
  require 'roo_on_rails/railties/rake_tasks'
15
15
  require 'roo_on_rails/railties/google_oauth'
16
16
  require 'roo_on_rails/railties/routemaster'
data/lib/roo_on_rails/railties/http.rb CHANGED
@@ -9,13 +9,13 @@ module RooOnRails
9
9
  require 'rack/ssl-enforcer'
10
10
  require 'roo_on_rails/rack/safe_timeouts'
11
11
 
12
- ::Rack::Timeout.service_timeout = ENV.fetch('RACK_SERVICE_TIMEOUT', 15).to_i
13
- ::Rack::Timeout.wait_timeout = ENV.fetch('RACK_WAIT_TIMEOUT', 30).to_i
14
12
  ::Rack::Timeout::Logger.level = ::Logger::WARN
15
13
 
16
14
  app.config.middleware.insert_before(
17
15
  ::Rack::Runtime,
18
- ::Rack::Timeout
16
+ ::Rack::Timeout,
17
+ service_timeout: ENV.fetch('RACK_SERVICE_TIMEOUT', 15).to_i,
18
+ wait_timeout: ENV.fetch('RACK_WAIT_TIMEOUT', 30).to_i
19
19
  )
20
20
 
21
21
  middleware_to_insert_before = Rails::VERSION::MAJOR < 4 ? ::ActionDispatch::Cookies : ::Rack::Head
data/lib/roo_on_rails/railties/{sidekiq.rb → sidekiq_integration.rb} RENAMED
@@ -6,10 +6,9 @@ require 'roo_on_rails/sidekiq/sla_metric'
6
6
 
7
7
  module RooOnRails
8
8
  module Railties
9
- class Sidekiq < Rails::Railtie
9
+ class SidekiqIntegration < Rails::Railtie
10
10
  initializer 'roo_on_rails.sidekiq' do |app|
11
11
  Rails.logger.with initializer: 'roo_on_rails.sidekiq' do |log|
12
-
13
12
  unless RooOnRails::Config.sidekiq_enabled?
14
13
  log.debug 'skipping'
15
14
  next
@@ -17,7 +16,7 @@ module RooOnRails
17
16
 
18
17
  log.debug 'loading'
19
18
  require 'hirefire-resource'
20
-
19
+
21
20
  config_sidekiq
22
21
  config_sidekiq_metrics
23
22
  config_hirefire(app)
@@ -40,11 +39,14 @@ module RooOnRails
40
39
  end
41
40
 
42
41
  def config_sidekiq_metrics
43
- require 'sidekiq/middleware/server/statsd'
42
+ # https://github.com/mperham/sidekiq/wiki/Pro-Metrics
43
+ require 'sidekiq-pro'
44
+ ::Sidekiq::Pro.dogstatsd = -> { RooOnRails.statsd }
44
45
 
45
- ::Sidekiq.configure_server do |x|
46
- x.server_middleware do |chain|
47
- chain.add ::Sidekiq::Middleware::Server::Statsd, client: RooOnRails.statsd
46
+ ::Sidekiq.configure_server do |config|
47
+ config.server_middleware do |chain|
48
+ require 'sidekiq/middleware/server/statsd'
49
+ chain.add ::Sidekiq::Middleware::Server::Statsd
48
50
  end
49
51
  end
50
52
  rescue LoadError
data/lib/roo_on_rails/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module RooOnRails
2
- VERSION = '1.20.0'.freeze
2
+ VERSION = '1.21.0'.freeze
3
3
  end
data/roo_on_rails.gemspec CHANGED
@@ -23,10 +23,10 @@ Gem::Specification.new do |spec|
23
23
 
24
24
  spec.add_runtime_dependency 'dotenv-rails', '~> 2.1'
25
25
  spec.add_runtime_dependency 'newrelic_rpm'
26
- spec.add_runtime_dependency 'rails', '>= 3.2.22', '< 5.2'
26
+ spec.add_runtime_dependency 'rails', '>= 3.2.22', '< 5.3'
27
27
  spec.add_runtime_dependency 'platform-api', '~> 2.0'
28
28
  spec.add_runtime_dependency 'hashie', '~> 3.4'
29
- spec.add_runtime_dependency 'rack-timeout'
29
+ spec.add_runtime_dependency 'rack-timeout', '>= 0.4.0'
30
30
  spec.add_runtime_dependency 'rack-ssl-enforcer'
31
31
  spec.add_runtime_dependency 'octokit'
32
32
  spec.add_runtime_dependency 'hirefire-resource'
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: roo_on_rails
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.20.0
4
+ version: 1.21.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Julien Letessier
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2018-03-27 00:00:00.000000000 Z
11
+ date: 2018-07-05 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: dotenv-rails
@@ -47,7 +47,7 @@ dependencies:
47
47
  version: 3.2.22
48
48
  - - "<"
49
49
  - !ruby/object:Gem::Version
50
- version: '5.2'
50
+ version: '5.3'
51
51
  type: :runtime
52
52
  prerelease: false
53
53
  version_requirements: !ruby/object:Gem::Requirement
@@ -57,7 +57,7 @@ dependencies:
57
57
  version: 3.2.22
58
58
  - - "<"
59
59
  - !ruby/object:Gem::Version
60
- version: '5.2'
60
+ version: '5.3'
61
61
  - !ruby/object:Gem::Dependency
62
62
  name: platform-api
63
63
  requirement: !ruby/object:Gem::Requirement
@@ -92,14 +92,14 @@ dependencies:
92
92
  requirements:
93
93
  - - ">="
94
94
  - !ruby/object:Gem::Version
95
- version: '0'
95
+ version: 0.4.0
96
96
  type: :runtime
97
97
  prerelease: false
98
98
  version_requirements: !ruby/object:Gem::Requirement
99
99
  requirements:
100
100
  - - ">="
101
101
  - !ruby/object:Gem::Version
102
- version: '0'
102
+ version: 0.4.0
103
103
  - !ruby/object:Gem::Dependency
104
104
  name: rack-ssl-enforcer
105
105
  requirement: !ruby/object:Gem::Requirement
@@ -416,6 +416,7 @@ files:
416
416
  - gemfiles/rails_4.gemfile
417
417
  - gemfiles/rails_5.gemfile
418
418
  - gemfiles/rails_5_1.gemfile
419
+ - gemfiles/rails_5_2.gemfile
419
420
  - lib/roo_on_rails.rb
420
421
  - lib/roo_on_rails/checks.rb
421
422
  - lib/roo_on_rails/checks/base.rb
@@ -464,7 +465,7 @@ files:
464
465
  - lib/roo_on_rails/railties/rake_tasks.rb
465
466
  - lib/roo_on_rails/railties/roo_identity.rb
466
467
  - lib/roo_on_rails/railties/routemaster.rb
467
- - lib/roo_on_rails/railties/sidekiq.rb
468
+ - lib/roo_on_rails/railties/sidekiq_integration.rb
468
469
  - lib/roo_on_rails/routemaster/lifecycle_events.rb
469
470
  - lib/roo_on_rails/routemaster/publish_lifecycle_events.rb
470
471
  - lib/roo_on_rails/routemaster/publisher.rb
@@ -501,7 +502,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
501
502
  version: '0'
502
503
  requirements: []
503
504
  rubyforge_project:
504
- rubygems_version: 2.7.6
505
+ rubygems_version: 2.7.0
505
506
  signing_key:
506
507
  specification_version: 4
507
508
  summary: Scaffolding for building services