activesupport 5.2.2.1 → 6.0.2

data/lib/active_support/core_ext/kernel.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "active_support/core_ext/kernel/agnostics"
 require "active_support/core_ext/kernel/concern"
 require "active_support/core_ext/kernel/reporting"
 require "active_support/core_ext/kernel/singleton_class"

data/lib/active_support/core_ext/load_error.rb

@@ -4,6 +4,6 @@ class LoadError
   # Returns true if the given path name (except perhaps for the ".rb"
   # extension) is the missing file which caused the exception to be raised.
   def is_missing?(location)
-    location.sub(/\.rb$/, "".freeze) == path.sub(/\.rb$/, "".freeze)
+    location.sub(/\.rb$/, "") == path.to_s.sub(/\.rb$/, "")
   end
 end

data/lib/active_support/core_ext/module.rb

@@ -3,7 +3,6 @@
 require "active_support/core_ext/module/aliasing"
 require "active_support/core_ext/module/introspection"
 require "active_support/core_ext/module/anonymous"
-require "active_support/core_ext/module/reachable"
 require "active_support/core_ext/module/attribute_accessors"
 require "active_support/core_ext/module/attribute_accessors_per_thread"
 require "active_support/core_ext/module/attr_internal"

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

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require "active_support/core_ext/array/extract_options"
-require "active_support/core_ext/regexp"
-
 # Extends the module object with class/module and instance accessors for
 # class/module attributes, just like the native attr* accessors for instance
 # attributes.
@@ -27,7 +24,7 @@ class Module
   #   end
   #   # => NameError: invalid attribute name: 1_Badname
   #
-  # If you want to opt out the creation on the instance reader method, pass
+  # To omit the instance reader method, pass
   # <tt>instance_reader: false</tt> or <tt>instance_accessor: false</tt>.
   #
   #   module HairColors
@@ -94,7 +91,7 @@ class Module
   #   Person.new.hair_colors = [:blonde, :red]
   #   HairColors.class_variable_get("@@hair_colors") # => [:blonde, :red]
   #
-  # If you want to opt out the instance writer method, pass
+  # To omit the instance writer method, pass
   # <tt>instance_writer: false</tt> or <tt>instance_accessor: false</tt>.
   #
   #   module HairColors
@@ -163,14 +160,14 @@ class Module
   # parent class. Similarly if parent class changes the value then that would
   # change the value of subclasses too.
   #
-  #   class Male < Person
+  #   class Citizen < Person
   #   end
   #
-  #   Male.new.hair_colors << :blue
+  #   Citizen.new.hair_colors << :blue
   #   Person.new.hair_colors # => [:brown, :black, :blonde, :red, :blue]
   #
-  # To opt out of the instance writer method, pass <tt>instance_writer: false</tt>.
-  # To opt out of the instance reader method, pass <tt>instance_reader: false</tt>.
+  # To omit the instance writer method, pass <tt>instance_writer: false</tt>.
+  # To omit the instance reader method, pass <tt>instance_reader: false</tt>.
   #
   #   module HairColors
   #     mattr_accessor :hair_colors, instance_writer: false, instance_reader: false
@@ -183,7 +180,7 @@ class Module
   #   Person.new.hair_colors = [:brown]  # => NoMethodError
   #   Person.new.hair_colors             # => NoMethodError
   #
-  # Or pass <tt>instance_accessor: false</tt>, to opt out both instance methods.
+  # Or pass <tt>instance_accessor: false</tt>, to omit both instance methods.
   #
   #   module HairColors
   #     mattr_accessor :hair_colors, instance_accessor: false

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

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require "active_support/core_ext/array/extract_options"
-require "active_support/core_ext/regexp"
-
 # 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.
@@ -28,7 +25,7 @@ class Module
   #   end
   #   # => NameError: invalid attribute name: 1_Badname
   #
-  # If you want to opt out of the creation of the instance reader method, pass
+  # To omit the instance reader method, pass
   # <tt>instance_reader: false</tt> or <tt>instance_accessor: false</tt>.
   #
   #   class Current
@@ -36,9 +33,7 @@ class Module
   #   end
   #
   #   Current.new.user # => NoMethodError
-  def thread_mattr_reader(*syms) # :nodoc:
-    options = syms.extract_options!
-
+  def thread_mattr_reader(*syms, instance_reader: true, instance_accessor: true) # :nodoc:
     syms.each do |sym|
       raise NameError.new("invalid attribute name: #{sym}") unless /^[_A-Za-z]\w*$/.match?(sym)
 
@@ -50,7 +45,7 @@ class Module
         end
       EOS
 
-      unless options[:instance_reader] == false || options[:instance_accessor] == false
+      if instance_reader && instance_accessor
         class_eval(<<-EOS, __FILE__, __LINE__ + 1)
           def #{sym}
             self.class.#{sym}
@@ -71,7 +66,7 @@ class Module
   #   Current.user = "DHH"
   #   Thread.current[:attr_Current_user] # => "DHH"
   #
-  # If you want to opt out of the creation of the instance writer method, pass
+  # To omit the instance writer method, pass
   # <tt>instance_writer: false</tt> or <tt>instance_accessor: false</tt>.
   #
   #   class Current
@@ -79,8 +74,7 @@ class Module
   #   end
   #
   #   Current.new.user = "DHH" # => NoMethodError
-  def thread_mattr_writer(*syms) # :nodoc:
-    options = syms.extract_options!
+  def thread_mattr_writer(*syms, instance_writer: true, instance_accessor: true) # :nodoc:
     syms.each do |sym|
       raise NameError.new("invalid attribute name: #{sym}") unless /^[_A-Za-z]\w*$/.match?(sym)
 
@@ -92,7 +86,7 @@ class Module
         end
       EOS
 
-      unless options[:instance_writer] == false || options[:instance_accessor] == false
+      if instance_writer && instance_accessor
         class_eval(<<-EOS, __FILE__, __LINE__ + 1)
           def #{sym}=(obj)
             self.class.#{sym} = obj
@@ -124,8 +118,8 @@ class Module
   #   Customer.user # => "Rafael"
   #   Account.user  # => "DHH"
   #
-  # To opt out of the instance writer method, pass <tt>instance_writer: false</tt>.
-  # To opt out of the instance reader method, pass <tt>instance_reader: false</tt>.
+  # To omit the instance writer method, pass <tt>instance_writer: false</tt>.
+  # To omit the instance reader method, pass <tt>instance_reader: false</tt>.
   #
   #   class Current
   #     thread_mattr_accessor :user, instance_writer: false, instance_reader: false
@@ -134,17 +128,17 @@ class Module
   #   Current.new.user = "DHH"  # => NoMethodError
   #   Current.new.user          # => NoMethodError
   #
-  # Or pass <tt>instance_accessor: false</tt>, to opt out both instance methods.
+  # Or pass <tt>instance_accessor: false</tt>, to omit both instance methods.
   #
   #   class Current
-  #     mattr_accessor :user, instance_accessor: false
+  #     thread_mattr_accessor :user, instance_accessor: false
   #   end
   #
   #   Current.new.user = "DHH"  # => NoMethodError
   #   Current.new.user          # => NoMethodError
-  def thread_mattr_accessor(*syms)
-    thread_mattr_reader(*syms)
-    thread_mattr_writer(*syms)
+  def thread_mattr_accessor(*syms, instance_reader: true, instance_writer: true, instance_accessor: true)
+    thread_mattr_reader(*syms, instance_reader: instance_reader, instance_accessor: instance_accessor)
+    thread_mattr_writer(*syms, instance_writer: instance_writer, instance_accessor: instance_accessor)
   end
   alias :thread_cattr_accessor :thread_mattr_accessor
 end

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

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "set"
-require "active_support/core_ext/regexp"
 
 class Module
   # Error generated by +delegate+ when a method is called on +nil+ and +allow_nil+
@@ -20,10 +19,11 @@ class Module
   # public methods as your own.
   #
   # ==== Options
-  # * <tt>:to</tt> - Specifies the target object
+  # * <tt>:to</tt> - Specifies the target object name as a symbol or string
   # * <tt>:prefix</tt> - Prefixes the new method with the target name or a custom prefix
-  # * <tt>:allow_nil</tt> - if set to true, prevents a +Module::DelegationError+
+  # * <tt>:allow_nil</tt> - If set to true, prevents a +Module::DelegationError+
   #   from being raised
+  # * <tt>:private</tt> - If set to true, changes method visibility to private
   #
   # The macro receives one or more method names (specified as symbols or
   # strings) and the name of the target object via the <tt>:to</tt> option
@@ -114,6 +114,23 @@ class Module
   #   invoice.customer_name    # => 'John Doe'
   #   invoice.customer_address # => 'Vimmersvej 13'
   #
+  # The delegated methods are public by default.
+  # Pass <tt>private: true</tt> to change that.
+  #
+  #   class User < ActiveRecord::Base
+  #     has_one :profile
+  #     delegate :first_name, to: :profile
+  #     delegate :date_of_birth, to: :profile, private: true
+  #
+  #     def age
+  #       Date.today.year - date_of_birth.year
+  #     end
+  #   end
+  #
+  #   User.new.first_name # => "Tomas"
+  #   User.new.date_of_birth # => NoMethodError: private method `date_of_birth' called for #<User:0x00000008221340>
+  #   User.new.age # => 2
+  #
   # If the target is +nil+ and does not respond to the delegated method a
   # +Module::DelegationError+ is raised. If you wish to instead return +nil+,
   # use the <tt>:allow_nil</tt> option.
@@ -151,7 +168,7 @@ class Module
   #   Foo.new("Bar").name # raises NoMethodError: undefined method `name'
   #
   # The target method must be public, otherwise it will raise +NoMethodError+.
-  def delegate(*methods, to: nil, prefix: nil, allow_nil: nil)
+  def delegate(*methods, to: nil, prefix: nil, allow_nil: nil, private: nil)
     unless to
       raise ArgumentError, "Delegation needs a target. Supply an options hash with a :to key as the last argument (e.g. delegate :hello, to: :greeter)."
     end
@@ -173,7 +190,7 @@ class Module
     to = to.to_s
     to = "self.#{to}" if DELEGATION_RESERVED_METHOD_NAMES.include?(to)
 
-    methods.map do |method|
+    method_names = methods.map do |method|
       # Attribute writer methods only accept one argument. Makes sure []=
       # methods still accept two arguments.
       definition = /[^\]]=$/.match?(method) ? "arg" : "*args, &block"
@@ -213,6 +230,9 @@ class Module
 
       module_eval(method_def, file, line)
     end
+
+    private(*method_names) if private
+    method_names
   end
 
   # When building decorators, a common pattern may emerge:
@@ -223,7 +243,7 @@ class Module
   #     end
   #
   #     def person
-  #       @event.detail.person || @event.creator
+  #       detail.person || creator
   #     end
   #
   #     private
@@ -246,7 +266,7 @@ class Module
   #     end
   #
   #     def person
-  #       @event.detail.person || @event.creator
+  #       detail.person || creator
   #     end
   #   end
   #
@@ -255,6 +275,11 @@ class Module
   #
   # The delegated method must be public on the target, otherwise it will
   # raise +NoMethodError+.
+  #
+  # The <tt>marshal_dump</tt> and <tt>_dump</tt> methods are exempt from
+  # delegation due to possible interference when calling
+  # <tt>Marshal.dump(object)</tt>, should the delegation target method
+  # of <tt>object</tt> add or remove instance variables.
   def delegate_missing_to(target)
     target = target.to_s
     target = "self.#{target}" if DELEGATION_RESERVED_METHOD_NAMES.include?(target)
@@ -264,6 +289,7 @@ class Module
         # It may look like an oversight, but we deliberately do not pass
         # +include_private+, because they do not get delegated.
 
+        return false if name == :marshal_dump || name == :_dump
         #{target}.respond_to?(name) || super
       end
 

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

@@ -5,8 +5,8 @@ require "active_support/inflector"
 class Module
   # Returns the name of the module containing this one.
   #
-  #   M::N.parent_name # => "M"
-  def parent_name
+  #   M::N.module_parent_name # => "M"
+  def module_parent_name
     if defined?(@parent_name)
       @parent_name
     else
@@ -16,6 +16,14 @@ class Module
     end
   end
 
+  def parent_name
+    ActiveSupport::Deprecation.warn(<<-MSG.squish)
+      `Module#parent_name` has been renamed to `module_parent_name`.
+      `parent_name` is deprecated and will be removed in Rails 6.1.
+    MSG
+    module_parent_name
+  end
+
   # Returns the module which contains this one according to its name.
   #
   #   module M
@@ -24,15 +32,23 @@ class Module
   #   end
   #   X = M::N
   #
-  #   M::N.parent # => M
-  #   X.parent    # => M
+  #   M::N.module_parent # => M
+  #   X.module_parent    # => M
   #
   # The parent of top-level and anonymous modules is Object.
   #
-  #   M.parent          # => Object
-  #   Module.new.parent # => Object
+  #   M.module_parent          # => Object
+  #   Module.new.module_parent # => Object
+  def module_parent
+    module_parent_name ? ActiveSupport::Inflector.constantize(module_parent_name) : Object
+  end
+
   def parent
-    parent_name ? ActiveSupport::Inflector.constantize(parent_name) : Object
+    ActiveSupport::Deprecation.warn(<<-MSG.squish)
+      `Module#parent` has been renamed to `module_parent`.
+      `parent` is deprecated and will be removed in Rails 6.1.
+    MSG
+    module_parent
   end
 
   # Returns all the parents of this module according to its name, ordered from
@@ -44,13 +60,13 @@ class Module
   #   end
   #   X = M::N
   #
-  #   M.parents    # => [Object]
-  #   M::N.parents # => [M, Object]
-  #   X.parents    # => [M, Object]
-  def parents
+  #   M.module_parents    # => [Object]
+  #   M::N.module_parents # => [M, Object]
+  #   X.module_parents    # => [M, Object]
+  def module_parents
     parents = []
-    if parent_name
-      parts = parent_name.split("::")
+    if module_parent_name
+      parts = module_parent_name.split("::")
       until parts.empty?
         parents << ActiveSupport::Inflector.constantize(parts * "::")
         parts.pop
@@ -59,4 +75,12 @@ class Module
     parents << Object unless parents.include? Object
     parents
   end
+
+  def parents
+    ActiveSupport::Deprecation.warn(<<-MSG.squish)
+      `Module#parents` has been renamed to `module_parents`.
+      `parents` is deprecated and will be removed in Rails 6.1.
+    MSG
+    module_parents
+  end
 end

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

@@ -3,9 +3,4 @@
 require "active_support/core_ext/module/anonymous"
 require "active_support/core_ext/string/inflections"
 
-class Module
-  def reachable? #:nodoc:
-    !anonymous? && name.safe_constantize.equal?(self)
-  end
-  deprecate :reachable?
-end
+ActiveSupport::Deprecation.warn("reachable is deprecated and will be removed from the framework.")

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

@@ -1,23 +1,14 @@
 # frozen_string_literal: true
 
 class Module
-  if RUBY_VERSION >= "2.3"
-    # Marks the named method as intended to be redefined, if it exists.
-    # Suppresses the Ruby method redefinition warning. Prefer
-    # #redefine_method where possible.
-    def silence_redefinition_of_method(method)
-      if method_defined?(method) || private_method_defined?(method)
-        # This suppresses the "method redefined" warning; the self-alias
-        # looks odd, but means we don't need to generate a unique name
-        alias_method method, method
-      end
-    end
-  else
-    def silence_redefinition_of_method(method)
-      if method_defined?(method) || private_method_defined?(method)
-        alias_method :__rails_redefine, method
-        remove_method :__rails_redefine
-      end
+  # Marks the named method as intended to be redefined, if it exists.
+  # Suppresses the Ruby method redefinition warning. Prefer
+  # #redefine_method where possible.
+  def silence_redefinition_of_method(method)
+    if method_defined?(method) || private_method_defined?(method)
+      # This suppresses the "method redefined" warning; the self-alias
+      # looks odd, but means we don't need to generate a unique name
+      alias_method method, method
     end
   end
 

data/lib/active_support/core_ext/numeric.rb

@@ -2,5 +2,4 @@
 
 require "active_support/core_ext/numeric/bytes"
 require "active_support/core_ext/numeric/time"
-require "active_support/core_ext/numeric/inquiry"
 require "active_support/core_ext/numeric/conversions"

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

@@ -4,137 +4,133 @@ require "active_support/core_ext/big_decimal/conversions"
 require "active_support/number_helper"
 require "active_support/core_ext/module/deprecation"
 
-module ActiveSupport::NumericWithFormat
-  # Provides options for converting numbers into formatted strings.
-  # Options are provided for phone numbers, currency, percentage,
-  # precision, positional notation, file size and pretty printing.
-  #
-  # ==== Options
-  #
-  # For details on which formats use which options, see ActiveSupport::NumberHelper
-  #
-  # ==== 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: '.')
-  #  # => "+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, locale: :fr)   # => "1 234 567 890,51 €"
-  #  -1234567890.50.to_s(:currency, negative_format: '(%u%n)')
-  #  # => "($1,234,567,890.50)"
-  #  1234567890.50.to_s(:currency, unit: '£', separator: ',', delimiter: '')
-  #  # => "£1234567890,50"
-  #  1234567890.50.to_s(:currency, unit: '£', separator: ',', delimiter: '', format: '%n %u')
-  #  # => "1234567890,50 £"
-  #
-  #  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%"
-  #  1000.to_s(:percentage, locale: :fr)                    # => "1 000,000%"
-  #  100.to_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: ',')
-  #  # => "98 765 432,98"
-  #
-  #  Rounded:
-  #  111.2345.to_s(:rounded)                                      # => "111.235"
-  #  111.2345.to_s(:rounded, precision: 2)                        # => "111.23"
-  #  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)
-  #  # => "13"
-  #  389.32314.to_s(:rounded, precision: 4, significant: true)    # => "389.3"
-  #  1111.2345.to_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"
-  #  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"
-  #
-  #  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: 4)                      # => "489.9 Thousand"
-  #  1234567.to_s(:human, precision: 4,
-  #                   significant: false)                   # => "1.2346 Million"
-  #  1234567.to_s(:human, precision: 1,
-  #                   separator: ',',
-  #                   significant: false)                   # => "1,2 Million"
-  def to_s(format = nil, options = nil)
-    case format
-    when nil
-      super()
-    when Integer, String
-      super(format)
-    when :phone
-      ActiveSupport::NumberHelper.number_to_phone(self, options || {})
-    when :currency
-      ActiveSupport::NumberHelper.number_to_currency(self, options || {})
-    when :percentage
-      ActiveSupport::NumberHelper.number_to_percentage(self, options || {})
-    when :delimited
-      ActiveSupport::NumberHelper.number_to_delimited(self, options || {})
-    when :rounded
-      ActiveSupport::NumberHelper.number_to_rounded(self, options || {})
-    when :human
-      ActiveSupport::NumberHelper.number_to_human(self, options || {})
-    when :human_size
-      ActiveSupport::NumberHelper.number_to_human_size(self, options || {})
-    when Symbol
-      super()
-    else
-      super(format)
+module ActiveSupport
+  module NumericWithFormat
+    # Provides options for converting numbers into formatted strings.
+    # Options are provided for phone numbers, currency, percentage,
+    # precision, positional notation, file size and pretty printing.
+    #
+    # ==== Options
+    #
+    # For details on which formats use which options, see ActiveSupport::NumberHelper
+    #
+    # ==== 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: '.')
+    #  # => "+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, locale: :fr)   # => "1 234 567 890,51 €"
+    #  -1234567890.50.to_s(:currency, negative_format: '(%u%n)')
+    #  # => "($1,234,567,890.50)"
+    #  1234567890.50.to_s(:currency, unit: '£', separator: ',', delimiter: '')
+    #  # => "£1234567890,50"
+    #  1234567890.50.to_s(:currency, unit: '£', separator: ',', delimiter: '', format: '%n %u')
+    #  # => "1234567890,50 £"
+    #
+    #  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%"
+    #  1000.to_s(:percentage, locale: :fr)                    # => "1 000,000%"
+    #  100.to_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: ',')
+    #  # => "98 765 432,98"
+    #
+    #  Rounded:
+    #  111.2345.to_s(:rounded)                                      # => "111.235"
+    #  111.2345.to_s(:rounded, precision: 2)                        # => "111.23"
+    #  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)
+    #  # => "13"
+    #  389.32314.to_s(:rounded, precision: 4, significant: true)    # => "389.3"
+    #  1111.2345.to_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"
+    #  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"
+    #
+    #  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: 4)                      # => "489.9 Thousand"
+    #  1234567.to_s(:human, precision: 4,
+    #                   significant: false)                   # => "1.2346 Million"
+    #  1234567.to_s(:human, precision: 1,
+    #                   separator: ',',
+    #                   significant: false)                   # => "1,2 Million"
+    def to_s(format = nil, options = nil)
+      case format
+      when nil
+        super()
+      when Integer, String
+        super(format)
+      when :phone
+        ActiveSupport::NumberHelper.number_to_phone(self, options || {})
+      when :currency
+        ActiveSupport::NumberHelper.number_to_currency(self, options || {})
+      when :percentage
+        ActiveSupport::NumberHelper.number_to_percentage(self, options || {})
+      when :delimited
+        ActiveSupport::NumberHelper.number_to_delimited(self, options || {})
+      when :rounded
+        ActiveSupport::NumberHelper.number_to_rounded(self, options || {})
+      when :human
+        ActiveSupport::NumberHelper.number_to_human(self, options || {})
+      when :human_size
+        ActiveSupport::NumberHelper.number_to_human_size(self, options || {})
+      when Symbol
+        super()
+      else
+        super(format)
+      end
     end
   end
 end
 
-# Ruby 2.4+ unifies Fixnum & Bignum into Integer.
-if 0.class == Integer
-  Integer.prepend ActiveSupport::NumericWithFormat
-else
-  Fixnum.prepend ActiveSupport::NumericWithFormat
-  Bignum.prepend ActiveSupport::NumericWithFormat
-end
+Integer.prepend ActiveSupport::NumericWithFormat
 Float.prepend ActiveSupport::NumericWithFormat
 BigDecimal.prepend ActiveSupport::NumericWithFormat