From 041b2052e6d5d715474e34f3625f88f586941bfd Mon Sep 17 00:00:00 2001
From: Chen Kinnrot <kinnrot@gmail.com>
Date: Wed, 13 Dec 2017 10:16:46 +0200
Subject: Empty duration inspect fix

---
 activesupport/lib/active_support/duration.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/duration.rb b/activesupport/lib/active_support/duration.rb
index 1af3411a8a..fe1058762b 100644
--- a/activesupport/lib/active_support/duration.rb
+++ b/activesupport/lib/active_support/duration.rb
@@ -194,7 +194,6 @@ module ActiveSupport
         end
 
         parts[:seconds] = remainder
-        parts.reject! { |k, v| v.zero? }
 
         new(value, parts)
       end
@@ -211,6 +210,7 @@ module ActiveSupport
     def initialize(value, parts) #:nodoc:
       @value, @parts = value, parts.to_h
       @parts.default = 0
+      @parts.reject! { |k, v| v.zero? }
     end
 
     def coerce(other) #:nodoc:
@@ -370,6 +370,8 @@ module ActiveSupport
     alias :before :ago
 
     def inspect #:nodoc:
+      return "0 seconds" if parts.empty?
+
       parts.
         reduce(::Hash.new(0)) { |h, (l, r)| h[l] += r; h }.
         sort_by { |unit,  _ | PARTS.index(unit) }.
-- 
cgit v1.2.3