activesupport 7.2.2.1 → 8.0.0
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 +66 -214
- data/lib/active_support/backtrace_cleaner.rb +1 -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 +12 -2
- data/lib/active_support/cache/memory_store.rb +6 -2
- data/lib/active_support/cache/redis_cache_store.rb +5 -2
- data/lib/active_support/cache.rb +16 -11
- data/lib/active_support/callbacks.rb +1 -2
- data/lib/active_support/class_attribute.rb +26 -0
- data/lib/active_support/code_generator.rb +9 -0
- data/lib/active_support/concurrency/share_lock.rb +0 -1
- data/lib/active_support/configuration_file.rb +15 -6
- data/lib/active_support/core_ext/benchmark.rb +6 -9
- data/lib/active_support/core_ext/class/attribute.rb +10 -19
- data/lib/active_support/core_ext/date/conversions.rb +2 -0
- data/lib/active_support/core_ext/date_and_time/compatibility.rb +2 -2
- data/lib/active_support/core_ext/enumerable.rb +8 -3
- data/lib/active_support/core_ext/hash/except.rb +0 -12
- data/lib/active_support/core_ext/module/attr_internal.rb +3 -4
- data/lib/active_support/core_ext/object/json.rb +15 -9
- data/lib/active_support/core_ext/thread/backtrace/location.rb +2 -7
- data/lib/active_support/core_ext/time/calculations.rb +14 -2
- data/lib/active_support/core_ext/time/compatibility.rb +9 -1
- data/lib/active_support/core_ext/time/conversions.rb +2 -0
- data/lib/active_support/delegation.rb +0 -2
- data/lib/active_support/dependencies.rb +0 -1
- data/lib/active_support/deprecation/reporting.rb +0 -19
- data/lib/active_support/deprecation.rb +1 -1
- data/lib/active_support/duration.rb +14 -10
- data/lib/active_support/encrypted_configuration.rb +20 -2
- data/lib/active_support/error_reporter.rb +25 -1
- data/lib/active_support/evented_file_update_checker.rb +0 -1
- data/lib/active_support/gem_version.rb +4 -4
- data/lib/active_support/hash_with_indifferent_access.rb +16 -16
- data/lib/active_support/i18n_railtie.rb +19 -11
- data/lib/active_support/isolated_execution_state.rb +0 -2
- data/lib/active_support/json/encoding.rb +2 -2
- data/lib/active_support/notifications/fanout.rb +0 -1
- data/lib/active_support/number_helper.rb +22 -0
- data/lib/active_support/railtie.rb +4 -0
- data/lib/active_support/tagged_logging.rb +5 -0
- data/lib/active_support/testing/assertions.rb +79 -21
- data/lib/active_support/testing/isolation.rb +0 -2
- data/lib/active_support/testing/strict_warnings.rb +1 -1
- data/lib/active_support/testing/time_helpers.rb +2 -1
- data/lib/active_support/time_with_zone.rb +21 -12
- data/lib/active_support/values/time_zone.rb +11 -9
- data/lib/active_support.rb +10 -3
- metadata +22 -7
- data/lib/active_support/proxy_object.rb +0 -20
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 8d43c6938627c736f544a0a9f0af6f8a538e8dd6c147ff51e368946c4d57d7c4
|
|
4
|
+
data.tar.gz: 6e57c37c1735b475cb5a2d96c0af1ed0f6f2f2d41a776743bc97cc0b61e4b778
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: c01d045e73ab8eb2c3a3494180490bb5fa39a082343d5445593bd591333cd95cca84ad0d79668afe6603389ac675c8cbe3f98a0bb5612bfb5a3ec8d77fa26d9b
|
|
7
|
+
data.tar.gz: b5a92add8986b7bb4f73a5e7c4ff82525dfcfb4a1ca0bcedb6364a338f88cb5b411595c1704d508d68ad0ed2df850788132a2270e4f1421d672b1394c49e8306
|
data/CHANGELOG.md
CHANGED
|
@@ -1,284 +1,136 @@
|
|
|
1
|
-
## Rails
|
|
1
|
+
## Rails 8.0.0 (November 07, 2024) ##
|
|
2
2
|
|
|
3
3
|
* No changes.
|
|
4
4
|
|
|
5
5
|
|
|
6
|
-
## Rails
|
|
7
|
-
|
|
8
|
-
* Include options when instrumenting `ActiveSupport::Cache::Store#delete` and `ActiveSupport::Cache::Store#delete_multi`.
|
|
9
|
-
|
|
10
|
-
*Adam Renberg Tamm*
|
|
11
|
-
|
|
12
|
-
* Print test names when running `rails test -v` for parallel tests.
|
|
13
|
-
|
|
14
|
-
*John Hawthorn*, *Abeid Ahmed*
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
## Rails 7.2.1.2 (October 23, 2024) ##
|
|
18
|
-
|
|
19
|
-
* No changes.
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
## Rails 7.2.1.1 (October 15, 2024) ##
|
|
6
|
+
## Rails 8.0.0.rc2 (October 30, 2024) ##
|
|
23
7
|
|
|
24
8
|
* No changes.
|
|
25
9
|
|
|
26
10
|
|
|
27
|
-
## Rails
|
|
28
|
-
|
|
29
|
-
* No changes.
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
## Rails 7.2.0 (August 09, 2024) ##
|
|
33
|
-
|
|
34
|
-
* Fix `delegate_missing_to allow_nil: true` when called with implict self
|
|
35
|
-
|
|
36
|
-
```ruby
|
|
37
|
-
class Person
|
|
38
|
-
delegate_missing_to :address, allow_nil: true
|
|
39
|
-
|
|
40
|
-
def address
|
|
41
|
-
nil
|
|
42
|
-
end
|
|
43
|
-
|
|
44
|
-
def berliner?
|
|
45
|
-
city == "Berlin"
|
|
46
|
-
end
|
|
47
|
-
end
|
|
48
|
-
|
|
49
|
-
Person.new.city # => nil
|
|
50
|
-
Person.new.berliner? # undefined local variable or method `city' for an instance of Person (NameError)
|
|
51
|
-
```
|
|
52
|
-
|
|
53
|
-
*Jean Boussier*
|
|
54
|
-
|
|
55
|
-
* Add `logger` as a dependency since it is a bundled gem candidate for Ruby 3.5
|
|
56
|
-
|
|
57
|
-
*Earlopain*
|
|
58
|
-
|
|
59
|
-
* Define `Digest::UUID.nil_uuid`, which returns the so-called nil UUID.
|
|
60
|
-
|
|
61
|
-
*Xavier Noria*
|
|
62
|
-
|
|
63
|
-
* Support `duration` type in `ActiveSupport::XmlMini`.
|
|
64
|
-
|
|
65
|
-
*heka1024*
|
|
66
|
-
|
|
67
|
-
* Remove deprecated `ActiveSupport::Notifications::Event#children` and `ActiveSupport::Notifications::Event#parent_of?`.
|
|
68
|
-
|
|
69
|
-
*Rafael Mendonça França*
|
|
70
|
-
|
|
71
|
-
* Remove deprecated support to call the following methods without passing a deprecator:
|
|
72
|
-
|
|
73
|
-
- `deprecate`
|
|
74
|
-
- `deprecate_constant`
|
|
75
|
-
- `ActiveSupport::Deprecation::DeprecatedObjectProxy.new`
|
|
76
|
-
- `ActiveSupport::Deprecation::DeprecatedInstanceVariableProxy.new`
|
|
77
|
-
- `ActiveSupport::Deprecation::DeprecatedConstantProxy.new`
|
|
78
|
-
- `assert_deprecated`
|
|
79
|
-
- `assert_not_deprecated`
|
|
80
|
-
- `collect_deprecations`
|
|
81
|
-
|
|
82
|
-
*Rafael Mendonça França*
|
|
83
|
-
|
|
84
|
-
* Remove deprecated `ActiveSupport::Deprecation` delegation to instance.
|
|
85
|
-
|
|
86
|
-
*Rafael Mendonça França*
|
|
87
|
-
|
|
88
|
-
* Remove deprecated `SafeBuffer#clone_empty`.
|
|
89
|
-
|
|
90
|
-
*Rafael Mendonça França*
|
|
91
|
-
|
|
92
|
-
* Remove deprecated `#to_default_s` from `Array`, `Date`, `DateTime` and `Time`.
|
|
93
|
-
|
|
94
|
-
*Rafael Mendonça França*
|
|
95
|
-
|
|
96
|
-
* Remove deprecated support to passing `Dalli::Client` instances to `MemCacheStore`.
|
|
97
|
-
|
|
98
|
-
*Rafael Mendonça França*
|
|
99
|
-
|
|
100
|
-
* Remove deprecated `config.active_support.use_rfc4122_namespaced_uuids`.
|
|
101
|
-
|
|
102
|
-
*Rafael Mendonça França*
|
|
103
|
-
|
|
104
|
-
* Remove deprecated `config.active_support.remove_deprecated_time_with_zone_name`.
|
|
105
|
-
|
|
106
|
-
*Rafael Mendonça França*
|
|
107
|
-
|
|
108
|
-
* Remove deprecated `config.active_support.disable_to_s_conversion`.
|
|
109
|
-
|
|
110
|
-
*Rafael Mendonça França*
|
|
11
|
+
## Rails 8.0.0.rc1 (October 19, 2024) ##
|
|
111
12
|
|
|
112
|
-
* Remove deprecated support to
|
|
13
|
+
* Remove deprecated support to passing an array of strings to `ActiveSupport::Deprecation#warn`.
|
|
113
14
|
|
|
114
15
|
*Rafael Mendonça França*
|
|
115
16
|
|
|
116
|
-
* Remove deprecated
|
|
17
|
+
* Remove deprecated support to setting `attr_internal_naming_format` with a `@` prefix.
|
|
117
18
|
|
|
118
19
|
*Rafael Mendonça França*
|
|
119
20
|
|
|
120
|
-
* Remove deprecated
|
|
21
|
+
* Remove deprecated `ActiveSupport::ProxyObject`.
|
|
121
22
|
|
|
122
23
|
*Rafael Mendonça França*
|
|
123
24
|
|
|
124
|
-
*
|
|
125
|
-
|
|
126
|
-
*Rafael Mendonça França*
|
|
127
|
-
|
|
128
|
-
* Warn on tests without assertions.
|
|
129
|
-
|
|
130
|
-
`ActiveSupport::TestCase` now warns when tests do not run any assertions.
|
|
131
|
-
This is helpful in detecting broken tests that do not perform intended assertions.
|
|
132
|
-
|
|
133
|
-
*fatkodima*
|
|
134
|
-
|
|
135
|
-
* Support `hexBinary` type in `ActiveSupport::XmlMini`.
|
|
136
|
-
|
|
137
|
-
*heka1024*
|
|
138
|
-
|
|
139
|
-
* Deprecate `ActiveSupport::ProxyObject` in favor of Ruby's built-in `BasicObject`.
|
|
140
|
-
|
|
141
|
-
*Earlopain*
|
|
142
|
-
|
|
143
|
-
* `stub_const` now accepts a `exists: false` parameter to allow stubbing missing constants.
|
|
144
|
-
|
|
145
|
-
*Jean Boussier*
|
|
146
|
-
|
|
147
|
-
* Make `ActiveSupport::BacktraceCleaner` copy filters and silencers on dup and clone.
|
|
25
|
+
* Don't execute i18n watcher on boot. It shouldn't catch any file changes initially,
|
|
26
|
+
and unnecessarily slows down boot of applications with lots of translations.
|
|
148
27
|
|
|
149
|
-
|
|
150
|
-
causing state to leak.
|
|
28
|
+
*Gannon McGibbon*, *David Stosik*
|
|
151
29
|
|
|
152
|
-
|
|
30
|
+
* Fix `ActiveSupport::HashWithIndifferentAccess#stringify_keys` to stringify all keys not just symbols.
|
|
153
31
|
|
|
154
|
-
|
|
32
|
+
Previously:
|
|
155
33
|
|
|
156
|
-
|
|
34
|
+
```ruby
|
|
35
|
+
{ 1 => 2 }.with_indifferent_access.stringify_keys[1] # => 2
|
|
36
|
+
```
|
|
157
37
|
|
|
158
|
-
|
|
38
|
+
After this change:
|
|
159
39
|
|
|
160
40
|
```ruby
|
|
161
|
-
|
|
162
|
-
ActiveSupport::Logger.logger_outputs_to?(logger, '/var/log/rails.log')
|
|
41
|
+
{ 1 => 2 }.with_indifferent_access.stringify_keys["1"] # => 2
|
|
163
42
|
```
|
|
164
43
|
|
|
165
|
-
|
|
44
|
+
This change can be seen as a bug fix, but since it behaved like this for a very long time, we're deciding
|
|
45
|
+
to not backport the fix and to make the change in a major release.
|
|
166
46
|
|
|
167
|
-
*
|
|
168
|
-
`ActiveSupport::MessagePack` serializer.
|
|
47
|
+
*Jean Boussier*
|
|
169
48
|
|
|
170
|
-
|
|
171
|
-
still be read, and new payloads will be readable by older versions of Rails.
|
|
49
|
+
## Rails 8.0.0.beta1 (September 26, 2024) ##
|
|
172
50
|
|
|
173
|
-
|
|
51
|
+
* Include options when instrumenting `ActiveSupport::Cache::Store#delete` and `ActiveSupport::Cache::Store#delete_multi`.
|
|
174
52
|
|
|
175
|
-
*
|
|
53
|
+
*Adam Renberg Tamm*
|
|
176
54
|
|
|
177
|
-
|
|
178
|
-
class Current < ActiveSupport::CurrentAttributes
|
|
179
|
-
attribute :counter, default: 0
|
|
180
|
-
end
|
|
181
|
-
```
|
|
55
|
+
* Print test names when running `rails test -v` for parallel tests.
|
|
182
56
|
|
|
183
|
-
*
|
|
57
|
+
*John Hawthorn*, *Abeid Ahmed*
|
|
184
58
|
|
|
185
|
-
*
|
|
59
|
+
* Deprecate `Benchmark.ms` core extension.
|
|
186
60
|
|
|
187
|
-
|
|
188
|
-
client.with(timeout: 5_000) do |c|
|
|
189
|
-
c.get("/commits")
|
|
190
|
-
end
|
|
191
|
-
```
|
|
61
|
+
The `benchmark` gem will become bundled in Ruby 3.5
|
|
192
62
|
|
|
193
|
-
*
|
|
63
|
+
*Earlopain*
|
|
194
64
|
|
|
195
|
-
*
|
|
196
|
-
default number of workers when parallelizing tests.
|
|
65
|
+
* `ActiveSupport::TimeWithZone#inspect` now uses ISO 8601 style time like `Time#inspect`
|
|
197
66
|
|
|
198
|
-
*
|
|
67
|
+
*John Hawthorn*
|
|
199
68
|
|
|
200
|
-
*
|
|
69
|
+
* `ActiveSupport::ErrorReporter#report` now assigns a backtrace to unraised exceptions.
|
|
201
70
|
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
returning results in that remembered timezone. However, the expected
|
|
205
|
-
behavior is to return results in a system timezone.
|
|
71
|
+
Previously reporting an un-raised exception would result in an error report without
|
|
72
|
+
a backtrace. Now it automatically generates one.
|
|
206
73
|
|
|
207
|
-
*
|
|
74
|
+
*Jean Boussier*
|
|
208
75
|
|
|
209
|
-
* Add `
|
|
76
|
+
* Add `escape_html_entities` option to `ActiveSupport::JSON.encode`.
|
|
210
77
|
|
|
211
|
-
|
|
78
|
+
This allows for overriding the global configuration found at
|
|
79
|
+
`ActiveSupport.escape_html_entities_in_json` for specific calls to `to_json`.
|
|
212
80
|
|
|
81
|
+
This should be usable from controllers in the following manner:
|
|
213
82
|
```ruby
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
return false
|
|
83
|
+
class MyController < ApplicationController
|
|
84
|
+
def index
|
|
85
|
+
render json: { hello: "world" }, escape_html_entities: false
|
|
218
86
|
end
|
|
219
|
-
# ...
|
|
220
87
|
end
|
|
221
88
|
```
|
|
222
89
|
|
|
223
|
-
|
|
90
|
+
*Nigel Baillie*
|
|
224
91
|
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
* Make the order of read_multi and write_multi notifications for `Cache::Store#fetch_multi` operations match the order they are executed in.
|
|
92
|
+
* Raise when using key which can't respond to `#to_sym` in `EncryptedConfiguration`.
|
|
228
93
|
|
|
229
|
-
|
|
94
|
+
As is the case when trying to use an Integer or Float as a key, which is unsupported.
|
|
230
95
|
|
|
231
|
-
*
|
|
96
|
+
*zzak*
|
|
232
97
|
|
|
233
|
-
|
|
234
|
-
`nil` if there was an error talking to the cache backend, and `false` if the write failed
|
|
235
|
-
for another reason (e.g. the key already exists and `unless_exist: true` was passed).
|
|
98
|
+
* Deprecate addition and since between two `Time` and `ActiveSupport::TimeWithZone`.
|
|
236
99
|
|
|
237
|
-
|
|
100
|
+
Previously adding time instances together such as `10.days.ago + 10.days.ago` or `10.days.ago.since(10.days.ago)` produced a nonsensical future date. This behavior is deprecated and will be removed in Rails 8.1.
|
|
238
101
|
|
|
239
|
-
*
|
|
102
|
+
*Nick Schwaderer*
|
|
240
103
|
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
* Improve error messages of `assert_changes` and `assert_no_changes`.
|
|
244
|
-
|
|
245
|
-
`assert_changes` error messages now display objects with `.inspect` to make it easier
|
|
246
|
-
to differentiate nil from empty strings, strings from symbols, etc.
|
|
247
|
-
`assert_no_changes` error messages now surface the actual value.
|
|
248
|
-
|
|
249
|
-
*pcreux*
|
|
250
|
-
|
|
251
|
-
* Fix `#to_fs(:human_size)` to correctly work with negative numbers.
|
|
252
|
-
|
|
253
|
-
*Earlopain*
|
|
104
|
+
* Support rfc2822 format for Time#to_fs & Date#to_fs.
|
|
254
105
|
|
|
255
|
-
*
|
|
106
|
+
*Akshay Birajdar*
|
|
256
107
|
|
|
257
|
-
|
|
108
|
+
* Optimize load time for `Railtie#initialize_i18n`. Filter `I18n.load_path`s passed to the file watcher to only those
|
|
109
|
+
under `Rails.root`. Previously the watcher would grab all available locales, including those in gems
|
|
110
|
+
which do not require a watcher because they won't change.
|
|
258
111
|
|
|
259
|
-
*
|
|
112
|
+
*Nick Schwaderer*
|
|
260
113
|
|
|
261
|
-
|
|
114
|
+
* Add a `filter` option to `in_order_of` to prioritize certain values in the sorting without filtering the results
|
|
115
|
+
by these values.
|
|
262
116
|
|
|
263
|
-
*
|
|
117
|
+
*Igor Depolli*
|
|
264
118
|
|
|
265
|
-
|
|
266
|
-
|
|
119
|
+
* Improve error message when using `assert_difference` or `assert_changes` with a
|
|
120
|
+
proc by printing the proc's source code (MRI only).
|
|
267
121
|
|
|
268
|
-
|
|
269
|
-
`SemanticLogger` instance.
|
|
122
|
+
*Richard Böhme*, *Jean Boussier*
|
|
270
123
|
|
|
271
|
-
|
|
124
|
+
* Add a new configuration value `:zone` for `ActiveSupport.to_time_preserves_timezone` and rename the previous `true` value to `:offset`. The new default value is `:zone`.
|
|
272
125
|
|
|
273
|
-
*
|
|
126
|
+
*Jason Kim*, *John Hawthorn*
|
|
274
127
|
|
|
275
|
-
|
|
128
|
+
* Align instrumentation `payload[:key]` in ActiveSupport::Cache to follow the same pattern, with namespaced and normalized keys.
|
|
276
129
|
|
|
277
|
-
*
|
|
130
|
+
*Frederik Erbs Spang Thomsen*
|
|
278
131
|
|
|
279
|
-
|
|
280
|
-
method from the `Hash` class, which was not able to access values using indifferent keys.
|
|
132
|
+
* Fix `travel_to` to set usec 0 when `with_usec` is `false` and the given argument String or DateTime.
|
|
281
133
|
|
|
282
|
-
*
|
|
134
|
+
*mopp*
|
|
283
135
|
|
|
284
|
-
Please check [7-
|
|
136
|
+
Please check [7-2-stable](https://github.com/rails/rails/blob/7-2-stable/activesupport/CHANGELOG.md) for previous changes.
|
|
@@ -18,7 +18,7 @@ module ActiveSupport
|
|
|
18
18
|
#
|
|
19
19
|
# bc = ActiveSupport::BacktraceCleaner.new
|
|
20
20
|
# root = "#{Rails.root}/"
|
|
21
|
-
# bc.add_filter { |line| line.
|
|
21
|
+
# bc.add_filter { |line| line.delete_prefix(root) } # strip the Rails.root prefix
|
|
22
22
|
# bc.add_silencer { |line| /puma|rubygems/.match?(line) } # skip any lines from puma or rubygems
|
|
23
23
|
# bc.clean(exception.backtrace) # perform the cleanup
|
|
24
24
|
#
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
# frozen_string_literal: true
|
|
2
|
+
|
|
3
|
+
module ActiveSupport
|
|
4
|
+
module Benchmark # :nodoc:
|
|
5
|
+
# Benchmark realtime in the specified time unit. By default,
|
|
6
|
+
# the returned unit is in seconds.
|
|
7
|
+
#
|
|
8
|
+
# ActiveSupport::Benchmark.realtime { sleep 0.1 }
|
|
9
|
+
# # => 0.10007
|
|
10
|
+
#
|
|
11
|
+
# ActiveSupport::Benchmark.realtime(:float_millisecond) { sleep 0.1 }
|
|
12
|
+
# # => 100.07
|
|
13
|
+
#
|
|
14
|
+
# `unit` can be any of the values accepted by Ruby's `Process.clock_gettime`.
|
|
15
|
+
def self.realtime(unit = :float_second, &block)
|
|
16
|
+
time_start = Process.clock_gettime(Process::CLOCK_MONOTONIC, unit)
|
|
17
|
+
yield
|
|
18
|
+
Process.clock_gettime(Process::CLOCK_MONOTONIC, unit) - time_start
|
|
19
|
+
end
|
|
20
|
+
end
|
|
21
|
+
end
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
2
|
|
|
3
|
-
require "active_support/core_ext/benchmark"
|
|
4
3
|
require "active_support/core_ext/hash/keys"
|
|
5
4
|
|
|
6
5
|
module ActiveSupport
|
|
@@ -41,7 +40,9 @@ module ActiveSupport
|
|
|
41
40
|
options[:level] ||= :info
|
|
42
41
|
|
|
43
42
|
result = nil
|
|
44
|
-
ms = Benchmark.
|
|
43
|
+
ms = ActiveSupport::Benchmark.realtime(:float_millisecond) do
|
|
44
|
+
result = options[:silence] ? logger.silence(&block) : yield
|
|
45
|
+
end
|
|
45
46
|
logger.public_send(options[:level], "%s (%.1fms)" % [ message, ms ])
|
|
46
47
|
result
|
|
47
48
|
else
|
|
@@ -58,7 +58,12 @@ module ActiveSupport
|
|
|
58
58
|
# cache.increment("baz") # => 6
|
|
59
59
|
#
|
|
60
60
|
def increment(name, amount = 1, options = nil)
|
|
61
|
-
|
|
61
|
+
options = merged_options(options)
|
|
62
|
+
key = normalize_key(name, options)
|
|
63
|
+
|
|
64
|
+
instrument(:increment, key, amount: amount) do
|
|
65
|
+
modify_value(name, amount, options)
|
|
66
|
+
end
|
|
62
67
|
end
|
|
63
68
|
|
|
64
69
|
# Decrement a cached integer value. Returns the updated value.
|
|
@@ -73,7 +78,12 @@ module ActiveSupport
|
|
|
73
78
|
# cache.decrement("baz") # => 4
|
|
74
79
|
#
|
|
75
80
|
def decrement(name, amount = 1, options = nil)
|
|
76
|
-
|
|
81
|
+
options = merged_options(options)
|
|
82
|
+
key = normalize_key(name, options)
|
|
83
|
+
|
|
84
|
+
instrument(:decrement, key, amount: amount) do
|
|
85
|
+
modify_value(name, -amount, options)
|
|
86
|
+
end
|
|
77
87
|
end
|
|
78
88
|
|
|
79
89
|
def delete_matched(matcher, options = nil)
|
|
@@ -147,7 +147,9 @@ module ActiveSupport
|
|
|
147
147
|
# cache.increment("baz") # => 6
|
|
148
148
|
#
|
|
149
149
|
def increment(name, amount = 1, options = nil)
|
|
150
|
-
|
|
150
|
+
instrument(:increment, name, amount: amount) do
|
|
151
|
+
modify_value(name, amount, options)
|
|
152
|
+
end
|
|
151
153
|
end
|
|
152
154
|
|
|
153
155
|
# Decrement a cached integer value. Returns the updated value.
|
|
@@ -162,7 +164,9 @@ module ActiveSupport
|
|
|
162
164
|
# cache.decrement("baz") # => 4
|
|
163
165
|
#
|
|
164
166
|
def decrement(name, amount = 1, options = nil)
|
|
165
|
-
|
|
167
|
+
instrument(:decrement, name, amount: amount) do
|
|
168
|
+
modify_value(name, -amount, options)
|
|
169
|
+
end
|
|
166
170
|
end
|
|
167
171
|
|
|
168
172
|
# Deletes cache entries if the cache key matches a given pattern.
|
|
@@ -173,9 +173,12 @@ module ActiveSupport
|
|
|
173
173
|
return {} if names.empty?
|
|
174
174
|
|
|
175
175
|
options = names.extract_options!
|
|
176
|
-
|
|
176
|
+
options = merged_options(options)
|
|
177
|
+
keys = names.map { |name| normalize_key(name, options) }
|
|
178
|
+
|
|
179
|
+
instrument_multi(:read_multi, keys, options) do |payload|
|
|
177
180
|
read_multi_entries(names, **options).tap do |results|
|
|
178
|
-
payload[:hits] = results.keys
|
|
181
|
+
payload[:hits] = results.keys.map { |name| normalize_key(name, options) }
|
|
179
182
|
end
|
|
180
183
|
end
|
|
181
184
|
end
|
data/lib/active_support/cache.rb
CHANGED
|
@@ -286,7 +286,7 @@ module ActiveSupport
|
|
|
286
286
|
# <tt>coder: nil</tt> to avoid the overhead of safeguarding against
|
|
287
287
|
# mutation.
|
|
288
288
|
#
|
|
289
|
-
# The +:coder+ option is
|
|
289
|
+
# The +:coder+ option is mutually exclusive with the +:serializer+ and
|
|
290
290
|
# +:compressor+ options. Specifying them together will raise an
|
|
291
291
|
# +ArgumentError+.
|
|
292
292
|
#
|
|
@@ -419,7 +419,7 @@ module ActiveSupport
|
|
|
419
419
|
# t1.join
|
|
420
420
|
#
|
|
421
421
|
# p val_1 # => "new value 1"
|
|
422
|
-
# p val_2 # => "
|
|
422
|
+
# p val_2 # => "original value"
|
|
423
423
|
# p cache.fetch("foo") # => "new value 1"
|
|
424
424
|
#
|
|
425
425
|
# # The entry requires 3 seconds to expire (expires_in + race_condition_ttl)
|
|
@@ -538,10 +538,11 @@ module ActiveSupport
|
|
|
538
538
|
|
|
539
539
|
options = names.extract_options!
|
|
540
540
|
options = merged_options(options)
|
|
541
|
+
keys = names.map { |name| normalize_key(name, options) }
|
|
541
542
|
|
|
542
|
-
instrument_multi :read_multi,
|
|
543
|
+
instrument_multi :read_multi, keys, options do |payload|
|
|
543
544
|
read_multi_entries(names, **options, event: payload).tap do |results|
|
|
544
|
-
payload[:hits] = results.keys
|
|
545
|
+
payload[:hits] = results.keys.map { |name| normalize_key(name, options) }
|
|
545
546
|
end
|
|
546
547
|
end
|
|
547
548
|
end
|
|
@@ -551,8 +552,9 @@ module ActiveSupport
|
|
|
551
552
|
return hash if hash.empty?
|
|
552
553
|
|
|
553
554
|
options = merged_options(options)
|
|
555
|
+
normalized_hash = hash.transform_keys { |key| normalize_key(key, options) }
|
|
554
556
|
|
|
555
|
-
instrument_multi :write_multi,
|
|
557
|
+
instrument_multi :write_multi, normalized_hash, options do |payload|
|
|
556
558
|
entries = hash.each_with_object({}) do |(name, value), memo|
|
|
557
559
|
memo[normalize_key(name, options)] = Entry.new(value, **options.merge(version: normalize_version(name, options)))
|
|
558
560
|
end
|
|
@@ -596,9 +598,9 @@ module ActiveSupport
|
|
|
596
598
|
|
|
597
599
|
options = names.extract_options!
|
|
598
600
|
options = merged_options(options)
|
|
599
|
-
|
|
601
|
+
keys = names.map { |name| normalize_key(name, options) }
|
|
600
602
|
writes = {}
|
|
601
|
-
ordered = instrument_multi :read_multi,
|
|
603
|
+
ordered = instrument_multi :read_multi, keys, options do |payload|
|
|
602
604
|
if options[:force]
|
|
603
605
|
reads = {}
|
|
604
606
|
else
|
|
@@ -610,7 +612,7 @@ module ActiveSupport
|
|
|
610
612
|
end
|
|
611
613
|
writes.compact! if options[:skip_nil]
|
|
612
614
|
|
|
613
|
-
payload[:hits] = reads.keys
|
|
615
|
+
payload[:hits] = reads.keys.map { |name| normalize_key(name, options) }
|
|
614
616
|
payload[:super_operation] = :fetch_multi
|
|
615
617
|
|
|
616
618
|
ordered
|
|
@@ -943,9 +945,12 @@ module ActiveSupport
|
|
|
943
945
|
#
|
|
944
946
|
# namespace_key 'foo', namespace: -> { 'cache' }
|
|
945
947
|
# # => 'cache:foo'
|
|
946
|
-
def namespace_key(key,
|
|
947
|
-
|
|
948
|
-
|
|
948
|
+
def namespace_key(key, call_options = nil)
|
|
949
|
+
namespace = if call_options&.key?(:namespace)
|
|
950
|
+
call_options[:namespace]
|
|
951
|
+
else
|
|
952
|
+
options[:namespace]
|
|
953
|
+
end
|
|
949
954
|
|
|
950
955
|
if namespace.respond_to?(:call)
|
|
951
956
|
namespace = namespace.call
|
|
@@ -6,7 +6,6 @@ require "active_support/core_ext/array/extract_options"
|
|
|
6
6
|
require "active_support/core_ext/class/attribute"
|
|
7
7
|
require "active_support/core_ext/string/filters"
|
|
8
8
|
require "active_support/core_ext/object/blank"
|
|
9
|
-
require "thread"
|
|
10
9
|
|
|
11
10
|
module ActiveSupport
|
|
12
11
|
# = Active Support \Callbacks
|
|
@@ -67,7 +66,7 @@ module ActiveSupport
|
|
|
67
66
|
|
|
68
67
|
included do
|
|
69
68
|
extend ActiveSupport::DescendantsTracker
|
|
70
|
-
class_attribute :__callbacks, instance_writer: false, default: {}
|
|
69
|
+
class_attribute :__callbacks, instance_writer: false, instance_predicate: false, default: {}
|
|
71
70
|
end
|
|
72
71
|
|
|
73
72
|
CALLBACK_FILTER_TYPES = [:before, :after, :around].freeze
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
# frozen_string_literal: true
|
|
2
|
+
|
|
3
|
+
module ActiveSupport
|
|
4
|
+
module ClassAttribute # :nodoc:
|
|
5
|
+
class << self
|
|
6
|
+
def redefine(owner, name, value)
|
|
7
|
+
if owner.singleton_class?
|
|
8
|
+
owner.redefine_method(name) { value }
|
|
9
|
+
owner.send(:public, name)
|
|
10
|
+
end
|
|
11
|
+
|
|
12
|
+
owner.redefine_singleton_method(name) { value }
|
|
13
|
+
owner.singleton_class.send(:public, name)
|
|
14
|
+
|
|
15
|
+
owner.redefine_singleton_method("#{name}=") do |new_value|
|
|
16
|
+
if owner.equal?(self)
|
|
17
|
+
value = new_value
|
|
18
|
+
else
|
|
19
|
+
::ActiveSupport::ClassAttribute.redefine(self, name, new_value)
|
|
20
|
+
end
|
|
21
|
+
end
|
|
22
|
+
owner.singleton_class.send(:public, "#{name}=")
|
|
23
|
+
end
|
|
24
|
+
end
|
|
25
|
+
end
|
|
26
|
+
end
|
|
@@ -55,6 +55,11 @@ module ActiveSupport
|
|
|
55
55
|
@path = path
|
|
56
56
|
@line = line
|
|
57
57
|
@namespaces = Hash.new { |h, k| h[k] = MethodSet.new(k) }
|
|
58
|
+
@sources = []
|
|
59
|
+
end
|
|
60
|
+
|
|
61
|
+
def class_eval
|
|
62
|
+
yield @sources
|
|
58
63
|
end
|
|
59
64
|
|
|
60
65
|
def define_cached_method(canonical_name, namespace:, as: nil, &block)
|
|
@@ -65,6 +70,10 @@ module ActiveSupport
|
|
|
65
70
|
@namespaces.each_value do |method_set|
|
|
66
71
|
method_set.apply(@owner, @path, @line - 1)
|
|
67
72
|
end
|
|
73
|
+
|
|
74
|
+
unless @sources.empty?
|
|
75
|
+
@owner.class_eval("# frozen_string_literal: true\n" + @sources.join(";"), @path, @line - 1)
|
|
76
|
+
end
|
|
68
77
|
end
|
|
69
78
|
end
|
|
70
79
|
end
|