mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
5aeb3cd3ac
This fixes:
1.second.eql?(1.second) #=> false
The new `eql?` requires that `other` is an `ActiveSupport::Duration`.
This requirement makes `ActiveSupport::Duration`'s behavior consistent
with other numeric types in Ruby.
1.eql?(1.0) #=> false
1.0.eql?(1) #=> false
1.second.eql?(1) #=> false (was true)
1.eql?(1.second) #=> false
{ 1 => "foo", 1.0 => "bar" }
#=> { 1 => "foo", 1.0 => "bar" }
{ 1 => "foo", 1.second => "bar" }
# now => { 1 => "foo", 1.second => "bar" }
# was => { 1 => "bar" }
And though the behavior here hasn't changed, for reference:
1 == 1.0 #=> true
1.0 == 1 #=> true
1 == 1.second #=> true
1.second == 1 #=> true
118 lines
3.2 KiB
Ruby
118 lines
3.2 KiB
Ruby
require 'active_support/proxy_object'
|
|
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.
|
|
#
|
|
# 1.month.ago # equivalent to Time.now.advance(months: -1)
|
|
class Duration < ProxyObject
|
|
attr_accessor :value, :parts
|
|
|
|
def initialize(value, parts) #:nodoc:
|
|
@value, @parts = value, parts
|
|
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)
|
|
else
|
|
Duration.new(value + other, @parts + [[:seconds, other]])
|
|
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] })
|
|
end
|
|
|
|
def is_a?(klass) #:nodoc:
|
|
Duration == klass || value.is_a?(klass)
|
|
end
|
|
alias :kind_of? :is_a?
|
|
|
|
# Returns +true+ if +other+ is also a Duration instance with the
|
|
# same +value+, or if <tt>other == value</tt>.
|
|
def ==(other)
|
|
if Duration === other
|
|
other.value == value
|
|
else
|
|
other == value
|
|
end
|
|
end
|
|
|
|
def eql?(other)
|
|
other.is_a?(Duration) && self == other
|
|
end
|
|
|
|
def self.===(other) #:nodoc:
|
|
other.is_a?(Duration)
|
|
rescue ::NoMethodError
|
|
false
|
|
end
|
|
|
|
# Calculates a new Time or Date that is as far in the future
|
|
# as this Duration represents.
|
|
def since(time = ::Time.current)
|
|
sum(1, time)
|
|
end
|
|
alias :from_now :since
|
|
|
|
# Calculates a new Time or Date that is as far in the past
|
|
# as this Duration represents.
|
|
def ago(time = ::Time.current)
|
|
sum(-1, time)
|
|
end
|
|
alias :until :ago
|
|
|
|
def inspect #:nodoc:
|
|
parts.
|
|
reduce(::Hash.new(0)) { |h,(l,r)| h[l] += r; h }.
|
|
sort_by {|unit, _ | [:years, :months, :days, :minutes, :seconds].index(unit)}.
|
|
map {|unit, val| "#{val} #{val == 1 ? unit.to_s.chop : unit.to_s}"}.
|
|
to_sentence(:locale => :en)
|
|
end
|
|
|
|
def as_json(options = nil) #:nodoc:
|
|
to_i
|
|
end
|
|
|
|
protected
|
|
|
|
def sum(sign, time = ::Time.current) #:nodoc:
|
|
parts.inject(time) do |t,(type,number)|
|
|
if t.acts_like?(:time) || t.acts_like?(:date)
|
|
if type == :seconds
|
|
t.since(sign * number)
|
|
else
|
|
t.advance(type => sign * number)
|
|
end
|
|
else
|
|
raise ::ArgumentError, "expected a time or date, got #{time.inspect}"
|
|
end
|
|
end
|
|
end
|
|
|
|
private
|
|
|
|
# We define it as a workaround to Ruby 2.0.0-p353 bug.
|
|
# For more information, check rails/rails#13055.
|
|
# It should be dropped once a new Ruby patch-level
|
|
# release after 2.0.0-p353 happens.
|
|
def ===(other) #:nodoc:
|
|
value === other
|
|
end
|
|
|
|
def method_missing(method, *args, &block) #:nodoc:
|
|
value.send(method, *args, &block)
|
|
end
|
|
end
|
|
end
|