From 6fe92a3cd6b4116580ff7663180407bc0c38030f Mon Sep 17 00:00:00 2001 From: tenderlove Date: Sat, 3 Jul 2010 00:15:51 +0000 Subject: * ext/psych/lib/psych/visitors/yaml_tree.rb (visit_Time): use Time#nsec to accurately serialize time objects. [ruby-core:29233] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28531 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ ext/psych/lib/psych/visitors/yaml_tree.rb | 4 ++-- test/psych/visitors/test_to_ruby.rb | 12 ++++++------ test/psych/visitors/test_yaml_tree.rb | 2 +- 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 013433f9e7..0b65b8cec5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat Jul 3 09:13:55 2010 Aaron Patterson + + * ext/psych/lib/psych/visitors/yaml_tree.rb (visit_Time): use + Time#nsec to accurately serialize time objects. [ruby-core:29233] + Fri Jul 2 23:30:23 2010 NAKAMURA Usaku * io.c (argf_inplace_mode_set): prohibits an assignment of a tainted diff --git a/ext/psych/lib/psych/visitors/yaml_tree.rb b/ext/psych/lib/psych/visitors/yaml_tree.rb index 93ccc5832b..4282e0bb0a 100644 --- a/ext/psych/lib/psych/visitors/yaml_tree.rb +++ b/ext/psych/lib/psych/visitors/yaml_tree.rb @@ -138,9 +138,9 @@ module Psych def visit_Time o formatted = o.strftime("%Y-%m-%d %H:%M:%S") if o.utc? - formatted += ".%06dZ" % [o.usec] + formatted += ".%06dZ" % [o.nsec] else - formatted += ".%06d %+.2d:00" % [o.usec, o.gmt_offset / 3600] + formatted += ".%06d %+.2d:00" % [o.nsec, o.gmt_offset / 3600] end @emitter.scalar formatted, nil, nil, true, false, Nodes::Scalar::ANY diff --git a/test/psych/visitors/test_to_ruby.rb b/test/psych/visitors/test_to_ruby.rb index 8ad41dbe7d..eb2841d9d0 100644 --- a/test/psych/visitors/test_to_ruby.rb +++ b/test/psych/visitors/test_to_ruby.rb @@ -113,25 +113,25 @@ description: def test_time now = Time.now formatted = now.strftime("%Y-%m-%d %H:%M:%S") + - ".%06d %+.2d:00" % [now.usec, now.gmt_offset / 3600] + ".%06d %+.2d:00" % [now.nsec, now.gmt_offset / 3600] - assert_in_delta now, Nodes::Scalar.new(formatted).to_ruby, 0.000001 + assert_equal now, Nodes::Scalar.new(formatted).to_ruby end def test_time_utc now = Time.now.utc formatted = now.strftime("%Y-%m-%d %H:%M:%S") + - ".%06dZ" % [now.usec] + ".%06dZ" % [now.nsec] - assert_in_delta now, Nodes::Scalar.new(formatted).to_ruby, 0.000001 + assert_equal now, Nodes::Scalar.new(formatted).to_ruby end def test_time_utc_no_z now = Time.now.utc formatted = now.strftime("%Y-%m-%d %H:%M:%S") + - ".%06d" % [now.usec] + ".%06d" % [now.nsec] - assert_in_delta now, Nodes::Scalar.new(formatted).to_ruby, 0.000001 + assert_equal now, Nodes::Scalar.new(formatted).to_ruby end def test_date diff --git a/test/psych/visitors/test_yaml_tree.rb b/test/psych/visitors/test_yaml_tree.rb index 758cfaed72..ed89e78600 100644 --- a/test/psych/visitors/test_yaml_tree.rb +++ b/test/psych/visitors/test_yaml_tree.rb @@ -54,7 +54,7 @@ module Psych def test_time t = Time.now - assert_in_delta t, Psych.load(Psych.dump(t)), 0.000001 + assert_equal t, Psych.load(Psych.dump(t)) end def test_date -- cgit v1.2.3