8000 Preserve time zone offset when deserializing times by stomar · Pull Request #316 · ruby/psych · GitHub
[go: up one dir, main page]
Skip to content

Preserve time zone offset when deserializing times #316

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

Merged
tenderlove merged 2 commits into from
May 22, 2017
Merged

Preserve time zone offset when deserializing times #316

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3719891
Add tests for time with usec and with time zone offset
stomar Apr 13, 2017
d2db988
Preserve time zone offset when deserializing times
stomar Apr 13, 2017
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
Prev Previous commit
Preserve time zone offset when deserializing times 
Fix support of time zone offsets. Now the time zone offset
will be preserved when times are deserialized from YAML with
a specified offset. Previously, times other than UTC ("Z")
where converted to local time.

The test cases use two different offsets to account for the
possibility of an erratic success when the tests are run in
the corresponding time zone.
  • Loading branch information
@stomar
stomar committed May 22, 2017
commit d2db988626a6bab441b6609a10d31e39b09fc784
2 changes: 1 addition & 1 deletion lib/psych/scalar_scanner.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ def parse_time string
offset += ((tz[1] || 0) * 60)
end

klass.at((time - offset).to_i, us)
klass.new(yy, m, dd, hh, mm, ss+us/(1_000_000r), offset)
end
end
end
16 changes: 16 additions & 0 deletions test/psych/test_date_time.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,14 @@ def test_non_utc
assert_cycle time
end

def test_timezone_offset
times = [Time.new(2017, 4, 13, 12, 0, 0, "+09:00"),
Time.new(2017, 4, 13, 12, 0, 0, "-05:00")]
cycled = Psych::load(Psych.dump times)
assert_match(/12:00:00 \+0900/, cycled.first.to_s)
assert_match(/12:00:00 -0500/, cycled.last.to_s)
end

def test_new_datetime
assert_cycle DateTime.new
end
Expand All @@ -28,6 +36,14 @@ def test_datetime_non_utc
assert_cycle dt
end

def test_datetime_timezone_offset
times = [DateTime.new(2017, 4, 13, 12, 0, 0, "+09:00"),
DateTime.new(2017, 4, 13, 12, 0, 0, "-05:00")]
cycled = Psych::load(Psych.dump times)
assert_match(/12:00:00\+09:00/, cycled.first.to_s)
assert_match(/12:00:00-05:00/, cycled.last.to_s)
end

def test_invalid_date
assert_cycle "2013-10-31T10:40:07-000000000000033"
end
Expand Down
0