RubyGems - activesupport - Versions diffs - 7.2.1 → 8.0.0 - Mend

activesupport 7.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.

Files changed (58) hide show

checksums.yaml +4 -4
data/CHANGELOG.md +67 -189
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/broadcast_logger.rb +14 -14
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 +18 -13
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 +20 -12
data/lib/active_support/core_ext/string/multibyte.rb +1 -1
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/core_ext/time/zones.rb +1 -1
data/lib/active_support/current_attributes.rb +7 -3
data/lib/active_support/delegation.rb +0 -2
data/lib/active_support/dependencies.rb +0 -1
data/lib/active_support/deprecation/reporting.rb +2 -21
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/encrypted_file.rb +1 -1
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 +3 -3
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 +2 -2
data/lib/active_support/testing/parallelization/server.rb +3 -0
data/lib/active_support/testing/strict_warnings.rb +3 -0
data/lib/active_support/testing/time_helpers.rb +2 -1
data/lib/active_support/time_with_zone.rb +22 -13
data/lib/active_support/values/time_zone.rb +17 -15
data/lib/active_support.rb +10 -3
metadata +40 -11
data/lib/active_support/proxy_object.rb +0 -20

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f87ceb32cd8ca6e8edc650d3951112271df9849a1a6d03e2637c55f33d9dcde3
-  data.tar.gz: 17fa74b2c99d9d3b27a28be44da050cf1363c474083bee2be7a8e2330ad4134f
+  metadata.gz: 8d43c6938627c736f544a0a9f0af6f8a538e8dd6c147ff51e368946c4d57d7c4
+  data.tar.gz: 6e57c37c1735b475cb5a2d96c0af1ed0f6f2f2d41a776743bc97cc0b61e4b778
 SHA512:
-  metadata.gz: 325172ee84f0822ac38da2fff3c8c078efb4cc27684e0cb22865197e62f6dbe412a41e59fb6e1b46788772e6f8381e57c5b973f322bcbd66e1cb3ec7970f4a43
-  data.tar.gz: ce7f3de0f2438f5df87040d5019f4d95625657072065d7f60f05eaf072db9bde8d35b6ce54eddb3f0fc1f715b75065484e2c3cc02bbae401cdbbc4d479e99c26
+  metadata.gz: c01d045e73ab8eb2c3a3494180490bb5fa39a082343d5445593bd591333cd95cca84ad0d79668afe6603389ac675c8cbe3f98a0bb5612bfb5a3ec8d77fa26d9b
+  data.tar.gz: b5a92add8986b7bb4f73a5e7c4ff82525dfcfb4a1ca0bcedb6364a338f88cb5b411595c1704d508d68ad0ed2df850788132a2270e4f1421d672b1394c49e8306

data/CHANGELOG.md CHANGED Viewed

@@ -1,258 +1,136 @@
-## Rails 7.2.1 (August 22, 2024) ##
+## Rails 8.0.0 (November 07, 2024) ##
 *   No changes.
-## Rails 7.2.0 (August 09, 2024) ##
+## Rails 8.0.0.rc2 (October 30, 2024) ##
-*   Fix `delegate_missing_to allow_nil: true` when called with implict self
-    ```ruby
-    class Person
-      delegate_missing_to :address, allow_nil: true
-      def address
-        nil
-      end
-      def berliner?
-        city == "Berlin"
-      end
-    end
-    Person.new.city # => nil
-    Person.new.berliner? # undefined local variable or method `city' for an instance of Person (NameError)
-    ```
-    *Jean Boussier*
-*   Add `logger` as a dependency since it is a bundled gem candidate for Ruby 3.5
-    *Earlopain*
-*   Define `Digest::UUID.nil_uuid`, which returns the so-called nil UUID.
-    *Xavier Noria*
-*   Support `duration` type in `ActiveSupport::XmlMini`.
-    *heka1024*
-*   Remove deprecated `ActiveSupport::Notifications::Event#children` and  `ActiveSupport::Notifications::Event#parent_of?`.
-    *Rafael Mendonça França*
-*   Remove deprecated support to call the following methods without passing a deprecator:
-    - `deprecate`
-    - `deprecate_constant`
-    - `ActiveSupport::Deprecation::DeprecatedObjectProxy.new`
-    - `ActiveSupport::Deprecation::DeprecatedInstanceVariableProxy.new`
-    - `ActiveSupport::Deprecation::DeprecatedConstantProxy.new`
-    - `assert_deprecated`
-    - `assert_not_deprecated`
-    - `collect_deprecations`
-    *Rafael Mendonça França*
-*   Remove deprecated `ActiveSupport::Deprecation` delegation to instance.
-    *Rafael Mendonça França*
-*   Remove deprecated `SafeBuffer#clone_empty`.
-    *Rafael Mendonça França*
-*   Remove deprecated `#to_default_s` from `Array`, `Date`, `DateTime` and `Time`.
-    *Rafael Mendonça França*
-*   Remove deprecated support to passing `Dalli::Client` instances to `MemCacheStore`.
-    *Rafael Mendonça França*
-*   Remove deprecated `config.active_support.use_rfc4122_namespaced_uuids`.
-    *Rafael Mendonça França*
-*   Remove deprecated `config.active_support.remove_deprecated_time_with_zone_name`.
-    *Rafael Mendonça França*
-*   Remove deprecated `config.active_support.disable_to_s_conversion`.
-    *Rafael Mendonça França*
+*   No changes.
-*   Remove deprecated support to bolding log text with positional boolean in `ActiveSupport::LogSubscriber#color`.
-    *Rafael Mendonça França*
+## Rails 8.0.0.rc1 (October 19, 2024) ##
-*   Remove deprecated constants `ActiveSupport::LogSubscriber::CLEAR` and `ActiveSupport::LogSubscriber::BOLD`.
+*   Remove deprecated support to passing an array of strings to `ActiveSupport::Deprecation#warn`.
     *Rafael Mendonça França*
-*   Remove deprecated support for `config.active_support.cache_format_version = 6.1`.
+*   Remove deprecated support to setting `attr_internal_naming_format` with a `@` prefix.
     *Rafael Mendonça França*
-*   Remove deprecated `:pool_size` and `:pool_timeout` options for the cache storage.
+*   Remove deprecated `ActiveSupport::ProxyObject`.
     *Rafael Mendonça França*
-*   Warn on tests without assertions.
-    `ActiveSupport::TestCase` now warns when tests do not run any assertions.
-    This is helpful in detecting broken tests that do not perform intended assertions.
-    *fatkodima*
-*   Support `hexBinary` type in `ActiveSupport::XmlMini`.
+*   Don't execute i18n watcher on boot. It shouldn't catch any file changes initially,
+    and unnecessarily slows down boot of applications with lots of translations.
-    *heka1024*
+    *Gannon McGibbon*, *David Stosik*
-*   Deprecate `ActiveSupport::ProxyObject` in favor of Ruby's built-in `BasicObject`.
+*   Fix `ActiveSupport::HashWithIndifferentAccess#stringify_keys` to stringify all keys not just symbols.
-    *Earlopain*
-*   `stub_const` now accepts a `exists: false` parameter to allow stubbing missing constants.
-    *Jean Boussier*
-*   Make `ActiveSupport::BacktraceCleaner` copy filters and silencers on dup and clone.
+    Previously:
-    Previously the copy would still share the internal silencers and filters array,
-    causing state to leak.
-    *Jean Boussier*
-*   Updating Astana with Western Kazakhstan TZInfo identifier.
-    *Damian Nelson*
+    ```ruby
+    { 1 => 2 }.with_indifferent_access.stringify_keys[1] # => 2
+    ```
-*   Add filename support for `ActiveSupport::Logger.logger_outputs_to?`.
+    After this change:
     ```ruby
-    logger = Logger.new('/var/log/rails.log')
-    ActiveSupport::Logger.logger_outputs_to?(logger, '/var/log/rails.log')
+    { 1 => 2 }.with_indifferent_access.stringify_keys["1"] # => 2
     ```
-    *Christian Schmidt*
+    This change can be seen as a bug fix, but since it behaved like this for a very long time, we're deciding
+    to not backport the fix and to make the change in a major release.
-*   Include `IPAddr#prefix` when serializing an `IPAddr` using the
-    `ActiveSupport::MessagePack` serializer.
+    *Jean Boussier*
-    This change is backward and forward compatible — old payloads can
-    still be read, and new payloads will be readable by older versions of Rails.
+## Rails 8.0.0.beta1 (September 26, 2024) ##
-    *Taiki Komaba*
+*   Include options when instrumenting `ActiveSupport::Cache::Store#delete` and `ActiveSupport::Cache::Store#delete_multi`.
-*   Add `default:` support for `ActiveSupport::CurrentAttributes.attribute`.
+    *Adam Renberg Tamm*
-    ```ruby
-    class Current < ActiveSupport::CurrentAttributes
-      attribute :counter, default: 0
-    end
-    ```
+*   Print test names when running `rails test -v` for parallel tests.
-    *Sean Doyle*
+    *John Hawthorn*, *Abeid Ahmed*
-*   Yield instance to `Object#with` block.
+*   Deprecate `Benchmark.ms` core extension.
-    ```ruby
-    client.with(timeout: 5_000) do |c|
-      c.get("/commits")
-    end
-    ```
+    The `benchmark` gem will become bundled in Ruby 3.5
-    *Sean Doyle*
+    *Earlopain*
-*   Use logical core count instead of physical core count to determine the
-    default number of workers when parallelizing tests.
+*   `ActiveSupport::TimeWithZone#inspect` now uses ISO 8601 style time like `Time#inspect`
-    *Jonathan Hefner*
+    *John Hawthorn*
-*   Fix `Time.now/DateTime.now/Date.today` to return results in a system timezone after `#travel_to`.
+*   `ActiveSupport::ErrorReporter#report` now assigns a backtrace to unraised exceptions.
-    There is a bug in the current implementation of #travel_to:
-    it remembers a timezone of its argument, and all stubbed methods start
-    returning results in that remembered timezone. However, the expected
-    behavior is to return results in a system timezone.
+    Previously reporting an un-raised exception would result in an error report without
+    a backtrace. Now it automatically generates one.
-    *Aleksei Chernenkov*
+    *Jean Boussier*
-*   Add `ErrorReported#unexpected` to report precondition violations.
+*   Add `escape_html_entities` option to `ActiveSupport::JSON.encode`.
-    For example:
+    This allows for overriding the global configuration found at
+    `ActiveSupport.escape_html_entities_in_json` for specific calls to `to_json`.
+    This should be usable from controllers in the following manner:
     ```ruby
-    def edit
-      if published?
-        Rails.error.unexpected("[BUG] Attempting to edit a published article, that shouldn't be possible")
-        return false
+    class MyController < ApplicationController
+      def index
+        render json: { hello: "world" }, escape_html_entities: false
       end
-      # ...
     end
     ```
-    The above will raise an error in development and test, but only report the error in production.
-    *Jean Boussier*
-*   Make the order of read_multi and write_multi notifications for `Cache::Store#fetch_multi` operations match the order they are executed in.
-    *Adam Renberg Tamm*
-*   Make return values of `Cache::Store#write` consistent.
-    The return value was not specified before. Now it returns `true` on a successful write,
-    `nil` if there was an error talking to the cache backend, and `false` if the write failed
-    for another reason (e.g. the key already exists and `unless_exist: true` was passed).
+    *Nigel Baillie*
-    *Sander Verdonschot*
+*   Raise when using key which can't respond to `#to_sym` in `EncryptedConfiguration`.
-*   Fix logged cache keys not always matching actual key used by cache action.
+    As is the case when trying to use an Integer or Float as a key, which is unsupported.
-    *Hartley McGuire*
+    *zzak*
-*   Improve error messages of `assert_changes` and `assert_no_changes`.
+*   Deprecate addition and since between two `Time` and `ActiveSupport::TimeWithZone`.
-    `assert_changes` error messages now display objects with `.inspect` to make it easier
-    to differentiate nil from empty strings, strings from symbols, etc.
-    `assert_no_changes` error messages now surface the actual value.
+    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.
-    *pcreux*
+    *Nick Schwaderer*
-*   Fix `#to_fs(:human_size)` to correctly work with negative numbers.
-    *Earlopain*
+*   Support rfc2822 format for Time#to_fs & Date#to_fs.
-*   Fix `BroadcastLogger#dup` so that it duplicates the logger's `broadcasts`.
+    *Akshay Birajdar*
-    *Andrew Novoselac*
+*   Optimize load time for `Railtie#initialize_i18n`. Filter `I18n.load_path`s passed to the file watcher to only those
+    under `Rails.root`. Previously the watcher would grab all available locales, including those in gems
+    which do not require a watcher because they won't change.
-*   Fix issue where `bootstrap.rb` overwrites the `level` of a `BroadcastLogger`'s `broadcasts`.
+    *Nick Schwaderer*
-    *Andrew Novoselac*
+*   Add a `filter` option to `in_order_of` to prioritize certain values in the sorting without filtering the results
+    by these values.
-*   Fix compatibility with the `semantic_logger` gem.
+    *Igor Depolli*
-    The `semantic_logger` gem doesn't behave exactly like stdlib logger in that
-    `SemanticLogger#level` returns a Symbol while stdlib `Logger#level` returns an Integer.
+*   Improve error message when using `assert_difference` or `assert_changes` with a
+    proc by printing the proc's source code (MRI only).
-    This caused the various `LogSubscriber` classes in Rails to break when assigned a
-    `SemanticLogger` instance.
+    *Richard Böhme*, *Jean Boussier*
-    *Jean Boussier*, *ojab*
+*   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`.
-*   Fix MemoryStore to prevent race conditions when incrementing or decrementing.
+    *Jason Kim*, *John Hawthorn*
-    *Pierre Jambet*
+*   Align instrumentation `payload[:key]` in ActiveSupport::Cache to follow the same pattern, with namespaced and normalized keys.
-*   Implement `HashWithIndifferentAccess#to_proc`.
+    *Frederik Erbs Spang Thomsen*
-    Previously, calling `#to_proc` on `HashWithIndifferentAccess` object used inherited `#to_proc`
-    method from the `Hash` class, which was not able to access values using indifferent keys.
+*   Fix `travel_to` to set usec 0 when `with_usec` is `false` and the given argument String or DateTime.
-    *fatkodima*
+    *mopp*
-Please check [7-1-stable](https://github.com/rails/rails/blob/7-1-stable/activesupport/CHANGELOG.md) for previous changes.
+Please check [7-2-stable](https://github.com/rails/rails/blob/7-2-stable/activesupport/CHANGELOG.md) for previous changes.

data/lib/active_support/backtrace_cleaner.rb CHANGED Viewed

@@ -18,7 +18,7 @@ module ActiveSupport
   #
   #   bc = ActiveSupport::BacktraceCleaner.new
   #   root = "#{Rails.root}/"
-  #   bc.add_filter   { |line| line.start_with?(root) ? line.from(root.size) : line } # strip the Rails.root prefix
+  #   bc.add_filter   { |line| line.delete_prefix(root) } # strip the Rails.root prefix
   #   bc.add_silencer { |line| /puma|rubygems/.match?(line) } # skip any lines from puma or rubygems
   #   bc.clean(exception.backtrace) # perform the cleanup
   #

data/lib/active_support/benchmark.rb ADDED Viewed

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+module ActiveSupport
+  module Benchmark # :nodoc:
+    # Benchmark realtime in the specified time unit. By default,
+    # the returned unit is in seconds.
+    #
+    #   ActiveSupport::Benchmark.realtime { sleep 0.1 }
+    #   # => 0.10007
+    #
+    #   ActiveSupport::Benchmark.realtime(:float_millisecond) { sleep 0.1 }
+    #   # => 100.07
+    #
+    # `unit` can be any of the values accepted by Ruby's `Process.clock_gettime`.
+    def self.realtime(unit = :float_second, &block)
+      time_start = Process.clock_gettime(Process::CLOCK_MONOTONIC, unit)
+      yield
+      Process.clock_gettime(Process::CLOCK_MONOTONIC, unit) - time_start
+    end
+  end
+end

data/lib/active_support/benchmarkable.rb CHANGED Viewed

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
-require "active_support/core_ext/benchmark"
 require "active_support/core_ext/hash/keys"
 module ActiveSupport
@@ -41,7 +40,9 @@ module ActiveSupport
         options[:level] ||= :info
         result = nil
-        ms = Benchmark.ms { result = options[:silence] ? logger.silence(&block) : yield }
+        ms = ActiveSupport::Benchmark.realtime(:float_millisecond) do
+          result = options[:silence] ? logger.silence(&block) : yield
+        end
         logger.public_send(options[:level], "%s (%.1fms)" % [ message, ms ])
         result
       else

data/lib/active_support/broadcast_logger.rb CHANGED Viewed

@@ -113,33 +113,33 @@ module ActiveSupport
       dispatch { |logger| logger.<<(message) }
     end
-    def add(*args, &block)
-      dispatch { |logger| logger.add(*args, &block) }
+    def add(...)
+      dispatch { |logger| logger.add(...) }
     end
     alias_method :log, :add
-    def debug(*args, &block)
-      dispatch { |logger| logger.debug(*args, &block) }
+    def debug(...)
+      dispatch { |logger| logger.debug(...) }
     end
-    def info(*args, &block)
-      dispatch { |logger| logger.info(*args, &block) }
+    def info(...)
+      dispatch { |logger| logger.info(...) }
     end
-    def warn(*args, &block)
-      dispatch { |logger| logger.warn(*args, &block) }
+    def warn(...)
+      dispatch { |logger| logger.warn(...) }
     end
-    def error(*args, &block)
-      dispatch { |logger| logger.error(*args, &block) }
+    def error(...)
+      dispatch { |logger| logger.error(...) }
     end
-    def fatal(*args, &block)
-      dispatch { |logger| logger.fatal(*args, &block) }
+    def fatal(...)
+      dispatch { |logger| logger.fatal(...) }
     end
-    def unknown(*args, &block)
-      dispatch { |logger| logger.unknown(*args, &block) }
+    def unknown(...)
+      dispatch { |logger| logger.unknown(...) }
     end
     def formatter=(formatter)

data/lib/active_support/cache/file_store.rb CHANGED Viewed

@@ -58,7 +58,12 @@ module ActiveSupport
       #   cache.increment("baz") # => 6
       #
       def increment(name, amount = 1, options = nil)
-        modify_value(name, amount, options)
+        options = merged_options(options)
+        key = normalize_key(name, options)
+        instrument(:increment, key, amount: amount) do
+          modify_value(name, amount, options)
+        end
       end
       # Decrement a cached integer value. Returns the updated value.
@@ -73,7 +78,12 @@ module ActiveSupport
       #   cache.decrement("baz") # => 4
       #
       def decrement(name, amount = 1, options = nil)
-        modify_value(name, -amount, options)
+        options = merged_options(options)
+        key = normalize_key(name, options)
+        instrument(:decrement, key, amount: amount) do
+          modify_value(name, -amount, options)
+        end
       end
       def delete_matched(matcher, options = nil)

data/lib/active_support/cache/memory_store.rb CHANGED Viewed

@@ -147,7 +147,9 @@ module ActiveSupport
       #   cache.increment("baz") # => 6
       #
       def increment(name, amount = 1, options = nil)
-        modify_value(name, amount, options)
+        instrument(:increment, name, amount: amount) do
+          modify_value(name, amount, options)
+        end
       end
       # Decrement a cached integer value. Returns the updated value.
@@ -162,7 +164,9 @@ module ActiveSupport
       #   cache.decrement("baz") # => 4
       #
       def decrement(name, amount = 1, options = nil)
-        modify_value(name, -amount, options)
+        instrument(:decrement, name, amount: amount) do
+          modify_value(name, -amount, options)
+        end
       end
       # Deletes cache entries if the cache key matches a given pattern.

data/lib/active_support/cache/redis_cache_store.rb CHANGED Viewed

@@ -173,9 +173,12 @@ module ActiveSupport
         return {} if names.empty?
         options = names.extract_options!
-        instrument_multi(:read_multi, names, options) do |payload|
+        options = merged_options(options)
+        keys    = names.map { |name| normalize_key(name, options) }
+        instrument_multi(:read_multi, keys, options) do |payload|
           read_multi_entries(names, **options).tap do |results|
-            payload[:hits] = results.keys
+            payload[:hits] = results.keys.map { |name| normalize_key(name, options) }
           end
         end
       end

data/lib/active_support/cache.rb CHANGED Viewed

@@ -286,7 +286,7 @@ module ActiveSupport
       #   <tt>coder: nil</tt> to avoid the overhead of safeguarding against
       #   mutation.
       #
-      #   The +:coder+ option is mutally exclusive with the +:serializer+ and
+      #   The +:coder+ option is mutually exclusive with the +:serializer+ and
       #   +:compressor+ options. Specifying them together will raise an
       #   +ArgumentError+.
       #
@@ -419,7 +419,7 @@ module ActiveSupport
       #     t1.join
       #
       #     p val_1 # => "new value 1"
-      #     p val_2 # => "oritinal value"
+      #     p val_2 # => "original value"
       #     p cache.fetch("foo") # => "new value 1"
       #
       #     # The entry requires 3 seconds to expire (expires_in + race_condition_ttl)
@@ -538,10 +538,11 @@ module ActiveSupport
         options = names.extract_options!
         options = merged_options(options)
+        keys    = names.map { |name| normalize_key(name, options) }
-        instrument_multi :read_multi, names, options do |payload|
+        instrument_multi :read_multi, keys, options do |payload|
           read_multi_entries(names, **options, event: payload).tap do |results|
-            payload[:hits] = results.keys
+            payload[:hits] = results.keys.map { |name| normalize_key(name, options) }
           end
         end
       end
@@ -551,8 +552,9 @@ module ActiveSupport
         return hash if hash.empty?
         options = merged_options(options)
+        normalized_hash = hash.transform_keys { |key| normalize_key(key, options) }
-        instrument_multi :write_multi, hash, options do |payload|
+        instrument_multi :write_multi, normalized_hash, options do |payload|
           entries = hash.each_with_object({}) do |(name, value), memo|
             memo[normalize_key(name, options)] = Entry.new(value, **options.merge(version: normalize_version(name, options)))
           end
@@ -596,9 +598,9 @@ module ActiveSupport
         options = names.extract_options!
         options = merged_options(options)
+        keys    = names.map { |name| normalize_key(name, options) }
         writes  = {}
-        ordered = instrument_multi :read_multi, names, options do |payload|
+        ordered = instrument_multi :read_multi, keys, options do |payload|
           if options[:force]
             reads = {}
           else
@@ -610,7 +612,7 @@ module ActiveSupport
           end
           writes.compact! if options[:skip_nil]
-          payload[:hits] = reads.keys
+          payload[:hits] = reads.keys.map { |name| normalize_key(name, options) }
           payload[:super_operation] = :fetch_multi
           ordered
@@ -675,7 +677,7 @@ module ActiveSupport
         options = merged_options(options)
         key = normalize_key(name, options)
-        instrument(:delete, key) do
+        instrument(:delete, key, options) do
           delete_entry(key, **options)
         end
       end
@@ -690,7 +692,7 @@ module ActiveSupport
         options = merged_options(options)
         names.map! { |key| normalize_key(key, options) }
-        instrument_multi :delete_multi, names do
+        instrument_multi(:delete_multi, names, options) do
           delete_multi_entries(names, **options)
         end
       end
@@ -943,9 +945,12 @@ module ActiveSupport
         #
         #   namespace_key 'foo', namespace: -> { 'cache' }
         #   # => 'cache:foo'
-        def namespace_key(key, options = nil)
-          options = merged_options(options)
-          namespace = options[:namespace]
+        def namespace_key(key, call_options = nil)
+          namespace = if call_options&.key?(:namespace)
+            call_options[:namespace]
+          else
+            options[:namespace]
+          end
           if namespace.respond_to?(:call)
             namespace = namespace.call

data/lib/active_support/callbacks.rb CHANGED Viewed

@@ -6,7 +6,6 @@ require "active_support/core_ext/array/extract_options"
 require "active_support/core_ext/class/attribute"
 require "active_support/core_ext/string/filters"
 require "active_support/core_ext/object/blank"
-require "thread"
 module ActiveSupport
   # = Active Support \Callbacks
@@ -67,7 +66,7 @@ module ActiveSupport
     included do
       extend ActiveSupport::DescendantsTracker
-      class_attribute :__callbacks, instance_writer: false, default: {}
+      class_attribute :__callbacks, instance_writer: false, instance_predicate: false, default: {}
     end
     CALLBACK_FILTER_TYPES = [:before, :after, :around].freeze

data/lib/active_support/class_attribute.rb ADDED Viewed

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+module ActiveSupport
+  module ClassAttribute # :nodoc:
+    class << self
+      def redefine(owner, name, value)
+        if owner.singleton_class?
+          owner.redefine_method(name) { value }
+          owner.send(:public, name)
+        end
+        owner.redefine_singleton_method(name) { value }
+        owner.singleton_class.send(:public, name)
+        owner.redefine_singleton_method("#{name}=") do |new_value|
+          if owner.equal?(self)
+            value = new_value
+          else
+            ::ActiveSupport::ClassAttribute.redefine(self, name, new_value)
+          end
+        end
+        owner.singleton_class.send(:public, "#{name}=")
+      end
+    end
+  end
+end