activesupport 7.2.1 → 8.0.0.beta1

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.
Files changed (47) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +45 -215
  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 +7 -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 +4 -4
  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/number_helper.rb +22 -0
  37. data/lib/active_support/railtie.rb +4 -0
  38. data/lib/active_support/tagged_logging.rb +5 -0
  39. data/lib/active_support/testing/assertions.rb +72 -21
  40. data/lib/active_support/testing/isolation.rb +2 -2
  41. data/lib/active_support/testing/parallelization/server.rb +3 -0
  42. data/lib/active_support/testing/strict_warnings.rb +3 -0
  43. data/lib/active_support/testing/time_helpers.rb +2 -1
  44. data/lib/active_support/time_with_zone.rb +21 -12
  45. data/lib/active_support/values/time_zone.rb +11 -9
  46. data/lib/active_support.rb +10 -2
  47. metadata +40 -10
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: f87ceb32cd8ca6e8edc650d3951112271df9849a1a6d03e2637c55f33d9dcde3
4
- data.tar.gz: 17fa74b2c99d9d3b27a28be44da050cf1363c474083bee2be7a8e2330ad4134f
3
+ metadata.gz: 492cd4c9d2ec59d97060d7949b3b68badc089d97ea467a30a0e6614d65e69c21
4
+ data.tar.gz: 98af51f7ec102b694fbd17f636cdf942b965a9a845561f05b1569b07efc56747
5
5
  SHA512:
6
- metadata.gz: 325172ee84f0822ac38da2fff3c8c078efb4cc27684e0cb22865197e62f6dbe412a41e59fb6e1b46788772e6f8381e57c5b973f322bcbd66e1cb3ec7970f4a43
7
- data.tar.gz: ce7f3de0f2438f5df87040d5019f4d95625657072065d7f60f05eaf072db9bde8d35b6ce54eddb3f0fc1f715b75065484e2c3cc02bbae401cdbbc4d479e99c26
6
+ metadata.gz: b720480df1c4117bf85c0f9066f7015dc750ca1279bba4c07a66a429effa06101adab40eda21f76c6d14ee1c57d46b6aff5cffd494e0e55d18600fe764c9d0e5
7
+ data.tar.gz: 13d40213e5c9720bda46e71d696a6f011547ca95ade865061df922cc9abd5adfbf6a0daa651e0732314dfb67faf3c9ad3fde39bb3490f4e3fd7577fb24b8221b
data/CHANGELOG.md CHANGED
@@ -1,258 +1,88 @@
1
- ## Rails 7.2.1 (August 22, 2024) ##
1
+ ## Rails 8.0.0.beta1 (September 26, 2024) ##
2
2
 
3
- * No changes.
3
+ * Include options when instrumenting `ActiveSupport::Cache::Store#delete` and `ActiveSupport::Cache::Store#delete_multi`.
4
4
 
5
+ *Adam Renberg Tamm*
5
6
 
6
- ## Rails 7.2.0 (August 09, 2024) ##
7
-
8
- * Fix `delegate_missing_to allow_nil: true` when called with implict self
9
-
10
- ```ruby
11
- class Person
12
- delegate_missing_to :address, allow_nil: true
13
-
14
- def address
15
- nil
16
- end
17
-
18
- def berliner?
19
- city == "Berlin"
20
- end
21
- end
22
-
23
- Person.new.city # => nil
24
- Person.new.berliner? # undefined local variable or method `city' for an instance of Person (NameError)
25
- ```
26
-
27
- *Jean Boussier*
28
-
29
- * Add `logger` as a dependency since it is a bundled gem candidate for Ruby 3.5
30
-
31
- *Earlopain*
32
-
33
- * Define `Digest::UUID.nil_uuid`, which returns the so-called nil UUID.
34
-
35
- *Xavier Noria*
36
-
37
- * Support `duration` type in `ActiveSupport::XmlMini`.
38
-
39
- *heka1024*
40
-
41
- * Remove deprecated `ActiveSupport::Notifications::Event#children` and `ActiveSupport::Notifications::Event#parent_of?`.
42
-
43
- *Rafael Mendonça França*
44
-
45
- * Remove deprecated support to call the following methods without passing a deprecator:
46
-
47
- - `deprecate`
48
- - `deprecate_constant`
49
- - `ActiveSupport::Deprecation::DeprecatedObjectProxy.new`
50
- - `ActiveSupport::Deprecation::DeprecatedInstanceVariableProxy.new`
51
- - `ActiveSupport::Deprecation::DeprecatedConstantProxy.new`
52
- - `assert_deprecated`
53
- - `assert_not_deprecated`
54
- - `collect_deprecations`
55
-
56
- *Rafael Mendonça França*
57
-
58
- * Remove deprecated `ActiveSupport::Deprecation` delegation to instance.
59
-
60
- *Rafael Mendonça França*
61
-
62
- * Remove deprecated `SafeBuffer#clone_empty`.
63
-
64
- *Rafael Mendonça França*
65
-
66
- * Remove deprecated `#to_default_s` from `Array`, `Date`, `DateTime` and `Time`.
67
-
68
- *Rafael Mendonça França*
69
-
70
- * Remove deprecated support to passing `Dalli::Client` instances to `MemCacheStore`.
71
-
72
- *Rafael Mendonça França*
73
-
74
- * Remove deprecated `config.active_support.use_rfc4122_namespaced_uuids`.
75
-
76
- *Rafael Mendonça França*
77
-
78
- * Remove deprecated `config.active_support.remove_deprecated_time_with_zone_name`.
79
-
80
- *Rafael Mendonça França*
81
-
82
- * Remove deprecated `config.active_support.disable_to_s_conversion`.
83
-
84
- *Rafael Mendonça França*
85
-
86
- * Remove deprecated support to bolding log text with positional boolean in `ActiveSupport::LogSubscriber#color`.
87
-
88
- *Rafael Mendonça França*
89
-
90
- * Remove deprecated constants `ActiveSupport::LogSubscriber::CLEAR` and `ActiveSupport::LogSubscriber::BOLD`.
91
-
92
- *Rafael Mendonça França*
93
-
94
- * Remove deprecated support for `config.active_support.cache_format_version = 6.1`.
95
-
96
- *Rafael Mendonça França*
97
-
98
- * Remove deprecated `:pool_size` and `:pool_timeout` options for the cache storage.
99
-
100
- *Rafael Mendonça França*
101
-
102
- * Warn on tests without assertions.
103
-
104
- `ActiveSupport::TestCase` now warns when tests do not run any assertions.
105
- This is helpful in detecting broken tests that do not perform intended assertions.
106
-
107
- *fatkodima*
7
+ * Print test names when running `rails test -v` for parallel tests.
108
8
 
109
- * Support `hexBinary` type in `ActiveSupport::XmlMini`.
9
+ *John Hawthorn*, *Abeid Ahmed*
110
10
 
111
- *heka1024*
11
+ * Deprecate `Benchmark.ms` core extension.
112
12
 
113
- * Deprecate `ActiveSupport::ProxyObject` in favor of Ruby's built-in `BasicObject`.
13
+ The `benchmark` gem will become bundled in Ruby 3.5
114
14
 
115
15
  *Earlopain*
116
16
 
117
- * `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`
118
18
 
119
- *Jean Boussier*
19
+ *John Hawthorn*
120
20
 
121
- * Make `ActiveSupport::BacktraceCleaner` copy filters and silencers on dup and clone.
21
+ * `ActiveSupport::ErrorReporter#report` now assigns a backtrace to unraised exceptions.
122
22
 
123
- Previously the copy would still share the internal silencers and filters array,
124
- 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.
125
25
 
126
26
  *Jean Boussier*
127
27
 
128
- * Updating Astana with Western Kazakhstan TZInfo identifier.
129
-
130
- *Damian Nelson*
131
-
132
- * Add filename support for `ActiveSupport::Logger.logger_outputs_to?`.
133
-
134
- ```ruby
135
- logger = Logger.new('/var/log/rails.log')
136
- ActiveSupport::Logger.logger_outputs_to?(logger, '/var/log/rails.log')
137
- ```
138
-
139
- *Christian Schmidt*
140
-
141
- * Include `IPAddr#prefix` when serializing an `IPAddr` using the
142
- `ActiveSupport::MessagePack` serializer.
143
-
144
- This change is backward and forward compatible — old payloads can
145
- still be read, and new payloads will be readable by older versions of Rails.
146
-
147
- *Taiki Komaba*
148
-
149
- * Add `default:` support for `ActiveSupport::CurrentAttributes.attribute`.
150
-
151
- ```ruby
152
- class Current < ActiveSupport::CurrentAttributes
153
- attribute :counter, default: 0
154
- end
155
- ```
156
-
157
- *Sean Doyle*
28
+ * Add `escape_html_entities` option to `ActiveSupport::JSON.encode`.
158
29
 
159
- * 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`.
160
32
 
33
+ This should be usable from controllers in the following manner:
161
34
  ```ruby
162
- client.with(timeout: 5_000) do |c|
163
- c.get("/commits")
164
- end
165
- ```
166
-
167
- *Sean Doyle*
168
-
169
- * Use logical core count instead of physical core count to determine the
170
- default number of workers when parallelizing tests.
171
-
172
- *Jonathan Hefner*
173
-
174
- * Fix `Time.now/DateTime.now/Date.today` to return results in a system timezone after `#travel_to`.
175
-
176
- There is a bug in the current implementation of #travel_to:
177
- it remembers a timezone of its argument, and all stubbed methods start
178
- returning results in that remembered timezone. However, the expected
179
- behavior is to return results in a system timezone.
180
-
181
- *Aleksei Chernenkov*
182
-
183
- * Add `ErrorReported#unexpected` to report precondition violations.
184
-
185
- For example:
186
-
187
- ```ruby
188
- def edit
189
- if published?
190
- Rails.error.unexpected("[BUG] Attempting to edit a published article, that shouldn't be possible")
191
- return false
35
+ class MyController < ApplicationController
36
+ def index
37
+ render json: { hello: "world" }, escape_html_entities: false
192
38
  end
193
- # ...
194
39
  end
195
40
  ```
196
41
 
197
- The above will raise an error in development and test, but only report the error in production.
198
-
199
- *Jean Boussier*
200
-
201
- * Make the order of read_multi and write_multi notifications for `Cache::Store#fetch_multi` operations match the order they are executed in.
202
-
203
- *Adam Renberg Tamm*
204
-
205
- * Make return values of `Cache::Store#write` consistent.
206
-
207
- The return value was not specified before. Now it returns `true` on a successful write,
208
- `nil` if there was an error talking to the cache backend, and `false` if the write failed
209
- for another reason (e.g. the key already exists and `unless_exist: true` was passed).
42
+ *Nigel Baillie*
210
43
 
211
- *Sander Verdonschot*
44
+ * Raise when using key which can't respond to `#to_sym` in `EncryptedConfiguration`.
212
45
 
213
- * 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.
214
47
 
215
- *Hartley McGuire*
48
+ *zzak*
216
49
 
217
- * Improve error messages of `assert_changes` and `assert_no_changes`.
50
+ * Deprecate addition and since between two `Time` and `ActiveSupport::TimeWithZone`.
218
51
 
219
- `assert_changes` error messages now display objects with `.inspect` to make it easier
220
- to differentiate nil from empty strings, strings from symbols, etc.
221
- `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.
222
53
 
223
- *pcreux*
54
+ *Nick Schwaderer*
224
55
 
225
- * Fix `#to_fs(:human_size)` to correctly work with negative numbers.
226
-
227
- *Earlopain*
56
+ * Support rfc2822 format for Time#to_fs & Date#to_fs.
228
57
 
229
- * Fix `BroadcastLogger#dup` so that it duplicates the logger's `broadcasts`.
58
+ *Akshay Birajdar*
230
59
 
231
- *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.
232
63
 
233
- * Fix issue where `bootstrap.rb` overwrites the `level` of a `BroadcastLogger`'s `broadcasts`.
64
+ *Nick Schwaderer*
234
65
 
235
- *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.
236
68
 
237
- * Fix compatibility with the `semantic_logger` gem.
69
+ *Igor Depolli*
238
70
 
239
- The `semantic_logger` gem doesn't behave exactly like stdlib logger in that
240
- `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).
241
73
 
242
- This caused the various `LogSubscriber` classes in Rails to break when assigned a
243
- `SemanticLogger` instance.
74
+ *Richard Böhme*, *Jean Boussier*
244
75
 
245
- *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`.
246
77
 
247
- * Fix MemoryStore to prevent race conditions when incrementing or decrementing.
78
+ *Jason Kim*, *John Hawthorn*
248
79
 
249
- *Pierre Jambet*
80
+ * Align instrumentation `payload[:key]` in ActiveSupport::Cache to follow the same pattern, with namespaced and normalized keys.
250
81
 
251
- * Implement `HashWithIndifferentAccess#to_proc`.
82
+ *Frederik Erbs Spang Thomsen*
252
83
 
253
- Previously, calling `#to_proc` on `HashWithIndifferentAccess` object used inherited `#to_proc`
254
- 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.
255
85
 
256
- *fatkodima*
86
+ *mopp*
257
87
 
258
- 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