Merge branch 'master' into merge-action-cable

1 files changed, 7 insertions, 10 deletions

diff --git a/activesupport/lib/active_support/core_ext/range/conversions.rb b/activesupport/lib/active_support/core_ext/range/conversions.rb
index 83eced50bf..965436c23a 100644
--- a/activesupport/lib/active_support/core_ext/range/conversions.rb
+++ b/activesupport/lib/active_support/core_ext/range/conversions.rb
@@ -1,34 +1,31 @@
-class Range
+module ActiveSupport::RangeWithFormat
   RANGE_FORMATS = {
     :db => Proc.new { |start, stop| "BETWEEN '#{start.to_s(:db)}' AND '#{stop.to_s(:db)}'" }
   }
 
   # Convert range to a formatted string. See RANGE_FORMATS for predefined formats.
   #
-  # This method is aliased to <tt>to_s</tt>.
-  #
   #   range = (1..100)           # => 1..100
   #
-  #   range.to_formatted_s       # => "1..100"
   #   range.to_s                 # => "1..100"
-  #
-  #   range.to_formatted_s(:db)  # => "BETWEEN '1' AND '100'"
   #   range.to_s(:db)            # => "BETWEEN '1' AND '100'"
   #
-  # == Adding your own range formats to to_formatted_s
+  # == 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_formatted_s(format = :default)
+  def to_s(format = :default)
     if formatter = RANGE_FORMATS[format]
       formatter.call(first, last)
     else
-      to_default_s
+      super()
     end
   end
 
   alias_method :to_default_s, :to_s
-  alias_method :to_s, :to_formatted_s
+  alias_method :to_formatted_s, :to_s
 end
+
+Range.prepend(ActiveSupport::RangeWithFormat)