2016-08-06 11:58:50 -04:00
|
|
|
require "active_support/duration"
|
|
|
|
require "active_support/values/time_zone"
|
|
|
|
require "active_support/core_ext/object/acts_like"
|
|
|
|
require "active_support/core_ext/date_and_time/compatibility"
|
2009-11-14 22:33:58 -05:00
|
|
|
|
2008-01-22 20:56:22 -05:00
|
|
|
module ActiveSupport
|
2012-09-17 01:22:18 -04:00
|
|
|
# A Time-like class that can represent a time in any time zone. Necessary
|
|
|
|
# because standard Ruby Time instances are limited to UTC and the
|
|
|
|
# system's <tt>ENV['TZ']</tt> zone.
|
2008-05-18 15:13:47 -04:00
|
|
|
#
|
2012-09-17 01:22:18 -04:00
|
|
|
# You shouldn't ever need to create a TimeWithZone instance directly via +new+.
|
|
|
|
# Instead use methods +local+, +parse+, +at+ and +now+ on TimeZone instances,
|
|
|
|
# and +in_time_zone+ on Time and DateTime instances.
|
2008-05-18 15:13:47 -04:00
|
|
|
#
|
|
|
|
# Time.zone = 'Eastern Time (US & Canada)' # => 'Eastern Time (US & Canada)'
|
|
|
|
# Time.zone.local(2007, 2, 10, 15, 30, 45) # => Sat, 10 Feb 2007 15:30:45 EST -05:00
|
2011-09-12 12:53:10 -04:00
|
|
|
# Time.zone.parse('2007-02-10 15:30:45') # => Sat, 10 Feb 2007 15:30:45 EST -05:00
|
2015-09-26 07:39:12 -04:00
|
|
|
# Time.zone.at(1171139445) # => Sat, 10 Feb 2007 15:30:45 EST -05:00
|
2008-05-18 15:13:47 -04:00
|
|
|
# Time.zone.now # => Sun, 18 May 2008 13:07:55 EDT -04:00
|
|
|
|
# Time.utc(2007, 2, 10, 20, 30, 45).in_time_zone # => Sat, 10 Feb 2007 15:30:45 EST -05:00
|
|
|
|
#
|
2009-04-22 03:47:25 -04:00
|
|
|
# See Time and TimeZone for further documentation of these methods.
|
2008-05-18 15:13:47 -04:00
|
|
|
#
|
2012-09-17 01:22:18 -04:00
|
|
|
# TimeWithZone instances implement the same API as Ruby Time instances, so
|
|
|
|
# that Time and TimeWithZone instances are interchangeable.
|
2008-05-18 15:13:47 -04:00
|
|
|
#
|
|
|
|
# t = Time.zone.now # => Sun, 18 May 2008 13:27:25 EDT -04:00
|
|
|
|
# t.hour # => 13
|
|
|
|
# t.dst? # => true
|
|
|
|
# t.utc_offset # => -14400
|
|
|
|
# t.zone # => "EDT"
|
|
|
|
# t.to_s(:rfc822) # => "Sun, 18 May 2008 13:27:25 -0400"
|
|
|
|
# t + 1.day # => Mon, 19 May 2008 13:27:25 EDT -04:00
|
|
|
|
# t.beginning_of_year # => Tue, 01 Jan 2008 00:00:00 EST -05:00
|
|
|
|
# t > Time.utc(1999) # => true
|
|
|
|
# t.is_a?(Time) # => true
|
|
|
|
# t.is_a?(ActiveSupport::TimeWithZone) # => true
|
2008-01-22 20:56:22 -05:00
|
|
|
class TimeWithZone
|
2012-09-17 01:22:18 -04:00
|
|
|
# Report class name as 'Time' to thwart type checking.
|
2009-04-05 11:08:54 -04:00
|
|
|
def self.name
|
2016-08-06 11:58:50 -04:00
|
|
|
"Time"
|
2009-04-05 11:08:54 -04:00
|
|
|
end
|
2010-08-14 01:13:00 -04:00
|
|
|
|
2015-06-17 07:01:18 -04:00
|
|
|
PRECISIONS = Hash.new { |h, n| h[n] = "%FT%T.%#{n}N".freeze }
|
2016-08-06 11:58:50 -04:00
|
|
|
PRECISIONS[0] = "%FT%T".freeze
|
2015-06-17 07:01:18 -04:00
|
|
|
|
2016-04-23 09:46:50 -04:00
|
|
|
include Comparable, DateAndTime::Compatibility
|
2008-01-22 20:56:22 -05:00
|
|
|
attr_reader :time_zone
|
2008-09-11 06:51:16 -04:00
|
|
|
|
2008-03-16 22:40:28 -04:00
|
|
|
def initialize(utc_time, time_zone, local_time = nil, period = nil)
|
2016-04-23 14:34:54 -04:00
|
|
|
@utc = utc_time ? transfer_time_values_to_utc_constructor(utc_time) : nil
|
|
|
|
@time_zone, @time = time_zone, local_time
|
2014-01-26 11:56:33 -05:00
|
|
|
@period = @utc ? period : get_period_and_ensure_valid_local_time(period)
|
2008-01-22 20:56:22 -05:00
|
|
|
end
|
2008-09-11 06:51:16 -04:00
|
|
|
|
2016-04-23 14:34:54 -04:00
|
|
|
# Returns a <tt>Time</tt> instance that represents the time in +time_zone+.
|
2008-01-22 20:56:22 -05:00
|
|
|
def time
|
2008-03-27 22:10:36 -04:00
|
|
|
@time ||= period.to_local(@utc)
|
2008-01-22 20:56:22 -05:00
|
|
|
end
|
|
|
|
|
2016-04-23 14:34:54 -04:00
|
|
|
# Returns a <tt>Time</tt> instance of the simultaneous time in the UTC timezone.
|
2008-01-22 20:56:22 -05:00
|
|
|
def utc
|
2008-03-27 22:10:36 -04:00
|
|
|
@utc ||= period.to_utc(@time)
|
2008-01-22 20:56:22 -05:00
|
|
|
end
|
|
|
|
alias_method :comparable_time, :utc
|
2008-02-10 17:26:16 -05:00
|
|
|
alias_method :getgm, :utc
|
|
|
|
alias_method :getutc, :utc
|
|
|
|
alias_method :gmtime, :utc
|
2008-09-11 06:51:16 -04:00
|
|
|
|
2008-05-25 07:29:00 -04:00
|
|
|
# Returns the underlying TZInfo::TimezonePeriod.
|
2008-01-22 20:56:22 -05:00
|
|
|
def period
|
2008-03-16 22:40:28 -04:00
|
|
|
@period ||= time_zone.period_for_utc(@utc)
|
2008-01-22 20:56:22 -05:00
|
|
|
end
|
|
|
|
|
2008-05-25 07:29:00 -04:00
|
|
|
# Returns the simultaneous time in <tt>Time.zone</tt>, or the specified zone.
|
2008-03-17 01:50:13 -04:00
|
|
|
def in_time_zone(new_zone = ::Time.zone)
|
2008-02-10 15:35:47 -05:00
|
|
|
return self if time_zone == new_zone
|
2008-01-22 20:56:22 -05:00
|
|
|
utc.in_time_zone(new_zone)
|
|
|
|
end
|
2008-09-11 06:51:16 -04:00
|
|
|
|
2016-04-23 14:34:54 -04:00
|
|
|
# Returns a <tt>Time</tt> instance of the simultaneous time in the system timezone.
|
2014-10-18 03:47:40 -04:00
|
|
|
def localtime(utc_offset = nil)
|
2016-10-02 12:02:27 -04:00
|
|
|
utc.getlocal(utc_offset)
|
2008-01-22 20:56:22 -05:00
|
|
|
end
|
2008-02-10 17:26:16 -05:00
|
|
|
alias_method :getlocal, :localtime
|
2008-09-11 06:51:16 -04:00
|
|
|
|
2013-01-01 09:58:34 -05:00
|
|
|
# Returns true if the current time is within Daylight Savings Time for the
|
2012-12-31 21:04:10 -05:00
|
|
|
# specified time zone.
|
|
|
|
#
|
2013-01-01 00:52:47 -05:00
|
|
|
# Time.zone = 'Eastern Time (US & Canada)' # => 'Eastern Time (US & Canada)'
|
|
|
|
# Time.zone.parse("2012-5-30").dst? # => true
|
|
|
|
# Time.zone.parse("2012-11-30").dst? # => false
|
2008-01-22 20:56:22 -05:00
|
|
|
def dst?
|
2008-01-25 13:23:22 -05:00
|
|
|
period.dst?
|
2008-01-22 20:56:22 -05:00
|
|
|
end
|
2008-02-10 17:26:16 -05:00
|
|
|
alias_method :isdst, :dst?
|
2008-09-11 06:51:16 -04:00
|
|
|
|
2013-01-01 09:58:34 -05:00
|
|
|
# Returns true if the current time zone is set to UTC.
|
2013-01-01 00:52:47 -05:00
|
|
|
#
|
|
|
|
# Time.zone = 'UTC' # => 'UTC'
|
|
|
|
# Time.zone.now.utc? # => true
|
|
|
|
# Time.zone = 'Eastern Time (US & Canada)' # => 'Eastern Time (US & Canada)'
|
|
|
|
# Time.zone.now.utc? # => false
|
2008-01-22 20:56:22 -05:00
|
|
|
def utc?
|
2015-10-13 03:42:39 -04:00
|
|
|
period.offset.abbreviation == :UTC || period.offset.abbreviation == :UCT
|
2008-01-22 20:56:22 -05:00
|
|
|
end
|
2008-02-10 17:26:16 -05:00
|
|
|
alias_method :gmt?, :utc?
|
2008-09-11 06:51:16 -04:00
|
|
|
|
2013-01-01 09:58:34 -05:00
|
|
|
# Returns the offset from current time to UTC time in seconds.
|
2008-01-22 20:56:22 -05:00
|
|
|
def utc_offset
|
2008-01-25 13:23:22 -05:00
|
|
|
period.utc_total_offset
|
2008-01-22 20:56:22 -05:00
|
|
|
end
|
2008-02-10 17:26:16 -05:00
|
|
|
alias_method :gmt_offset, :utc_offset
|
|
|
|
alias_method :gmtoff, :utc_offset
|
2008-09-11 06:51:16 -04:00
|
|
|
|
2013-01-01 11:45:30 -05:00
|
|
|
# Returns a formatted string of the offset from UTC, or an alternative
|
|
|
|
# string if the time zone is already UTC.
|
|
|
|
#
|
|
|
|
# Time.zone = 'Eastern Time (US & Canada)' # => "Eastern Time (US & Canada)"
|
|
|
|
# Time.zone.now.formatted_offset(true) # => "-05:00"
|
|
|
|
# Time.zone.now.formatted_offset(false) # => "-0500"
|
|
|
|
# Time.zone = 'UTC' # => "UTC"
|
|
|
|
# Time.zone.now.formatted_offset(true, "0") # => "0"
|
2008-01-22 20:56:22 -05:00
|
|
|
def formatted_offset(colon = true, alternate_utc_string = nil)
|
2009-03-24 01:01:51 -04:00
|
|
|
utc? && alternate_utc_string || TimeZone.seconds_to_utc_offset(utc_offset, colon)
|
2008-01-22 20:56:22 -05:00
|
|
|
end
|
2008-09-11 06:51:16 -04:00
|
|
|
|
2014-12-04 11:10:47 -05:00
|
|
|
# Returns the time zone abbreviation.
|
|
|
|
#
|
|
|
|
# Time.zone = 'Eastern Time (US & Canada)' # => "Eastern Time (US & Canada)"
|
|
|
|
# Time.zone.now.zone # => "EST"
|
2008-01-22 20:56:22 -05:00
|
|
|
def zone
|
2008-03-21 18:48:00 -04:00
|
|
|
period.zone_identifier.to_s
|
2008-01-22 20:56:22 -05:00
|
|
|
end
|
2008-09-11 06:51:16 -04:00
|
|
|
|
2016-09-17 15:36:13 -04:00
|
|
|
# Returns a string of the object's date, time, zone, and offset from UTC.
|
2014-12-04 11:10:47 -05:00
|
|
|
#
|
2015-09-09 20:38:09 -04:00
|
|
|
# Time.zone.now.inspect # => "Thu, 04 Dec 2014 11:00:25 EST -05:00"
|
2008-01-22 20:56:22 -05:00
|
|
|
def inspect
|
|
|
|
"#{time.strftime('%a, %d %b %Y %H:%M:%S')} #{zone} #{formatted_offset}"
|
|
|
|
end
|
|
|
|
|
2014-12-04 11:10:47 -05:00
|
|
|
# Returns a string of the object's date and time in the ISO 8601 standard
|
|
|
|
# format.
|
|
|
|
#
|
|
|
|
# Time.zone.now.xmlschema # => "2014-12-04T11:02:37-05:00"
|
2009-01-10 09:09:29 -05:00
|
|
|
def xmlschema(fraction_digits = 0)
|
2015-06-17 07:01:18 -04:00
|
|
|
"#{time.strftime(PRECISIONS[fraction_digits.to_i])}#{formatted_offset(true, 'Z'.freeze)}"
|
2008-01-22 20:56:22 -05:00
|
|
|
end
|
2008-02-10 17:26:16 -05:00
|
|
|
alias_method :iso8601, :xmlschema
|
2008-07-16 08:00:36 -04:00
|
|
|
|
2012-09-17 01:22:18 -04:00
|
|
|
# Coerces time to a string for JSON encoding. The default format is ISO 8601.
|
|
|
|
# You can get %Y/%m/%d %H:%M:%S +offset style by setting
|
|
|
|
# <tt>ActiveSupport::JSON::Encoding.use_standard_json_time_format</tt>
|
|
|
|
# to +false+.
|
2009-06-05 21:25:07 -04:00
|
|
|
#
|
|
|
|
# # With ActiveSupport::JSON::Encoding.use_standard_json_time_format = true
|
2013-11-05 03:08:16 -05:00
|
|
|
# Time.utc(2005,2,1,15,15,10).in_time_zone("Hawaii").to_json
|
|
|
|
# # => "2005-02-01T05:15:10.000-10:00"
|
2009-06-05 21:25:07 -04:00
|
|
|
#
|
|
|
|
# # With ActiveSupport::JSON::Encoding.use_standard_json_time_format = false
|
2013-11-05 03:08:16 -05:00
|
|
|
# Time.utc(2005,2,1,15,15,10).in_time_zone("Hawaii").to_json
|
|
|
|
# # => "2005/02/01 05:15:10 -1000"
|
2009-06-05 21:25:07 -04:00
|
|
|
def as_json(options = nil)
|
|
|
|
if ActiveSupport::JSON::Encoding.use_standard_json_time_format
|
2014-01-26 16:09:06 -05:00
|
|
|
xmlschema(ActiveSupport::JSON::Encoding.time_precision)
|
2009-06-05 21:25:07 -04:00
|
|
|
else
|
|
|
|
%(#{time.strftime("%Y/%m/%d %H:%M:%S")} #{formatted_offset(false)})
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2014-10-20 04:12:35 -04:00
|
|
|
def init_with(coder) #:nodoc:
|
2016-08-06 11:58:50 -04:00
|
|
|
initialize(coder["utc"], coder["zone"], coder["time"])
|
2014-10-20 04:12:35 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
def encode_with(coder) #:nodoc:
|
2016-08-06 11:58:50 -04:00
|
|
|
coder.tag = "!ruby/object:ActiveSupport::TimeWithZone"
|
|
|
|
coder.map = { "utc" => utc, "zone" => time_zone, "time" => time }
|
2011-01-19 18:19:57 -05:00
|
|
|
end
|
|
|
|
|
2013-01-01 00:52:47 -05:00
|
|
|
# Returns a string of the object's date and time in the format used by
|
|
|
|
# HTTP requests.
|
|
|
|
#
|
|
|
|
# Time.zone.now.httpdate # => "Tue, 01 Jan 2013 04:39:43 GMT"
|
2008-02-10 15:04:14 -05:00
|
|
|
def httpdate
|
|
|
|
utc.httpdate
|
|
|
|
end
|
2008-09-11 06:51:16 -04:00
|
|
|
|
2013-01-01 00:52:47 -05:00
|
|
|
# Returns a string of the object's date and time in the RFC 2822 standard
|
|
|
|
# format.
|
|
|
|
#
|
|
|
|
# Time.zone.now.rfc2822 # => "Tue, 01 Jan 2013 04:51:39 +0000"
|
2008-02-10 15:04:14 -05:00
|
|
|
def rfc2822
|
|
|
|
to_s(:rfc822)
|
|
|
|
end
|
|
|
|
alias_method :rfc822, :rfc2822
|
2008-09-11 06:51:16 -04:00
|
|
|
|
2014-05-09 12:50:35 -04:00
|
|
|
# Returns a string of the object's date and time.
|
|
|
|
# Accepts an optional <tt>format</tt>:
|
2015-01-04 13:37:05 -05:00
|
|
|
# * <tt>:default</tt> - default value, mimics Ruby Time#to_s format.
|
2014-05-09 12:50:35 -04:00
|
|
|
# * <tt>:db</tt> - format outputs time in UTC :db time. See Time#to_formatted_s(:db).
|
|
|
|
# * Any key in <tt>Time::DATE_FORMATS</tt> can be used. See active_support/core_ext/time/conversions.rb.
|
2008-09-11 06:51:16 -04:00
|
|
|
def to_s(format = :default)
|
2009-03-29 02:54:46 -04:00
|
|
|
if format == :db
|
|
|
|
utc.to_s(format)
|
|
|
|
elsif formatter = ::Time::DATE_FORMATS[format]
|
2008-01-22 20:56:22 -05:00
|
|
|
formatter.respond_to?(:call) ? formatter.call(self).to_s : strftime(formatter)
|
|
|
|
else
|
2015-01-04 13:37:05 -05:00
|
|
|
"#{time.strftime("%Y-%m-%d %H:%M:%S")} #{formatted_offset(false, 'UTC')}" # mimicking Ruby Time#to_s format
|
2008-01-22 20:56:22 -05:00
|
|
|
end
|
|
|
|
end
|
2009-01-26 10:10:41 -05:00
|
|
|
alias_method :to_formatted_s, :to_s
|
2008-09-11 06:51:16 -04:00
|
|
|
|
2014-10-18 03:47:40 -04:00
|
|
|
# Replaces <tt>%Z</tt> directive with +zone before passing to Time#strftime,
|
|
|
|
# so that zone information is correct.
|
2008-01-22 20:56:22 -05:00
|
|
|
def strftime(format)
|
2014-10-18 03:47:40 -04:00
|
|
|
format = format.gsub(/((?:\A|[^%])(?:%%)*)%Z/, "\\1#{zone}")
|
|
|
|
getlocal(utc_offset).strftime(format)
|
2008-01-22 20:56:22 -05:00
|
|
|
end
|
2008-09-11 06:51:16 -04:00
|
|
|
|
2008-05-25 07:29:00 -04:00
|
|
|
# Use the time in UTC for comparisons.
|
2008-01-22 20:56:22 -05:00
|
|
|
def <=>(other)
|
|
|
|
utc <=> other
|
|
|
|
end
|
2008-09-11 06:51:16 -04:00
|
|
|
|
2013-01-01 11:45:30 -05:00
|
|
|
# Returns true if the current object's time is within the specified
|
|
|
|
# +min+ and +max+ time.
|
2008-02-16 19:35:49 -05:00
|
|
|
def between?(min, max)
|
|
|
|
utc.between?(min, max)
|
|
|
|
end
|
2008-09-11 06:51:16 -04:00
|
|
|
|
2013-01-01 11:45:30 -05:00
|
|
|
# Returns true if the current object's time is in the past.
|
2008-09-11 06:51:16 -04:00
|
|
|
def past?
|
|
|
|
utc.past?
|
|
|
|
end
|
|
|
|
|
2013-01-01 11:45:30 -05:00
|
|
|
# Returns true if the current object's time falls within
|
|
|
|
# the current day.
|
2008-09-11 06:51:16 -04:00
|
|
|
def today?
|
2008-09-14 23:56:32 -04:00
|
|
|
time.today?
|
2008-09-11 06:51:16 -04:00
|
|
|
end
|
|
|
|
|
2013-01-01 11:45:30 -05:00
|
|
|
# Returns true if the current object's time is in the future.
|
2008-09-11 06:51:16 -04:00
|
|
|
def future?
|
|
|
|
utc.future?
|
|
|
|
end
|
|
|
|
|
2015-08-17 22:47:54 -04:00
|
|
|
# Returns +true+ if +other+ is equal to current object.
|
2008-02-10 17:26:16 -05:00
|
|
|
def eql?(other)
|
2015-07-19 11:08:20 -04:00
|
|
|
other.eql?(utc)
|
2011-11-22 15:37:16 -05:00
|
|
|
end
|
|
|
|
|
|
|
|
def hash
|
|
|
|
utc.hash
|
2008-02-10 17:26:16 -05:00
|
|
|
end
|
2008-09-11 06:51:16 -04:00
|
|
|
|
2015-03-04 22:16:46 -05:00
|
|
|
# Adds an interval of time to the current object's time and returns that
|
2014-12-04 14:57:12 -05:00
|
|
|
# value as a new TimeWithZone object.
|
|
|
|
#
|
|
|
|
# Time.zone = 'Eastern Time (US & Canada)' # => 'Eastern Time (US & Canada)'
|
|
|
|
# now = Time.zone.now # => Sun, 02 Nov 2014 01:26:28 EDT -04:00
|
|
|
|
# now + 1000 # => Sun, 02 Nov 2014 01:43:08 EDT -04:00
|
|
|
|
#
|
|
|
|
# If we're adding a Duration of variable length (i.e., years, months, days),
|
|
|
|
# move forward from #time, otherwise move forward from #utc, for accuracy
|
|
|
|
# when moving across DST boundaries.
|
|
|
|
#
|
|
|
|
# For instance, a time + 24.hours will advance exactly 24 hours, while a
|
|
|
|
# time + 1.day will advance 23-25 hours, depending on the day.
|
|
|
|
#
|
|
|
|
# now + 24.hours # => Mon, 03 Nov 2014 00:26:28 EST -05:00
|
|
|
|
# now + 1.day # => Mon, 03 Nov 2014 01:26:28 EST -05:00
|
2008-02-16 18:15:59 -05:00
|
|
|
def +(other)
|
2008-06-29 16:17:51 -04:00
|
|
|
if duration_of_variable_length?(other)
|
|
|
|
method_missing(:+, other)
|
|
|
|
else
|
|
|
|
result = utc.acts_like?(:date) ? utc.since(other) : utc + other rescue utc.since(other)
|
|
|
|
result.in_time_zone(time_zone)
|
|
|
|
end
|
2008-02-16 18:15:59 -05:00
|
|
|
end
|
Replace AS::TimeWithZone#since with alias to +
Stems from [Google group discussion](https://groups.google.com/forum/#!topic/rubyonrails-core/jSPbP-TNLb0).
Currently `AS::TimeWithZone` has two methods to add an interval to a time:
`+(other)` and `since(other)` ([docs](http://edgeapi.rubyonrails.org/classes/ActiveSupport/TimeWithZone.html)).
The two methods are "pretty much" equivalent in every case:
1. When adding any interval to an `AS::TimeWithZone` representing a `Time`:
```ruby
t = Time.now.in_time_zone #=> Thu, 04 Dec 2014 18:56:28 EST -05:00
t + 1 == t.since(1) #=> true
t + 1.day == t.since(1.day) #=> true
t + 1.month == t.since(1.month) #=> true
```
2. When adding any interval to an `AS::TimeWithZone` representing a `Date`:
```ruby
d = Date.today.in_time_zone #=> Thu, 04 Dec 2014 00:00:00 EST -05:00
d + 1 == d.since(1) #=> true
d + 1.day == d.since(1.day) #=> true
d + 1.month == d.since(1.month) #=> true
```
3. When adding any interval to an `AS::TimeWithZone` representing a `DateTime`:
```ruby
dt = DateTime.now.in_time_zone #=> Thu, 04 Dec 2014 18:57:28 EST -05:00
dt + 1 == dt.since(1) #=> true
dt + 1.day == dt.since(1.day) #=> true
dt + 1.month == dt.since(1.month) #=> false
```
As you can see, the only case in which they differ is when the interval added
to a `DateTime` is in a format like `1.month`.
However, this usage of "since" is explicitly discouraged by the
[documentation of `DateTime#since`](https://github.com/rails/rails/blob/master/activesupport/lib/active_support/core_ext/date_time/calculations.rb#L86L88):
> Returns a new DateTime representing the time a number of seconds since the instance time.
> Do not use this method in combination with x.months, use months_since instead!
And indeed, following this recommendation the correct result is returned:
```ruby
dt + 1.month == dt.months_since 1 #=> true
```
Therefore, my proposal is to remove the method definition of `TimeWithZone#since`
and instead replace it with a simple `alias_method :since, :+`.
The rationale is that the only case where they differ is a case that is
explicitly discouraged as "wrong".
In my opinion, having two methods named `since` and `+` and having to figure
out exactly what the difference is makes the codebase more confusing.
However, I understand this PR is "subjective", so if you feel like it's better
to ignore this, feel free to close the PR.
Thanks!
2014-12-16 18:51:05 -05:00
|
|
|
alias_method :since, :+
|
2016-09-23 08:03:48 -04:00
|
|
|
alias_method :in, :+
|
2008-06-29 16:17:51 -04:00
|
|
|
|
2014-12-04 14:57:12 -05:00
|
|
|
# Returns a new TimeWithZone object that represents the difference between
|
|
|
|
# the current object's time and the +other+ time.
|
|
|
|
#
|
|
|
|
# Time.zone = 'Eastern Time (US & Canada)' # => 'Eastern Time (US & Canada)'
|
2015-10-29 13:45:24 -04:00
|
|
|
# now = Time.zone.now # => Mon, 03 Nov 2014 00:26:28 EST -05:00
|
|
|
|
# now - 1000 # => Mon, 03 Nov 2014 00:09:48 EST -05:00
|
2014-12-04 14:57:12 -05:00
|
|
|
#
|
|
|
|
# If subtracting a Duration of variable length (i.e., years, months, days),
|
|
|
|
# move backward from #time, otherwise move backward from #utc, for accuracy
|
|
|
|
# when moving across DST boundaries.
|
|
|
|
#
|
|
|
|
# For instance, a time - 24.hours will go subtract exactly 24 hours, while a
|
|
|
|
# time - 1.day will subtract 23-25 hours, depending on the day.
|
|
|
|
#
|
2015-10-29 13:45:24 -04:00
|
|
|
# now - 24.hours # => Sun, 02 Nov 2014 01:26:28 EDT -04:00
|
|
|
|
# now - 1.day # => Sun, 02 Nov 2014 00:26:28 EDT -04:00
|
2008-01-25 19:34:44 -05:00
|
|
|
def -(other)
|
2008-02-16 18:15:59 -05:00
|
|
|
if other.acts_like?(:time)
|
2014-05-30 04:29:30 -04:00
|
|
|
to_time - other.to_time
|
2008-06-29 16:17:51 -04:00
|
|
|
elsif duration_of_variable_length?(other)
|
|
|
|
method_missing(:-, other)
|
2008-02-16 18:15:59 -05:00
|
|
|
else
|
2008-05-18 12:15:29 -04:00
|
|
|
result = utc.acts_like?(:date) ? utc.ago(other) : utc - other rescue utc.ago(other)
|
2008-04-12 18:31:29 -04:00
|
|
|
result.in_time_zone(time_zone)
|
2008-02-16 18:15:59 -05:00
|
|
|
end
|
2008-01-25 19:34:44 -05:00
|
|
|
end
|
2008-09-11 06:51:16 -04:00
|
|
|
|
2015-10-29 13:36:50 -04:00
|
|
|
# Subtracts an interval of time from the current object's time and returns
|
|
|
|
# the result as a new TimeWithZone object.
|
|
|
|
#
|
|
|
|
# Time.zone = 'Eastern Time (US & Canada)' # => 'Eastern Time (US & Canada)'
|
|
|
|
# now = Time.zone.now # => Mon, 03 Nov 2014 00:26:28 EST -05:00
|
|
|
|
# now.ago(1000) # => Mon, 03 Nov 2014 00:09:48 EST -05:00
|
|
|
|
#
|
|
|
|
# If we're subtracting a Duration of variable length (i.e., years, months,
|
|
|
|
# days), move backward from #time, otherwise move backward from #utc, for
|
|
|
|
# accuracy when moving across DST boundaries.
|
|
|
|
#
|
|
|
|
# For instance, <tt>time.ago(24.hours)</tt> will move back exactly 24 hours,
|
|
|
|
# while <tt>time.ago(1.day)</tt> will move back 23-25 hours, depending on
|
|
|
|
# the day.
|
|
|
|
#
|
|
|
|
# now.ago(24.hours) # => Sun, 02 Nov 2014 01:26:28 EDT -04:00
|
|
|
|
# now.ago(1.day) # => Sun, 02 Nov 2014 00:26:28 EDT -04:00
|
2008-04-12 18:31:29 -04:00
|
|
|
def ago(other)
|
2008-06-29 16:17:51 -04:00
|
|
|
since(-other)
|
2008-04-12 18:31:29 -04:00
|
|
|
end
|
2008-06-29 16:17:51 -04:00
|
|
|
|
2015-10-29 13:36:50 -04:00
|
|
|
# Uses Date to provide precise Time calculations for years, months, and days
|
|
|
|
# according to the proleptic Gregorian calendar. The result is returned as a
|
|
|
|
# new TimeWithZone object.
|
|
|
|
#
|
|
|
|
# The +options+ parameter takes a hash with any of these keys:
|
|
|
|
# <tt>:years</tt>, <tt>:months</tt>, <tt>:weeks</tt>, <tt>:days</tt>,
|
|
|
|
# <tt>:hours</tt>, <tt>:minutes</tt>, <tt>:seconds</tt>.
|
|
|
|
#
|
|
|
|
# If advancing by a value of variable length (i.e., years, weeks, months,
|
|
|
|
# days), move forward from #time, otherwise move forward from #utc, for
|
|
|
|
# accuracy when moving across DST boundaries.
|
|
|
|
#
|
|
|
|
# Time.zone = 'Eastern Time (US & Canada)' # => 'Eastern Time (US & Canada)'
|
|
|
|
# now = Time.zone.now # => Sun, 02 Nov 2014 01:26:28 EDT -04:00
|
|
|
|
# now.advance(seconds: 1) # => Sun, 02 Nov 2014 01:26:29 EDT -04:00
|
|
|
|
# now.advance(minutes: 1) # => Sun, 02 Nov 2014 01:27:28 EDT -04:00
|
|
|
|
# now.advance(hours: 1) # => Sun, 02 Nov 2014 01:26:28 EST -05:00
|
|
|
|
# now.advance(days: 1) # => Mon, 03 Nov 2014 01:26:28 EST -05:00
|
|
|
|
# now.advance(weeks: 1) # => Sun, 09 Nov 2014 01:26:28 EST -05:00
|
|
|
|
# now.advance(months: 1) # => Tue, 02 Dec 2014 01:26:28 EST -05:00
|
|
|
|
# now.advance(years: 1) # => Mon, 02 Nov 2015 01:26:28 EST -05:00
|
2008-04-12 18:31:29 -04:00
|
|
|
def advance(options)
|
2008-06-29 16:26:56 -04:00
|
|
|
# If we're advancing a value of variable length (i.e., years, weeks, months, days), advance from #time,
|
2008-06-29 16:17:51 -04:00
|
|
|
# otherwise advance from #utc, for accuracy when moving across DST boundaries
|
2009-02-10 00:12:47 -05:00
|
|
|
if options.values_at(:years, :weeks, :months, :days).any?
|
2008-06-29 16:17:51 -04:00
|
|
|
method_missing(:advance, options)
|
|
|
|
else
|
|
|
|
utc.advance(options).in_time_zone(time_zone)
|
|
|
|
end
|
2008-04-12 18:31:29 -04:00
|
|
|
end
|
2008-09-11 06:51:16 -04:00
|
|
|
|
2013-06-13 07:01:12 -04:00
|
|
|
%w(year mon month day mday wday yday hour min sec usec nsec to_date).each do |method_name|
|
2008-12-28 05:21:10 -05:00
|
|
|
class_eval <<-EOV, __FILE__, __LINE__ + 1
|
|
|
|
def #{method_name} # def month
|
|
|
|
time.#{method_name} # time.month
|
|
|
|
end # end
|
2008-05-08 23:07:21 -04:00
|
|
|
EOV
|
|
|
|
end
|
2008-09-11 06:51:16 -04:00
|
|
|
|
2015-08-17 22:47:54 -04:00
|
|
|
# Returns Array of parts of Time in sequence of
|
|
|
|
# [seconds, minutes, hours, day, month, year, weekday, yearday, dst?, zone].
|
|
|
|
#
|
|
|
|
# now = Time.zone.now # => Tue, 18 Aug 2015 02:29:27 UTC +00:00
|
|
|
|
# now.to_a # => [27, 29, 2, 18, 8, 2015, 2, 230, false, "UTC"]
|
2008-02-10 15:04:14 -05:00
|
|
|
def to_a
|
2008-03-16 23:45:32 -04:00
|
|
|
[time.sec, time.min, time.hour, time.day, time.mon, time.year, time.wday, time.yday, dst?, zone]
|
2008-02-10 15:04:14 -05:00
|
|
|
end
|
2008-09-11 06:51:16 -04:00
|
|
|
|
2014-12-04 11:10:47 -05:00
|
|
|
# Returns the object's date and time as a floating point number of seconds
|
|
|
|
# since the Epoch (January 1, 1970 00:00 UTC).
|
|
|
|
#
|
|
|
|
# Time.zone.now.to_f # => 1417709320.285418
|
2008-02-10 15:04:14 -05:00
|
|
|
def to_f
|
|
|
|
utc.to_f
|
2008-09-11 06:51:16 -04:00
|
|
|
end
|
|
|
|
|
2014-12-04 11:10:47 -05:00
|
|
|
# Returns the object's date and time as an integer number of seconds
|
|
|
|
# since the Epoch (January 1, 1970 00:00 UTC).
|
|
|
|
#
|
|
|
|
# Time.zone.now.to_i # => 1417709320
|
2008-02-10 15:04:14 -05:00
|
|
|
def to_i
|
|
|
|
utc.to_i
|
|
|
|
end
|
2008-02-10 17:26:16 -05:00
|
|
|
alias_method :tv_sec, :to_i
|
2008-09-11 06:51:16 -04:00
|
|
|
|
2014-12-04 11:10:47 -05:00
|
|
|
# Returns the object's date and time as a rational number of seconds
|
|
|
|
# since the Epoch (January 1, 1970 00:00 UTC).
|
|
|
|
#
|
|
|
|
# Time.zone.now.to_r # => (708854548642709/500000)
|
2013-02-24 16:07:20 -05:00
|
|
|
def to_r
|
|
|
|
utc.to_r
|
|
|
|
end
|
|
|
|
|
2015-08-26 00:48:20 -04:00
|
|
|
# Returns an instance of DateTime with the timezone's UTC offset
|
2015-08-17 22:47:54 -04:00
|
|
|
#
|
2015-08-26 00:48:20 -04:00
|
|
|
# Time.zone.now.to_datetime # => Tue, 18 Aug 2015 02:32:20 +0000
|
|
|
|
# Time.current.in_time_zone('Hawaii').to_datetime # => Mon, 17 Aug 2015 16:32:20 -1000
|
2008-02-10 17:26:16 -05:00
|
|
|
def to_datetime
|
2016-09-01 06:28:35 -04:00
|
|
|
@to_datetime ||= utc.to_datetime.new_offset(Rational(utc_offset, 86_400))
|
2008-02-10 17:26:16 -05:00
|
|
|
end
|
2008-09-11 06:51:16 -04:00
|
|
|
|
2008-05-25 07:29:00 -04:00
|
|
|
# So that +self+ <tt>acts_like?(:time)</tt>.
|
2008-01-22 20:56:22 -05:00
|
|
|
def acts_like_time?
|
|
|
|
true
|
|
|
|
end
|
2008-09-11 06:51:16 -04:00
|
|
|
|
2008-05-25 07:29:00 -04:00
|
|
|
# Say we're a Time to thwart type checking.
|
2008-01-22 20:56:22 -05:00
|
|
|
def is_a?(klass)
|
|
|
|
klass == ::Time || super
|
|
|
|
end
|
|
|
|
alias_method :kind_of?, :is_a?
|
2008-09-11 06:51:16 -04:00
|
|
|
|
2015-09-21 07:59:00 -04:00
|
|
|
# An instance of ActiveSupport::TimeWithZone is never blank
|
|
|
|
def blank?
|
|
|
|
false
|
|
|
|
end
|
|
|
|
|
2008-01-22 20:56:22 -05:00
|
|
|
def freeze
|
2008-10-19 23:33:26 -04:00
|
|
|
period; utc; time # preload instance variables before freezing
|
|
|
|
super
|
2008-01-22 20:56:22 -05:00
|
|
|
end
|
2008-03-02 22:49:37 -05:00
|
|
|
|
|
|
|
def marshal_dump
|
|
|
|
[utc, time_zone.name, time]
|
|
|
|
end
|
2008-09-11 06:51:16 -04:00
|
|
|
|
2008-03-02 22:49:37 -05:00
|
|
|
def marshal_load(variables)
|
2011-04-04 18:33:29 -04:00
|
|
|
initialize(variables[0].utc, ::Time.find_zone(variables[1]), variables[2].utc)
|
2008-03-02 22:49:37 -05:00
|
|
|
end
|
2008-05-31 17:54:17 -04:00
|
|
|
|
2014-05-25 04:55:29 -04:00
|
|
|
# respond_to_missing? is not called in some cases, such as when type conversion is
|
|
|
|
# performed with Kernel#String
|
|
|
|
def respond_to?(sym, include_priv = false)
|
|
|
|
# ensure that we're not going to throw and rescue from NoMethodError in method_missing which is slow
|
|
|
|
return false if sym.to_sym == :to_str
|
|
|
|
super
|
|
|
|
end
|
|
|
|
|
2012-09-17 01:22:18 -04:00
|
|
|
# Ensure proxy class responds to all methods that underlying time instance
|
|
|
|
# responds to.
|
2012-05-05 02:42:48 -04:00
|
|
|
def respond_to_missing?(sym, include_priv)
|
|
|
|
return false if sym.to_sym == :acts_like_date?
|
|
|
|
time.respond_to?(sym, include_priv)
|
2008-01-22 20:56:22 -05:00
|
|
|
end
|
2008-05-31 17:54:17 -04:00
|
|
|
|
2012-09-17 01:22:18 -04:00
|
|
|
# Send the missing method to +time+ instance, and wrap result in a new
|
|
|
|
# TimeWithZone with the existing +time_zone+.
|
2008-01-22 20:56:22 -05:00
|
|
|
def method_missing(sym, *args, &block)
|
2012-05-06 16:33:12 -04:00
|
|
|
wrap_with_time_zone time.__send__(sym, *args, &block)
|
2013-03-18 11:24:40 -04:00
|
|
|
rescue NoMethodError => e
|
2016-08-07 19:05:28 -04:00
|
|
|
raise e, e.message.sub(time.inspect, inspect), e.backtrace
|
2008-01-22 20:56:22 -05:00
|
|
|
end
|
2008-09-11 06:51:16 -04:00
|
|
|
|
|
|
|
private
|
2014-01-26 11:56:33 -05:00
|
|
|
def get_period_and_ensure_valid_local_time(period)
|
2008-09-11 06:51:16 -04:00
|
|
|
# we don't want a Time.local instance enforcing its own DST rules as well,
|
2008-03-17 01:07:50 -04:00
|
|
|
# so transfer time values to a utc constructor if necessary
|
|
|
|
@time = transfer_time_values_to_utc_constructor(@time) unless @time.utc?
|
|
|
|
begin
|
2014-01-26 11:56:33 -05:00
|
|
|
period || @time_zone.period_for_local(@time)
|
2008-03-17 01:07:50 -04:00
|
|
|
rescue ::TZInfo::PeriodNotFound
|
|
|
|
# time is in the "spring forward" hour gap, so we're moving the time forward one hour and trying again
|
|
|
|
@time += 1.hour
|
|
|
|
retry
|
|
|
|
end
|
|
|
|
end
|
2008-09-11 06:51:16 -04:00
|
|
|
|
2008-03-17 01:07:50 -04:00
|
|
|
def transfer_time_values_to_utc_constructor(time)
|
Speed up Time.zone.now
@amatsuda, during his RailsConf talk this past year, presented a
benchmark that showed `Time.zone.now` (an Active Support joint)
performing 24.97x slower than Ruby's `Time.now`. Rails master appears to
be a _bit_ faster than that, currently clocking in at 18.25x slower than
`Time.now`. Here's the exact benchmark data for that:
```
Warming up --------------------------------------
Time.now 127.923k i/100ms
Time.zone.now 10.275k i/100ms
Calculating -------------------------------------
Time.now 1.946M (± 5.9%) i/s - 9.722M in 5.010236s
Time.zone.now 106.625k (± 4.3%) i/s - 534.300k in 5.020343s
Comparison:
Time.now: 1946220.1 i/s
Time.zone.now: 106625.5 i/s - 18.25x slower
```
What if I told you we could make `Time.zone.now` _even_ faster? Well,
that's exactly what this patch accomplishes. When creating `ActiveSupport::TimeWithZone`
objects, we try to convert the provided time to be in a UTC format. All
this patch does is, in the method where we convert a provided time to
UTC, check if the provided time is already UTC, and is a `Time` object
and then return early if that is the case, This sidesteps having to continue on,
and create a new `Time` object from scratch. Here's the exact benchmark
data for my patch:
```
Warming up --------------------------------------
Time.now 124.136k i/100ms
Time.zone.now 26.260k i/100ms
Calculating -------------------------------------
Time.now 1.894M (± 6.4%) i/s - 9.434M in 5.000153s
Time.zone.now 301.654k (± 4.3%) i/s - 1.523M in 5.058328s
Comparison:
Time.now: 1893958.0 i/s
Time.zone.now: 301653.7 i/s - 6.28x slower
```
With this patch, we go from `Time.zone.now` being 18.25x slower than
`Time.now` to only being 6.28x slower than `Time.now`. I'd obviously love some
verification on this patch, since these numbers sound pretty interesting... :)
This is the benchmark-ips report I have been using while working on this:
```ruby
require 'benchmark/ips'
Time.zone = 'Eastern Time (US & Canada)'
Benchmark.ips do |x|
x.report('Time.now') {
Time.now
}
x.report('Time.zone.now') {
Time.zone.now
}
x.compare!
end
```
cc @amatsuda
cc performance folks @tenderlove and @schneems
![Pretty... pretty... pretty good.](https://media.giphy.com/media/bWeR8tA1QV4cM/giphy.gif)
2016-09-01 18:02:55 -04:00
|
|
|
# avoid creating another Time object if possible
|
|
|
|
return time if time.instance_of?(::Time) && time.utc?
|
2016-04-23 14:34:54 -04:00
|
|
|
::Time.utc(time.year, time.month, time.day, time.hour, time.min, time.sec + time.subsec)
|
2008-03-16 22:40:28 -04:00
|
|
|
end
|
2008-09-11 06:51:16 -04:00
|
|
|
|
2008-06-29 16:17:51 -04:00
|
|
|
def duration_of_variable_length?(obj)
|
2016-08-16 03:30:11 -04:00
|
|
|
ActiveSupport::Duration === obj && obj.parts.any? { |p| [:years, :months, :weeks, :days].include?(p[0]) }
|
2008-06-29 16:17:51 -04:00
|
|
|
end
|
2012-05-06 16:33:12 -04:00
|
|
|
|
|
|
|
def wrap_with_time_zone(time)
|
|
|
|
if time.acts_like?(:time)
|
2014-01-31 12:13:12 -05:00
|
|
|
periods = time_zone.periods_for_local(time)
|
|
|
|
self.class.new(nil, time_zone, time, periods.include?(period) ? period : nil)
|
2012-05-06 16:33:12 -04:00
|
|
|
elsif time.is_a?(Range)
|
|
|
|
wrap_with_time_zone(time.begin)..wrap_with_time_zone(time.end)
|
|
|
|
else
|
|
|
|
time
|
|
|
|
end
|
|
|
|
end
|
2008-01-22 20:56:22 -05:00
|
|
|
end
|
|
|
|
end
|