Skip to content

Commit

Permalink
Fixed Date#xmlschema for dates outside the range of what can be creat…
Browse files Browse the repository at this point in the history
…ed with Time (closes #9744) [gbuesing]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7707 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information
dhh committed Oct 1, 2007
1 parent ec49896 commit 22dc11c
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 2 deletions.
5 changes: 5 additions & 0 deletions activesupport/CHANGELOG
@@ -1,3 +1,8 @@
*SVN*

* Fixed Date#xmlschema for dates outside the range of what can be created with Time #9744 [gbuesing]


*2.0.0 [Preview Release]* (September 29th, 2007)

* Fixed that La Paz was included in -25200 and -14400 offsets when it should only be in -14400 #9735 [bermi]
Expand Down
Expand Up @@ -45,6 +45,10 @@ def to_time
def to_datetime
self
end

def xmlschema
strftime("%Y-%m-%dT%H:%M:%S#{offset == 0 ? 'Z' : '%Z'}")
end
end
end
end
Expand Down
16 changes: 16 additions & 0 deletions activesupport/test/core_ext/date_ext_test.rb
Expand Up @@ -162,4 +162,20 @@ def test_beginning_of_day
def test_end_of_day
assert_equal Time.local(2005,2,21,23,59,59), Date.new(2005,2,21).end_of_day
end

def test_xmlschema
with_timezone 'US/Eastern' do
assert_equal '1880-06-28T00:00:00-04:00', Date.new(1880, 6, 28).xmlschema
assert_equal '1980-06-28T00:00:00-04:00', Date.new(1980, 6, 28).xmlschema
assert_equal '2080-06-28T00:00:00-04:00', Date.new(2080, 6, 28).xmlschema
end
end

protected
def with_timezone(new_tz = 'US/Eastern')
old_tz, ENV['TZ'] = ENV['TZ'], new_tz
yield
ensure
old_tz ? ENV['TZ'] = old_tz : ENV.delete('TZ')
end
end
9 changes: 7 additions & 2 deletions activesupport/test/core_ext/date_time_ext_test.rb
Expand Up @@ -182,8 +182,13 @@ def test_last_month_on_31st
assert_equal DateTime.civil(2004, 2, 29), DateTime.civil(2004, 3, 31).last_month
end

def test_xmlschema_is_available
assert_nothing_raised { DateTime.now.xmlschema }
def test_xmlschema
assert_equal '1880-02-28T15:15:10Z', DateTime.civil(1880, 2, 28, 15, 15, 10).xmlschema
assert_equal '1980-02-28T15:15:10Z', DateTime.civil(1980, 2, 28, 15, 15, 10).xmlschema
assert_equal '2080-02-28T15:15:10Z', DateTime.civil(2080, 2, 28, 15, 15, 10).xmlschema
assert_equal '1880-02-28T15:15:10-06:00', DateTime.civil(1880, 2, 28, 15, 15, 10, -0.25).xmlschema
assert_equal '1980-02-28T15:15:10-06:00', DateTime.civil(1980, 2, 28, 15, 15, 10, -0.25).xmlschema
assert_equal '2080-02-28T15:15:10-06:00', DateTime.civil(2080, 2, 28, 15, 15, 10, -0.25).xmlschema
end

def test_acts_like_time
Expand Down

0 comments on commit 22dc11c

Please sign in to comment.