activesupport 7.0.0.alpha1 → 7.0.0.rc3

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

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require "date"
+
+class Date
+  NOT_SET = Object.new # :nodoc:
+  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."
+      )
+      if formatter.respond_to?(:call)
+        formatter.call(self).to_s
+      else
+        strftime(formatter)
+      end
+    elsif format == NOT_SET
+      to_default_s
+    else
+      ActiveSupport::Deprecation.warn(
+        "Date#to_s(#{format.inspect}) is deprecated. Please use Date#to_formatted_s(#{format.inspect}) instead."
+      )
+      to_default_s
+    end
+  end
+end

data/lib/active_support/core_ext/date.rb

@@ -4,4 +4,5 @@ require "active_support/core_ext/date/acts_like"
 require "active_support/core_ext/date/blank"
 require "active_support/core_ext/date/calculations"
 require "active_support/core_ext/date/conversions"
+require "active_support/core_ext/date/deprecated_conversions" unless ENV["RAILS_DISABLE_DEPRECATED_TO_S_CONVERSION"]
 require "active_support/core_ext/date/zones"

data/lib/active_support/core_ext/date_and_time/compatibility.rb

@@ -15,7 +15,7 @@ module DateAndTime
 
     # Change the output of <tt>ActiveSupport::TimeZone.utc_to_local</tt>.
     #
-    # When `true`, it returns local times with an UTC offset, with `false` local
+    # When `true`, it returns local times with a UTC offset, with `false` local
     # times are returned as UTC.
     #
     #   # Given this zone:

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

@@ -9,14 +9,14 @@ 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_s</tt>.
+  # This method is aliased to <tt>to_fs</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_s(:db)                      # => "2007-12-04 00:00:00"
-  #   datetime.to_s(:number)                  # => "20071204000000"
+  #   datetime.to_formatted_s(: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"
@@ -39,8 +39,8 @@ class DateTime
       to_default_s
     end
   end
+  alias_method :to_fs, :to_formatted_s
   alias_method :to_default_s, :to_s if instance_methods(false).include?(:to_s)
-  alias_method :to_s, :to_formatted_s
 
   # Returns a formatted string of the offset from UTC, or an alternative
   # string if the time zone is already UTC.
@@ -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_s(:rfc822)
+    to_formatted_s(:rfc822)
   end
   alias_method :default_inspect, :inspect
   alias_method :inspect, :readable_inspect

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

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require "date"
+
+class DateTime
+  NOT_SET = Object.new # :nodoc:
+  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."
+      )
+      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."
+      )
+      to_default_s
+    end
+  end
+end

data/lib/active_support/core_ext/date_time.rb

@@ -5,3 +5,4 @@ require "active_support/core_ext/date_time/blank"
 require "active_support/core_ext/date_time/calculations"
 require "active_support/core_ext/date_time/compatibility"
 require "active_support/core_ext/date_time/conversions"
+require "active_support/core_ext/date_time/deprecated_conversions" unless ENV["RAILS_DISABLE_DEPRECATED_TO_S_CONVERSION"]

data/lib/active_support/core_ext/digest/uuid.rb

@@ -10,13 +10,15 @@ module Digest
     OID_NAMESPACE  = "k\xA7\xB8\x12\x9D\xAD\x11\xD1\x80\xB4\x00\xC0O\xD40\xC8" # :nodoc:
     X500_NAMESPACE = "k\xA7\xB8\x14\x9D\xAD\x11\xD1\x80\xB4\x00\xC0O\xD40\xC8" # :nodoc:
 
+    mattr_accessor :use_rfc4122_namespaced_uuids, instance_accessor: false, default: false
+
     # Generates a v5 non-random UUID (Universally Unique IDentifier).
     #
     # Using OpenSSL::Digest::MD5 generates version 3 UUIDs; OpenSSL::Digest::SHA1 generates version 5 UUIDs.
     # uuid_from_hash always generates the same UUID for a given name and namespace combination.
     #
     # See RFC 4122 for details of UUID at: https://www.ietf.org/rfc/rfc4122.txt
-    def self.uuid_from_hash(hash_class, uuid_namespace, name)
+    def self.uuid_from_hash(hash_class, namespace, name)
       if hash_class == Digest::MD5 || hash_class == OpenSSL::Digest::MD5
         version = 3
       elsif hash_class == Digest::SHA1 || hash_class == OpenSSL::Digest::SHA1
@@ -25,6 +27,8 @@ module Digest
         raise ArgumentError, "Expected OpenSSL::Digest::SHA1 or OpenSSL::Digest::MD5, got #{hash_class.name}."
       end
 
+      uuid_namespace = pack_uuid_namespace(namespace)
+
       hash = hash_class.new
       hash.update(uuid_namespace)
       hash.update(name)
@@ -50,5 +54,26 @@ module Digest
     def self.uuid_v4
       SecureRandom.uuid
     end
+
+    def self.pack_uuid_namespace(namespace)
+      if [DNS_NAMESPACE, OID_NAMESPACE, URL_NAMESPACE, X500_NAMESPACE].include?(namespace)
+        namespace
+      elsif use_rfc4122_namespaced_uuids == true
+        match_data = namespace.match(/\A(\h{8})-(\h{4})-(\h{4})-(\h{4})-(\h{4})(\h{8})\z/)
+
+        raise ArgumentError, "Only UUIDs are valid namespace identifiers" unless match_data.present?
+
+        match_data.captures.map { |s| s.to_i(16) }.pack("NnnnnN")
+      else
+        ActiveSupport::Deprecation.warn <<~WARNING.squish
+          Providing a namespace ID that is not one of the constants defined on Digest::UUID generates an incorrect UUID value according to RFC 4122.
+          To enable the correct behavior, set the Rails.application.config.active_support.use_rfc4122_namespaced_uuids configuration option to true.
+        WARNING
+
+        namespace
+      end
+    end
+
+    private_class_method :pack_uuid_namespace
   end
 end

data/lib/active_support/core_ext/module/attribute_accessors.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+# == Attribute Accessors
+#
 # Extends the module object with class/module and instance accessors for
 # class/module attributes, just like the native attr* accessors for instance
 # attributes.

data/lib/active_support/core_ext/module/attribute_accessors_per_thread.rb

@@ -1,11 +1,16 @@
 # frozen_string_literal: true
 
+# == Attribute Accessors per Thread
+#
 # Extends the module object with class/module and instance accessors for
 # class/module attributes, just like the native attr* accessors for instance
 # attributes, but does so on a per-thread basis.
 #
 # So the values are scoped within the Thread.current space under the class name
 # of the module.
+#
+# Note that it can also be scoped per-fiber if Rails.application.config.active_support.isolation_level
+# is set to `:fiber`
 class Module
   # Defines a per-thread class attribute and creates class and instance reader methods.
   # The underlying per-thread class variable is set to +nil+, if it is not previously defined.
@@ -14,9 +19,9 @@ class Module
   #     thread_mattr_reader :user
   #   end
   #
-  #   Current.user # => nil
-  #   Thread.current[:attr_Current_user] = "DHH"
+  #   Current.user = "DHH"
   #   Current.user # => "DHH"
+  #   Thread.new { Current.user }.values # => nil
   #
   # The attribute name must be a valid method name in Ruby.
   #
@@ -41,7 +46,8 @@ class Module
       # to work with inheritance via polymorphism.
       class_eval(<<-EOS, __FILE__, __LINE__ + 1)
         def self.#{sym}
-          Thread.current["attr_" + name + "_#{sym}"]
+          @__thread_mattr_#{sym} ||= "attr_\#{name}_#{sym}"
+          ::ActiveSupport::IsolatedExecutionState[@__thread_mattr_#{sym}]
         end
       EOS
 
@@ -53,7 +59,7 @@ class Module
         EOS
       end
 
-      Thread.current["attr_" + name + "_#{sym}"] = default unless default.nil?
+      ::ActiveSupport::IsolatedExecutionState["attr_#{name}_#{sym}"] = default unless default.nil?
     end
   end
   alias :thread_cattr_reader :thread_mattr_reader
@@ -84,7 +90,8 @@ class Module
       # to work with inheritance via polymorphism.
       class_eval(<<-EOS, __FILE__, __LINE__ + 1)
         def self.#{sym}=(obj)
-          Thread.current["attr_" + name + "_#{sym}"] = obj
+          @__thread_mattr_#{sym} ||= "attr_\#{name}_#{sym}"
+          ::ActiveSupport::IsolatedExecutionState[@__thread_mattr_#{sym}] = obj
         end
       EOS
 
@@ -111,16 +118,18 @@ class Module
   #   Account.user     # => "DHH"
   #   Account.new.user # => "DHH"
   #
+  # Unlike `mattr_accessor`, values are *not* shared with subclasses or parent classes.
   # If a subclass changes the value, the parent class' value is not changed.
-  # Similarly, if the parent class changes the value, the value of subclasses
-  # is not changed.
+  # If the parent class changes the value, the value of subclasses is not changed.
   #
   #   class Customer < Account
   #   end
   #
-  #   Customer.user = "Rafael"
-  #   Customer.user # => "Rafael"
-  #   Account.user  # => "DHH"
+  #   Account.user   # => "DHH"
+  #   Customer.user  # => nil
+  #   Customer.user  = "Rafael"
+  #   Customer.user  # => "Rafael"
+  #   Account.user   # => "DHH"
   #
   # To omit the instance writer method, pass <tt>instance_writer: false</tt>.
   # To omit the instance reader method, pass <tt>instance_reader: false</tt>.

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

@@ -9,6 +9,8 @@ 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>.
+    #
     # ==== Options
     #
     # For details on which formats use which options, see ActiveSupport::NumberHelper
@@ -16,102 +18,102 @@ module ActiveSupport
     # ==== Examples
     #
     #  Phone Numbers:
-    #  5551234.to_s(:phone)                                     # => "555-1234"
-    #  1235551234.to_s(:phone)                                  # => "123-555-1234"
-    #  1235551234.to_s(:phone, area_code: true)                 # => "(123) 555-1234"
-    #  1235551234.to_s(:phone, delimiter: ' ')                  # => "123 555 1234"
-    #  1235551234.to_s(:phone, area_code: true, extension: 555) # => "(123) 555-1234 x 555"
-    #  1235551234.to_s(:phone, country_code: 1)                 # => "+1-123-555-1234"
-    #  1235551234.to_s(:phone, country_code: 1, extension: 1343, delimiter: '.')
+    #  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: '.')
     #  # => "+1.123.555.1234 x 1343"
     #
     #  Currency:
-    #  1234567890.50.to_s(:currency)                     # => "$1,234,567,890.50"
-    #  1234567890.506.to_s(:currency)                    # => "$1,234,567,890.51"
-    #  1234567890.506.to_s(:currency, precision: 3)      # => "$1,234,567,890.506"
-    #  1234567890.506.to_s(:currency, round_mode: :down) # => "$1,234,567,890.50"
-    #  1234567890.506.to_s(:currency, locale: :fr)       # => "1 234 567 890,51 €"
-    #  -1234567890.50.to_s(:currency, negative_format: '(%u%n)')
+    #  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)')
     #  # => "($1,234,567,890.50)"
-    #  1234567890.50.to_s(:currency, unit: '&pound;', separator: ',', delimiter: '')
+    #  1234567890.50.to_formatted_s(:currency, unit: '&pound;', separator: ',', delimiter: '')
     #  # => "&pound;1234567890,50"
-    #  1234567890.50.to_s(:currency, unit: '&pound;', separator: ',', delimiter: '', format: '%n %u')
+    #  1234567890.50.to_formatted_s(:currency, unit: '&pound;', separator: ',', delimiter: '', format: '%n %u')
     #  # => "1234567890,50 &pound;"
     #
     #  Percentage:
-    #  100.to_s(:percentage)                                  # => "100.000%"
-    #  100.to_s(:percentage, precision: 0)                    # => "100%"
-    #  1000.to_s(:percentage, delimiter: '.', separator: ',') # => "1.000,000%"
-    #  302.24398923423.to_s(:percentage, precision: 5)        # => "302.24399%"
-    #  302.24398923423.to_s(:percentage, round_mode: :down)   # => "302.243%"
-    #  1000.to_s(:percentage, locale: :fr)                    # => "1 000,000%"
-    #  100.to_s(:percentage, format: '%n  %')                 # => "100.000  %"
+    #  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  %"
     #
     #  Delimited:
-    #  12345678.to_s(:delimited)                     # => "12,345,678"
-    #  12345678.05.to_s(:delimited)                  # => "12,345,678.05"
-    #  12345678.to_s(:delimited, delimiter: '.')     # => "12.345.678"
-    #  12345678.to_s(:delimited, delimiter: ',')     # => "12,345,678"
-    #  12345678.05.to_s(:delimited, separator: ' ')  # => "12,345,678 05"
-    #  12345678.05.to_s(:delimited, locale: :fr)     # => "12 345 678,05"
-    #  98765432.98.to_s(:delimited, delimiter: ' ', separator: ',')
+    #  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: ',')
     #  # => "98 765 432,98"
     #
     #  Rounded:
-    #  111.2345.to_s(:rounded)                                      # => "111.235"
-    #  111.2345.to_s(:rounded, precision: 2)                        # => "111.23"
-    #  111.2345.to_s(:rounded, precision: 2, round_mode: :up)       # => "111.24"
-    #  13.to_s(:rounded, precision: 5)                              # => "13.00000"
-    #  389.32314.to_s(:rounded, precision: 0)                       # => "389"
-    #  111.2345.to_s(:rounded, significant: true)                   # => "111"
-    #  111.2345.to_s(:rounded, precision: 1, significant: true)     # => "100"
-    #  13.to_s(:rounded, precision: 5, significant: true)           # => "13.000"
-    #  111.234.to_s(:rounded, locale: :fr)                          # => "111,234"
-    #  13.to_s(:rounded, precision: 5, significant: true, strip_insignificant_zeros: true)
+    #  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)
     #  # => "13"
-    #  389.32314.to_s(:rounded, precision: 4, significant: true)    # => "389.3"
-    #  1111.2345.to_s(:rounded, precision: 2, separator: ',', delimiter: '.')
+    #  389.32314.to_formatted_s(:rounded, precision: 4, significant: true)    # => "389.3"
+    #  1111.2345.to_formatted_s(:rounded, precision: 2, separator: ',', delimiter: '.')
     #  # => "1.111,23"
     #
     #  Human-friendly size in Bytes:
-    #  123.to_s(:human_size)                                    # => "123 Bytes"
-    #  1234.to_s(:human_size)                                   # => "1.21 KB"
-    #  12345.to_s(:human_size)                                  # => "12.1 KB"
-    #  1234567.to_s(:human_size)                                # => "1.18 MB"
-    #  1234567890.to_s(:human_size)                             # => "1.15 GB"
-    #  1234567890123.to_s(:human_size)                          # => "1.12 TB"
-    #  1234567890123456.to_s(:human_size)                       # => "1.1 PB"
-    #  1234567890123456789.to_s(:human_size)                    # => "1.07 EB"
-    #  1234567.to_s(:human_size, precision: 2)                  # => "1.2 MB"
-    #  1234567.to_s(:human_size, precision: 2, round_mode: :up) # => "1.3 MB"
-    #  483989.to_s(:human_size, precision: 2)                   # => "470 KB"
-    #  1234567.to_s(:human_size, precision: 2, separator: ',')  # => "1,2 MB"
-    #  1234567890123.to_s(:human_size, precision: 5)            # => "1.1228 TB"
-    #  524288000.to_s(:human_size, precision: 5)                # => "500 MB"
+    #  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"
     #
     #  Human-friendly format:
-    #  123.to_s(:human)                                       # => "123"
-    #  1234.to_s(:human)                                      # => "1.23 Thousand"
-    #  12345.to_s(:human)                                     # => "12.3 Thousand"
-    #  1234567.to_s(:human)                                   # => "1.23 Million"
-    #  1234567890.to_s(:human)                                # => "1.23 Billion"
-    #  1234567890123.to_s(:human)                             # => "1.23 Trillion"
-    #  1234567890123456.to_s(:human)                          # => "1.23 Quadrillion"
-    #  1234567890123456789.to_s(:human)                       # => "1230 Quadrillion"
-    #  489939.to_s(:human, precision: 2)                      # => "490 Thousand"
-    #  489939.to_s(:human, precision: 2, round_mode: :down)   # => "480 Thousand"
-    #  489939.to_s(:human, precision: 4)                      # => "489.9 Thousand"
-    #  1234567.to_s(:human, precision: 4,
-    #                   significant: false)                   # => "1.2346 Million"
-    #  1234567.to_s(:human, precision: 1,
+    #  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,
+    #                   significant: false)                             # => "1.2346 Million"
+    #  1234567.to_formatted_s(:human, precision: 1,
     #                   separator: ',',
-    #                   significant: false)                   # => "1,2 Million"
-    def to_s(format = nil, options = nil)
-      return super() if format.nil?
+    #                   significant: false)                             # => "1,2 Million"
+    def to_formatted_s(format = nil, options = nil)
+      return to_s if format.nil?
 
       case format
       when Integer, String
-        super(format)
+        to_s(format)
       when :phone
         ActiveSupport::NumberHelper.number_to_phone(self, options || {})
       when :currency
@@ -127,11 +129,12 @@ module ActiveSupport
       when :human_size
         ActiveSupport::NumberHelper.number_to_human_size(self, options || {})
       when Symbol
-        super()
+        to_s
       else
-        super(format)
+        to_s(format)
       end
     end
+    alias_method :to_fs, :to_formatted_s
   end
 end
 

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

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+module ActiveSupport
+  module DeprecatedNumericWithFormat # :nodoc:
+    def to_s(format = nil, options = nil)
+      return super() if format.nil?
+
+      case format
+      when Integer, String
+        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."
+        )
+        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."
+        )
+        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."
+        )
+        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."
+        )
+        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."
+        )
+        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."
+        )
+        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."
+        )
+        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."
+        )
+        super()
+      else
+        super(format)
+      end
+    end
+  end
+end
+
+Integer.prepend ActiveSupport::DeprecatedNumericWithFormat
+Float.prepend ActiveSupport::DeprecatedNumericWithFormat
+BigDecimal.prepend ActiveSupport::DeprecatedNumericWithFormat

data/lib/active_support/core_ext/numeric.rb

@@ -3,3 +3,4 @@
 require "active_support/core_ext/numeric/bytes"
 require "active_support/core_ext/numeric/time"
 require "active_support/core_ext/numeric/conversions"
+require "active_support/core_ext/numeric/deprecated_conversions" unless ENV["RAILS_DISABLE_DEPRECATED_TO_S_CONVERSION"]

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

@@ -75,8 +75,27 @@ class Object
   #     end
   #   end
   #
+  # When the block argument is omitted, the decorated Object instance is returned:
+  #
+  #   module MyStyledHelpers
+  #     def styled
+  #       with_options style: "color: red;"
+  #     end
+  #   end
+  #
+  #   # styled.link_to "I'm red", "/"
+  #   # #=> <a href="/" style="color: red;">I'm red</a>
+  #
+  #   # styled.button_tag "I'm red too!"
+  #   # #=> <button style="color: red;">I'm red too!</button>
+  #
   def with_options(options, &block)
     option_merger = ActiveSupport::OptionMerger.new(self, options)
-    block.arity.zero? ? option_merger.instance_eval(&block) : block.call(option_merger)
+
+    if block
+      block.arity.zero? ? option_merger.instance_eval(&block) : block.call(option_merger)
+    else
+      option_merger
+    end
   end
 end

data/lib/active_support/core_ext/pathname/existence.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+class Pathname
+  # Returns the receiver if the named file exists otherwise returns +nil+.
+  # <tt>pathname.existence</tt> is equivalent to
+  #
+  #    pathname.exists? ? pathname : nil
+  #
+  # For example, something like
+  #
+  #   content = pathname.read if pathname.exist?
+  #
+  # becomes
+  #
+  #   content = pathname.existence&.read
+  #
+  # @return [Pathname]
+  def existence
+    self if exist?
+  end
+end

data/lib/active_support/core_ext/pathname.rb

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+require "active_support/core_ext/pathname/existence"

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_s(:db)}' AND '#{stop.to_s(:db)}'"
+          "BETWEEN '#{start.to_formatted_s(:db)}' AND '#{stop.to_formatted_s(:db)}'"
         end
       end
     }
 
     # Convert range to a formatted string. See RANGE_FORMATS for predefined formats.
     #
+    # This method is aliased to <tt>to_fs</tt>.
+    #
     #   range = (1..100)           # => 1..100
     #
     #   range.to_s                 # => "1..100"
-    #   range.to_s(:db)            # => "BETWEEN '1' AND '100'"
+    #   range.to_formatted_s(: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_s(:db)} and #{stop.to_s(:db)}" }
-    def to_s(format = :default)
+    #   Range::RANGE_FORMATS[:short] = ->(start, stop) { "Between #{start.to_formatted_s(:db)} and #{stop.to_formatted_s(:db)}" }
+    def to_formatted_s(format = :default)
       if formatter = RANGE_FORMATS[format]
         formatter.call(first, last)
       else
-        super()
+        to_s
       end
     end
-
-    alias_method :to_default_s, :to_s
-    alias_method :to_formatted_s, :to_s
+    alias_method :to_fs, :to_formatted_s
   end
 end