activesupport 7.2.3.1 → 8.1.4.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/CHANGELOG.md +584 -234
- data/lib/active_support/backtrace_cleaner.rb +72 -1
- data/lib/active_support/benchmark.rb +21 -0
- data/lib/active_support/benchmarkable.rb +3 -2
- data/lib/active_support/cache/file_store.rb +13 -2
- data/lib/active_support/cache/mem_cache_store.rb +17 -14
- data/lib/active_support/cache/memory_store.rb +9 -3
- data/lib/active_support/cache/redis_cache_store.rb +51 -34
- data/lib/active_support/cache/strategy/local_cache.rb +17 -8
- data/lib/active_support/cache/strategy/local_cache_middleware.rb +7 -7
- data/lib/active_support/cache.rb +86 -18
- data/lib/active_support/callbacks.rb +25 -11
- data/lib/active_support/class_attribute.rb +33 -0
- data/lib/active_support/code_generator.rb +9 -0
- data/lib/active_support/concurrency/load_interlock_aware_monitor.rb +8 -62
- data/lib/active_support/concurrency/share_lock.rb +0 -1
- data/lib/active_support/concurrency/thread_monitor.rb +55 -0
- data/lib/active_support/configurable.rb +34 -0
- data/lib/active_support/configuration_file.rb +15 -6
- data/lib/active_support/continuous_integration.rb +145 -0
- data/lib/active_support/core_ext/array/conversions.rb +3 -3
- data/lib/active_support/core_ext/array.rb +7 -7
- data/lib/active_support/core_ext/benchmark.rb +0 -16
- data/lib/active_support/core_ext/big_decimal.rb +1 -1
- data/lib/active_support/core_ext/class/attribute.rb +24 -18
- data/lib/active_support/core_ext/class.rb +2 -2
- data/lib/active_support/core_ext/date/conversions.rb +2 -0
- data/lib/active_support/core_ext/date.rb +5 -5
- data/lib/active_support/core_ext/date_and_time/compatibility.rb +0 -35
- data/lib/active_support/core_ext/date_time/calculations.rb +1 -0
- data/lib/active_support/core_ext/date_time/compatibility.rb +3 -5
- data/lib/active_support/core_ext/date_time.rb +5 -5
- data/lib/active_support/core_ext/digest.rb +1 -1
- data/lib/active_support/core_ext/enumerable.rb +8 -3
- data/lib/active_support/core_ext/erb/util.rb +3 -3
- data/lib/active_support/core_ext/file.rb +1 -1
- data/lib/active_support/core_ext/hash/deep_merge.rb +1 -0
- data/lib/active_support/core_ext/hash/except.rb +0 -12
- data/lib/active_support/core_ext/hash.rb +8 -8
- data/lib/active_support/core_ext/integer.rb +3 -3
- data/lib/active_support/core_ext/kernel.rb +3 -3
- data/lib/active_support/core_ext/module/attr_internal.rb +3 -4
- data/lib/active_support/core_ext/module.rb +11 -11
- data/lib/active_support/core_ext/numeric.rb +3 -3
- data/lib/active_support/core_ext/object/instance_variables.rb +1 -1
- data/lib/active_support/core_ext/object/json.rb +24 -11
- data/lib/active_support/core_ext/object/to_query.rb +7 -1
- data/lib/active_support/core_ext/object.rb +13 -13
- data/lib/active_support/core_ext/pathname.rb +2 -2
- data/lib/active_support/core_ext/range/compare_range.rb +2 -14
- data/lib/active_support/core_ext/range/overlap.rb +3 -3
- data/lib/active_support/core_ext/range/sole.rb +2 -0
- data/lib/active_support/core_ext/range.rb +4 -5
- data/lib/active_support/core_ext/string/filters.rb +2 -0
- data/lib/active_support/core_ext/string/inflections.rb +1 -1
- data/lib/active_support/core_ext/string/multibyte.rb +10 -1
- data/lib/active_support/core_ext/string/output_safety.rb +27 -13
- data/lib/active_support/core_ext/string.rb +13 -13
- data/lib/active_support/core_ext/symbol.rb +1 -1
- data/lib/active_support/core_ext/thread/backtrace/location.rb +2 -7
- data/lib/active_support/core_ext/time/calculations.rb +11 -2
- data/lib/active_support/core_ext/time/compatibility.rb +2 -27
- data/lib/active_support/core_ext/time/conversions.rb +2 -0
- data/lib/active_support/core_ext/time.rb +5 -5
- data/lib/active_support/current_attributes/test_helper.rb +2 -2
- data/lib/active_support/current_attributes.rb +13 -10
- data/lib/active_support/delegation.rb +25 -44
- data/lib/active_support/dependencies/interlock.rb +11 -5
- data/lib/active_support/dependencies.rb +6 -2
- data/lib/active_support/deprecation/reporting.rb +4 -21
- data/lib/active_support/deprecation.rb +1 -1
- data/lib/active_support/duration.rb +20 -16
- data/lib/active_support/editor.rb +70 -0
- data/lib/active_support/encrypted_configuration.rb +20 -2
- data/lib/active_support/error_reporter.rb +76 -2
- data/lib/active_support/event_reporter/test_helper.rb +32 -0
- data/lib/active_support/event_reporter.rb +592 -0
- data/lib/active_support/evented_file_update_checker.rb +5 -2
- data/lib/active_support/execution_context.rb +75 -7
- data/lib/active_support/file_update_checker.rb +7 -5
- data/lib/active_support/gem_version.rb +3 -3
- data/lib/active_support/gzip.rb +1 -0
- data/lib/active_support/hash_with_indifferent_access.rb +44 -24
- data/lib/active_support/i18n_railtie.rb +19 -11
- data/lib/active_support/inflector/inflections.rb +34 -16
- data/lib/active_support/inflector/methods.rb +6 -22
- data/lib/active_support/inflector/transliterate.rb +18 -10
- data/lib/active_support/isolated_execution_state.rb +17 -17
- data/lib/active_support/json/decoding.rb +9 -3
- data/lib/active_support/json/encoding.rb +149 -19
- data/lib/active_support/log_subscriber.rb +2 -6
- data/lib/active_support/logger_thread_safe_level.rb +6 -3
- data/lib/active_support/message_encryptors.rb +52 -0
- data/lib/active_support/message_pack/extensions.rb +23 -1
- data/lib/active_support/message_verifiers.rb +52 -0
- data/lib/active_support/messages/rotation_coordinator.rb +9 -0
- data/lib/active_support/messages/rotator.rb +5 -0
- data/lib/active_support/messages/serializer_with_fallback.rb +1 -1
- data/lib/active_support/multibyte/chars.rb +8 -1
- data/lib/active_support/multibyte.rb +4 -0
- data/lib/active_support/notifications/fanout.rb +64 -43
- data/lib/active_support/notifications/instrumenter.rb +1 -1
- data/lib/active_support/notifications.rb +2 -2
- data/lib/active_support/number_helper/number_converter.rb +4 -1
- data/lib/active_support/number_helper/number_to_currency_converter.rb +1 -1
- data/lib/active_support/number_helper/number_to_delimited_converter.rb +3 -4
- data/lib/active_support/number_helper/number_to_phone_converter.rb +3 -7
- data/lib/active_support/number_helper/rounding_helper.rb +1 -1
- data/lib/active_support/number_helper.rb +22 -0
- data/lib/active_support/ordered_options.rb +2 -2
- data/lib/active_support/railtie.rb +32 -9
- data/lib/active_support/security_utils.rb +4 -5
- data/lib/active_support/structured_event_subscriber.rb +99 -0
- data/lib/active_support/subscriber.rb +0 -5
- data/lib/active_support/syntax_error_proxy.rb +9 -1
- data/lib/active_support/tagged_logging.rb +5 -0
- data/lib/active_support/test_case.rb +67 -6
- data/lib/active_support/testing/assertions.rb +118 -27
- data/lib/active_support/testing/autorun.rb +5 -0
- data/lib/active_support/testing/error_reporter_assertions.rb +17 -0
- data/lib/active_support/testing/event_reporter_assertions.rb +227 -0
- data/lib/active_support/testing/isolation.rb +0 -2
- data/lib/active_support/testing/notification_assertions.rb +92 -0
- data/lib/active_support/testing/parallelization/worker.rb +7 -1
- data/lib/active_support/testing/parallelization.rb +17 -0
- data/lib/active_support/testing/tests_without_assertions.rb +1 -1
- data/lib/active_support/testing/time_helpers.rb +9 -4
- data/lib/active_support/time_with_zone.rb +36 -23
- data/lib/active_support/values/time_zone.rb +22 -13
- data/lib/active_support/xml_mini.rb +1 -2
- data/lib/active_support.rb +21 -9
- metadata +33 -17
- data/lib/active_support/core_ext/range/each.rb +0 -24
- data/lib/active_support/proxy_object.rb +0 -20
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
2
|
|
|
3
3
|
require "concurrent/map"
|
|
4
|
-
require "set"
|
|
5
4
|
require "active_support/core_ext/object/try"
|
|
6
5
|
|
|
7
6
|
module ActiveSupport
|
|
@@ -18,24 +17,30 @@ module ActiveSupport
|
|
|
18
17
|
|
|
19
18
|
module FanoutIteration # :nodoc:
|
|
20
19
|
private
|
|
21
|
-
def iterate_guarding_exceptions(collection)
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
exceptions
|
|
28
|
-
exceptions << e
|
|
29
|
-
end
|
|
20
|
+
def iterate_guarding_exceptions(collection, &block)
|
|
21
|
+
case collection.size
|
|
22
|
+
when 0
|
|
23
|
+
when 1
|
|
24
|
+
collection.each(&block)
|
|
25
|
+
else
|
|
26
|
+
exceptions = nil
|
|
30
27
|
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
28
|
+
collection.each do |s|
|
|
29
|
+
yield s
|
|
30
|
+
rescue Exception => e
|
|
31
|
+
exceptions ||= []
|
|
32
|
+
exceptions << e
|
|
34
33
|
end
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
34
|
+
|
|
35
|
+
if exceptions
|
|
36
|
+
exceptions = exceptions.flat_map do |exception|
|
|
37
|
+
exception.is_a?(InstrumentationSubscriberError) ? exception.exceptions : [exception]
|
|
38
|
+
end
|
|
39
|
+
if exceptions.size == 1
|
|
40
|
+
raise exceptions.first
|
|
41
|
+
else
|
|
42
|
+
raise InstrumentationSubscriberError.new(exceptions), cause: exceptions.first
|
|
43
|
+
end
|
|
39
44
|
end
|
|
40
45
|
end
|
|
41
46
|
|
|
@@ -54,7 +59,6 @@ module ActiveSupport
|
|
|
54
59
|
@other_subscribers = []
|
|
55
60
|
@all_listeners_for = Concurrent::Map.new
|
|
56
61
|
@groups_for = Concurrent::Map.new
|
|
57
|
-
@silenceable_groups_for = Concurrent::Map.new
|
|
58
62
|
end
|
|
59
63
|
|
|
60
64
|
def inspect # :nodoc:
|
|
@@ -103,11 +107,9 @@ module ActiveSupport
|
|
|
103
107
|
if key
|
|
104
108
|
@all_listeners_for.delete(key)
|
|
105
109
|
@groups_for.delete(key)
|
|
106
|
-
@silenceable_groups_for.delete(key)
|
|
107
110
|
else
|
|
108
111
|
@all_listeners_for.clear
|
|
109
112
|
@groups_for.clear
|
|
110
|
-
@silenceable_groups_for.clear
|
|
111
113
|
end
|
|
112
114
|
end
|
|
113
115
|
|
|
@@ -185,25 +187,25 @@ module ActiveSupport
|
|
|
185
187
|
end
|
|
186
188
|
end
|
|
187
189
|
|
|
188
|
-
def
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
end
|
|
190
|
+
def group_listeners(listeners) # :nodoc:
|
|
191
|
+
listeners.group_by(&:group_class).transform_values do |s|
|
|
192
|
+
s.map(&:delegate).freeze
|
|
193
|
+
end.freeze
|
|
194
|
+
end
|
|
194
195
|
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
196
|
+
def groups_for(name) # :nodoc:
|
|
197
|
+
silenceable_groups, groups = @groups_for.compute_if_absent(name) do
|
|
198
|
+
listeners = all_listeners_for(name)
|
|
199
|
+
listeners.partition(&:silenceable).map { |l| group_listeners(l) }
|
|
199
200
|
end
|
|
200
201
|
|
|
201
202
|
unless silenceable_groups.empty?
|
|
202
|
-
groups = groups.dup
|
|
203
203
|
silenceable_groups.each do |group_class, subscriptions|
|
|
204
204
|
active_subscriptions = subscriptions.reject { |s| s.silenced?(name) }
|
|
205
205
|
unless active_subscriptions.empty?
|
|
206
|
-
groups
|
|
206
|
+
groups = groups.dup if groups.frozen?
|
|
207
|
+
base_groups = groups[group_class]
|
|
208
|
+
groups[group_class] = base_groups ? base_groups + active_subscriptions : active_subscriptions
|
|
207
209
|
end
|
|
208
210
|
end
|
|
209
211
|
end
|
|
@@ -228,13 +230,11 @@ module ActiveSupport
|
|
|
228
230
|
class Handle
|
|
229
231
|
include FanoutIteration
|
|
230
232
|
|
|
231
|
-
def initialize(notifier, name, id, payload) # :nodoc:
|
|
233
|
+
def initialize(notifier, name, id, groups, payload) # :nodoc:
|
|
232
234
|
@name = name
|
|
233
235
|
@id = id
|
|
234
236
|
@payload = payload
|
|
235
|
-
@groups =
|
|
236
|
-
group_klass.new(grouped_listeners, name, id, payload)
|
|
237
|
-
end
|
|
237
|
+
@groups = groups
|
|
238
238
|
@state = :initialized
|
|
239
239
|
end
|
|
240
240
|
|
|
@@ -268,10 +268,31 @@ module ActiveSupport
|
|
|
268
268
|
end
|
|
269
269
|
end
|
|
270
270
|
|
|
271
|
+
module NullHandle # :nodoc:
|
|
272
|
+
extend self
|
|
273
|
+
|
|
274
|
+
def start
|
|
275
|
+
end
|
|
276
|
+
|
|
277
|
+
def finish
|
|
278
|
+
end
|
|
279
|
+
|
|
280
|
+
def finish_with_values(_name, _id, _payload)
|
|
281
|
+
end
|
|
282
|
+
end
|
|
283
|
+
|
|
271
284
|
include FanoutIteration
|
|
272
285
|
|
|
273
286
|
def build_handle(name, id, payload)
|
|
274
|
-
|
|
287
|
+
groups = groups_for(name).map do |group_klass, grouped_listeners|
|
|
288
|
+
group_klass.new(grouped_listeners, name, id, payload)
|
|
289
|
+
end
|
|
290
|
+
|
|
291
|
+
if groups.empty?
|
|
292
|
+
NullHandle
|
|
293
|
+
else
|
|
294
|
+
Handle.new(self, name, id, groups, payload)
|
|
295
|
+
end
|
|
275
296
|
end
|
|
276
297
|
|
|
277
298
|
def start(name, id, payload)
|
|
@@ -287,8 +308,8 @@ module ActiveSupport
|
|
|
287
308
|
handle.finish_with_values(name, id, payload)
|
|
288
309
|
end
|
|
289
310
|
|
|
290
|
-
def publish(name,
|
|
291
|
-
iterate_guarding_exceptions(listeners_for(name)) { |s| s.publish(name,
|
|
311
|
+
def publish(name, ...)
|
|
312
|
+
iterate_guarding_exceptions(listeners_for(name)) { |s| s.publish(name, ...) }
|
|
292
313
|
end
|
|
293
314
|
|
|
294
315
|
def publish_event(event)
|
|
@@ -388,9 +409,9 @@ module ActiveSupport
|
|
|
388
409
|
EventedGroup
|
|
389
410
|
end
|
|
390
411
|
|
|
391
|
-
def publish(
|
|
412
|
+
def publish(...)
|
|
392
413
|
if @can_publish
|
|
393
|
-
@delegate.publish
|
|
414
|
+
@delegate.publish(...)
|
|
394
415
|
end
|
|
395
416
|
end
|
|
396
417
|
|
|
@@ -420,8 +441,8 @@ module ActiveSupport
|
|
|
420
441
|
TimedGroup
|
|
421
442
|
end
|
|
422
443
|
|
|
423
|
-
def publish(
|
|
424
|
-
@delegate.call
|
|
444
|
+
def publish(...)
|
|
445
|
+
@delegate.call(...)
|
|
425
446
|
end
|
|
426
447
|
end
|
|
427
448
|
|
|
@@ -164,7 +164,7 @@ module ActiveSupport
|
|
|
164
164
|
@cpu_time_finish - @cpu_time_start
|
|
165
165
|
end
|
|
166
166
|
|
|
167
|
-
# Returns the idle time
|
|
167
|
+
# Returns the idle time (in milliseconds) passed between the call to
|
|
168
168
|
# #start! and the call to #finish!.
|
|
169
169
|
def idle_time
|
|
170
170
|
diff = duration - cpu_time
|
|
@@ -185,8 +185,8 @@ module ActiveSupport
|
|
|
185
185
|
#
|
|
186
186
|
# subscriber = ActiveSupport::Notifications.subscribe(/render/) { }
|
|
187
187
|
# ActiveSupport::Notifications.unsubscribe('render_template.action_view')
|
|
188
|
-
# subscriber.
|
|
189
|
-
# subscriber.
|
|
188
|
+
# subscriber.subscribed_to?('render_template.action_view') # => false
|
|
189
|
+
# subscriber.subscribed_to?('render_partial.action_view') # => true
|
|
190
190
|
#
|
|
191
191
|
# == Default Queue
|
|
192
192
|
#
|
|
@@ -14,7 +14,7 @@ module ActiveSupport
|
|
|
14
14
|
if number_d
|
|
15
15
|
if number_d.negative?
|
|
16
16
|
number_d = number_d.abs
|
|
17
|
-
format = options[:negative_format] if (number_d * 10**options[:precision]) >= 0.5
|
|
17
|
+
format = options[:negative_format] if options[:precision].nil? || (number_d * 10**options[:precision]) >= 0.5
|
|
18
18
|
end
|
|
19
19
|
number_s = NumberToRoundedConverter.convert(number_d, options)
|
|
20
20
|
else
|
|
@@ -7,8 +7,6 @@ module ActiveSupport
|
|
|
7
7
|
class NumberToDelimitedConverter < NumberConverter # :nodoc:
|
|
8
8
|
self.validate_float = true
|
|
9
9
|
|
|
10
|
-
DEFAULT_DELIMITER_REGEX = /(\d)(?=(\d\d\d)+(?!\d))/
|
|
11
|
-
|
|
12
10
|
def convert
|
|
13
11
|
parts.join(options[:separator])
|
|
14
12
|
end
|
|
@@ -22,6 +20,7 @@ module ActiveSupport
|
|
|
22
20
|
end
|
|
23
21
|
else
|
|
24
22
|
left_parts = []
|
|
23
|
+
sign = left.slice!(0) if left.start_with?("-", "+")
|
|
25
24
|
offset = left.size % 3
|
|
26
25
|
if offset > 0
|
|
27
26
|
left_parts << left[0, offset]
|
|
@@ -31,14 +30,14 @@ module ActiveSupport
|
|
|
31
30
|
left_parts << left[offset + (i * 3), 3]
|
|
32
31
|
end
|
|
33
32
|
|
|
34
|
-
left = left_parts.join(options[:delimiter])
|
|
33
|
+
left = "#{sign}#{left_parts.join(options[:delimiter])}"
|
|
35
34
|
end
|
|
36
35
|
|
|
37
36
|
[left, right].compact
|
|
38
37
|
end
|
|
39
38
|
|
|
40
39
|
def delimiter_pattern
|
|
41
|
-
options
|
|
40
|
+
options[:delimiter_pattern]
|
|
42
41
|
end
|
|
43
42
|
end
|
|
44
43
|
end
|
|
@@ -30,16 +30,12 @@ module ActiveSupport
|
|
|
30
30
|
|
|
31
31
|
def convert_without_area_code(number)
|
|
32
32
|
default_pattern = /(\d{0,3})(\d{3})(\d{4})$/
|
|
33
|
-
number.gsub!(regexp_pattern(default_pattern)
|
|
34
|
-
|
|
35
|
-
|
|
33
|
+
number.gsub!(regexp_pattern(default_pattern)) do
|
|
34
|
+
$1.empty? ? "#{$2}#{delimiter}#{$3}" : "#{$1}#{delimiter}#{$2}#{delimiter}#{$3}"
|
|
35
|
+
end
|
|
36
36
|
number
|
|
37
37
|
end
|
|
38
38
|
|
|
39
|
-
def start_with_delimiter?(number)
|
|
40
|
-
delimiter.present? && number.start_with?(delimiter)
|
|
41
|
-
end
|
|
42
|
-
|
|
43
39
|
def delimiter
|
|
44
40
|
opts[:delimiter] || "-"
|
|
45
41
|
end
|
|
@@ -35,7 +35,7 @@ module ActiveSupport
|
|
|
35
35
|
end
|
|
36
36
|
|
|
37
37
|
def absolute_precision(number)
|
|
38
|
-
if options[:significant] && options[:precision] > 0
|
|
38
|
+
if options[:significant] && options[:precision] && options[:precision] > 0
|
|
39
39
|
options[:precision] - digit_count(convert_to_decimal(number))
|
|
40
40
|
else
|
|
41
41
|
options[:precision]
|
|
@@ -1,6 +1,28 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
2
|
|
|
3
3
|
module ActiveSupport
|
|
4
|
+
# = Number Helper
|
|
5
|
+
#
|
|
6
|
+
# Provides methods for formatting numbers into currencies, percentages,
|
|
7
|
+
# phone numbers, and more.
|
|
8
|
+
#
|
|
9
|
+
# Example usage in a class:
|
|
10
|
+
# class Topic
|
|
11
|
+
# include ActiveSupport::NumberHelper
|
|
12
|
+
#
|
|
13
|
+
# def price
|
|
14
|
+
# number_to_currency(@price)
|
|
15
|
+
# end
|
|
16
|
+
# end
|
|
17
|
+
#
|
|
18
|
+
# Example usage in a module:
|
|
19
|
+
# require "active_support/number_helper"
|
|
20
|
+
#
|
|
21
|
+
# module NumberFormatting
|
|
22
|
+
# def format_price(price)
|
|
23
|
+
# ActiveSupport::NumberHelper.number_to_currency(price)
|
|
24
|
+
# end
|
|
25
|
+
# end
|
|
4
26
|
module NumberHelper
|
|
5
27
|
extend ActiveSupport::Autoload
|
|
6
28
|
|
|
@@ -15,7 +15,7 @@ module ActiveSupport
|
|
|
15
15
|
|
|
16
16
|
initializer "active_support.isolation_level" do |app|
|
|
17
17
|
config.after_initialize do
|
|
18
|
-
if level = app.config.active_support.
|
|
18
|
+
if level = app.config.active_support.isolation_level
|
|
19
19
|
ActiveSupport::IsolatedExecutionState.isolation_level = level
|
|
20
20
|
end
|
|
21
21
|
end
|
|
@@ -38,19 +38,35 @@ module ActiveSupport
|
|
|
38
38
|
end
|
|
39
39
|
end
|
|
40
40
|
|
|
41
|
-
initializer "active_support.
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
41
|
+
initializer "active_support.set_event_reporter_context_store" do |app|
|
|
42
|
+
config.after_initialize do
|
|
43
|
+
if klass = app.config.active_support.event_reporter_context_store
|
|
44
|
+
ActiveSupport::EventReporter.context_store = klass
|
|
45
|
+
end
|
|
46
|
+
end
|
|
45
47
|
end
|
|
46
48
|
|
|
47
|
-
initializer "active_support.
|
|
48
|
-
app.reloader.before_class_unload
|
|
49
|
-
|
|
50
|
-
|
|
49
|
+
initializer "active_support.reset_execution_context" do |app|
|
|
50
|
+
app.reloader.before_class_unload do
|
|
51
|
+
ActiveSupport::CurrentAttributes.clear_all
|
|
52
|
+
ActiveSupport::ExecutionContext.flush
|
|
53
|
+
ActiveSupport.event_reporter.clear_context
|
|
54
|
+
end
|
|
55
|
+
|
|
56
|
+
app.executor.to_run do
|
|
57
|
+
ActiveSupport::ExecutionContext.push
|
|
58
|
+
end
|
|
59
|
+
|
|
60
|
+
app.executor.to_complete do
|
|
61
|
+
ActiveSupport::CurrentAttributes.clear_all
|
|
62
|
+
ActiveSupport::ExecutionContext.pop
|
|
63
|
+
ActiveSupport.event_reporter.clear_context
|
|
64
|
+
end
|
|
51
65
|
|
|
52
66
|
ActiveSupport.on_load(:active_support_test_case) do
|
|
53
67
|
if app.config.active_support.executor_around_test_case
|
|
68
|
+
ActiveSupport::ExecutionContext.nestable = true
|
|
69
|
+
|
|
54
70
|
require "active_support/executor/test_helper"
|
|
55
71
|
include ActiveSupport::Executor::TestHelper
|
|
56
72
|
else
|
|
@@ -63,6 +79,13 @@ module ActiveSupport
|
|
|
63
79
|
end
|
|
64
80
|
end
|
|
65
81
|
|
|
82
|
+
initializer "active_support.set_filter_parameters" do |app|
|
|
83
|
+
config.after_initialize do
|
|
84
|
+
ActiveSupport.filter_parameters += Rails.application.config.filter_parameters
|
|
85
|
+
ActiveSupport.event_reporter.reload_payload_filter
|
|
86
|
+
end
|
|
87
|
+
end
|
|
88
|
+
|
|
66
89
|
initializer "active_support.deprecation_behavior" do |app|
|
|
67
90
|
if app.config.active_support.report_deprecations == false
|
|
68
91
|
app.deprecators.silenced = true
|
|
@@ -2,12 +2,11 @@
|
|
|
2
2
|
|
|
3
3
|
module ActiveSupport
|
|
4
4
|
module SecurityUtils
|
|
5
|
-
# Constant time string comparison, for fixed length strings.
|
|
6
|
-
#
|
|
7
|
-
# The values compared should be of fixed length, such as strings
|
|
8
|
-
# that have already been processed by HMAC. Raises in case of length mismatch.
|
|
9
|
-
|
|
10
5
|
if defined?(OpenSSL.fixed_length_secure_compare)
|
|
6
|
+
# Constant time string comparison, for fixed length strings.
|
|
7
|
+
#
|
|
8
|
+
# The values compared should be of fixed length, such as strings
|
|
9
|
+
# that have already been processed by HMAC. Raises in case of length mismatch.
|
|
11
10
|
def fixed_length_secure_compare(a, b)
|
|
12
11
|
OpenSSL.fixed_length_secure_compare(a, b)
|
|
13
12
|
end
|
|
@@ -0,0 +1,99 @@
|
|
|
1
|
+
# frozen_string_literal: true
|
|
2
|
+
|
|
3
|
+
require "active_support/subscriber"
|
|
4
|
+
|
|
5
|
+
module ActiveSupport
|
|
6
|
+
# = Active Support Structured Event \Subscriber
|
|
7
|
+
#
|
|
8
|
+
# +ActiveSupport::StructuredEventSubscriber+ consumes ActiveSupport::Notifications
|
|
9
|
+
# in order to emit structured events via +Rails.event+.
|
|
10
|
+
#
|
|
11
|
+
# An example would be the Action Controller structured event subscriber, responsible for
|
|
12
|
+
# emitting request processing events:
|
|
13
|
+
#
|
|
14
|
+
# module ActionController
|
|
15
|
+
# class StructuredEventSubscriber < ActiveSupport::StructuredEventSubscriber
|
|
16
|
+
# attach_to :action_controller
|
|
17
|
+
#
|
|
18
|
+
# def start_processing(event)
|
|
19
|
+
# emit_event("controller.request_started",
|
|
20
|
+
# controller: event.payload[:controller],
|
|
21
|
+
# action: event.payload[:action],
|
|
22
|
+
# format: event.payload[:format]
|
|
23
|
+
# )
|
|
24
|
+
# end
|
|
25
|
+
# end
|
|
26
|
+
# end
|
|
27
|
+
#
|
|
28
|
+
# After configured, whenever a <tt>"start_processing.action_controller"</tt> notification is published,
|
|
29
|
+
# it will properly dispatch the event (+ActiveSupport::Notifications::Event+) to the +start_processing+ method.
|
|
30
|
+
# The subscriber can then emit a structured event via the +emit_event+ method.
|
|
31
|
+
class StructuredEventSubscriber < Subscriber
|
|
32
|
+
class_attribute :debug_methods, instance_accessor: false, default: [] # :nodoc:
|
|
33
|
+
|
|
34
|
+
DEBUG_CHECK = proc { !ActiveSupport.event_reporter.debug_mode? }
|
|
35
|
+
|
|
36
|
+
class << self
|
|
37
|
+
def attach_to(...) # :nodoc:
|
|
38
|
+
result = super
|
|
39
|
+
set_silenced_events
|
|
40
|
+
result
|
|
41
|
+
end
|
|
42
|
+
|
|
43
|
+
private
|
|
44
|
+
def set_silenced_events
|
|
45
|
+
if subscriber
|
|
46
|
+
subscriber.silenced_events = debug_methods.to_h { |method| ["#{method}.#{namespace}", DEBUG_CHECK] }
|
|
47
|
+
end
|
|
48
|
+
end
|
|
49
|
+
|
|
50
|
+
def debug_only(method)
|
|
51
|
+
self.debug_methods += [method]
|
|
52
|
+
set_silenced_events
|
|
53
|
+
end
|
|
54
|
+
end
|
|
55
|
+
|
|
56
|
+
def initialize
|
|
57
|
+
super
|
|
58
|
+
@silenced_events = {}
|
|
59
|
+
end
|
|
60
|
+
|
|
61
|
+
def silenced?(event)
|
|
62
|
+
ActiveSupport.event_reporter.subscribers.none? || @silenced_events[event]&.call
|
|
63
|
+
end
|
|
64
|
+
|
|
65
|
+
attr_writer :silenced_events # :nodoc:
|
|
66
|
+
|
|
67
|
+
# Emit a structured event via Rails.event.notify.
|
|
68
|
+
#
|
|
69
|
+
# ==== Arguments
|
|
70
|
+
#
|
|
71
|
+
# * +name+ - The event name as a string or symbol
|
|
72
|
+
# * +payload+ - The event payload as a hash or object
|
|
73
|
+
# * +caller_depth+ - Stack depth for source location (default: 1)
|
|
74
|
+
# * +kwargs+ - Additional payload data merged with the payload hash
|
|
75
|
+
def emit_event(name, payload = nil, caller_depth: 1, **kwargs)
|
|
76
|
+
ActiveSupport.event_reporter.notify(name, payload, caller_depth: caller_depth + 1, **kwargs)
|
|
77
|
+
rescue => e
|
|
78
|
+
handle_event_error(name, e)
|
|
79
|
+
end
|
|
80
|
+
|
|
81
|
+
# Like +emit_event+, but only emits when the event reporter is in debug mode
|
|
82
|
+
def emit_debug_event(name, payload = nil, caller_depth: 1, **kwargs)
|
|
83
|
+
ActiveSupport.event_reporter.debug(name, payload, caller_depth: caller_depth + 1, **kwargs)
|
|
84
|
+
rescue => e
|
|
85
|
+
handle_event_error(name, e)
|
|
86
|
+
end
|
|
87
|
+
|
|
88
|
+
def call(event)
|
|
89
|
+
super
|
|
90
|
+
rescue => e
|
|
91
|
+
handle_event_error(event.name, e)
|
|
92
|
+
end
|
|
93
|
+
|
|
94
|
+
private
|
|
95
|
+
def handle_event_error(name, error)
|
|
96
|
+
ActiveSupport.error_reporter.report(error, source: name)
|
|
97
|
+
end
|
|
98
|
+
end
|
|
99
|
+
end
|
|
@@ -18,6 +18,13 @@ module ActiveSupport
|
|
|
18
18
|
|
|
19
19
|
def label
|
|
20
20
|
end
|
|
21
|
+
|
|
22
|
+
def base_label
|
|
23
|
+
end
|
|
24
|
+
|
|
25
|
+
def absolute_path
|
|
26
|
+
path
|
|
27
|
+
end
|
|
21
28
|
end
|
|
22
29
|
|
|
23
30
|
class BacktraceLocationProxy < DelegateClass(Thread::Backtrace::Location) # :nodoc:
|
|
@@ -53,7 +60,8 @@ module ActiveSupport
|
|
|
53
60
|
location = __getobj__.backtrace_locations[0]
|
|
54
61
|
["#{location.path}:#{location.lineno}: #{__getobj__}"]
|
|
55
62
|
else
|
|
56
|
-
|
|
63
|
+
# Only message lines with a file location on them are trace entries
|
|
64
|
+
__getobj__.to_s.split("\n").grep(/:\d+/)
|
|
57
65
|
end
|
|
58
66
|
end
|
|
59
67
|
end
|
|
@@ -113,6 +113,11 @@ module ActiveSupport
|
|
|
113
113
|
end
|
|
114
114
|
end
|
|
115
115
|
|
|
116
|
+
# Returns an `ActiveSupport::Logger` that has already been wrapped with tagged logging concern.
|
|
117
|
+
def self.logger(*args, **kwargs)
|
|
118
|
+
new ActiveSupport::Logger.new(*args, **kwargs)
|
|
119
|
+
end
|
|
120
|
+
|
|
116
121
|
def self.new(logger)
|
|
117
122
|
logger = logger.clone
|
|
118
123
|
|