duration.rb in activesupport-5.1.0.beta1

- old
+ new

@@ -1,7 +1,7 @@
-require 'active_support/core_ext/array/conversions'
-require 'active_support/core_ext/object/acts_like'
+require "active_support/core_ext/array/conversions"
+require "active_support/core_ext/object/acts_like"
 
 module ActiveSupport
   # Provides accurate date and time measurements using Date#advance and
   # Time#advance, respectively. It mainly supports the methods on Numeric.
   #
@@ -9,12 +9,12 @@
   class Duration
     SECONDS_PER_MINUTE = 60
     SECONDS_PER_HOUR   = 3600
     SECONDS_PER_DAY    = 86400
     SECONDS_PER_WEEK   = 604800
-    SECONDS_PER_MONTH  = 2592000  # 30 days
-    SECONDS_PER_YEAR   = 31557600 # length of a julian year (365.2425 days)
+    SECONDS_PER_MONTH  = 2629746  # 1/12 of a gregorian year
+    SECONDS_PER_YEAR   = 31556952 # length of a gregorian year (365.2425 days)
 
     PARTS_IN_SECONDS = {
       seconds: 1,
       minutes: SECONDS_PER_MINUTE,
       hours:   SECONDS_PER_HOUR,
@@ -24,12 +24,12 @@
       years:   SECONDS_PER_YEAR
     }.freeze
 
     attr_accessor :value, :parts
 
-    autoload :ISO8601Parser,     'active_support/duration/iso8601_parser'
-    autoload :ISO8601Serializer, 'active_support/duration/iso8601_serializer'
+    autoload :ISO8601Parser,     "active_support/duration/iso8601_parser"
+    autoload :ISO8601Serializer, "active_support/duration/iso8601_serializer"
 
     class << self
       # Creates a new Duration from string formatted according to ISO 8601 Duration.
       #
       # See {ISO 8601}[http://en.wikipedia.org/wiki/ISO_8601#Durations] for more information.
@@ -82,31 +82,37 @@
           end
         end
     end
 
     def initialize(value, parts) #:nodoc:
-      @value, @parts = value, parts
+      @value, @parts = value, parts.to_h
+      @parts.default = 0
     end
 
     # Adds another Duration or a Numeric to this Duration. Numeric values
     # are treated as seconds.
     def +(other)
       if Duration === other
-        Duration.new(value + other.value, @parts + other.parts)
+        parts = @parts.dup
+        other.parts.each do |(key, value)|
+          parts[key] += value
+        end
+        Duration.new(value + other.value, parts)
       else
-        Duration.new(value + other, @parts + [[:seconds, other]])
+        seconds = @parts[:seconds] + other
+        Duration.new(value + other, @parts.merge(seconds: seconds))
       end
     end
 
     # Subtracts another Duration or a Numeric from this Duration. Numeric
     # values are treated as seconds.
     def -(other)
       self + (-other)
     end
 
     def -@ #:nodoc:
-      Duration.new(-value, parts.map { |type,number| [type, -number] })
+      Duration.new(-value, parts.map { |type, number| [type, -number] })
     end
 
     def is_a?(klass) #:nodoc:
       Duration == klass || value.is_a?(klass)
     end
@@ -139,18 +145,18 @@
     #   1.minute.to_i   # => 60
     #   1.hour.to_i     # => 3600
     #   1.day.to_i      # => 86400
     #
     # Note that this conversion makes some assumptions about the
-    # duration of some periods, e.g. months are always 30 days
-    # and years are 365.25 days:
+    # duration of some periods, e.g. months are always 1/12 of year
+    # and years are 365.2425 days:
     #
-    #   # equivalent to 30.days.to_i
-    #   1.month.to_i    # => 2592000
+    #   # equivalent to (1.year / 12).to_i
+    #   1.month.to_i    # => 2629746
     #
-    #   # equivalent to 365.25.days.to_i
-    #   1.year.to_i     # => 31557600
+    #   # equivalent to 365.2425.days.to_i
+    #   1.year.to_i     # => 31556952
     #
     # In such cases, Ruby's core
     # Date[http://ruby-doc.org/stdlib/libdoc/date/rdoc/Date.html] and
     # Time[http://ruby-doc.org/stdlib/libdoc/time/rdoc/Time.html] should be used for precision
     # date and time arithmetic.
@@ -182,21 +188,21 @@
     end
     alias :until :ago
 
     def inspect #:nodoc:
       parts.
-        reduce(::Hash.new(0)) { |h,(l,r)| h[l] += r; h }.
-        sort_by {|unit,  _ | [:years, :months, :weeks, :days, :hours, :minutes, :seconds].index(unit)}.
-        map     {|unit, val| "#{val} #{val == 1 ? unit.to_s.chop : unit.to_s}"}.
+        reduce(::Hash.new(0)) { |h, (l, r)| h[l] += r; h }.
+        sort_by { |unit,  _ | [:years, :months, :weeks, :days, :hours, :minutes, :seconds].index(unit) }.
+        map     { |unit, val| "#{val} #{val == 1 ? unit.to_s.chop : unit.to_s}" }.
         to_sentence(locale: ::I18n.default_locale)
     end
 
     def as_json(options = nil) #:nodoc:
       to_i
     end
 
-    def respond_to_missing?(method, include_private=false) #:nodoc:
+    def respond_to_missing?(method, include_private = false) #:nodoc:
       @value.respond_to?(method, include_private)
     end
 
     # Build ISO 8601 Duration string for this duration.
     # The +precision+ parameter can be used to limit seconds' precision of duration.
@@ -204,14 +210,14 @@
       ISO8601Serializer.new(self, precision: precision).serialize
     end
 
     delegate :<=>, to: :value
 
-    protected
+    private
 
-      def sum(sign, time = ::Time.current) #:nodoc:
-        parts.inject(time) do |t,(type,number)|
+      def sum(sign, time = ::Time.current)
+        parts.inject(time) do |t, (type, number)|
           if t.acts_like?(:time) || t.acts_like?(:date)
             if type == :seconds
               t.since(sign * number)
             elsif type == :minutes
               t.since(sign * number * 60)
@@ -224,12 +230,10 @@
             raise ::ArgumentError, "expected a time or date, got #{time.inspect}"
           end
         end
       end
 
-    private
-
-      def method_missing(method, *args, &block) #:nodoc:
+      def method_missing(method, *args, &block)
         value.send(method, *args, &block)
       end
   end
 end