diff options
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | ext/psych/lib/psych/scalar_scanner.rb | 32 | ||||
| -rw-r--r-- | ext/psych/lib/psych/visitors/to_ruby.rb | 3 | ||||
| -rw-r--r-- | ext/psych/lib/psych/visitors/yaml_tree.rb | 13 | ||||
| -rw-r--r-- | test/psych/test_date_time.rb | 17 |
5 files changed, 65 insertions, 13 deletions
@@ -1,3 +1,16 @@ +Sat Jul 3 09:47:26 2010 Aaron Patterson <aaron@tenderlovemaking.com> + + * ext/psych/lib/psych/visitors/to_ruby.rb(visit_Psych_Nodes_Scalar): + teaching Psych to deserialize DateTime objects. [Bug #1390] + + * ext/psych/lib/psych/visitors/yaml_tree.rb(visit_DateTime): added a + method for serializing DateTime objects. + + * ext/psych/lib/psych/scalar_scanner.rb(parse_time): add method for + parsing times objects from a string. + + * test/psych/test_date_time.rb: tests for dumping DateTime objects. + Sat Jul 3 09:13:55 2010 Aaron Patterson <aaron@tenderlovemaking.com> * ext/psych/lib/psych/visitors/yaml_tree.rb (visit_Time): use diff --git a/ext/psych/lib/psych/scalar_scanner.rb b/ext/psych/lib/psych/scalar_scanner.rb index bee88de419..e65651a740 100644 --- a/ext/psych/lib/psych/scalar_scanner.rb +++ b/ext/psych/lib/psych/scalar_scanner.rb @@ -39,19 +39,7 @@ module Psych string end when TIME - date, time = *(string.split(/[ tT]/, 2)) - (yy, m, dd) = date.split('-').map { |x| x.to_i } - md = time.match(/(\d+:\d+:\d+)(\.\d*)?\s*(Z|[-+]\d+(:\d\d)?)?/) - - (hh, mm, ss) = md[1].split(':').map { |x| x.to_i } - us = (md[2] ? Rational(md[2].sub(/^\./, '0.')) : 0) * 1000000 - - time = Time.utc(yy, m, dd, hh, mm, ss, us) - - return time if 'Z' == md[3] - - tz = md[3] ? Integer(md[3].split(':').first.sub(/([-+])0/, '\1')) : 0 - Time.at((time - (tz * 3600)).to_i, us) + parse_time string when /^\d{4}-\d{1,2}-\d{1,2}$/ require 'date' Date.strptime(string, '%Y-%m-%d') @@ -86,5 +74,23 @@ module Psych string end end + + ### + # Parse and return a Time from +string+ + def parse_time string + date, time = *(string.split(/[ tT]/, 2)) + (yy, m, dd) = date.split('-').map { |x| x.to_i } + md = time.match(/(\d+:\d+:\d+)(\.\d*)?\s*(Z|[-+]\d+(:\d\d)?)?/) + + (hh, mm, ss) = md[1].split(':').map { |x| x.to_i } + us = (md[2] ? Rational(md[2].sub(/^\./, '0.')) : 0) * 1000000 + + time = Time.utc(yy, m, dd, hh, mm, ss, us) + + return time if 'Z' == md[3] + + tz = md[3] ? Integer(md[3].split(':').first.sub(/([-+])0/, '\1')) : 0 + Time.at((time - (tz * 3600)).to_i, us) + end end end diff --git a/ext/psych/lib/psych/visitors/to_ruby.rb b/ext/psych/lib/psych/visitors/to_ruby.rb index ffff636d8e..745338ad99 100644 --- a/ext/psych/lib/psych/visitors/to_ruby.rb +++ b/ext/psych/lib/psych/visitors/to_ruby.rb @@ -50,6 +50,9 @@ module Psych o.value.unpack('m').first when '!str', 'tag:yaml.org,2002:str' o.value + when "!ruby/object:DateTime" + require 'date' + @ss.parse_time(o.value).to_datetime when "!ruby/object:Complex" Complex(o.value) when "!ruby/object:Rational" diff --git a/ext/psych/lib/psych/visitors/yaml_tree.rb b/ext/psych/lib/psych/visitors/yaml_tree.rb index 4282e0bb0a..412acdb750 100644 --- a/ext/psych/lib/psych/visitors/yaml_tree.rb +++ b/ext/psych/lib/psych/visitors/yaml_tree.rb @@ -135,6 +135,19 @@ module Psych @emitter.scalar o.inspect, nil, '!ruby/regexp', false, false, Nodes::Scalar::ANY end + def visit_DateTime o + o = o.to_time + formatted = o.strftime("%Y-%m-%d %H:%M:%S") + if o.utc? + formatted += ".%06dZ" % [o.nsec] + else + formatted += ".%06d %+.2d:00" % [o.nsec, o.gmt_offset / 3600] + end + + tag = '!ruby/object:DateTime' + @emitter.scalar formatted, nil, tag, false, false, Nodes::Scalar::ANY + end + def visit_Time o formatted = o.strftime("%Y-%m-%d %H:%M:%S") if o.utc? diff --git a/test/psych/test_date_time.rb b/test/psych/test_date_time.rb new file mode 100644 index 0000000000..df66d142f6 --- /dev/null +++ b/test/psych/test_date_time.rb @@ -0,0 +1,17 @@ +require_relative 'helper' +require 'date' + +module Psych + class TestDateTime < TestCase + def test_string_tag + dt = DateTime.now + yaml = Psych.dump dt + assert_match(/DateTime/, yaml) + end + + def test_round_trip + dt = DateTime.now + assert_cycle dt + end + end +end |