activesupport 7.2.0 → 8.0.0.beta1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (49) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +45 -210
  3. data/lib/active_support/backtrace_cleaner.rb +1 -1
  4. data/lib/active_support/benchmark.rb +21 -0
  5. data/lib/active_support/benchmarkable.rb +3 -2
  6. data/lib/active_support/broadcast_logger.rb +14 -14
  7. data/lib/active_support/cache/file_store.rb +12 -2
  8. data/lib/active_support/cache/memory_store.rb +6 -2
  9. data/lib/active_support/cache/redis_cache_store.rb +5 -2
  10. data/lib/active_support/cache.rb +16 -11
  11. data/lib/active_support/callbacks.rb +1 -2
  12. data/lib/active_support/class_attribute.rb +26 -0
  13. data/lib/active_support/code_generator.rb +9 -0
  14. data/lib/active_support/concurrency/share_lock.rb +0 -1
  15. data/lib/active_support/configuration_file.rb +15 -6
  16. data/lib/active_support/core_ext/benchmark.rb +6 -9
  17. data/lib/active_support/core_ext/class/attribute.rb +10 -19
  18. data/lib/active_support/core_ext/date/conversions.rb +2 -0
  19. data/lib/active_support/core_ext/date_and_time/compatibility.rb +2 -2
  20. data/lib/active_support/core_ext/enumerable.rb +8 -3
  21. data/lib/active_support/core_ext/hash/except.rb +0 -12
  22. data/lib/active_support/core_ext/object/json.rb +15 -9
  23. data/lib/active_support/core_ext/time/calculations.rb +14 -2
  24. data/lib/active_support/core_ext/time/conversions.rb +2 -0
  25. data/lib/active_support/current_attributes.rb +8 -3
  26. data/lib/active_support/deprecation/reporting.rb +2 -2
  27. data/lib/active_support/deprecation.rb +1 -1
  28. data/lib/active_support/encrypted_configuration.rb +20 -2
  29. data/lib/active_support/encrypted_file.rb +1 -1
  30. data/lib/active_support/error_reporter.rb +25 -1
  31. data/lib/active_support/gem_version.rb +3 -3
  32. data/lib/active_support/hash_with_indifferent_access.rb +16 -12
  33. data/lib/active_support/i18n_railtie.rb +19 -10
  34. data/lib/active_support/isolated_execution_state.rb +0 -1
  35. data/lib/active_support/json/encoding.rb +2 -2
  36. data/lib/active_support/notifications.rb +2 -2
  37. data/lib/active_support/number_helper.rb +22 -0
  38. data/lib/active_support/railtie.rb +4 -0
  39. data/lib/active_support/subscriber.rb +1 -0
  40. data/lib/active_support/tagged_logging.rb +5 -0
  41. data/lib/active_support/testing/assertions.rb +72 -21
  42. data/lib/active_support/testing/isolation.rb +2 -2
  43. data/lib/active_support/testing/parallelization/server.rb +3 -0
  44. data/lib/active_support/testing/strict_warnings.rb +3 -0
  45. data/lib/active_support/testing/time_helpers.rb +2 -1
  46. data/lib/active_support/time_with_zone.rb +21 -12
  47. data/lib/active_support/values/time_zone.rb +11 -9
  48. data/lib/active_support.rb +10 -2
  49. metadata +40 -10
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 595b3a2882b5800f2e0660b8a23b420cf1e8341d3267ca345de62713d26896c8
4
- data.tar.gz: 74c1f8bc7333e29619f42ea6f3a35c48325b8635d6909e1c830ed40abd50d8ee
3
+ metadata.gz: 492cd4c9d2ec59d97060d7949b3b68badc089d97ea467a30a0e6614d65e69c21
4
+ data.tar.gz: 98af51f7ec102b694fbd17f636cdf942b965a9a845561f05b1569b07efc56747
5
5
  SHA512:
6
- metadata.gz: 1a3b026e74330927df7149a237edcca9dacec9a90463fe38f06ee4e6ca12837b109b0be17f608fdb706b323743722f4e2c48534dd3324beec308b9c05bdcea98
7
- data.tar.gz: fc4ebffa83a4ca40f1e524cadd4d0aaf0348139f254d9e332cccf3074df25dfd3a3cacafcc80be32154d2cf373632d16d47d67fc4c062e83580022500c104f49
6
+ metadata.gz: b720480df1c4117bf85c0f9066f7015dc750ca1279bba4c07a66a429effa06101adab40eda21f76c6d14ee1c57d46b6aff5cffd494e0e55d18600fe764c9d0e5
7
+ data.tar.gz: 13d40213e5c9720bda46e71d696a6f011547ca95ade865061df922cc9abd5adfbf6a0daa651e0732314dfb67faf3c9ad3fde39bb3490f4e3fd7577fb24b8221b
data/CHANGELOG.md CHANGED
@@ -1,253 +1,88 @@
1
- ## Rails 7.2.0 (August 09, 2024) ##
1
+ ## Rails 8.0.0.beta1 (September 26, 2024) ##
2
2
 
3
- * Fix `delegate_missing_to allow_nil: true` when called with implict self
3
+ * Include options when instrumenting `ActiveSupport::Cache::Store#delete` and `ActiveSupport::Cache::Store#delete_multi`.
4
4
 
5
- ```ruby
6
- class Person
7
- delegate_missing_to :address, allow_nil: true
8
-
9
- def address
10
- nil
11
- end
12
-
13
- def berliner?
14
- city == "Berlin"
15
- end
16
- end
17
-
18
- Person.new.city # => nil
19
- Person.new.berliner? # undefined local variable or method `city' for an instance of Person (NameError)
20
- ```
21
-
22
- *Jean Boussier*
23
-
24
- * Add `logger` as a dependency since it is a bundled gem candidate for Ruby 3.5
25
-
26
- *Earlopain*
27
-
28
- * Define `Digest::UUID.nil_uuid`, which returns the so-called nil UUID.
29
-
30
- *Xavier Noria*
31
-
32
- * Support `duration` type in `ActiveSupport::XmlMini`.
33
-
34
- *heka1024*
35
-
36
- * Remove deprecated `ActiveSupport::Notifications::Event#children` and `ActiveSupport::Notifications::Event#parent_of?`.
37
-
38
- *Rafael Mendonça França*
39
-
40
- * Remove deprecated support to call the following methods without passing a deprecator:
41
-
42
- - `deprecate`
43
- - `deprecate_constant`
44
- - `ActiveSupport::Deprecation::DeprecatedObjectProxy.new`
45
- - `ActiveSupport::Deprecation::DeprecatedInstanceVariableProxy.new`
46
- - `ActiveSupport::Deprecation::DeprecatedConstantProxy.new`
47
- - `assert_deprecated`
48
- - `assert_not_deprecated`
49
- - `collect_deprecations`
50
-
51
- *Rafael Mendonça França*
52
-
53
- * Remove deprecated `ActiveSupport::Deprecation` delegation to instance.
54
-
55
- *Rafael Mendonça França*
56
-
57
- * Remove deprecated `SafeBuffer#clone_empty`.
58
-
59
- *Rafael Mendonça França*
60
-
61
- * Remove deprecated `#to_default_s` from `Array`, `Date`, `DateTime` and `Time`.
62
-
63
- *Rafael Mendonça França*
64
-
65
- * Remove deprecated support to passing `Dalli::Client` instances to `MemCacheStore`.
66
-
67
- *Rafael Mendonça França*
68
-
69
- * Remove deprecated `config.active_support.use_rfc4122_namespaced_uuids`.
70
-
71
- *Rafael Mendonça França*
72
-
73
- * Remove deprecated `config.active_support.remove_deprecated_time_with_zone_name`.
74
-
75
- *Rafael Mendonça França*
76
-
77
- * Remove deprecated `config.active_support.disable_to_s_conversion`.
78
-
79
- *Rafael Mendonça França*
80
-
81
- * Remove deprecated support to bolding log text with positional boolean in `ActiveSupport::LogSubscriber#color`.
82
-
83
- *Rafael Mendonça França*
84
-
85
- * Remove deprecated constants `ActiveSupport::LogSubscriber::CLEAR` and `ActiveSupport::LogSubscriber::BOLD`.
86
-
87
- *Rafael Mendonça França*
88
-
89
- * Remove deprecated support for `config.active_support.cache_format_version = 6.1`.
90
-
91
- *Rafael Mendonça França*
92
-
93
- * Remove deprecated `:pool_size` and `:pool_timeout` options for the cache storage.
94
-
95
- *Rafael Mendonça França*
96
-
97
- * Warn on tests without assertions.
98
-
99
- `ActiveSupport::TestCase` now warns when tests do not run any assertions.
100
- This is helpful in detecting broken tests that do not perform intended assertions.
5
+ *Adam Renberg Tamm*
101
6
 
102
- *fatkodima*
7
+ * Print test names when running `rails test -v` for parallel tests.
103
8
 
104
- * Support `hexBinary` type in `ActiveSupport::XmlMini`.
9
+ *John Hawthorn*, *Abeid Ahmed*
105
10
 
106
- *heka1024*
11
+ * Deprecate `Benchmark.ms` core extension.
107
12
 
108
- * Deprecate `ActiveSupport::ProxyObject` in favor of Ruby's built-in `BasicObject`.
13
+ The `benchmark` gem will become bundled in Ruby 3.5
109
14
 
110
15
  *Earlopain*
111
16
 
112
- * `stub_const` now accepts a `exists: false` parameter to allow stubbing missing constants.
17
+ * `ActiveSupport::TimeWithZone#inspect` now uses ISO 8601 style time like `Time#inspect`
113
18
 
114
- *Jean Boussier*
19
+ *John Hawthorn*
115
20
 
116
- * Make `ActiveSupport::BacktraceCleaner` copy filters and silencers on dup and clone.
21
+ * `ActiveSupport::ErrorReporter#report` now assigns a backtrace to unraised exceptions.
117
22
 
118
- Previously the copy would still share the internal silencers and filters array,
119
- causing state to leak.
23
+ Previously reporting an un-raised exception would result in an error report without
24
+ a backtrace. Now it automatically generates one.
120
25
 
121
26
  *Jean Boussier*
122
27
 
123
- * Updating Astana with Western Kazakhstan TZInfo identifier.
124
-
125
- *Damian Nelson*
126
-
127
- * Add filename support for `ActiveSupport::Logger.logger_outputs_to?`.
128
-
129
- ```ruby
130
- logger = Logger.new('/var/log/rails.log')
131
- ActiveSupport::Logger.logger_outputs_to?(logger, '/var/log/rails.log')
132
- ```
133
-
134
- *Christian Schmidt*
135
-
136
- * Include `IPAddr#prefix` when serializing an `IPAddr` using the
137
- `ActiveSupport::MessagePack` serializer.
138
-
139
- This change is backward and forward compatible — old payloads can
140
- still be read, and new payloads will be readable by older versions of Rails.
141
-
142
- *Taiki Komaba*
143
-
144
- * Add `default:` support for `ActiveSupport::CurrentAttributes.attribute`.
145
-
146
- ```ruby
147
- class Current < ActiveSupport::CurrentAttributes
148
- attribute :counter, default: 0
149
- end
150
- ```
151
-
152
- *Sean Doyle*
28
+ * Add `escape_html_entities` option to `ActiveSupport::JSON.encode`.
153
29
 
154
- * Yield instance to `Object#with` block.
30
+ This allows for overriding the global configuration found at
31
+ `ActiveSupport.escape_html_entities_in_json` for specific calls to `to_json`.
155
32
 
33
+ This should be usable from controllers in the following manner:
156
34
  ```ruby
157
- client.with(timeout: 5_000) do |c|
158
- c.get("/commits")
159
- end
160
- ```
161
-
162
- *Sean Doyle*
163
-
164
- * Use logical core count instead of physical core count to determine the
165
- default number of workers when parallelizing tests.
166
-
167
- *Jonathan Hefner*
168
-
169
- * Fix `Time.now/DateTime.now/Date.today` to return results in a system timezone after `#travel_to`.
170
-
171
- There is a bug in the current implementation of #travel_to:
172
- it remembers a timezone of its argument, and all stubbed methods start
173
- returning results in that remembered timezone. However, the expected
174
- behavior is to return results in a system timezone.
175
-
176
- *Aleksei Chernenkov*
177
-
178
- * Add `ErrorReported#unexpected` to report precondition violations.
179
-
180
- For example:
181
-
182
- ```ruby
183
- def edit
184
- if published?
185
- Rails.error.unexpected("[BUG] Attempting to edit a published article, that shouldn't be possible")
186
- return false
35
+ class MyController < ApplicationController
36
+ def index
37
+ render json: { hello: "world" }, escape_html_entities: false
187
38
  end
188
- # ...
189
39
  end
190
40
  ```
191
41
 
192
- The above will raise an error in development and test, but only report the error in production.
193
-
194
- *Jean Boussier*
195
-
196
- * Make the order of read_multi and write_multi notifications for `Cache::Store#fetch_multi` operations match the order they are executed in.
197
-
198
- *Adam Renberg Tamm*
199
-
200
- * Make return values of `Cache::Store#write` consistent.
201
-
202
- The return value was not specified before. Now it returns `true` on a successful write,
203
- `nil` if there was an error talking to the cache backend, and `false` if the write failed
204
- for another reason (e.g. the key already exists and `unless_exist: true` was passed).
42
+ *Nigel Baillie*
205
43
 
206
- *Sander Verdonschot*
44
+ * Raise when using key which can't respond to `#to_sym` in `EncryptedConfiguration`.
207
45
 
208
- * Fix logged cache keys not always matching actual key used by cache action.
46
+ As is the case when trying to use an Integer or Float as a key, which is unsupported.
209
47
 
210
- *Hartley McGuire*
48
+ *zzak*
211
49
 
212
- * Improve error messages of `assert_changes` and `assert_no_changes`.
50
+ * Deprecate addition and since between two `Time` and `ActiveSupport::TimeWithZone`.
213
51
 
214
- `assert_changes` error messages now display objects with `.inspect` to make it easier
215
- to differentiate nil from empty strings, strings from symbols, etc.
216
- `assert_no_changes` error messages now surface the actual value.
52
+ 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.
217
53
 
218
- *pcreux*
54
+ *Nick Schwaderer*
219
55
 
220
- * Fix `#to_fs(:human_size)` to correctly work with negative numbers.
221
-
222
- *Earlopain*
56
+ * Support rfc2822 format for Time#to_fs & Date#to_fs.
223
57
 
224
- * Fix `BroadcastLogger#dup` so that it duplicates the logger's `broadcasts`.
58
+ *Akshay Birajdar*
225
59
 
226
- *Andrew Novoselac*
60
+ * Optimize load time for `Railtie#initialize_i18n`. Filter `I18n.load_path`s passed to the file watcher to only those
61
+ under `Rails.root`. Previously the watcher would grab all available locales, including those in gems
62
+ which do not require a watcher because they won't change.
227
63
 
228
- * Fix issue where `bootstrap.rb` overwrites the `level` of a `BroadcastLogger`'s `broadcasts`.
64
+ *Nick Schwaderer*
229
65
 
230
- *Andrew Novoselac*
66
+ * Add a `filter` option to `in_order_of` to prioritize certain values in the sorting without filtering the results
67
+ by these values.
231
68
 
232
- * Fix compatibility with the `semantic_logger` gem.
69
+ *Igor Depolli*
233
70
 
234
- The `semantic_logger` gem doesn't behave exactly like stdlib logger in that
235
- `SemanticLogger#level` returns a Symbol while stdlib `Logger#level` returns an Integer.
71
+ * Improve error message when using `assert_difference` or `assert_changes` with a
72
+ proc by printing the proc's source code (MRI only).
236
73
 
237
- This caused the various `LogSubscriber` classes in Rails to break when assigned a
238
- `SemanticLogger` instance.
74
+ *Richard Böhme*, *Jean Boussier*
239
75
 
240
- *Jean Boussier*, *ojab*
76
+ * 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`.
241
77
 
242
- * Fix MemoryStore to prevent race conditions when incrementing or decrementing.
78
+ *Jason Kim*, *John Hawthorn*
243
79
 
244
- *Pierre Jambet*
80
+ * Align instrumentation `payload[:key]` in ActiveSupport::Cache to follow the same pattern, with namespaced and normalized keys.
245
81
 
246
- * Implement `HashWithIndifferentAccess#to_proc`.
82
+ *Frederik Erbs Spang Thomsen*
247
83
 
248
- Previously, calling `#to_proc` on `HashWithIndifferentAccess` object used inherited `#to_proc`
249
- method from the `Hash` class, which was not able to access values using indifferent keys.
84
+ * Fix `travel_to` to set usec 0 when `with_usec` is `false` and the given argument String or DateTime.
250
85
 
251
- *fatkodima*
86
+ *mopp*
252
87
 
253
- Please check [7-1-stable](https://github.com/rails/rails/blob/7-1-stable/activesupport/CHANGELOG.md) for previous changes.
88
+ 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.start_with?(root) ? line.from(root.size) : line } # strip the Rails.root prefix
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.ms { result = options[:silence] ? logger.silence(&block) : yield }
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
@@ -113,33 +113,33 @@ module ActiveSupport
113
113
  dispatch { |logger| logger.<<(message) }
114
114
  end
115
115
 
116
- def add(*args, &block)
117
- dispatch { |logger| logger.add(*args, &block) }
116
+ def add(...)
117
+ dispatch { |logger| logger.add(...) }
118
118
  end
119
119
  alias_method :log, :add
120
120
 
121
- def debug(*args, &block)
122
- dispatch { |logger| logger.debug(*args, &block) }
121
+ def debug(...)
122
+ dispatch { |logger| logger.debug(...) }
123
123
  end
124
124
 
125
- def info(*args, &block)
126
- dispatch { |logger| logger.info(*args, &block) }
125
+ def info(...)
126
+ dispatch { |logger| logger.info(...) }
127
127
  end
128
128
 
129
- def warn(*args, &block)
130
- dispatch { |logger| logger.warn(*args, &block) }
129
+ def warn(...)
130
+ dispatch { |logger| logger.warn(...) }
131
131
  end
132
132
 
133
- def error(*args, &block)
134
- dispatch { |logger| logger.error(*args, &block) }
133
+ def error(...)
134
+ dispatch { |logger| logger.error(...) }
135
135
  end
136
136
 
137
- def fatal(*args, &block)
138
- dispatch { |logger| logger.fatal(*args, &block) }
137
+ def fatal(...)
138
+ dispatch { |logger| logger.fatal(...) }
139
139
  end
140
140
 
141
- def unknown(*args, &block)
142
- dispatch { |logger| logger.unknown(*args, &block) }
141
+ def unknown(...)
142
+ dispatch { |logger| logger.unknown(...) }
143
143
  end
144
144
 
145
145
  def formatter=(formatter)
@@ -58,7 +58,12 @@ module ActiveSupport
58
58
  # cache.increment("baz") # => 6
59
59
  #
60
60
  def increment(name, amount = 1, options = nil)
61
- modify_value(name, amount, options)
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
- modify_value(name, -amount, options)
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
- modify_value(name, amount, options)
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
- modify_value(name, -amount, options)
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
- instrument_multi(:read_multi, names, options) do |payload|
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
@@ -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, names, options do |payload|
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, hash, options do |payload|
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, names, options do |payload|
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
@@ -675,7 +677,7 @@ module ActiveSupport
675
677
  options = merged_options(options)
676
678
  key = normalize_key(name, options)
677
679
 
678
- instrument(:delete, key) do
680
+ instrument(:delete, key, options) do
679
681
  delete_entry(key, **options)
680
682
  end
681
683
  end
@@ -690,7 +692,7 @@ module ActiveSupport
690
692
  options = merged_options(options)
691
693
  names.map! { |key| normalize_key(key, options) }
692
694
 
693
- instrument_multi :delete_multi, names do
695
+ instrument_multi(:delete_multi, names, options) do
694
696
  delete_multi_entries(names, **options)
695
697
  end
696
698
  end
@@ -943,9 +945,12 @@ module ActiveSupport
943
945
  #
944
946
  # namespace_key 'foo', namespace: -> { 'cache' }
945
947
  # # => 'cache:foo'
946
- def namespace_key(key, options = nil)
947
- options = merged_options(options)
948
- namespace = options[:namespace]
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
@@ -1,6 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require "thread"
4
3
  require "monitor"
5
4
 
6
5
  module ActiveSupport