getaround_utils 0.2.24 → 0.2.26
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile.lock +64 -60
- data/getaround_utils.gemspec +4 -4
- data/lib/getaround_utils/railties/dotenv.rb +1 -1
- data/lib/getaround_utils/railties/ougai.rb +19 -9
- data/lib/getaround_utils/version.rb +1 -1
- metadata +16 -10
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 7a86b238c5bd80c92349e4d952fd36129e794bec89c077f93b26cb72c0d921e4
|
4
|
+
data.tar.gz: af6af95bbc99f2c63c1d09bca2639d57aecd05654c22abaec3bca751b500634e
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 3301d94834c447b84bfb3900c86b511174c0f909181761c2b2dcc5614e0d75e8a4dc580996f9d77ecd5fe3e7cfa4b588514d856df6480b9fce8b487b4196f69c
|
7
|
+
data.tar.gz: 97dccd6a55bbe86dbca884c9b7810fcc38c8bea492ea53c8934c40f5a4412fb658d5950252659ddb3e9caab1ae146f97ea606bb075b85c3aa8bb128b31c6180f
|
data/Gemfile.lock
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
PATH
|
2
2
|
remote: .
|
3
3
|
specs:
|
4
|
-
getaround_utils (0.2.
|
4
|
+
getaround_utils (0.2.25)
|
5
5
|
|
6
6
|
GEM
|
7
7
|
remote: https://rubygems.org/
|
@@ -65,49 +65,49 @@ GEM
|
|
65
65
|
minitest (>= 5.1)
|
66
66
|
tzinfo (~> 2.0)
|
67
67
|
zeitwerk (~> 2.3)
|
68
|
-
addressable (2.8.
|
69
|
-
public_suffix (>= 2.0.2, <
|
68
|
+
addressable (2.8.4)
|
69
|
+
public_suffix (>= 2.0.2, < 6.0)
|
70
70
|
ast (2.4.2)
|
71
71
|
builder (3.2.4)
|
72
72
|
coderay (1.1.3)
|
73
|
-
concurrent-ruby (1.
|
74
|
-
connection_pool (2.
|
73
|
+
concurrent-ruby (1.2.2)
|
74
|
+
connection_pool (2.4.0)
|
75
75
|
crack (0.4.5)
|
76
76
|
rexml
|
77
77
|
crass (1.0.6)
|
78
78
|
diff-lcs (1.5.0)
|
79
|
-
dotenv (2.
|
80
|
-
dotenv-rails (2.
|
81
|
-
dotenv (= 2.
|
79
|
+
dotenv (2.8.1)
|
80
|
+
dotenv-rails (2.8.1)
|
81
|
+
dotenv (= 2.8.1)
|
82
82
|
railties (>= 3.2)
|
83
|
-
erubi (1.
|
83
|
+
erubi (1.12.0)
|
84
84
|
getaround-rubocop (0.2.7)
|
85
85
|
relaxed-rubocop (= 2.5)
|
86
86
|
rubocop (= 1.25.1)
|
87
87
|
rubocop-rspec (= 2.4.0)
|
88
|
-
globalid (1.
|
88
|
+
globalid (1.1.0)
|
89
89
|
activesupport (>= 5.0)
|
90
90
|
hashdiff (1.0.1)
|
91
|
-
i18n (1.
|
91
|
+
i18n (1.14.1)
|
92
92
|
concurrent-ruby (~> 1.0)
|
93
|
-
lograge (0.
|
93
|
+
lograge (0.13.0)
|
94
94
|
actionpack (>= 4)
|
95
95
|
activesupport (>= 4)
|
96
96
|
railties (>= 4)
|
97
97
|
request_store (~> 1.0)
|
98
|
-
loofah (2.
|
98
|
+
loofah (2.21.3)
|
99
99
|
crass (~> 1.0.2)
|
100
|
-
nokogiri (>= 1.
|
100
|
+
nokogiri (>= 1.12.0)
|
101
101
|
mail (2.7.1)
|
102
102
|
mini_mime (>= 0.1.1)
|
103
103
|
marcel (1.0.2)
|
104
104
|
method_source (1.0.0)
|
105
105
|
mini_mime (1.1.2)
|
106
|
-
mini_portile2 (2.8.
|
107
|
-
minitest (5.
|
106
|
+
mini_portile2 (2.8.4)
|
107
|
+
minitest (5.19.0)
|
108
108
|
nio4r (2.5.8)
|
109
|
-
nokogiri (1.
|
110
|
-
mini_portile2 (~> 2.8.
|
109
|
+
nokogiri (1.15.3)
|
110
|
+
mini_portile2 (~> 2.8.2)
|
111
111
|
racc (~> 1.4)
|
112
112
|
oj (3.11.3)
|
113
113
|
ougai (2.0.0)
|
@@ -115,14 +115,14 @@ GEM
|
|
115
115
|
parallel (1.21.0)
|
116
116
|
parser (3.1.1.0)
|
117
117
|
ast (~> 2.4.1)
|
118
|
-
pry (0.14.
|
118
|
+
pry (0.14.2)
|
119
119
|
coderay (~> 1.1)
|
120
120
|
method_source (~> 1.0)
|
121
|
-
public_suffix (
|
122
|
-
racc (1.
|
123
|
-
rack (2.2.
|
124
|
-
rack-test (
|
125
|
-
rack (>= 1.
|
121
|
+
public_suffix (5.0.1)
|
122
|
+
racc (1.7.1)
|
123
|
+
rack (2.2.7)
|
124
|
+
rack-test (2.1.0)
|
125
|
+
rack (>= 1.3)
|
126
126
|
rails (6.1.4.6)
|
127
127
|
actioncable (= 6.1.4.6)
|
128
128
|
actionmailbox (= 6.1.4.6)
|
@@ -138,11 +138,13 @@ GEM
|
|
138
138
|
bundler (>= 1.15.0)
|
139
139
|
railties (= 6.1.4.6)
|
140
140
|
sprockets-rails (>= 2.0.0)
|
141
|
-
rails-dom-testing (2.
|
142
|
-
activesupport (>=
|
141
|
+
rails-dom-testing (2.1.1)
|
142
|
+
activesupport (>= 5.0.0)
|
143
|
+
minitest
|
143
144
|
nokogiri (>= 1.6)
|
144
|
-
rails-html-sanitizer (1.
|
145
|
-
loofah (~> 2.
|
145
|
+
rails-html-sanitizer (1.6.0)
|
146
|
+
loofah (~> 2.21)
|
147
|
+
nokogiri (~> 1.14)
|
146
148
|
railties (6.1.4.6)
|
147
149
|
actionpack (= 6.1.4.6)
|
148
150
|
activesupport (= 6.1.4.6)
|
@@ -151,7 +153,8 @@ GEM
|
|
151
153
|
thor (~> 1.0)
|
152
154
|
rainbow (3.1.1)
|
153
155
|
rake (13.0.6)
|
154
|
-
redis (
|
156
|
+
redis-client (0.14.1)
|
157
|
+
connection_pool
|
155
158
|
regexp_parser (2.2.1)
|
156
159
|
relaxed-rubocop (2.5)
|
157
160
|
request_store (1.5.1)
|
@@ -159,27 +162,27 @@ GEM
|
|
159
162
|
request_store_rails (2.0.0)
|
160
163
|
concurrent-ruby (~> 1.0)
|
161
164
|
rexml (3.2.5)
|
162
|
-
rspec (3.
|
163
|
-
rspec-core (~> 3.
|
164
|
-
rspec-expectations (~> 3.
|
165
|
-
rspec-mocks (~> 3.
|
166
|
-
rspec-core (3.
|
167
|
-
rspec-support (~> 3.
|
168
|
-
rspec-expectations (3.
|
165
|
+
rspec (3.12.0)
|
166
|
+
rspec-core (~> 3.12.0)
|
167
|
+
rspec-expectations (~> 3.12.0)
|
168
|
+
rspec-mocks (~> 3.12.0)
|
169
|
+
rspec-core (3.12.2)
|
170
|
+
rspec-support (~> 3.12.0)
|
171
|
+
rspec-expectations (3.12.3)
|
169
172
|
diff-lcs (>= 1.2.0, < 2.0)
|
170
|
-
rspec-support (~> 3.
|
171
|
-
rspec-mocks (3.
|
173
|
+
rspec-support (~> 3.12.0)
|
174
|
+
rspec-mocks (3.12.6)
|
172
175
|
diff-lcs (>= 1.2.0, < 2.0)
|
173
|
-
rspec-support (~> 3.
|
174
|
-
rspec-rails (
|
175
|
-
actionpack (>=
|
176
|
-
activesupport (>=
|
177
|
-
railties (>=
|
178
|
-
rspec-core (~> 3.
|
179
|
-
rspec-expectations (~> 3.
|
180
|
-
rspec-mocks (~> 3.
|
181
|
-
rspec-support (~> 3.
|
182
|
-
rspec-support (3.
|
176
|
+
rspec-support (~> 3.12.0)
|
177
|
+
rspec-rails (6.0.3)
|
178
|
+
actionpack (>= 6.1)
|
179
|
+
activesupport (>= 6.1)
|
180
|
+
railties (>= 6.1)
|
181
|
+
rspec-core (~> 3.12)
|
182
|
+
rspec-expectations (~> 3.12)
|
183
|
+
rspec-mocks (~> 3.12)
|
184
|
+
rspec-support (~> 3.12)
|
185
|
+
rspec-support (3.12.1)
|
183
186
|
rubocop (1.25.1)
|
184
187
|
parallel (~> 1.10)
|
185
188
|
parser (>= 3.1.0.0)
|
@@ -195,10 +198,11 @@ GEM
|
|
195
198
|
rubocop (~> 1.0)
|
196
199
|
rubocop-ast (>= 1.1.0)
|
197
200
|
ruby-progressbar (1.11.0)
|
198
|
-
sidekiq (
|
199
|
-
|
200
|
-
|
201
|
-
|
201
|
+
sidekiq (7.0.9)
|
202
|
+
concurrent-ruby (< 2)
|
203
|
+
connection_pool (>= 2.3.0)
|
204
|
+
rack (>= 2.2.4)
|
205
|
+
redis-client (>= 0.11.0)
|
202
206
|
sprockets (4.0.2)
|
203
207
|
concurrent-ruby (~> 1.0)
|
204
208
|
rack (> 1, < 3)
|
@@ -206,37 +210,37 @@ GEM
|
|
206
210
|
actionpack (>= 5.2)
|
207
211
|
activesupport (>= 5.2)
|
208
212
|
sprockets (>= 3.0.0)
|
209
|
-
thor (1.2.
|
210
|
-
tzinfo (2.0.
|
213
|
+
thor (1.2.2)
|
214
|
+
tzinfo (2.0.6)
|
211
215
|
concurrent-ruby (~> 1.0)
|
212
216
|
unicode-display_width (2.1.0)
|
213
|
-
webmock (3.
|
217
|
+
webmock (3.18.1)
|
214
218
|
addressable (>= 2.8.0)
|
215
219
|
crack (>= 0.3.2)
|
216
220
|
hashdiff (>= 0.4.0, < 2.0.0)
|
217
221
|
websocket-driver (0.7.5)
|
218
222
|
websocket-extensions (>= 0.1.0)
|
219
223
|
websocket-extensions (0.1.5)
|
220
|
-
zeitwerk (2.
|
224
|
+
zeitwerk (2.6.9)
|
221
225
|
|
222
226
|
PLATFORMS
|
223
227
|
ruby
|
224
228
|
|
225
229
|
DEPENDENCIES
|
226
230
|
bundler (~> 2.0)
|
227
|
-
dotenv-rails (~> 2.
|
231
|
+
dotenv-rails (~> 2.8.1)
|
228
232
|
getaround-rubocop (= 0.2.7)
|
229
233
|
getaround_utils!
|
230
|
-
lograge (~> 0.
|
234
|
+
lograge (~> 0.13.0)
|
231
235
|
ougai (~> 2.0)
|
232
236
|
pry (~> 0.14.0)
|
233
237
|
rails (~> 6.0)
|
234
238
|
rake (~> 13.0)
|
235
239
|
request_store_rails (~> 2.0)
|
236
240
|
rspec (~> 3.9, >= 3.9.0)
|
237
|
-
rspec-rails (~>
|
241
|
+
rspec-rails (~> 6.0)
|
238
242
|
rubocop (= 1.25.1)
|
239
|
-
sidekiq (
|
243
|
+
sidekiq (> 6.0, < 8.0)
|
240
244
|
webmock (~> 3.7)
|
241
245
|
|
242
246
|
BUNDLED WITH
|
data/getaround_utils.gemspec
CHANGED
@@ -23,15 +23,15 @@ Gem::Specification.new do |gem|
|
|
23
23
|
gem.add_development_dependency 'pry', '~> 0.14.0'
|
24
24
|
gem.add_development_dependency 'rake', '~> 13.0'
|
25
25
|
gem.add_development_dependency 'rspec', '~> 3.9', '>= 3.9.0'
|
26
|
-
gem.add_development_dependency 'rspec-rails', '~>
|
26
|
+
gem.add_development_dependency 'rspec-rails', '~> 6.0'
|
27
27
|
gem.add_development_dependency 'rubocop', '= 1.25.1'
|
28
28
|
gem.add_development_dependency 'webmock', '~> 3.7'
|
29
29
|
|
30
30
|
# Functional (optional) dependencies
|
31
|
-
gem.add_development_dependency 'dotenv-rails', '~> 2.
|
32
|
-
gem.add_development_dependency 'lograge', '~> 0.
|
31
|
+
gem.add_development_dependency 'dotenv-rails', '~> 2.8.1'
|
32
|
+
gem.add_development_dependency 'lograge', '~> 0.13.0'
|
33
33
|
gem.add_development_dependency 'ougai', '~> 2.0'
|
34
34
|
gem.add_development_dependency 'rails', '~> 6.0'
|
35
35
|
gem.add_development_dependency 'request_store_rails', '~> 2.0'
|
36
|
-
gem.add_development_dependency 'sidekiq', '
|
36
|
+
gem.add_development_dependency 'sidekiq', '> 6.0', "< 8.0"
|
37
37
|
end
|
@@ -13,7 +13,12 @@ module GetaroundUtils::Railties; end
|
|
13
13
|
# https://github.com/tilfin/ougai/wiki/Use-as-Rails-logger#define-a-custom-logger
|
14
14
|
class OugaiRailsLogger < Ougai::Logger
|
15
15
|
include ActiveSupport::LoggerThreadSafeLevel
|
16
|
-
include
|
16
|
+
include ActiveSupport::LoggerSilence
|
17
|
+
|
18
|
+
def initialize(*args)
|
19
|
+
super
|
20
|
+
after_initialize if respond_to?(:after_initialize) && ActiveSupport::VERSION::MAJOR < 6
|
21
|
+
end
|
17
22
|
end
|
18
23
|
|
19
24
|
# Patch for ActiveSupport::TaggedLogging
|
@@ -46,14 +51,14 @@ end
|
|
46
51
|
|
47
52
|
class GetaroundUtils::Railties::Ougai < Rails::Railtie
|
48
53
|
config.ougai_logger = OugaiRailsLogger.new($stdout)
|
49
|
-
config.ougai_logger.after_initialize if Rails::VERSION::MAJOR < 6
|
50
54
|
config.ougai_logger.formatter = GetaroundUtils::Ougai::JsonFormatter.new
|
55
|
+
|
51
56
|
config.ougai_logger.before_log = lambda do |data|
|
52
|
-
|
53
|
-
|
57
|
+
data.deep_merge!(RequestStore.store[:ougai]) \
|
58
|
+
if defined?(RequestStore) && RequestStore.store.key?(:ougai)
|
54
59
|
|
55
|
-
|
56
|
-
|
60
|
+
data.merge!(sidekiq: Thread.current[:sidekiq_context]) \
|
61
|
+
if defined?(Sidekiq) && Thread.current.key?(:sidekiq_context)
|
57
62
|
end
|
58
63
|
|
59
64
|
initializer :getaround_utils_ougai, before: :initialize_logger do |app|
|
@@ -61,16 +66,17 @@ class GetaroundUtils::Railties::Ougai < Rails::Railtie
|
|
61
66
|
end
|
62
67
|
|
63
68
|
initializer :getaround_utils_ougai_middleware do |app|
|
64
|
-
app.config.app_middleware.insert_after
|
69
|
+
app.config.app_middleware.insert_after(ActionDispatch::RequestId, OugaiRequestStoreMiddleware)
|
65
70
|
end
|
66
71
|
|
67
72
|
initializer :getaround_utils_ougai_activesupport do
|
68
|
-
ActiveSupport::TaggedLogging::Formatter.prepend
|
73
|
+
ActiveSupport::TaggedLogging::Formatter.prepend(OugaiTaggedLoggingFormatter)
|
69
74
|
end
|
70
75
|
|
71
76
|
initializer :getaround_utils_ougai_lograge do |app|
|
72
77
|
next unless defined?(Lograge)
|
73
78
|
|
79
|
+
# https://github.com/tilfin/ougai/wiki/Use-as-Rails-logger#with-lograge
|
74
80
|
app.config.lograge.logger = app.config.logger
|
75
81
|
app.config.lograge.formatter = Lograge::Formatters::Raw.new
|
76
82
|
end
|
@@ -79,9 +85,13 @@ class GetaroundUtils::Railties::Ougai < Rails::Railtie
|
|
79
85
|
next unless defined?(Sidekiq)
|
80
86
|
|
81
87
|
# https://github.com/tilfin/ougai/wiki/Customize-Sidekiq-logger
|
82
|
-
Sidekiq.
|
88
|
+
Sidekiq.configure_client do |config|
|
89
|
+
config.logger = Rails.application.config.logger
|
90
|
+
end
|
83
91
|
|
84
92
|
Sidekiq.configure_server do |config|
|
93
|
+
config.logger = Rails.application.config.logger
|
94
|
+
|
85
95
|
original_handler = config.error_handlers.shift
|
86
96
|
config.error_handlers << lambda do |ex, ctx|
|
87
97
|
if Sidekiq.logger.is_a?(Ougai::Logger)
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: getaround_utils
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.2.
|
4
|
+
version: 0.2.26
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Drivy
|
@@ -9,7 +9,7 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date:
|
12
|
+
date: 2023-07-31 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: bundler
|
@@ -93,14 +93,14 @@ dependencies:
|
|
93
93
|
requirements:
|
94
94
|
- - "~>"
|
95
95
|
- !ruby/object:Gem::Version
|
96
|
-
version: '
|
96
|
+
version: '6.0'
|
97
97
|
type: :development
|
98
98
|
prerelease: false
|
99
99
|
version_requirements: !ruby/object:Gem::Requirement
|
100
100
|
requirements:
|
101
101
|
- - "~>"
|
102
102
|
- !ruby/object:Gem::Version
|
103
|
-
version: '
|
103
|
+
version: '6.0'
|
104
104
|
- !ruby/object:Gem::Dependency
|
105
105
|
name: rubocop
|
106
106
|
requirement: !ruby/object:Gem::Requirement
|
@@ -135,28 +135,28 @@ dependencies:
|
|
135
135
|
requirements:
|
136
136
|
- - "~>"
|
137
137
|
- !ruby/object:Gem::Version
|
138
|
-
version: 2.
|
138
|
+
version: 2.8.1
|
139
139
|
type: :development
|
140
140
|
prerelease: false
|
141
141
|
version_requirements: !ruby/object:Gem::Requirement
|
142
142
|
requirements:
|
143
143
|
- - "~>"
|
144
144
|
- !ruby/object:Gem::Version
|
145
|
-
version: 2.
|
145
|
+
version: 2.8.1
|
146
146
|
- !ruby/object:Gem::Dependency
|
147
147
|
name: lograge
|
148
148
|
requirement: !ruby/object:Gem::Requirement
|
149
149
|
requirements:
|
150
150
|
- - "~>"
|
151
151
|
- !ruby/object:Gem::Version
|
152
|
-
version: 0.
|
152
|
+
version: 0.13.0
|
153
153
|
type: :development
|
154
154
|
prerelease: false
|
155
155
|
version_requirements: !ruby/object:Gem::Requirement
|
156
156
|
requirements:
|
157
157
|
- - "~>"
|
158
158
|
- !ruby/object:Gem::Version
|
159
|
-
version: 0.
|
159
|
+
version: 0.13.0
|
160
160
|
- !ruby/object:Gem::Dependency
|
161
161
|
name: ougai
|
162
162
|
requirement: !ruby/object:Gem::Requirement
|
@@ -203,16 +203,22 @@ dependencies:
|
|
203
203
|
name: sidekiq
|
204
204
|
requirement: !ruby/object:Gem::Requirement
|
205
205
|
requirements:
|
206
|
-
- - "
|
206
|
+
- - ">"
|
207
207
|
- !ruby/object:Gem::Version
|
208
208
|
version: '6.0'
|
209
|
+
- - "<"
|
210
|
+
- !ruby/object:Gem::Version
|
211
|
+
version: '8.0'
|
209
212
|
type: :development
|
210
213
|
prerelease: false
|
211
214
|
version_requirements: !ruby/object:Gem::Requirement
|
212
215
|
requirements:
|
213
|
-
- - "
|
216
|
+
- - ">"
|
214
217
|
- !ruby/object:Gem::Version
|
215
218
|
version: '6.0'
|
219
|
+
- - "<"
|
220
|
+
- !ruby/object:Gem::Version
|
221
|
+
version: '8.0'
|
216
222
|
description: Shared base utility classes for Getaround Backend Applications.
|
217
223
|
email:
|
218
224
|
- oss@drivy.com
|