activesupport 7.2.2 → 8.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a3996eac7e9551da7dd4bfc64cd93c049f3cb044fba118c088fc7ae18098565
-  data.tar.gz: fc6777f0b3cc247cfb3d3bbedabec020937ef4bf226318d6f775bef99b43b162
+  metadata.gz: e4fc487978c855f357de44a7915c8d6d21161a4731bfe676294c1a39f91083d8
+  data.tar.gz: e0c7577dabe5346cdcaddef70cb94d58d636df12bef5f7b96df8c062f1831d08
 SHA512:
-  metadata.gz: 1c2e709540796368a539085facf517fd7bd02fb30438a87dd4508fff29e15fe58632b8d62351238998b95e775ec12491591efbd8ac0edb89f513c7a3dad1ff47
-  data.tar.gz: 1be932867f259f0ee991d3b74a8f8e186f75b7bf7a279bde9235ac6e59cc4bae7f2c61feff5a19c5582afcca0bd4bd4468f25cf55b07693d24586a5f05723f90
+  metadata.gz: 2fc772fb80613c40405114a4cf7a806fe77766ee128c7c308de18eedd73fa6581f95dd072cdf38b13947d91d9df560620b8126b199577b293f2095c4c6d0481e
+  data.tar.gz: 8aa7beb41005f500c9d4d1287f2f11724f7178aaa9953c089d4afb5523060136da33771f3ac0ee5edf8dc91afcb9bd31272eaeef650c9238c670c6f0c82b18cb

data/CHANGELOG.md

@@ -1,279 +1,157 @@
-## Rails 7.2.2 (October 30, 2024) ##
+## Rails 8.0.1 (December 13, 2024) ##
 
-*   Include options when instrumenting `ActiveSupport::Cache::Store#delete` and `ActiveSupport::Cache::Store#delete_multi`.
-
-    *Adam Renberg Tamm*
+*   Fix a bug in `ERB::Util.tokenize` that causes incorrect tokenization when ERB tags are preceeded by multibyte characters.
 
-*   Print test names when running `rails test -v` for parallel tests.
+    *Martin Emde*
 
-    *John Hawthorn*, *Abeid Ahmed*
+*   Restore the ability to decorate methods generated by `class_attribute`.
 
+    It always has been complicated to use Module#prepend or an alias method chain
+    to decorate methods defined by `class_attribute`, but became even harder in 8.0.
 
-## Rails 7.2.1.2 (October 23, 2024) ##
+    This capability is now supported for both reader and writer methods.
 
-*   No changes.
+    *Jean Boussier*
 
 
-## Rails 7.2.1.1 (October 15, 2024) ##
+## Rails 8.0.0.1 (December 10, 2024) ##
 
 *   No changes.
 
 
-## Rails 7.2.1 (August 22, 2024) ##
+## Rails 8.0.0 (November 07, 2024) ##
 
 *   No changes.
 
 
-## Rails 7.2.0 (August 09, 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`.
+## Rails 8.0.0.rc2 (October 30, 2024) ##
 
-    *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.
+*   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.
 
-    `ActiveSupport::TestCase` now warns when tests do not run any assertions.
-    This is helpful in detecting broken tests that do not perform intended assertions.
+    *Gannon McGibbon*, *David Stosik*
 
-    *fatkodima*
+*   Fix `ActiveSupport::HashWithIndifferentAccess#stringify_keys` to stringify all keys not just symbols.
 
-*   Support `hexBinary` type in `ActiveSupport::XmlMini`.
+    Previously:
 
-    *heka1024*
-
-*   Deprecate `ActiveSupport::ProxyObject` in favor of Ruby's built-in `BasicObject`.
-
-    *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 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.
+    *Nigel Baillie*
 
-    *Adam Renberg Tamm*
+*   Raise when using key which can't respond to `#to_sym` in `EncryptedConfiguration`.
 
-*   Make return values of `Cache::Store#write` consistent.
+    As is the case when trying to use an Integer or Float as a key, which is unsupported.
 
-    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).
+    *zzak*
 
-    *Sander Verdonschot*
+*   Deprecate addition and since between two `Time` and `ActiveSupport::TimeWithZone`.
 
-*   Fix logged cache keys not always matching actual key used by cache action.
+    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.
 
-    *Hartley McGuire*
+    *Nick Schwaderer*
 
-*   Improve error messages of `assert_changes` and `assert_no_changes`.
-
-    `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.
-
-    *pcreux*
-
-*   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

@@ -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

@@ -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

@@ -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/cache/file_store.rb

@@ -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

@@ -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

@@ -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

@@ -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
@@ -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

@@ -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
@@ -934,7 +933,10 @@ module ActiveSupport
           end
 
           def set_callbacks(name, callbacks) # :nodoc:
-            unless singleton_class.method_defined?(:__callbacks, false)
+            # HACK: We're making assumption on how `class_attribute` is implemented
+            # to save constantly duping the callback hash. If this desync with class_attribute
+            # we'll lose the optimization, but won't cause an actual behavior bug.
+            unless singleton_class.private_method_defined?(:__class_attr__callbacks, false)
               self.__callbacks = __callbacks.dup
             end
             self.__callbacks[name.to_sym] = callbacks

data/lib/active_support/class_attribute.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module ActiveSupport
+  module ClassAttribute # :nodoc:
+    class << self
+      def redefine(owner, name, namespaced_name, value)
+        if owner.singleton_class?
+          if owner.attached_object.is_a?(Module)
+            redefine_method(owner, namespaced_name, private: true) { value }
+          else
+            redefine_method(owner, name) { value }
+          end
+        end
+
+        redefine_method(owner.singleton_class, namespaced_name, private: true) { value }
+
+        redefine_method(owner.singleton_class, "#{namespaced_name}=", private: true) do |new_value|
+          if owner.equal?(self)
+            value = new_value
+          else
+            ::ActiveSupport::ClassAttribute.redefine(self, name, namespaced_name, new_value)
+          end
+        end
+      end
+
+      def redefine_method(owner, name, private: false, &block)
+        owner.silence_redefinition_of_method(name)
+        owner.define_method(name, &block)
+        owner.send(:private, name) if private
+      end
+    end
+  end
+end

data/lib/active_support/code_generator.rb

@@ -55,6 +55,11 @@ module ActiveSupport
       @path = path
       @line = line
       @namespaces = Hash.new { |h, k| h[k] = MethodSet.new(k) }
+      @sources = []
+    end
+
+    def class_eval
+      yield @sources
     end
 
     def define_cached_method(canonical_name, namespace:, as: nil, &block)
@@ -65,6 +70,10 @@ module ActiveSupport
       @namespaces.each_value do |method_set|
         method_set.apply(@owner, @path, @line - 1)
       end
+
+      unless @sources.empty?
+        @owner.class_eval("# frozen_string_literal: true\n" + @sources.join(";"), @path, @line - 1)
+      end
     end
   end
 end

data/lib/active_support/concurrency/share_lock.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "thread"
 require "monitor"
 
 module ActiveSupport