Skip to content

Require offset when parsing RFC3339 #72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bdewater-thatch wants to merge 1 commit into
base: master
Choose a base branch
from
+18 −15
Open

Require offset when parsing RFC3339 #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/time.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -660,7 +660,7 @@ def rfc3339(time)
[T\s]
(\d\d):(\d\d):(\d\d)
(\.\d+)?
(Z|[+-]\d\d(?::?\d\d)?)?
(Z|[+-]\d\d(?::?\d\d)?)
\s*\z/ix
_xmlschema(pattern, time)
end
Expand Down
31 changes: 17 additions & 14 deletions test/test_time.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,8 +152,6 @@ def subtest_xmlschema_alias(method)
def subtest_xmlschema(method)
assert_equal(Time.utc(1999, 5, 31, 13, 20, 0) + 5 * 3600,
Time.__send__(method, "1999-05-31T13:20:00-05:00"))
assert_equal(Time.local(2000, 1, 20, 12, 0, 0),
Time.__send__(method, "2000-01-20T12:00:00"))
assert_equal(Time.utc(2000, 1, 20, 12, 0, 0),
Time.__send__(method, "2000-01-20T12:00:00Z"))
assert_equal(Time.utc(2000, 1, 20, 12, 0, 0) - 12 * 3600,
Expand All @@ -164,29 +162,34 @@ def subtest_xmlschema(method)
Time.__send__(method, "2000-03-04T23:00:00+03:00"))
assert_equal(Time.utc(2000, 3, 4, 20, 0, 0),
Time.__send__(method, "2000-03-04T20:00:00Z"))
assert_equal(Time.local(2000, 1, 15, 0, 0, 0),
Time.__send__(method, "2000-01-15T00:00:00"))
assert_equal(Time.local(2000, 2, 15, 0, 0, 0),
Time.__send__(method, "2000-02-15T00:00:00"))
assert_equal(Time.local(2000, 1, 15, 12, 0, 0),
Time.__send__(method, "2000-01-15T12:00:00"))
assert_equal(Time.utc(2000, 1, 16, 12, 0, 0),
Time.__send__(method, "2000-01-16T12:00:00Z"))
assert_equal(Time.local(2000, 1, 1, 12, 0, 0),
Time.__send__(method, "2000-01-01T12:00:00"))
assert_equal(Time.utc(1999, 12, 31, 23, 0, 0),
Time.__send__(method, "1999-12-31T23:00:00Z"))
assert_equal(Time.local(2000, 1, 16, 12, 0, 0),
Time.__send__(method, "2000-01-16T12:00:00"))
assert_equal(Time.local(2000, 1, 16, 0, 0, 0),
Time.__send__(method, "2000-01-16T00:00:00"))
assert_equal(Time.utc(2000, 1, 12, 12, 13, 14),
Time.__send__(method, "2000-01-12T12:13:14Z"))
assert_equal(Time.utc(2001, 4, 17, 19, 23, 17, 300000),
Time.__send__(method, "2001-04-17T19:23:17.3Z"))
assert_equal(Time.utc(2000, 1, 2, 0, 0, 0),
Time.__send__(method, "2000-01-01T24:00:00Z"))
assert_raise(ArgumentError) { Time.__send__(method, "2000-01-01T00:00:00.+00:00") }

local_times = [
[Time.local(2000, 1, 20, 12, 0, 0), "2000-01-20T12:00:00"],
[Time.local(2000, 1, 15, 0, 0, 0), "2000-01-15T00:00:00"],
[Time.local(2000, 2, 15, 0, 0, 0), "2000-02-15T00:00:00"],
[Time.local(2000, 1, 15, 12, 0, 0), "2000-01-15T12:00:00"],
[Time.local(2000, 1, 1, 12, 0, 0), "2000-01-01T12:00:00"],
[Time.local(2000, 1, 16, 12, 0, 0), "2000-01-16T12:00:00"],
[Time.local(2000, 1, 16, 0, 0, 0), "2000-01-16T00:00:00"],
]
local_times.each do |expected, time|
if method == :rfc3339
assert_raise(ArgumentError) { Time.rfc3339(time) }
else
assert_equal(expected, Time.__send__(method, time))
end
end
end

def subtest_xmlschema_encode(method)
Expand Down