Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Date#since, #ago, #beginning_of_day, #end_of_day, #xmlschema return T…

…imeWithZone when Time.zone_default is set

Signed-off-by: Xavier Noria <fxn@hashref.com>
  • Loading branch information...
commit 4146a443b6ffc3d250a280a3b5218c0e5d1a54dd 1 parent 1a56548
Geoff Buesing gbuesing authored fxn committed
8 activesupport/lib/active_support/core_ext/date/calculations.rb
View
@@ -57,19 +57,19 @@ def future?
# Converts Date to a Time (or DateTime if necessary) with the time portion set to the beginning of the day (0:00)
# and then subtracts the specified number of seconds
def ago(seconds)
- to_time.since(-seconds)
+ to_time_in_current_zone.since(-seconds)
end
# Converts Date to a Time (or DateTime if necessary) with the time portion set to the beginning of the day (0:00)
# and then adds the specified number of seconds
def since(seconds)
- to_time.since(seconds)
+ to_time_in_current_zone.since(seconds)
end
alias :in :since
# Converts Date to a Time (or DateTime if necessary) with the time portion set to the beginning of the day (0:00)
def beginning_of_day
- to_time
+ to_time_in_current_zone
end
alias :midnight :beginning_of_day
alias :at_midnight :beginning_of_day
@@ -77,7 +77,7 @@ def beginning_of_day
# Converts Date to a Time (or DateTime if necessary) with the time portion set to the end of the day (23:59:59)
def end_of_day
- to_time.end_of_day
+ to_time_in_current_zone.end_of_day
end
def plus_with_duration(other) #:nodoc:
12 activesupport/lib/active_support/core_ext/date/conversions.rb
View
@@ -81,6 +81,16 @@ def to_date
def to_time(form = :local)
::Time.send("#{form}_time", year, month, day)
end
+
+ # Converts Date to a TimeWithZone in the current zone if Time.zone_default is set,
+ # otherwise converts Date to a Time via Date#to_time
+ def to_time_in_current_zone
+ if ::Time.zone_default
+ ::Time.zone.local(year, month, day)
+ else
+ to_time
+ end
+ end
# Converts a Date instance to a DateTime, where the time is set to the beginning of the day
# and UTC offset is set to 0.
@@ -94,6 +104,6 @@ def to_datetime
end if RUBY_VERSION < '1.9'
def xmlschema
- to_time.xmlschema
+ to_time_in_current_zone.xmlschema
end
end
51 activesupport/test/core_ext/date_ext_test.rb
View
@@ -286,19 +286,59 @@ def test_tomorrow_constructor_when_zone_default_is_set
def test_since
assert_equal Time.local(2005,2,21,0,0,45), Date.new(2005,2,21).since(45)
end
+
+ def test_since_when_zone_default_is_set
+ zone = ActiveSupport::TimeZone['Eastern Time (US & Canada)']
+ with_env_tz 'UTC' do
+ with_tz_default zone do
+ assert_equal zone.local(2005,2,21,0,0,45), Date.new(2005,2,21).since(45)
+ assert_equal zone, Date.new(2005,2,21).since(45).time_zone
+ end
+ end
+ end
def test_ago
assert_equal Time.local(2005,2,20,23,59,15), Date.new(2005,2,21).ago(45)
end
+
+ def test_ago_when_zone_default_is_set
+ zone = ActiveSupport::TimeZone['Eastern Time (US & Canada)']
+ with_env_tz 'UTC' do
+ with_tz_default zone do
+ assert_equal zone.local(2005,2,20,23,59,15), Date.new(2005,2,21).ago(45)
+ assert_equal zone, Date.new(2005,2,21).ago(45).time_zone
+ end
+ end
+ end
def test_beginning_of_day
assert_equal Time.local(2005,2,21,0,0,0), Date.new(2005,2,21).beginning_of_day
end
+
+ def test_beginning_of_day_when_zone_default_is_set
+ zone = ActiveSupport::TimeZone['Eastern Time (US & Canada)']
+ with_env_tz 'UTC' do
+ with_tz_default zone do
+ assert_equal zone.local(2005,2,21,0,0,0), Date.new(2005,2,21).beginning_of_day
+ assert_equal zone, Date.new(2005,2,21).beginning_of_day.time_zone
+ end
+ end
+ end
def test_end_of_day
assert_equal Time.local(2005,2,21,23,59,59,999999.999), Date.new(2005,2,21).end_of_day
end
-
+
+ def test_end_of_day_when_zone_default_is_set
+ zone = ActiveSupport::TimeZone['Eastern Time (US & Canada)']
+ with_env_tz 'UTC' do
+ with_tz_default zone do
+ assert_equal zone.local(2005,2,21,23,59,59,999999.999), Date.new(2005,2,21).end_of_day
+ assert_equal zone, Date.new(2005,2,21).end_of_day.time_zone
+ end
+ end
+ end
+
def test_xmlschema
with_env_tz 'US/Eastern' do
assert_match(/^1980-02-28T00:00:00-05:?00$/, Date.new(1980, 2, 28).xmlschema)
@@ -310,6 +350,15 @@ def test_xmlschema
end
end
end
+
+ def test_xmlschema_when_zone_default_is_set
+ with_env_tz 'UTC' do
+ with_tz_default ActiveSupport::TimeZone['Eastern Time (US & Canada)'] do # UTC -5
+ assert_match(/^1980-02-28T00:00:00-05:?00$/, Date.new(1980, 2, 28).xmlschema)
+ assert_match(/^1980-06-28T00:00:00-04:?00$/, Date.new(1980, 6, 28).xmlschema)
+ end
+ end
+ end
def test_today
Date.stubs(:current).returns(Date.new(2000, 1, 1))
Please sign in to comment.
Something went wrong with that request. Please try again.