Merge branch 'master' of github.com:rails/rails

4 files changed, 12 insertions, 5 deletions

diff --git a/activesupport/lib/active_support/core_ext/object/itself.rb b/activesupport/lib/active_support/core_ext/object/itself.rb
index adedc20169..d71cea6674 100644
--- a/activesupport/lib/active_support/core_ext/object/itself.rb
+++ b/activesupport/lib/active_support/core_ext/object/itself.rb
@@ -1,6 +1,9 @@
 class Object
-  unless respond_to?(:itself) # TODO: Remove this file when we drop support for Ruby < 2.2
-    # Returns the object itself. Useful when dealing with a chaining scenario, like Active Record scopes:
+  # TODO: Remove this file when we drop support for Ruby < 2.2
+  unless respond_to?(:itself)
+    # Returns the object itself.
+    #
+    # Useful for chaining methods, such as Active Record scopes:
     #
     #   Event.public_send(state.presence_in([ :trashed, :drafted ]) || :itself).order(:created_at)
     #
diff --git a/activesupport/lib/active_support/deprecation.rb b/activesupport/lib/active_support/deprecation.rb
index ab16977bda..46e9996d59 100644
--- a/activesupport/lib/active_support/deprecation.rb
+++ b/activesupport/lib/active_support/deprecation.rb
@@ -32,7 +32,7 @@ module ActiveSupport
     # and the second is a library name
     #
     #   ActiveSupport::Deprecation.new('2.0', 'MyLibrary')
-    def initialize(deprecation_horizon = '4.2', gem_name = 'Rails')
+    def initialize(deprecation_horizon = '5.0', gem_name = 'Rails')
       self.gem_name = gem_name
       self.deprecation_horizon = deprecation_horizon
       # By default, warnings are not silenced and debugging is off.
diff --git a/activesupport/lib/active_support/duration.rb b/activesupport/lib/active_support/duration.rb
index 0ae641d05b..1a6c02a39b 100644
--- a/activesupport/lib/active_support/duration.rb
+++ b/activesupport/lib/active_support/duration.rb
@@ -39,6 +39,10 @@ module ActiveSupport
     end
     alias :kind_of? :is_a?
 
+    def instance_of?(klass) # :nodoc:
+      Duration == klass || value.instance_of?(klass)
+    end
+
     # Returns +true+ if +other+ is also a Duration instance with the
     # same +value+, or if <tt>other == value</tt>.
     def ==(other)
diff --git a/activesupport/lib/active_support/number_helper/number_to_rounded_converter.rb b/activesupport/lib/active_support/number_helper/number_to_rounded_converter.rb
index 01597b288a..dcf9a567e8 100644
--- a/activesupport/lib/active_support/number_helper/number_to_rounded_converter.rb
+++ b/activesupport/lib/active_support/number_helper/number_to_rounded_converter.rb
@@ -33,7 +33,7 @@ module ActiveSupport
             a, b = s.split('.', 2)
             a + '.' + b[0, precision]
           else
-            "%01.#{precision}f" % rounded_number
+            "%00.#{precision}f" % rounded_number
           end
 
         delimited_number = NumberToDelimitedConverter.convert(formatted_string, options)
@@ -59,7 +59,7 @@ module ActiveSupport
         end
 
         def digit_count(number)
-          (Math.log10(absolute_number(number)) + 1).floor
+          number.zero? ? 1 : (Math.log10(absolute_number(number)) + 1).floor
         end
 
         def strip_insignificant_zeros