RubyGems - activesupport - Versions diffs - 7.2.2 → 8.0.0.beta1 - Mend

activesupport 7.2.2 → 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 (43) hide show

checksums.yaml +4 -4
data/CHANGELOG.md +41 -232
data/lib/active_support/backtrace_cleaner.rb +1 -1
data/lib/active_support/benchmark.rb +21 -0
data/lib/active_support/benchmarkable.rb +3 -2
data/lib/active_support/cache/file_store.rb +12 -2
data/lib/active_support/cache/memory_store.rb +6 -2
data/lib/active_support/cache/redis_cache_store.rb +5 -2
data/lib/active_support/cache.rb +14 -9
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/object/json.rb +18 -14
data/lib/active_support/core_ext/string/multibyte.rb +1 -1
data/lib/active_support/core_ext/time/calculations.rb +14 -2
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/deprecation.rb +1 -1
data/lib/active_support/encrypted_configuration.rb +20 -2
data/lib/active_support/error_reporter.rb +25 -1
data/lib/active_support/gem_version.rb +4 -4
data/lib/active_support/hash_with_indifferent_access.rb +16 -12
data/lib/active_support/i18n_railtie.rb +19 -10
data/lib/active_support/isolated_execution_state.rb +0 -1
data/lib/active_support/json/encoding.rb +2 -2
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 +72 -21
data/lib/active_support/testing/isolation.rb +0 -2
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 -2
metadata +22 -6

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a3996eac7e9551da7dd4bfc64cd93c049f3cb044fba118c088fc7ae18098565
-  data.tar.gz: fc6777f0b3cc247cfb3d3bbedabec020937ef4bf226318d6f775bef99b43b162
+  metadata.gz: 492cd4c9d2ec59d97060d7949b3b68badc089d97ea467a30a0e6614d65e69c21
+  data.tar.gz: 98af51f7ec102b694fbd17f636cdf942b965a9a845561f05b1569b07efc56747
 SHA512:
-  metadata.gz: 1c2e709540796368a539085facf517fd7bd02fb30438a87dd4508fff29e15fe58632b8d62351238998b95e775ec12491591efbd8ac0edb89f513c7a3dad1ff47
-  data.tar.gz: 1be932867f259f0ee991d3b74a8f8e186f75b7bf7a279bde9235ac6e59cc4bae7f2c61feff5a19c5582afcca0bd4bd4468f25cf55b07693d24586a5f05723f90
+  metadata.gz: b720480df1c4117bf85c0f9066f7015dc750ca1279bba4c07a66a429effa06101adab40eda21f76c6d14ee1c57d46b6aff5cffd494e0e55d18600fe764c9d0e5
+  data.tar.gz: 13d40213e5c9720bda46e71d696a6f011547ca95ade865061df922cc9abd5adfbf6a0daa651e0732314dfb67faf3c9ad3fde39bb3490f4e3fd7577fb24b8221b

data/CHANGELOG.md CHANGED Viewed

@@ -1,4 +1,4 @@
-## Rails 7.2.2 (October 30, 2024) ##
+## Rails 8.0.0.beta1 (September 26, 2024) ##
 *   Include options when instrumenting `ActiveSupport::Cache::Store#delete` and `ActiveSupport::Cache::Store#delete_multi`.
@@ -8,272 +8,81 @@
     *John Hawthorn*, *Abeid Ahmed*
+*   Deprecate `Benchmark.ms` core extension.
-## Rails 7.2.1.2 (October 23, 2024) ##
-*   No changes.
-## Rails 7.2.1.1 (October 15, 2024) ##
-*   No changes.
-## Rails 7.2.1 (August 22, 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`.
-    *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*
-*   Remove deprecated support to bolding log text with positional boolean in `ActiveSupport::LogSubscriber#color`.
-    *Rafael Mendonça França*
-*   Remove deprecated constants `ActiveSupport::LogSubscriber::CLEAR` and `ActiveSupport::LogSubscriber::BOLD`.
-    *Rafael Mendonça França*
-*   Remove deprecated support for `config.active_support.cache_format_version = 6.1`.
-    *Rafael Mendonça França*
-*   Remove deprecated `:pool_size` and `:pool_timeout` options for the cache storage.
-    *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`.
-    *heka1024*
-*   Deprecate `ActiveSupport::ProxyObject` in favor of Ruby's built-in `BasicObject`.
+    The `benchmark` gem will become bundled in Ruby 3.5
     *Earlopain*
-*   `stub_const` now accepts a `exists: false` parameter to allow stubbing missing constants.
+*   `ActiveSupport::TimeWithZone#inspect` now uses ISO 8601 style time like `Time#inspect`
-    *Jean Boussier*
+    *John Hawthorn*
-*   Make `ActiveSupport::BacktraceCleaner` copy filters and silencers on dup and clone.
+*   `ActiveSupport::ErrorReporter#report` now assigns a backtrace to unraised exceptions.
-    Previously the copy would still share the internal silencers and filters array,
-    causing state to leak.
+    Previously reporting an un-raised exception would result in an error report without
+    a backtrace. Now it automatically generates one.
     *Jean Boussier*
-*   Updating Astana with Western Kazakhstan TZInfo identifier.
+*   Add `escape_html_entities` option to `ActiveSupport::JSON.encode`.
-    *Damian Nelson*
-*   Add filename support for `ActiveSupport::Logger.logger_outputs_to?`.
-    ```ruby
-    logger = Logger.new('/var/log/rails.log')
-    ActiveSupport::Logger.logger_outputs_to?(logger, '/var/log/rails.log')
-    ```
-    *Christian Schmidt*
-*   Include `IPAddr#prefix` when serializing an `IPAddr` using the
-    `ActiveSupport::MessagePack` serializer.
-    This change is backward and forward compatible — old payloads can
-    still be read, and new payloads will be readable by older versions of Rails.
-    *Taiki Komaba*
-*   Add `default:` support for `ActiveSupport::CurrentAttributes.attribute`.
+    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
-    class Current < ActiveSupport::CurrentAttributes
-      attribute :counter, default: 0
-    end
-    ```
-    *Sean Doyle*
-*   Yield instance to `Object#with` block.
-    ```ruby
-    client.with(timeout: 5_000) do |c|
-      c.get("/commits")
-    end
-    ```
-    *Sean Doyle*
-*   Use logical core count instead of physical core count to determine the
-    default number of workers when parallelizing tests.
-    *Jonathan Hefner*
-*   Fix `Time.now/DateTime.now/Date.today` to return results in a system timezone after `#travel_to`.
-    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.
-    *Aleksei Chernenkov*
-*   Add `ErrorReported#unexpected` to report precondition violations.
-    For example:
-    ```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*
-*   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).
+*   Raise when using key which can't respond to `#to_sym` in `EncryptedConfiguration`.
-    *Sander Verdonschot*
+    As is the case when trying to use an Integer or Float as a key, which is unsupported.
-*   Fix logged cache keys not always matching actual key used by cache action.
+    *zzak*
-    *Hartley McGuire*
+*   Deprecate addition and since between two `Time` and `ActiveSupport::TimeWithZone`.
-*   Improve error messages of `assert_changes` and `assert_no_changes`.
+    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.
-    `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.
+    *Nick Schwaderer*
-    *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 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/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

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

data/lib/active_support/code_generator.rb CHANGED Viewed

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

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

data/lib/active_support/configuration_file.rb CHANGED Viewed

@@ -19,11 +19,20 @@ module ActiveSupport
     end
     def parse(context: nil, **options)
-      source = render(context)
-      if YAML.respond_to?(:unsafe_load)
-        YAML.unsafe_load(source, **options) || {}
+      source = @content.include?("<%") ? render(context) : @content
+      if source == @content
+        if YAML.respond_to?(:unsafe_load)
+          YAML.unsafe_load_file(@content_path, **options) || {}
+        else
+          YAML.load_file(@content_path, **options) || {}
+        end
       else
-        YAML.load(source, **options) || {}
+        if YAML.respond_to?(:unsafe_load)
+          YAML.unsafe_load(source, **options) || {}
+        else
+          YAML.load(source, **options) || {}
+        end
       end
     rescue Psych::SyntaxError => error
       raise "YAML syntax error occurred while parsing #{@content_path}. " \
@@ -33,8 +42,7 @@ module ActiveSupport
     private
       def read(content_path)
-        require "yaml"
-        require "erb"
+        require "yaml" unless defined?(YAML)
         File.read(content_path).tap do |content|
           if content.include?("\u00A0")
@@ -44,6 +52,7 @@ module ActiveSupport
       end
       def render(context)
+        require "erb" unless defined?(ERB)
         erb = ERB.new(@content).tap { |e| e.filename = @content_path }
         context ? erb.result(context) : erb.result
       end

data/lib/active_support/core_ext/benchmark.rb CHANGED Viewed

@@ -3,14 +3,11 @@
 require "benchmark"
 class << Benchmark
-  # Benchmark realtime in milliseconds.
-  #
-  #   Benchmark.realtime { User.all }
-  #   # => 8.0e-05
-  #
-  #   Benchmark.ms { User.all }
-  #   # => 0.074
-  def ms(&block)
-    1000 * realtime(&block)
+  def ms(&block) # :nodoc
+    # NOTE: Please also remove the Active Support `benchmark` dependency when removing this
+    ActiveSupport.deprecator.warn <<~TEXT
+      `Benchmark.ms` is deprecated and will be removed in Rails 8.1 without replacement.
+    TEXT
+    ActiveSupport::Benchmark.realtime(:float_millisecond, &block)
   end
 end