activesupport 6.1.7.2 → 7.1.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +866 -411
- data/MIT-LICENSE +1 -1
- data/README.rdoc +6 -6
- data/lib/active_support/actionable_error.rb +4 -2
- data/lib/active_support/array_inquirer.rb +2 -2
- data/lib/active_support/backtrace_cleaner.rb +27 -7
- data/lib/active_support/benchmarkable.rb +3 -2
- data/lib/active_support/broadcast_logger.rb +250 -0
- data/lib/active_support/builder.rb +1 -1
- data/lib/active_support/cache/coder.rb +153 -0
- data/lib/active_support/cache/entry.rb +134 -0
- data/lib/active_support/cache/file_store.rb +52 -19
- data/lib/active_support/cache/mem_cache_store.rb +195 -60
- data/lib/active_support/cache/memory_store.rb +86 -24
- data/lib/active_support/cache/null_store.rb +16 -2
- data/lib/active_support/cache/redis_cache_store.rb +186 -193
- data/lib/active_support/cache/serializer_with_fallback.rb +175 -0
- data/lib/active_support/cache/strategy/local_cache.rb +63 -71
- data/lib/active_support/cache.rb +478 -247
- data/lib/active_support/callbacks.rb +227 -105
- data/lib/active_support/code_generator.rb +65 -0
- data/lib/active_support/concern.rb +9 -7
- data/lib/active_support/concurrency/load_interlock_aware_monitor.rb +44 -7
- data/lib/active_support/concurrency/null_lock.rb +13 -0
- data/lib/active_support/concurrency/share_lock.rb +2 -2
- data/lib/active_support/configurable.rb +18 -5
- data/lib/active_support/configuration_file.rb +1 -1
- data/lib/active_support/core_ext/array/access.rb +1 -5
- data/lib/active_support/core_ext/array/conversions.rb +15 -13
- data/lib/active_support/core_ext/array/grouping.rb +6 -6
- data/lib/active_support/core_ext/array/inquiry.rb +2 -2
- data/lib/active_support/core_ext/big_decimal/conversions.rb +1 -1
- data/lib/active_support/core_ext/class/subclasses.rb +37 -26
- data/lib/active_support/core_ext/date/blank.rb +1 -1
- data/lib/active_support/core_ext/date/calculations.rb +24 -9
- data/lib/active_support/core_ext/date/conversions.rb +16 -15
- data/lib/active_support/core_ext/date_and_time/calculations.rb +14 -4
- data/lib/active_support/core_ext/date_and_time/compatibility.rb +1 -1
- data/lib/active_support/core_ext/date_time/blank.rb +1 -1
- data/lib/active_support/core_ext/date_time/calculations.rb +4 -0
- data/lib/active_support/core_ext/date_time/conversions.rb +19 -15
- data/lib/active_support/core_ext/digest/uuid.rb +30 -14
- data/lib/active_support/core_ext/enumerable.rb +85 -83
- data/lib/active_support/core_ext/erb/util.rb +196 -0
- data/lib/active_support/core_ext/file/atomic.rb +3 -1
- data/lib/active_support/core_ext/hash/conversions.rb +1 -2
- data/lib/active_support/core_ext/hash/deep_merge.rb +22 -14
- data/lib/active_support/core_ext/hash/deep_transform_values.rb +3 -3
- data/lib/active_support/core_ext/hash/indifferent_access.rb +3 -3
- data/lib/active_support/core_ext/hash/keys.rb +4 -4
- data/lib/active_support/core_ext/integer/inflections.rb +12 -12
- data/lib/active_support/core_ext/kernel/reporting.rb +4 -4
- data/lib/active_support/core_ext/kernel/singleton_class.rb +1 -1
- data/lib/active_support/core_ext/module/attribute_accessors.rb +8 -0
- data/lib/active_support/core_ext/module/attribute_accessors_per_thread.rb +49 -22
- data/lib/active_support/core_ext/module/concerning.rb +6 -6
- data/lib/active_support/core_ext/module/delegation.rb +41 -18
- data/lib/active_support/core_ext/module/deprecation.rb +15 -12
- data/lib/active_support/core_ext/module/introspection.rb +0 -1
- data/lib/active_support/core_ext/name_error.rb +2 -8
- data/lib/active_support/core_ext/numeric/bytes.rb +9 -0
- data/lib/active_support/core_ext/numeric/conversions.rb +82 -77
- data/lib/active_support/core_ext/object/acts_like.rb +29 -5
- data/lib/active_support/core_ext/object/blank.rb +2 -2
- data/lib/active_support/core_ext/object/deep_dup.rb +17 -1
- data/lib/active_support/core_ext/object/duplicable.rb +15 -4
- data/lib/active_support/core_ext/object/inclusion.rb +13 -5
- data/lib/active_support/core_ext/object/instance_variables.rb +22 -12
- data/lib/active_support/core_ext/object/json.rb +40 -27
- data/lib/active_support/core_ext/object/to_query.rb +2 -4
- data/lib/active_support/core_ext/object/try.rb +20 -20
- data/lib/active_support/core_ext/object/with.rb +44 -0
- data/lib/active_support/core_ext/object/with_options.rb +25 -6
- data/lib/active_support/core_ext/object.rb +1 -0
- data/lib/active_support/core_ext/pathname/blank.rb +16 -0
- data/lib/active_support/core_ext/pathname/existence.rb +23 -0
- data/lib/active_support/core_ext/pathname.rb +4 -0
- data/lib/active_support/core_ext/range/compare_range.rb +0 -25
- data/lib/active_support/core_ext/range/conversions.rb +34 -13
- data/lib/active_support/core_ext/range/each.rb +1 -1
- data/lib/active_support/core_ext/range/overlap.rb +40 -0
- data/lib/active_support/core_ext/range.rb +1 -2
- data/lib/active_support/core_ext/securerandom.rb +25 -13
- data/lib/active_support/core_ext/string/conversions.rb +2 -2
- data/lib/active_support/core_ext/string/filters.rb +21 -15
- data/lib/active_support/core_ext/string/indent.rb +1 -1
- data/lib/active_support/core_ext/string/inflections.rb +17 -10
- data/lib/active_support/core_ext/string/inquiry.rb +1 -1
- data/lib/active_support/core_ext/string/output_safety.rb +85 -193
- data/lib/active_support/core_ext/symbol/starts_ends_with.rb +0 -8
- data/lib/active_support/core_ext/thread/backtrace/location.rb +12 -0
- data/lib/active_support/core_ext/time/calculations.rb +29 -10
- data/lib/active_support/core_ext/time/conversions.rb +14 -13
- data/lib/active_support/core_ext/time/zones.rb +12 -28
- data/lib/active_support/core_ext.rb +1 -0
- data/lib/active_support/current_attributes.rb +46 -21
- data/lib/active_support/deep_mergeable.rb +53 -0
- data/lib/active_support/dependencies/autoload.rb +17 -12
- data/lib/active_support/dependencies/interlock.rb +10 -18
- data/lib/active_support/dependencies/require_dependency.rb +28 -0
- data/lib/active_support/dependencies.rb +58 -788
- data/lib/active_support/deprecation/behaviors.rb +66 -40
- data/lib/active_support/deprecation/constant_accessor.rb +5 -4
- data/lib/active_support/deprecation/deprecators.rb +104 -0
- data/lib/active_support/deprecation/disallowed.rb +6 -8
- data/lib/active_support/deprecation/instance_delegator.rb +31 -4
- data/lib/active_support/deprecation/method_wrappers.rb +9 -26
- data/lib/active_support/deprecation/proxy_wrappers.rb +38 -23
- data/lib/active_support/deprecation/reporting.rb +42 -25
- data/lib/active_support/deprecation.rb +32 -5
- data/lib/active_support/deprecator.rb +7 -0
- data/lib/active_support/descendants_tracker.rb +150 -72
- data/lib/active_support/digest.rb +4 -4
- data/lib/active_support/duration/iso8601_parser.rb +3 -3
- data/lib/active_support/duration/iso8601_serializer.rb +9 -3
- data/lib/active_support/duration.rb +79 -49
- data/lib/active_support/encrypted_configuration.rb +72 -9
- data/lib/active_support/encrypted_file.rb +29 -13
- data/lib/active_support/environment_inquirer.rb +23 -3
- data/lib/active_support/error_reporter/test_helper.rb +15 -0
- data/lib/active_support/error_reporter.rb +203 -0
- data/lib/active_support/evented_file_update_checker.rb +20 -7
- data/lib/active_support/execution_context/test_helper.rb +13 -0
- data/lib/active_support/execution_context.rb +53 -0
- data/lib/active_support/execution_wrapper.rb +31 -12
- data/lib/active_support/executor/test_helper.rb +7 -0
- data/lib/active_support/file_update_checker.rb +4 -2
- data/lib/active_support/fork_tracker.rb +28 -13
- data/lib/active_support/gem_version.rb +4 -4
- data/lib/active_support/gzip.rb +2 -0
- data/lib/active_support/hash_with_indifferent_access.rb +38 -18
- data/lib/active_support/html_safe_translation.rb +43 -0
- data/lib/active_support/i18n.rb +2 -1
- data/lib/active_support/i18n_railtie.rb +21 -14
- data/lib/active_support/inflector/inflections.rb +25 -7
- data/lib/active_support/inflector/methods.rb +50 -63
- data/lib/active_support/inflector/transliterate.rb +4 -2
- data/lib/active_support/isolated_execution_state.rb +76 -0
- data/lib/active_support/json/decoding.rb +2 -1
- data/lib/active_support/json/encoding.rb +27 -45
- data/lib/active_support/key_generator.rb +31 -6
- data/lib/active_support/lazy_load_hooks.rb +33 -7
- data/lib/active_support/locale/en.yml +3 -1
- data/lib/active_support/log_subscriber/test_helper.rb +2 -2
- data/lib/active_support/log_subscriber.rb +96 -35
- data/lib/active_support/logger.rb +9 -60
- data/lib/active_support/logger_thread_safe_level.rb +11 -34
- data/lib/active_support/message_encryptor.rb +206 -56
- data/lib/active_support/message_encryptors.rb +141 -0
- data/lib/active_support/message_pack/cache_serializer.rb +23 -0
- data/lib/active_support/message_pack/extensions.rb +292 -0
- data/lib/active_support/message_pack/serializer.rb +63 -0
- data/lib/active_support/message_pack.rb +50 -0
- data/lib/active_support/message_verifier.rb +235 -84
- data/lib/active_support/message_verifiers.rb +135 -0
- data/lib/active_support/messages/codec.rb +65 -0
- data/lib/active_support/messages/metadata.rb +112 -46
- data/lib/active_support/messages/rotation_coordinator.rb +93 -0
- data/lib/active_support/messages/rotator.rb +34 -32
- data/lib/active_support/messages/serializer_with_fallback.rb +158 -0
- data/lib/active_support/multibyte/chars.rb +12 -11
- data/lib/active_support/multibyte/unicode.rb +9 -49
- data/lib/active_support/multibyte.rb +1 -1
- data/lib/active_support/notifications/fanout.rb +304 -114
- data/lib/active_support/notifications/instrumenter.rb +109 -35
- data/lib/active_support/notifications.rb +24 -24
- data/lib/active_support/number_helper/number_converter.rb +14 -7
- data/lib/active_support/number_helper/number_to_currency_converter.rb +11 -6
- data/lib/active_support/number_helper/number_to_delimited_converter.rb +1 -1
- data/lib/active_support/number_helper/number_to_human_size_converter.rb +4 -4
- data/lib/active_support/number_helper/number_to_phone_converter.rb +2 -1
- data/lib/active_support/number_helper/rounding_helper.rb +1 -5
- data/lib/active_support/number_helper.rb +379 -319
- data/lib/active_support/option_merger.rb +10 -18
- data/lib/active_support/ordered_hash.rb +4 -4
- data/lib/active_support/ordered_options.rb +15 -1
- data/lib/active_support/parameter_filter.rb +104 -80
- data/lib/active_support/proxy_object.rb +2 -0
- data/lib/active_support/railtie.rb +83 -21
- data/lib/active_support/reloader.rb +12 -4
- data/lib/active_support/rescuable.rb +14 -12
- data/lib/active_support/ruby_features.rb +7 -0
- data/lib/active_support/secure_compare_rotator.rb +18 -11
- data/lib/active_support/string_inquirer.rb +3 -3
- data/lib/active_support/subscriber.rb +11 -40
- data/lib/active_support/syntax_error_proxy.rb +70 -0
- data/lib/active_support/tagged_logging.rb +60 -24
- data/lib/active_support/test_case.rb +166 -27
- data/lib/active_support/testing/assertions.rb +60 -14
- data/lib/active_support/testing/autorun.rb +0 -2
- data/lib/active_support/testing/constant_stubbing.rb +32 -0
- data/lib/active_support/testing/deprecation.rb +53 -2
- data/lib/active_support/testing/error_reporter_assertions.rb +107 -0
- data/lib/active_support/testing/isolation.rb +30 -29
- data/lib/active_support/testing/method_call_assertions.rb +24 -11
- data/lib/active_support/testing/parallelization/server.rb +4 -0
- data/lib/active_support/testing/parallelization/worker.rb +3 -0
- data/lib/active_support/testing/parallelization.rb +4 -0
- data/lib/active_support/testing/parallelize_executor.rb +81 -0
- data/lib/active_support/testing/stream.rb +4 -6
- data/lib/active_support/testing/strict_warnings.rb +39 -0
- data/lib/active_support/testing/tagged_logging.rb +1 -1
- data/lib/active_support/testing/time_helpers.rb +49 -16
- data/lib/active_support/time_with_zone.rb +39 -28
- data/lib/active_support/values/time_zone.rb +38 -17
- data/lib/active_support/version.rb +1 -1
- data/lib/active_support/xml_mini/jdom.rb +4 -11
- data/lib/active_support/xml_mini/libxml.rb +5 -5
- data/lib/active_support/xml_mini/libxmlsax.rb +1 -1
- data/lib/active_support/xml_mini/nokogiri.rb +5 -5
- data/lib/active_support/xml_mini/nokogirisax.rb +2 -2
- data/lib/active_support/xml_mini/rexml.rb +2 -2
- data/lib/active_support/xml_mini.rb +7 -6
- data/lib/active_support.rb +28 -1
- metadata +107 -18
- data/lib/active_support/core_ext/marshal.rb +0 -26
- data/lib/active_support/core_ext/range/include_time_with_zone.rb +0 -28
- data/lib/active_support/core_ext/range/overlaps.rb +0 -10
- data/lib/active_support/core_ext/uri.rb +0 -29
- data/lib/active_support/dependencies/zeitwerk_integration.rb +0 -120
- data/lib/active_support/per_thread_registry.rb +0 -61
@@ -4,45 +4,75 @@ require "monitor"
|
|
4
4
|
|
5
5
|
module ActiveSupport
|
6
6
|
module Cache
|
7
|
+
# = Memory \Cache \Store
|
8
|
+
#
|
7
9
|
# A cache store implementation which stores everything into memory in the
|
8
|
-
# same process. If you're running multiple Ruby on Rails server processes
|
10
|
+
# same process. If you're running multiple Ruby on \Rails server processes
|
9
11
|
# (which is the case if you're using Phusion Passenger or puma clustered mode),
|
10
|
-
# then this means that Rails server process instances won't be able
|
12
|
+
# then this means that \Rails server process instances won't be able
|
11
13
|
# to share cache data with each other and this may not be the most
|
12
14
|
# appropriate cache in that scenario.
|
13
15
|
#
|
14
|
-
# This cache has a bounded size specified by the
|
16
|
+
# This cache has a bounded size specified by the +:size+ options to the
|
15
17
|
# initializer (default is 32Mb). When the cache exceeds the allotted size,
|
16
18
|
# a cleanup will occur which tries to prune the cache down to three quarters
|
17
19
|
# of the maximum size by removing the least recently used entries.
|
18
20
|
#
|
19
|
-
# Unlike other Cache store implementations, MemoryStore does not compress
|
20
|
-
# values by default. MemoryStore does not benefit from compression as much
|
21
|
+
# Unlike other Cache store implementations, +MemoryStore+ does not compress
|
22
|
+
# values by default. +MemoryStore+ does not benefit from compression as much
|
21
23
|
# as other Store implementations, as it does not send data over a network.
|
22
24
|
# However, when compression is enabled, it still pays the full cost of
|
23
25
|
# compression in terms of cpu use.
|
24
26
|
#
|
25
|
-
# MemoryStore is thread-safe.
|
27
|
+
# +MemoryStore+ is thread-safe.
|
26
28
|
class MemoryStore < Store
|
27
29
|
module DupCoder # :nodoc:
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
30
|
+
extend self
|
31
|
+
|
32
|
+
def dump(entry)
|
33
|
+
if entry.value && entry.value != true && !entry.value.is_a?(Numeric)
|
34
|
+
Cache::Entry.new(dump_value(entry.value), expires_at: entry.expires_at, version: entry.version)
|
35
|
+
else
|
32
36
|
entry
|
33
37
|
end
|
38
|
+
end
|
39
|
+
|
40
|
+
def dump_compressed(entry, threshold)
|
41
|
+
compressed_entry = entry.compressed(threshold)
|
42
|
+
compressed_entry.compressed? ? compressed_entry : dump(entry)
|
43
|
+
end
|
34
44
|
|
35
|
-
|
36
|
-
|
45
|
+
def load(entry)
|
46
|
+
if !entry.compressed? && entry.value.is_a?(String)
|
47
|
+
Cache::Entry.new(load_value(entry.value), expires_at: entry.expires_at, version: entry.version)
|
48
|
+
else
|
37
49
|
entry
|
38
50
|
end
|
39
51
|
end
|
40
|
-
end
|
41
52
|
|
42
|
-
|
53
|
+
private
|
54
|
+
MARSHAL_SIGNATURE = "\x04\x08".b.freeze
|
55
|
+
|
56
|
+
def dump_value(value)
|
57
|
+
if value.is_a?(String) && !value.start_with?(MARSHAL_SIGNATURE)
|
58
|
+
value.dup
|
59
|
+
else
|
60
|
+
Marshal.dump(value)
|
61
|
+
end
|
62
|
+
end
|
63
|
+
|
64
|
+
def load_value(string)
|
65
|
+
if string.start_with?(MARSHAL_SIGNATURE)
|
66
|
+
Marshal.load(string)
|
67
|
+
else
|
68
|
+
string.dup
|
69
|
+
end
|
70
|
+
end
|
71
|
+
end
|
43
72
|
|
44
73
|
def initialize(options = nil)
|
45
74
|
options ||= {}
|
75
|
+
options[:coder] = DupCoder unless options.key?(:coder) || options.key?(:serializer)
|
46
76
|
# Disable compression by default.
|
47
77
|
options[:compress] ||= false
|
48
78
|
super(options)
|
@@ -70,7 +100,7 @@ module ActiveSupport
|
|
70
100
|
# Preemptively iterates through all stored keys and removes the ones which have expired.
|
71
101
|
def cleanup(options = nil)
|
72
102
|
options = merged_options(options)
|
73
|
-
|
103
|
+
_instrument(:cleanup, size: @data.size) do
|
74
104
|
keys = synchronize { @data.keys }
|
75
105
|
keys.each do |key|
|
76
106
|
entry = @data[key]
|
@@ -85,13 +115,13 @@ module ActiveSupport
|
|
85
115
|
return if pruning?
|
86
116
|
@pruning = true
|
87
117
|
begin
|
88
|
-
start_time =
|
118
|
+
start_time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
|
89
119
|
cleanup
|
90
120
|
instrument(:prune, target_size, from: @cache_size) do
|
91
121
|
keys = synchronize { @data.keys }
|
92
122
|
keys.each do |key|
|
93
123
|
delete_entry(key, **options)
|
94
|
-
return if @cache_size <= target_size || (max_time &&
|
124
|
+
return if @cache_size <= target_size || (max_time && Process.clock_gettime(Process::CLOCK_MONOTONIC) - start_time > max_time)
|
95
125
|
end
|
96
126
|
end
|
97
127
|
ensure
|
@@ -104,12 +134,33 @@ module ActiveSupport
|
|
104
134
|
@pruning
|
105
135
|
end
|
106
136
|
|
107
|
-
# Increment
|
137
|
+
# Increment a cached integer value. Returns the updated value.
|
138
|
+
#
|
139
|
+
# If the key is unset, it will be set to +amount+:
|
140
|
+
#
|
141
|
+
# cache.increment("foo") # => 1
|
142
|
+
# cache.increment("bar", 100) # => 100
|
143
|
+
#
|
144
|
+
# To set a specific value, call #write:
|
145
|
+
#
|
146
|
+
# cache.write("baz", 5)
|
147
|
+
# cache.increment("baz") # => 6
|
148
|
+
#
|
108
149
|
def increment(name, amount = 1, options = nil)
|
109
150
|
modify_value(name, amount, options)
|
110
151
|
end
|
111
152
|
|
112
|
-
# Decrement
|
153
|
+
# Decrement a cached integer value. Returns the updated value.
|
154
|
+
#
|
155
|
+
# If the key is unset or has expired, it will be set to +-amount+.
|
156
|
+
#
|
157
|
+
# cache.decrement("foo") # => -1
|
158
|
+
#
|
159
|
+
# To set a specific value, call #write:
|
160
|
+
#
|
161
|
+
# cache.write("baz", 5)
|
162
|
+
# cache.decrement("baz") # => 4
|
163
|
+
#
|
113
164
|
def decrement(name, amount = 1, options = nil)
|
114
165
|
modify_value(name, -amount, options)
|
115
166
|
end
|
@@ -156,9 +207,9 @@ module ActiveSupport
|
|
156
207
|
end
|
157
208
|
|
158
209
|
def write_entry(key, entry, **options)
|
159
|
-
payload = serialize_entry(entry)
|
210
|
+
payload = serialize_entry(entry, **options)
|
160
211
|
synchronize do
|
161
|
-
return false if options[:unless_exist] &&
|
212
|
+
return false if options[:unless_exist] && exist?(key, namespace: nil)
|
162
213
|
|
163
214
|
old_payload = @data[key]
|
164
215
|
if old_payload
|
@@ -180,12 +231,23 @@ module ActiveSupport
|
|
180
231
|
end
|
181
232
|
end
|
182
233
|
|
234
|
+
# Modifies the amount of an integer value that is stored in the cache.
|
235
|
+
# If the key is not found it is created and set to +amount+.
|
183
236
|
def modify_value(name, amount, options)
|
184
237
|
options = merged_options(options)
|
238
|
+
key = normalize_key(name, options)
|
239
|
+
version = normalize_version(name, options)
|
240
|
+
|
185
241
|
synchronize do
|
186
|
-
|
187
|
-
|
188
|
-
|
242
|
+
entry = read_entry(key, **options)
|
243
|
+
|
244
|
+
if !entry || entry.expired? || entry.mismatched?(version)
|
245
|
+
write(name, Integer(amount), options)
|
246
|
+
amount
|
247
|
+
else
|
248
|
+
num = entry.value.to_i + amount
|
249
|
+
entry = Entry.new(num, expires_at: entry.expires_at, version: entry.version)
|
250
|
+
write_entry(key, entry)
|
189
251
|
num
|
190
252
|
end
|
191
253
|
end
|
@@ -2,6 +2,8 @@
|
|
2
2
|
|
3
3
|
module ActiveSupport
|
4
4
|
module Cache
|
5
|
+
# = Null \Cache \Store
|
6
|
+
#
|
5
7
|
# A cache store implementation which doesn't actually store anything. Useful in
|
6
8
|
# development and test environments where you don't want caching turned on but
|
7
9
|
# need to go through the caching interface.
|
@@ -32,11 +34,23 @@ module ActiveSupport
|
|
32
34
|
def delete_matched(matcher, options = nil)
|
33
35
|
end
|
34
36
|
|
37
|
+
def inspect # :nodoc:
|
38
|
+
"#<#{self.class.name} options=#{@options.inspect}>"
|
39
|
+
end
|
40
|
+
|
35
41
|
private
|
36
|
-
def read_entry(key, **
|
42
|
+
def read_entry(key, **s)
|
43
|
+
deserialize_entry(read_serialized_entry(key))
|
44
|
+
end
|
45
|
+
|
46
|
+
def read_serialized_entry(_key, **)
|
47
|
+
end
|
48
|
+
|
49
|
+
def write_entry(key, entry, **)
|
50
|
+
write_serialized_entry(key, serialize_entry(entry))
|
37
51
|
end
|
38
52
|
|
39
|
-
def
|
53
|
+
def write_serialized_entry(_key, _payload, **)
|
40
54
|
true
|
41
55
|
end
|
42
56
|
|