activesupport 7.0.0 → 7.0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa0345240163d6b0d98012c437fc988d7c6b957264b42be1c095cb759ed0b102
-  data.tar.gz: 3533cafb988ce3d2ace9b21f2a78d8bb76aeb6524ecc8b0d71743ee3af64c3c4
+  metadata.gz: 480bb0a63a96ae3fb951d8cabf2d012331916489f6c2d8a7fff8c04dfee378d5
+  data.tar.gz: 611b1c0a39cbea9edae09e3d129d0c7bff941d431cb98e1e236907929b7a4610
 SHA512:
-  metadata.gz: 5e84aa52f105e68d791fc59101c3f288c86d21a0e26eccd5b3ef9643b82205811f0116055675dffa23c22f9ef126e5c3e52b6113332fd9b3540d90e80afca6a0
-  data.tar.gz: bd68dd8c4eeebf5c956bb32e6617c2821dba0abdd344aa1f0b8e4f5f3674b1a5d1c3ea19d4b29f99222388ddeef164fcb2183c440af8bc1cab8a86e39aede24a
+  metadata.gz: 45da4b770dbca53981ffee48b8a0eac44015df8bedb4bf302ee9453479ce0ed9a8de16eeb51da2a5d35c3d19a8cafcb01910c9b6d2d70627de19092eded8aad3
+  data.tar.gz: babc18127ee0c122ccd757a25c5653737dda1d6af6059f58bcbee985113505e4b6e088c8e097684eacdb8b38c4af4d49d00c306d26711983b78d7b21bf6294d0

data/CHANGELOG.md

@@ -1,3 +1,34 @@
+## Rails 7.0.2.2 (February 11, 2022) ##
+
+*   Fix Reloader method signature to work with the new Executor signature
+
+
+## Rails 7.0.2.1 (February 11, 2022) ##
+
+*   No changes.
+
+
+## Rails 7.0.2 (February 08, 2022) ##
+
+*   Fix `ActiveSupport::EncryptedConfiguration` to be compatible with Psych 4
+
+    *Stephen Sugden*
+
+*   Improve `File.atomic_write` error handling.
+
+    *Daniel Pepper*
+
+
+## Rails 7.0.1 (January 06, 2022) ##
+
+*   Fix `Class#descendants` and `DescendantsTracker#descendants` compatibility with Ruby 3.1.
+
+    [The native `Class#descendants` was reverted prior to Ruby 3.1 release](https://bugs.ruby-lang.org/issues/14394#note-33),
+    but `Class#subclasses` was kept, breaking the feature detection.
+
+    *Jean Boussier*
+
+
 ## Rails 7.0.0 (December 15, 2021) ##
 
 *   Fix `ActiveSupport::Duration.build` to support negative values.

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2005-2021 David Heinemeier Hansson
+Copyright (c) 2005-2022 David Heinemeier Hansson
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/lib/active_support/core_ext/array/conversions.rb

@@ -87,12 +87,12 @@ class Array
   # Extends <tt>Array#to_s</tt> to convert a collection of elements into a
   # comma separated id list if <tt>:db</tt> argument is given as the format.
   #
-  # This method is aliased to <tt>to_fs</tt>.
+  # This method is aliased to <tt>to_formatted_s</tt>.
   #
-  #   Blog.all.to_formatted_s(:db)  # => "1,2,3"
-  #   Blog.none.to_formatted_s(:db) # => "null"
-  #   [1,2].to_formatted_s          # => "[1, 2]"
-  def to_formatted_s(format = :default)
+  #   Blog.all.to_fs(:db)  # => "1,2,3"
+  #   Blog.none.to_fs(:db) # => "null"
+  #   [1,2].to_fs          # => "[1, 2]"
+  def to_fs(format = :default)
     case format
     when :db
       if empty?
@@ -104,7 +104,7 @@ class Array
       to_default_s
     end
   end
-  alias_method :to_fs, :to_formatted_s
+  alias_method :to_formatted_s, :to_fs
   alias_method :to_default_s, :to_s
 
   # Returns a string that represents the array in XML by invoking +to_xml+

data/lib/active_support/core_ext/array/deprecated_conversions.rb

@@ -6,7 +6,7 @@ class Array
     case format
     when :db
       ActiveSupport::Deprecation.warn(
-        "Array#to_s(#{format.inspect}) is deprecated. Please use Array#to_formatted_s(#{format.inspect}) instead."
+        "Array#to_s(#{format.inspect}) is deprecated. Please use Array#to_fs(#{format.inspect}) instead."
       )
       if empty?
         "null"
@@ -17,7 +17,7 @@ class Array
       to_default_s
     else
       ActiveSupport::Deprecation.warn(
-        "Array#to_s(#{format.inspect}) is deprecated. Please use Array#to_formatted_s(#{format.inspect}) instead."
+        "Array#to_s(#{format.inspect}) is deprecated. Please use Array#to_fs(#{format.inspect}) instead."
       )
       to_default_s
     end

data/lib/active_support/core_ext/class/subclasses.rb

@@ -3,24 +3,30 @@
 require "active_support/ruby_features"
 
 class Class
-  # Returns an array with all classes that are < than its receiver.
-  #
-  #   class C; end
-  #   C.descendants # => []
-  #
-  #   class B < C; end
-  #   C.descendants # => [B]
-  #
-  #   class A < B; end
-  #   C.descendants # => [B, A]
-  #
-  #   class D < C; end
-  #   C.descendants # => [B, A, D]
-  def descendants
-    ObjectSpace.each_object(singleton_class).reject do |k|
-      k.singleton_class? || k == self
+  if ActiveSupport::RubyFeatures::CLASS_SUBCLASSES
+    # Returns an array with all classes that are < than its receiver.
+    #
+    #   class C; end
+    #   C.descendants # => []
+    #
+    #   class B < C; end
+    #   C.descendants # => [B]
+    #
+    #   class A < B; end
+    #   C.descendants # => [B, A]
+    #
+    #   class D < C; end
+    #   C.descendants # => [B, A, D]
+    def descendants
+      subclasses.concat(subclasses.flat_map(&:descendants))
     end
-  end unless ActiveSupport::RubyFeatures::CLASS_SUBCLASSES
+  else
+    def descendants
+      ObjectSpace.each_object(singleton_class).reject do |k|
+        k.singleton_class? || k == self
+      end
+    end
+  end
 
   # Returns an array with the direct children of +self+.
   #

data/lib/active_support/core_ext/date/conversions.rb

@@ -22,21 +22,21 @@ class Date
 
   # Convert to a formatted string. See DATE_FORMATS for predefined formats.
   #
-  # This method is aliased to <tt>to_fs</tt>.
+  # This method is aliased to <tt>to_formatted_s</tt>.
   #
   #   date = Date.new(2007, 11, 10)       # => Sat, 10 Nov 2007
   #
-  #   date.to_formatted_s(:db)            # => "2007-11-10"
   #   date.to_fs(:db)                     # => "2007-11-10"
+  #   date.to_formatted_s(:db)            # => "2007-11-10"
   #
-  #   date.to_formatted_s(:short)         # => "10 Nov"
-  #   date.to_formatted_s(:number)        # => "20071110"
-  #   date.to_formatted_s(:long)          # => "November 10, 2007"
-  #   date.to_formatted_s(:long_ordinal)  # => "November 10th, 2007"
-  #   date.to_formatted_s(:rfc822)        # => "10 Nov 2007"
-  #   date.to_formatted_s(:iso8601)       # => "2007-11-10"
+  #   date.to_fs(:short)         # => "10 Nov"
+  #   date.to_fs(:number)        # => "20071110"
+  #   date.to_fs(:long)          # => "November 10, 2007"
+  #   date.to_fs(:long_ordinal)  # => "November 10th, 2007"
+  #   date.to_fs(:rfc822)        # => "10 Nov 2007"
+  #   date.to_fs(:iso8601)       # => "2007-11-10"
   #
-  # == Adding your own date formats to to_formatted_s
+  # == Adding your own date formats to to_fs
   # You can add your own formats to the Date::DATE_FORMATS hash.
   # Use the format name as the hash key and either a strftime string
   # or Proc instance that takes a date argument as the value.
@@ -44,7 +44,7 @@ class Date
   #   # config/initializers/date_formats.rb
   #   Date::DATE_FORMATS[:month_and_year] = '%B %Y'
   #   Date::DATE_FORMATS[:short_ordinal] = ->(date) { date.strftime("%B #{date.day.ordinalize}") }
-  def to_formatted_s(format = :default)
+  def to_fs(format = :default)
     if formatter = DATE_FORMATS[format]
       if formatter.respond_to?(:call)
         formatter.call(self).to_s
@@ -55,7 +55,7 @@ class Date
       to_default_s
     end
   end
-  alias_method :to_fs, :to_formatted_s
+  alias_method :to_formatted_s, :to_fs
   alias_method :to_default_s, :to_s
 
   # Overrides the default inspect method with a human readable one, e.g., "Mon, 21 Feb 2005"

data/lib/active_support/core_ext/date/deprecated_conversions.rb

@@ -7,7 +7,7 @@ class Date
   def to_s(format = NOT_SET) # :nodoc:
     if formatter = DATE_FORMATS[format]
       ActiveSupport::Deprecation.warn(
-        "Date#to_s(#{format.inspect}) is deprecated. Please use Date#to_formatted_s(#{format.inspect}) instead."
+        "Date#to_s(#{format.inspect}) is deprecated. Please use Date#to_fs(#{format.inspect}) instead."
       )
       if formatter.respond_to?(:call)
         formatter.call(self).to_s
@@ -18,7 +18,7 @@ class Date
       to_default_s
     else
       ActiveSupport::Deprecation.warn(
-        "Date#to_s(#{format.inspect}) is deprecated. Please use Date#to_formatted_s(#{format.inspect}) instead."
+        "Date#to_s(#{format.inspect}) is deprecated. Please use Date#to_fs(#{format.inspect}) instead."
       )
       to_default_s
     end

data/lib/active_support/core_ext/date_time/conversions.rb

@@ -9,21 +9,21 @@ require "active_support/values/time_zone"
 class DateTime
   # Convert to a formatted string. See Time::DATE_FORMATS for predefined formats.
   #
-  # This method is aliased to <tt>to_fs</tt>.
+  # This method is aliased to <tt>to_formatted_s</tt>.
   #
   # === Examples
   #   datetime = DateTime.civil(2007, 12, 4, 0, 0, 0, 0)   # => Tue, 04 Dec 2007 00:00:00 +0000
   #
-  #   datetime.to_formatted_s(:db)            # => "2007-12-04 00:00:00"
-  #   datetime.to_fs(:db)                     # => "2007-12-04 00:00:00"
-  #   datetime.to_formatted_s(:number)        # => "20071204000000"
-  #   datetime.to_formatted_s(:short)         # => "04 Dec 00:00"
-  #   datetime.to_formatted_s(:long)          # => "December 04, 2007 00:00"
-  #   datetime.to_formatted_s(:long_ordinal)  # => "December 4th, 2007 00:00"
-  #   datetime.to_formatted_s(:rfc822)        # => "Tue, 04 Dec 2007 00:00:00 +0000"
-  #   datetime.to_formatted_s(:iso8601)       # => "2007-12-04T00:00:00+00:00"
+  #   datetime.to_fs(:db)            # => "2007-12-04 00:00:00"
+  #   datetime.to_formatted_s(:db)   # => "2007-12-04 00:00:00"
+  #   datetime.to_fs(:number)        # => "20071204000000"
+  #   datetime.to_fs(:short)         # => "04 Dec 00:00"
+  #   datetime.to_fs(:long)          # => "December 04, 2007 00:00"
+  #   datetime.to_fs(:long_ordinal)  # => "December 4th, 2007 00:00"
+  #   datetime.to_fs(:rfc822)        # => "Tue, 04 Dec 2007 00:00:00 +0000"
+  #   datetime.to_fs(:iso8601)       # => "2007-12-04T00:00:00+00:00"
   #
-  # == Adding your own datetime formats to to_formatted_s
+  # == Adding your own datetime formats to to_fs
   # DateTime formats are shared with Time. You can add your own to the
   # Time::DATE_FORMATS hash. Use the format name as the hash key and
   # either a strftime string or Proc instance that takes a time or
@@ -32,14 +32,14 @@ class DateTime
   #   # config/initializers/time_formats.rb
   #   Time::DATE_FORMATS[:month_and_year] = '%B %Y'
   #   Time::DATE_FORMATS[:short_ordinal] = lambda { |time| time.strftime("%B #{time.day.ordinalize}") }
-  def to_formatted_s(format = :default)
+  def to_fs(format = :default)
     if formatter = ::Time::DATE_FORMATS[format]
       formatter.respond_to?(:call) ? formatter.call(self).to_s : strftime(formatter)
     else
       to_default_s
     end
   end
-  alias_method :to_fs, :to_formatted_s
+  alias_method :to_formatted_s, :to_fs
   alias_method :to_default_s, :to_s if instance_methods(false).include?(:to_s)
 
   # Returns a formatted string of the offset from UTC, or an alternative
@@ -54,7 +54,7 @@ class DateTime
 
   # Overrides the default inspect method with a human readable one, e.g., "Mon, 21 Feb 2005 14:30:00 +0000".
   def readable_inspect
-    to_formatted_s(:rfc822)
+    to_fs(:rfc822)
   end
   alias_method :default_inspect, :inspect
   alias_method :inspect, :readable_inspect

data/lib/active_support/core_ext/date_time/deprecated_conversions.rb

@@ -7,14 +7,14 @@ class DateTime
   def to_s(format = NOT_SET) # :nodoc:
     if formatter = ::Time::DATE_FORMATS[format]
       ActiveSupport::Deprecation.warn(
-        "DateTime#to_s(#{format.inspect}) is deprecated. Please use DateTime#to_formatted_s(#{format.inspect}) instead."
+        "DateTime#to_s(#{format.inspect}) is deprecated. Please use DateTime#to_fs(#{format.inspect}) instead."
       )
       formatter.respond_to?(:call) ? formatter.call(self).to_s : strftime(formatter)
     elsif format == NOT_SET
       to_default_s
     else
       ActiveSupport::Deprecation.warn(
-        "DateTime#to_s(#{format.inspect}) is deprecated. Please use DateTime#to_formatted_s(#{format.inspect}) instead."
+        "DateTime#to_s(#{format.inspect}) is deprecated. Please use DateTime#to_fs(#{format.inspect}) instead."
       )
       to_default_s
     end

data/lib/active_support/core_ext/enumerable.rb

@@ -22,16 +22,16 @@ module Enumerable
 
   # Calculates the minimum from the extracted elements.
   #
-  # payments = [Payment.new(5), Payment.new(15), Payment.new(10)]
-  # payments.minimum(:price) # => 5
+  #   payments = [Payment.new(5), Payment.new(15), Payment.new(10)]
+  #   payments.minimum(:price) # => 5
   def minimum(key)
     map(&key).min
   end
 
   # Calculates the maximum from the extracted elements.
   #
-  # payments = [Payment.new(5), Payment.new(15), Payment.new(10)]
-  # payments.maximum(:price) # => 15
+  #   payments = [Payment.new(5), Payment.new(15), Payment.new(10)]
+  #   payments.maximum(:price) # => 15
   def maximum(key)
     map(&key).max
   end
@@ -47,13 +47,13 @@ module Enumerable
   #
   # It can also calculate the sum without the use of a block.
   #
-  #  [5, 15, 10].sum # => 30
-  #  ['foo', 'bar'].sum('') # => "foobar"
-  #  [[1, 2], [3, 1, 5]].sum([]) # => [1, 2, 3, 1, 5]
+  #   [5, 15, 10].sum # => 30
+  #   ['foo', 'bar'].sum('') # => "foobar"
+  #   [[1, 2], [3, 1, 5]].sum([]) # => [1, 2, 3, 1, 5]
   #
   # The default sum of an empty list is zero. You can override this default:
   #
-  #  [].sum(Payment.new(0)) { |i| i.amount } # => Payment.new(0)
+  #   [].sum(Payment.new(0)) { |i| i.amount } # => Payment.new(0)
   def sum(identity = nil, &block)
     if identity
       _original_sum_with_required_identity(identity, &block)
@@ -205,16 +205,16 @@ module Enumerable
   # Returns a new +Array+ without the blank items.
   # Uses Object#blank? for determining if an item is blank.
   #
-  #    [1, "", nil, 2, " ", [], {}, false, true].compact_blank
-  #    # =>  [1, 2, true]
+  #   [1, "", nil, 2, " ", [], {}, false, true].compact_blank
+  #   # =>  [1, 2, true]
   #
-  #    Set.new([nil, "", 1, 2])
-  #    # => [2, 1] (or [1, 2])
+  #   Set.new([nil, "", 1, 2])
+  #   # => [2, 1] (or [1, 2])
   #
   # When called on a +Hash+, returns a new +Hash+ without the blank values.
   #
-  #    { a: "", b: 1, c: nil, d: [], e: false, f: true }.compact_blank
-  #    #=> { b: 1, f: true }
+  #   { a: "", b: 1, c: nil, d: [], e: false, f: true }.compact_blank
+  #   # => { b: 1, f: true }
   def compact_blank
     reject(&:blank?)
   end
@@ -223,7 +223,7 @@ module Enumerable
   # objects in the original enumerable.
   #
   #   [ Person.find(5), Person.find(3), Person.find(1) ].in_order_of(:id, [ 1, 5, 3 ])
-  #   => [ Person.find(1), Person.find(5), Person.find(3) ]
+  #   # => [ Person.find(1), Person.find(5), Person.find(3) ]
   #
   # If the +series+ include keys that have no corresponding element in the Enumerable, these are ignored.
   # If the Enumerable has additional elements that aren't named in the +series+, these are not included in the result.
@@ -234,9 +234,9 @@ module Enumerable
   # Returns the sole item in the enumerable. If there are no items, or more
   # than one item, raises +Enumerable::SoleItemExpectedError+.
   #
-  #    ["x"].sole          # => "x"
-  #    Set.new.sole        # => Enumerable::SoleItemExpectedError: no item found
-  #    { a: 1, b: 2 }.sole # => Enumerable::SoleItemExpectedError: multiple items found
+  #   ["x"].sole          # => "x"
+  #   Set.new.sole        # => Enumerable::SoleItemExpectedError: no item found
+  #   { a: 1, b: 2 }.sole # => Enumerable::SoleItemExpectedError: multiple items found
   def sole
     case count
     when 1   then return first # rubocop:disable Style/RedundantReturn
@@ -255,9 +255,9 @@ class Hash
   # Removes all blank values from the +Hash+ in place and returns self.
   # Uses Object#blank? for determining if a value is blank.
   #
-  #    h = { a: "", b: 1, c: nil, d: [], e: false, f: true }
-  #    h.compact_blank!
-  #    # => { b: 1, f: true }
+  #   h = { a: "", b: 1, c: nil, d: [], e: false, f: true }
+  #   h.compact_blank!
+  #   # => { b: 1, f: true }
   def compact_blank!
     # use delete_if rather than reject! because it always returns self even if nothing changed
     delete_if { |_k, v| v.blank? }
@@ -302,9 +302,9 @@ class Array # :nodoc:
   # Removes all blank elements from the +Array+ in place and returns self.
   # Uses Object#blank? for determining if an item is blank.
   #
-  #    a = [1, "", nil, 2, " ", [], {}, false, true]
-  #    a.compact_blank!
-  #    # =>  [1, 2, true]
+  #   a = [1, "", nil, 2, " ", [], {}, false, true]
+  #   a.compact_blank!
+  #   # =>  [1, 2, true]
   def compact_blank!
     # use delete_if rather than reject! because it always returns self even if nothing changed
     delete_if(&:blank?)

data/lib/active_support/core_ext/file/atomic.rb

@@ -64,6 +64,8 @@ class File
     file_name = join(dir, basename)
     FileUtils.touch(file_name)
     stat(file_name)
+  rescue Errno::ENOENT
+    file_name = nil
   ensure
     FileUtils.rm_f(file_name) if file_name
   end

data/lib/active_support/core_ext/numeric/conversions.rb

@@ -9,7 +9,7 @@ module ActiveSupport
     # Options are provided for phone numbers, currency, percentage,
     # precision, positional notation, file size and pretty printing.
     #
-    # This method is aliased to <tt>to_fs</tt>.
+    # This method is aliased to <tt>to_formatted_s</tt>.
     #
     # ==== Options
     #
@@ -18,97 +18,97 @@ module ActiveSupport
     # ==== Examples
     #
     #  Phone Numbers:
-    #  5551234.to_formatted_s(:phone)                                     # => "555-1234"
-    #  1235551234.to_formatted_s(:phone)                                  # => "123-555-1234"
-    #  1235551234.to_formatted_s(:phone, area_code: true)                 # => "(123) 555-1234"
-    #  1235551234.to_formatted_s(:phone, delimiter: ' ')                  # => "123 555 1234"
-    #  1235551234.to_formatted_s(:phone, area_code: true, extension: 555) # => "(123) 555-1234 x 555"
-    #  1235551234.to_formatted_s(:phone, country_code: 1)                 # => "+1-123-555-1234"
-    #  1235551234.to_formatted_s(:phone, country_code: 1, extension: 1343, delimiter: '.')
+    #  5551234.to_fs(:phone)                                     # => "555-1234"
+    #  1235551234.to_fs(:phone)                                  # => "123-555-1234"
+    #  1235551234.to_fs(:phone, area_code: true)                 # => "(123) 555-1234"
+    #  1235551234.to_fs(:phone, delimiter: ' ')                  # => "123 555 1234"
+    #  1235551234.to_fs(:phone, area_code: true, extension: 555) # => "(123) 555-1234 x 555"
+    #  1235551234.to_fs(:phone, country_code: 1)                 # => "+1-123-555-1234"
+    #  1235551234.to_fs(:phone, country_code: 1, extension: 1343, delimiter: '.')
     #  # => "+1.123.555.1234 x 1343"
     #
     #  Currency:
-    #  1234567890.50.to_formatted_s(:currency)                     # => "$1,234,567,890.50"
-    #  1234567890.506.to_formatted_s(:currency)                    # => "$1,234,567,890.51"
-    #  1234567890.506.to_formatted_s(:currency, precision: 3)      # => "$1,234,567,890.506"
-    #  1234567890.506.to_formatted_s(:currency, round_mode: :down) # => "$1,234,567,890.50"
-    #  1234567890.506.to_formatted_s(:currency, locale: :fr)       # => "1 234 567 890,51 €"
-    #  -1234567890.50.to_formatted_s(:currency, negative_format: '(%u%n)')
+    #  1234567890.50.to_fs(:currency)                     # => "$1,234,567,890.50"
+    #  1234567890.506.to_fs(:currency)                    # => "$1,234,567,890.51"
+    #  1234567890.506.to_fs(:currency, precision: 3)      # => "$1,234,567,890.506"
+    #  1234567890.506.to_fs(:currency, round_mode: :down) # => "$1,234,567,890.50"
+    #  1234567890.506.to_fs(:currency, locale: :fr)       # => "1 234 567 890,51 €"
+    #  -1234567890.50.to_fs(:currency, negative_format: '(%u%n)')
     #  # => "($1,234,567,890.50)"
-    #  1234567890.50.to_formatted_s(:currency, unit: '&pound;', separator: ',', delimiter: '')
+    #  1234567890.50.to_fs(:currency, unit: '&pound;', separator: ',', delimiter: '')
     #  # => "&pound;1234567890,50"
-    #  1234567890.50.to_formatted_s(:currency, unit: '&pound;', separator: ',', delimiter: '', format: '%n %u')
+    #  1234567890.50.to_fs(:currency, unit: '&pound;', separator: ',', delimiter: '', format: '%n %u')
     #  # => "1234567890,50 &pound;"
     #
     #  Percentage:
-    #  100.to_formatted_s(:percentage)                                  # => "100.000%"
-    #  100.to_formatted_s(:percentage, precision: 0)                    # => "100%"
-    #  1000.to_formatted_s(:percentage, delimiter: '.', separator: ',') # => "1.000,000%"
-    #  302.24398923423.to_formatted_s(:percentage, precision: 5)        # => "302.24399%"
-    #  302.24398923423.to_formatted_s(:percentage, round_mode: :down)   # => "302.243%"
-    #  1000.to_formatted_s(:percentage, locale: :fr)                    # => "1 000,000%"
-    #  100.to_formatted_s(:percentage, format: '%n  %')                 # => "100.000  %"
+    #  100.to_fs(:percentage)                                  # => "100.000%"
+    #  100.to_fs(:percentage, precision: 0)                    # => "100%"
+    #  1000.to_fs(:percentage, delimiter: '.', separator: ',') # => "1.000,000%"
+    #  302.24398923423.to_fs(:percentage, precision: 5)        # => "302.24399%"
+    #  302.24398923423.to_fs(:percentage, round_mode: :down)   # => "302.243%"
+    #  1000.to_fs(:percentage, locale: :fr)                    # => "1 000,000%"
+    #  100.to_fs(:percentage, format: '%n  %')                 # => "100.000  %"
     #
     #  Delimited:
-    #  12345678.to_formatted_s(:delimited)                     # => "12,345,678"
-    #  12345678.05.to_formatted_s(:delimited)                  # => "12,345,678.05"
-    #  12345678.to_formatted_s(:delimited, delimiter: '.')     # => "12.345.678"
-    #  12345678.to_formatted_s(:delimited, delimiter: ',')     # => "12,345,678"
-    #  12345678.05.to_formatted_s(:delimited, separator: ' ')  # => "12,345,678 05"
-    #  12345678.05.to_formatted_s(:delimited, locale: :fr)     # => "12 345 678,05"
-    #  98765432.98.to_formatted_s(:delimited, delimiter: ' ', separator: ',')
+    #  12345678.to_fs(:delimited)                     # => "12,345,678"
+    #  12345678.05.to_fs(:delimited)                  # => "12,345,678.05"
+    #  12345678.to_fs(:delimited, delimiter: '.')     # => "12.345.678"
+    #  12345678.to_fs(:delimited, delimiter: ',')     # => "12,345,678"
+    #  12345678.05.to_fs(:delimited, separator: ' ')  # => "12,345,678 05"
+    #  12345678.05.to_fs(:delimited, locale: :fr)     # => "12 345 678,05"
+    #  98765432.98.to_fs(:delimited, delimiter: ' ', separator: ',')
     #  # => "98 765 432,98"
     #
     #  Rounded:
-    #  111.2345.to_formatted_s(:rounded)                                      # => "111.235"
-    #  111.2345.to_formatted_s(:rounded, precision: 2)                        # => "111.23"
-    #  111.2345.to_formatted_s(:rounded, precision: 2, round_mode: :up)       # => "111.24"
-    #  13.to_formatted_s(:rounded, precision: 5)                              # => "13.00000"
-    #  389.32314.to_formatted_s(:rounded, precision: 0)                       # => "389"
-    #  111.2345.to_formatted_s(:rounded, significant: true)                   # => "111"
-    #  111.2345.to_formatted_s(:rounded, precision: 1, significant: true)     # => "100"
-    #  13.to_formatted_s(:rounded, precision: 5, significant: true)           # => "13.000"
-    #  111.234.to_formatted_s(:rounded, locale: :fr)                          # => "111,234"
-    #  13.to_formatted_s(:rounded, precision: 5, significant: true, strip_insignificant_zeros: true)
+    #  111.2345.to_fs(:rounded)                                      # => "111.235"
+    #  111.2345.to_fs(:rounded, precision: 2)                        # => "111.23"
+    #  111.2345.to_fs(:rounded, precision: 2, round_mode: :up)       # => "111.24"
+    #  13.to_fs(:rounded, precision: 5)                              # => "13.00000"
+    #  389.32314.to_fs(:rounded, precision: 0)                       # => "389"
+    #  111.2345.to_fs(:rounded, significant: true)                   # => "111"
+    #  111.2345.to_fs(:rounded, precision: 1, significant: true)     # => "100"
+    #  13.to_fs(:rounded, precision: 5, significant: true)           # => "13.000"
+    #  111.234.to_fs(:rounded, locale: :fr)                          # => "111,234"
+    #  13.to_fs(:rounded, precision: 5, significant: true, strip_insignificant_zeros: true)
     #  # => "13"
-    #  389.32314.to_formatted_s(:rounded, precision: 4, significant: true)    # => "389.3"
-    #  1111.2345.to_formatted_s(:rounded, precision: 2, separator: ',', delimiter: '.')
+    #  389.32314.to_fs(:rounded, precision: 4, significant: true)    # => "389.3"
+    #  1111.2345.to_fs(:rounded, precision: 2, separator: ',', delimiter: '.')
     #  # => "1.111,23"
     #
     #  Human-friendly size in Bytes:
-    #  123.to_formatted_s(:human_size)                                    # => "123 Bytes"
-    #  1234.to_formatted_s(:human_size)                                   # => "1.21 KB"
-    #  12345.to_formatted_s(:human_size)                                  # => "12.1 KB"
-    #  1234567.to_formatted_s(:human_size)                                # => "1.18 MB"
-    #  1234567890.to_formatted_s(:human_size)                             # => "1.15 GB"
-    #  1234567890123.to_formatted_s(:human_size)                          # => "1.12 TB"
-    #  1234567890123456.to_formatted_s(:human_size)                       # => "1.1 PB"
-    #  1234567890123456789.to_formatted_s(:human_size)                    # => "1.07 EB"
-    #  1234567.to_formatted_s(:human_size, precision: 2)                  # => "1.2 MB"
-    #  1234567.to_formatted_s(:human_size, precision: 2, round_mode: :up) # => "1.3 MB"
-    #  483989.to_formatted_s(:human_size, precision: 2)                   # => "470 KB"
-    #  1234567.to_formatted_s(:human_size, precision: 2, separator: ',')  # => "1,2 MB"
-    #  1234567890123.to_formatted_s(:human_size, precision: 5)            # => "1.1228 TB"
-    #  524288000.to_formatted_s(:human_size, precision: 5)                # => "500 MB"
+    #  123.to_fs(:human_size)                                    # => "123 Bytes"
+    #  1234.to_fs(:human_size)                                   # => "1.21 KB"
+    #  12345.to_fs(:human_size)                                  # => "12.1 KB"
+    #  1234567.to_fs(:human_size)                                # => "1.18 MB"
+    #  1234567890.to_fs(:human_size)                             # => "1.15 GB"
+    #  1234567890123.to_fs(:human_size)                          # => "1.12 TB"
+    #  1234567890123456.to_fs(:human_size)                       # => "1.1 PB"
+    #  1234567890123456789.to_fs(:human_size)                    # => "1.07 EB"
+    #  1234567.to_fs(:human_size, precision: 2)                  # => "1.2 MB"
+    #  1234567.to_fs(:human_size, precision: 2, round_mode: :up) # => "1.3 MB"
+    #  483989.to_fs(:human_size, precision: 2)                   # => "470 KB"
+    #  1234567.to_fs(:human_size, precision: 2, separator: ',')  # => "1,2 MB"
+    #  1234567890123.to_fs(:human_size, precision: 5)            # => "1.1228 TB"
+    #  524288000.to_fs(:human_size, precision: 5)                # => "500 MB"
     #
     #  Human-friendly format:
-    #  123.to_formatted_s(:human)                                       # => "123"
-    #  1234.to_formatted_s(:human)                                      # => "1.23 Thousand"
-    #  12345.to_formatted_s(:human)                                     # => "12.3 Thousand"
-    #  1234567.to_formatted_s(:human)                                   # => "1.23 Million"
-    #  1234567890.to_formatted_s(:human)                                # => "1.23 Billion"
-    #  1234567890123.to_formatted_s(:human)                             # => "1.23 Trillion"
-    #  1234567890123456.to_formatted_s(:human)                          # => "1.23 Quadrillion"
-    #  1234567890123456789.to_formatted_s(:human)                       # => "1230 Quadrillion"
-    #  489939.to_formatted_s(:human, precision: 2)                      # => "490 Thousand"
-    #  489939.to_formatted_s(:human, precision: 2, round_mode: :down)   # => "480 Thousand"
-    #  489939.to_formatted_s(:human, precision: 4)                      # => "489.9 Thousand"
-    #  1234567.to_formatted_s(:human, precision: 4,
+    #  123.to_fs(:human)                                       # => "123"
+    #  1234.to_fs(:human)                                      # => "1.23 Thousand"
+    #  12345.to_fs(:human)                                     # => "12.3 Thousand"
+    #  1234567.to_fs(:human)                                   # => "1.23 Million"
+    #  1234567890.to_fs(:human)                                # => "1.23 Billion"
+    #  1234567890123.to_fs(:human)                             # => "1.23 Trillion"
+    #  1234567890123456.to_fs(:human)                          # => "1.23 Quadrillion"
+    #  1234567890123456789.to_fs(:human)                       # => "1230 Quadrillion"
+    #  489939.to_fs(:human, precision: 2)                      # => "490 Thousand"
+    #  489939.to_fs(:human, precision: 2, round_mode: :down)   # => "480 Thousand"
+    #  489939.to_fs(:human, precision: 4)                      # => "489.9 Thousand"
+    #  1234567.to_fs(:human, precision: 4,
     #                   significant: false)                             # => "1.2346 Million"
-    #  1234567.to_formatted_s(:human, precision: 1,
+    #  1234567.to_fs(:human, precision: 1,
     #                   separator: ',',
     #                   significant: false)                             # => "1,2 Million"
-    def to_formatted_s(format = nil, options = nil)
+    def to_fs(format = nil, options = nil)
       return to_s if format.nil?
 
       case format
@@ -134,7 +134,7 @@ module ActiveSupport
         to_s(format)
       end
     end
-    alias_method :to_fs, :to_formatted_s
+    alias_method :to_formatted_s, :to_fs
   end
 end
 

data/lib/active_support/core_ext/numeric/deprecated_conversions.rb

@@ -10,42 +10,42 @@ module ActiveSupport
         super(format)
       when :phone
         ActiveSupport::Deprecation.warn(
-          "#{self.class}#to_s(#{format.inspect}) is deprecated. Please use #{self.class}#to_formatted_s(#{format.inspect}) instead."
+          "#{self.class}#to_s(#{format.inspect}) is deprecated. Please use #{self.class}#to_fs(#{format.inspect}) instead."
         )
         ActiveSupport::NumberHelper.number_to_phone(self, options || {})
       when :currency
         ActiveSupport::Deprecation.warn(
-          "#{self.class}#to_s(#{format.inspect}) is deprecated. Please use #{self.class}#to_formatted_s(#{format.inspect}) instead."
+          "#{self.class}#to_s(#{format.inspect}) is deprecated. Please use #{self.class}#to_fs(#{format.inspect}) instead."
         )
         ActiveSupport::NumberHelper.number_to_currency(self, options || {})
       when :percentage
         ActiveSupport::Deprecation.warn(
-          "#{self.class}#to_s(#{format.inspect}) is deprecated. Please use #{self.class}#to_formatted_s(#{format.inspect}) instead."
+          "#{self.class}#to_s(#{format.inspect}) is deprecated. Please use #{self.class}#to_fs(#{format.inspect}) instead."
         )
         ActiveSupport::NumberHelper.number_to_percentage(self, options || {})
       when :delimited
         ActiveSupport::Deprecation.warn(
-          "#{self.class}#to_s(#{format.inspect}) is deprecated. Please use #{self.class}#to_formatted_s(#{format.inspect}) instead."
+          "#{self.class}#to_s(#{format.inspect}) is deprecated. Please use #{self.class}#to_fs(#{format.inspect}) instead."
         )
         ActiveSupport::NumberHelper.number_to_delimited(self, options || {})
       when :rounded
         ActiveSupport::Deprecation.warn(
-          "#{self.class}#to_s(#{format.inspect}) is deprecated. Please use #{self.class}#to_formatted_s(#{format.inspect}) instead."
+          "#{self.class}#to_s(#{format.inspect}) is deprecated. Please use #{self.class}#to_fs(#{format.inspect}) instead."
         )
         ActiveSupport::NumberHelper.number_to_rounded(self, options || {})
       when :human
         ActiveSupport::Deprecation.warn(
-          "#{self.class}#to_s(#{format.inspect}) is deprecated. Please use #{self.class}#to_formatted_s(#{format.inspect}) instead."
+          "#{self.class}#to_s(#{format.inspect}) is deprecated. Please use #{self.class}#to_fs(#{format.inspect}) instead."
         )
         ActiveSupport::NumberHelper.number_to_human(self, options || {})
       when :human_size
         ActiveSupport::Deprecation.warn(
-          "#{self.class}#to_s(#{format.inspect}) is deprecated. Please use #{self.class}#to_formatted_s(#{format.inspect}) instead."
+          "#{self.class}#to_s(#{format.inspect}) is deprecated. Please use #{self.class}#to_fs(#{format.inspect}) instead."
         )
         ActiveSupport::NumberHelper.number_to_human_size(self, options || {})
       when Symbol
         ActiveSupport::Deprecation.warn(
-          "#{self.class}#to_s(#{format.inspect}) is deprecated. Please use #{self.class}#to_formatted_s(#{format.inspect}) instead."
+          "#{self.class}#to_s(#{format.inspect}) is deprecated. Please use #{self.class}#to_fs(#{format.inspect}) instead."
         )
         super()
       else

data/lib/active_support/core_ext/object/acts_like.rb

@@ -1,11 +1,35 @@
 # frozen_string_literal: true
 
 class Object
-  # A duck-type assistant method. For example, Active Support extends Date
-  # to define an <tt>acts_like_date?</tt> method, and extends Time to define
-  # <tt>acts_like_time?</tt>. As a result, we can do <tt>x.acts_like?(:time)</tt> and
-  # <tt>x.acts_like?(:date)</tt> to do duck-type-safe comparisons, since classes that
-  # we want to act like Time simply need to define an <tt>acts_like_time?</tt> method.
+  # Provides a way to check whether some class acts like some other class based on the existence of
+  # an appropriately-named marker method.
+  #
+  # A class that provides the same interface as <tt>SomeClass</tt> may define a marker method named
+  # <tt>acts_like_some_class?</tt> to signal its compatibility to callers of
+  # <tt>acts_like?(:some_class)</tt>.
+  #
+  # For example, Active Support extends <tt>Date</tt> to define an <tt>acts_like_date?</tt> method,
+  # and extends <tt>Time</tt> to define <tt>acts_like_time?</tt>. As a result, developers can call
+  # <tt>x.acts_like?(:time)</tt> and <tt>x.acts_like?(:date)</tt> to test duck-type compatibility,
+  # and classes that are able to act like <tt>Time</tt> can also define an <tt>acts_like_time?</tt>
+  # method to interoperate.
+  #
+  # Note that the marker method is only expected to exist. It isn't called, so its body or return
+  # value are irrelevant.
+  #
+  # ==== Example: A class that provides the same interface as <tt>String</tt>
+  #
+  # This class may define:
+  #
+  #   class Stringish
+  #     def acts_like_string?
+  #     end
+  #   end
+  #
+  # Then client code can query for duck-type-safeness this way:
+  #
+  #   Stringish.new.acts_like?(:string) # => true
+  #
   def acts_like?(duck)
     case duck
     when :time

data/lib/active_support/core_ext/range/conversions.rb

@@ -7,34 +7,34 @@ module ActiveSupport
         case start
         when String then "BETWEEN '#{start}' AND '#{stop}'"
         else
-          "BETWEEN '#{start.to_formatted_s(:db)}' AND '#{stop.to_formatted_s(:db)}'"
+          "BETWEEN '#{start.to_fs(:db)}' AND '#{stop.to_fs(:db)}'"
         end
       end
     }
 
     # Convert range to a formatted string. See RANGE_FORMATS for predefined formats.
     #
-    # This method is aliased to <tt>to_fs</tt>.
+    # This method is aliased to <tt>to_formatted_s</tt>.
     #
     #   range = (1..100)           # => 1..100
     #
     #   range.to_s                 # => "1..100"
-    #   range.to_formatted_s(:db)            # => "BETWEEN '1' AND '100'"
+    #   range.to_fs(:db)            # => "BETWEEN '1' AND '100'"
     #
     # == Adding your own range formats to to_s
     # You can add your own formats to the Range::RANGE_FORMATS hash.
     # Use the format name as the hash key and a Proc instance.
     #
     #   # config/initializers/range_formats.rb
-    #   Range::RANGE_FORMATS[:short] = ->(start, stop) { "Between #{start.to_formatted_s(:db)} and #{stop.to_formatted_s(:db)}" }
-    def to_formatted_s(format = :default)
+    #   Range::RANGE_FORMATS[:short] = ->(start, stop) { "Between #{start.to_fs(:db)} and #{stop.to_fs(:db)}" }
+    def to_fs(format = :default)
       if formatter = RANGE_FORMATS[format]
         formatter.call(first, last)
       else
         to_s
       end
     end
-    alias_method :to_fs, :to_formatted_s
+    alias_method :to_formatted_s, :to_fs
   end
 end
 

data/lib/active_support/core_ext/range/deprecated_conversions.rb

@@ -6,14 +6,14 @@ module ActiveSupport
     def to_s(format = NOT_SET)
       if formatter = RangeWithFormat::RANGE_FORMATS[format]
         ActiveSupport::Deprecation.warn(
-          "Range#to_s(#{format.inspect}) is deprecated. Please use Range#to_formatted_s(#{format.inspect}) instead."
+          "Range#to_s(#{format.inspect}) is deprecated. Please use Range#to_fs(#{format.inspect}) instead."
         )
         formatter.call(first, last)
       elsif format == NOT_SET
         super()
       else
         ActiveSupport::Deprecation.warn(
-          "Range#to_s(#{format.inspect}) is deprecated. Please use Range#to_formatted_s(#{format.inspect}) instead."
+          "Range#to_s(#{format.inspect}) is deprecated. Please use Range#to_fs(#{format.inspect}) instead."
         )
         super()
       end

data/lib/active_support/core_ext/time/conversions.rb

@@ -27,22 +27,22 @@ class Time
 
   # Converts to a formatted string. See DATE_FORMATS for built-in formats.
   #
-  # This method is aliased to <tt>to_fs</tt>.
+  # This method is aliased to <tt>to_formatted_s</tt>.
   #
   #   time = Time.now                    # => 2007-01-18 06:10:17 -06:00
   #
-  #   time.to_formatted_s(:time)         # => "06:10"
   #   time.to_fs(:time)                  # => "06:10"
+  #   time.to_formatted_s(:time)         # => "06:10"
   #
-  #   time.to_formatted_s(:db)           # => "2007-01-18 06:10:17"
-  #   time.to_formatted_s(:number)       # => "20070118061017"
-  #   time.to_formatted_s(:short)        # => "18 Jan 06:10"
-  #   time.to_formatted_s(:long)         # => "January 18, 2007 06:10"
-  #   time.to_formatted_s(:long_ordinal) # => "January 18th, 2007 06:10"
-  #   time.to_formatted_s(:rfc822)       # => "Thu, 18 Jan 2007 06:10:17 -0600"
-  #   time.to_formatted_s(:iso8601)      # => "2007-01-18T06:10:17-06:00"
+  #   time.to_fs(:db)           # => "2007-01-18 06:10:17"
+  #   time.to_fs(:number)       # => "20070118061017"
+  #   time.to_fs(:short)        # => "18 Jan 06:10"
+  #   time.to_fs(:long)         # => "January 18, 2007 06:10"
+  #   time.to_fs(:long_ordinal) # => "January 18th, 2007 06:10"
+  #   time.to_fs(:rfc822)       # => "Thu, 18 Jan 2007 06:10:17 -0600"
+  #   time.to_fs(:iso8601)      # => "2007-01-18T06:10:17-06:00"
   #
-  # == Adding your own time formats to +to_formatted_s+
+  # == Adding your own time formats to +to_fs+
   # You can add your own formats to the Time::DATE_FORMATS hash.
   # Use the format name as the hash key and either a strftime string
   # or Proc instance that takes a time argument as the value.
@@ -50,7 +50,7 @@ class Time
   #   # config/initializers/time_formats.rb
   #   Time::DATE_FORMATS[:month_and_year] = '%B %Y'
   #   Time::DATE_FORMATS[:short_ordinal]  = ->(time) { time.strftime("%B #{time.day.ordinalize}") }
-  def to_formatted_s(format = :default)
+  def to_fs(format = :default)
     if formatter = DATE_FORMATS[format]
       formatter.respond_to?(:call) ? formatter.call(self).to_s : strftime(formatter)
     else
@@ -58,7 +58,7 @@ class Time
       to_default_s
     end
   end
-  alias_method :to_fs, :to_formatted_s
+  alias_method :to_formatted_s, :to_fs
   alias_method :to_default_s, :to_s
 
   # Returns a formatted string of the offset from UTC, or an alternative

data/lib/active_support/core_ext/time/deprecated_conversions.rb

@@ -7,14 +7,14 @@ class Time
   def to_s(format = NOT_SET) # :nodoc:
     if formatter = DATE_FORMATS[format]
       ActiveSupport::Deprecation.warn(
-        "Time#to_s(#{format.inspect}) is deprecated. Please use Time#to_formatted_s(#{format.inspect}) instead."
+        "Time#to_s(#{format.inspect}) is deprecated. Please use Time#to_fs(#{format.inspect}) instead."
       )
       formatter.respond_to?(:call) ? formatter.call(self).to_s : strftime(formatter)
     elsif format == NOT_SET
       to_default_s
     else
       ActiveSupport::Deprecation.warn(
-        "Time#to_s(#{format.inspect}) is deprecated. Please use Time#to_formatted_s(#{format.inspect}) instead."
+        "Time#to_s(#{format.inspect}) is deprecated. Please use Time#to_fs(#{format.inspect}) instead."
       )
       to_default_s
     end

data/lib/active_support/descendants_tracker.rb

@@ -51,7 +51,6 @@ module ActiveSupport
           unless @clear_disabled
             @clear_disabled = true
             remove_method(:subclasses)
-            remove_method(:descendants)
             @@excluded_descendants = nil
           end
         end
@@ -87,9 +86,7 @@ module ActiveSupport
       end
 
       def descendants
-        descendants = super
-        descendants.reject! { |d| @@excluded_descendants[d] }
-        descendants
+        subclasses.concat(subclasses.flat_map(&:descendants))
       end
 
       def direct_descendants

data/lib/active_support/encrypted_configuration.rb

@@ -49,7 +49,8 @@ module ActiveSupport
       end
 
       def deserialize(config)
-        YAML.load(config).presence || {}
+        doc = YAML.respond_to?(:unsafe_load) ? YAML.unsafe_load(config) : YAML.load(config)
+        doc.presence || {}
       end
   end
 end

data/lib/active_support/execution_wrapper.rb

@@ -64,18 +64,21 @@ module ActiveSupport
     # after the work has been performed.
     #
     # Where possible, prefer +wrap+.
-    def self.run!
-      if active?
-        Null
+    def self.run!(reset: false)
+      if reset
+        lost_instance = IsolatedExecutionState.delete(active_key)
+        lost_instance&.complete!
       else
-        new.tap do |instance|
-          success = nil
-          begin
-            instance.run!
-            success = true
-          ensure
-            instance.complete! unless success
-          end
+        return Null if active?
+      end
+
+      new.tap do |instance|
+        success = nil
+        begin
+          instance.run!
+          success = true
+        ensure
+          instance.complete! unless success
         end
       end
     end
@@ -105,27 +108,20 @@ module ActiveSupport
       end
     end
 
-    class << self # :nodoc:
-      attr_accessor :active
-    end
-
     def self.error_reporter
       @error_reporter ||= ActiveSupport::ErrorReporter.new
     end
 
-    def self.inherited(other) # :nodoc:
-      super
-      other.active = Concurrent::Hash.new
+    def self.active_key # :nodoc:
+      @active_key ||= :"active_execution_wrapper_#{object_id}"
     end
 
-    self.active = Concurrent::Hash.new
-
     def self.active? # :nodoc:
-      @active[IsolatedExecutionState.unique_id]
+      IsolatedExecutionState.key?(active_key)
     end
 
     def run! # :nodoc:
-      self.class.active[IsolatedExecutionState.unique_id] = true
+      IsolatedExecutionState[self.class.active_key] = self
       run
     end
 
@@ -140,7 +136,7 @@ module ActiveSupport
     def complete!
       complete
     ensure
-      self.class.active.delete(IsolatedExecutionState.unique_id)
+      IsolatedExecutionState.delete(self.class.active_key)
     end
 
     def complete # :nodoc:

data/lib/active_support/gem_version.rb

@@ -9,8 +9,8 @@ module ActiveSupport
   module VERSION
     MAJOR = 7
     MINOR = 0
-    TINY  = 0
-    PRE   = nil
+    TINY  = 2
+    PRE   = "2"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/active_support/isolated_execution_state.rb

@@ -37,6 +37,14 @@ module ActiveSupport
         current[key] = value
       end
 
+      def key?(key)
+        current.key?(key)
+      end
+
+      def delete(key)
+        current.delete(key)
+      end
+
       def clear
         current.clear
       end

data/lib/active_support/reloader.rb

@@ -58,7 +58,7 @@ module ActiveSupport
       prepare!
     end
 
-    def self.run! # :nodoc:
+    def self.run!(reset: false) # :nodoc:
       if check!
         super
       else

data/lib/active_support/time_with_zone.rb

@@ -33,7 +33,7 @@ module ActiveSupport
   #   t.dst?                                # => true
   #   t.utc_offset                          # => -14400
   #   t.zone                                # => "EDT"
-  #   t.to_formatted_s(:rfc822)             # => "Sun, 18 May 2008 13:27:25 -0400"
+  #   t.to_fs(:rfc822)                      # => "Sun, 18 May 2008 13:27:25 -0400"
   #   t + 1.day                             # => Mon, 19 May 2008 13:27:25.031505668 EDT -04:00
   #   t.beginning_of_year                   # => Tue, 01 Jan 2008 00:00:00.000000000 EST -05:00
   #   t > Time.utc(1999)                    # => true
@@ -202,7 +202,7 @@ module ActiveSupport
     #
     #   Time.zone.now.rfc2822  # => "Tue, 01 Jan 2013 04:51:39 +0000"
     def rfc2822
-      to_formatted_s(:rfc822)
+      to_fs(:rfc822)
     end
     alias_method :rfc822, :rfc2822
 
@@ -212,19 +212,19 @@ module ActiveSupport
     def to_s(format = NOT_SET)
       if format == :db
         ActiveSupport::Deprecation.warn(
-          "TimeWithZone#to_s(:db) is deprecated. Please use TimeWithZone#to_formatted_s(:db) instead."
+          "TimeWithZone#to_s(:db) is deprecated. Please use TimeWithZone#to_fs(:db) instead."
         )
-        utc.to_formatted_s(format)
+        utc.to_fs(format)
       elsif formatter = ::Time::DATE_FORMATS[format]
         ActiveSupport::Deprecation.warn(
-          "TimeWithZone#to_s(#{format.inspect}) is deprecated. Please use TimeWithZone#to_formatted_s(#{format.inspect}) instead."
+          "TimeWithZone#to_s(#{format.inspect}) is deprecated. Please use TimeWithZone#to_fs(#{format.inspect}) instead."
         )
         formatter.respond_to?(:call) ? formatter.call(self).to_s : strftime(formatter)
       elsif format == NOT_SET
         "#{time.strftime("%Y-%m-%d %H:%M:%S")} #{formatted_offset(false, 'UTC')}" # mimicking Ruby Time#to_s format
       else
         ActiveSupport::Deprecation.warn(
-          "TimeWithZone#to_s(#{format.inspect}) is deprecated. Please use TimeWithZone#to_formatted_s(#{format.inspect}) instead."
+          "TimeWithZone#to_s(#{format.inspect}) is deprecated. Please use TimeWithZone#to_fs(#{format.inspect}) instead."
         )
         "#{time.strftime("%Y-%m-%d %H:%M:%S")} #{formatted_offset(false, 'UTC')}" # mimicking Ruby Time#to_s format
       end
@@ -232,15 +232,15 @@ module ActiveSupport
 
     # Returns a string of the object's date and time.
     #
-    # This method is aliased to <tt>to_fs</tt>.
+    # This method is aliased to <tt>to_formatted_s</tt>.
     #
     # Accepts an optional <tt>format</tt>:
     # * <tt>:default</tt> - default value, mimics Ruby Time#to_s format.
-    # * <tt>:db</tt> - format outputs time in UTC :db time. See Time#to_formatted_s(:db).
+    # * <tt>:db</tt> - format outputs time in UTC :db time. See Time#to_fs(:db).
     # * Any key in <tt>Time::DATE_FORMATS</tt> can be used. See active_support/core_ext/time/conversions.rb.
-    def to_formatted_s(format = :default)
+    def to_fs(format = :default)
       if format == :db
-        utc.to_formatted_s(format)
+        utc.to_fs(format)
       elsif formatter = ::Time::DATE_FORMATS[format]
         formatter.respond_to?(:call) ? formatter.call(self).to_s : strftime(formatter)
       else
@@ -248,7 +248,7 @@ module ActiveSupport
         "#{time.strftime("%Y-%m-%d %H:%M:%S")} #{formatted_offset(false, 'UTC')}"
       end
     end
-    alias_method :to_fs, :to_formatted_s
+    alias_method :to_formatted_s, :to_fs
 
     # Replaces <tt>%Z</tt> directive with +zone before passing to Time#strftime,
     # so that zone information is correct.

data/lib/active_support/xml_mini.rb

@@ -54,7 +54,7 @@ module ActiveSupport
 
     FORMATTING = {
       "symbol"   => Proc.new { |symbol| symbol.to_s },
-      "date"     => Proc.new { |date| date.to_formatted_s(:db) },
+      "date"     => Proc.new { |date| date.to_fs(:db) },
       "dateTime" => Proc.new { |time| time.xmlschema },
       "binary"   => Proc.new { |binary| ::Base64.encode64(binary) },
       "yaml"     => Proc.new { |yaml| yaml.to_yaml }

data/lib/active_support.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 #--
-# Copyright (c) 2005-2021 David Heinemeier Hansson
+# Copyright (c) 2005-2022 David Heinemeier Hansson
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activesupport
 version: !ruby/object:Gem::Version
-  version: 7.0.0
+  version: 7.0.2.2
 platform: ruby
 authors:
 - David Heinemeier Hansson
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-15 00:00:00.000000000 Z
+date: 2022-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -359,12 +359,12 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rails/rails/issues
-  changelog_uri: https://github.com/rails/rails/blob/v7.0.0/activesupport/CHANGELOG.md
-  documentation_uri: https://api.rubyonrails.org/v7.0.0/
+  changelog_uri: https://github.com/rails/rails/blob/v7.0.2.2/activesupport/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v7.0.2.2/
   mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
-  source_code_uri: https://github.com/rails/rails/tree/v7.0.0/activesupport
+  source_code_uri: https://github.com/rails/rails/tree/v7.0.2.2/activesupport
   rubygems_mfa_required: 'true'
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--encoding"
 - UTF-8
@@ -381,8 +381,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
 summary: A toolkit of support libraries and Ruby core extensions extracted from the
   Rails framework.