1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* ext/psych/lib/psych/scalar_scanner.rb (parse_string): support

Browse Source 
timezones that are not one hour off. [ruby-core:31023]
* ext/psych/lib/psych/visitors/yaml_tree.rb: ditto

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28541 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
tenderlove 2010-07-05 03:33:56 +00:00
parent 9f56a870af
commit ce2e7368d7
3 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Mon Jul 5 12:32:01 2010 Aaron Patterson <aaron@tenderlovemaking.com>
* ext/psych/lib/psych/scalar_scanner.rb (parse_string): support
timezones that are not one hour off. [ruby-core:31023]
* ext/psych/lib/psych/visitors/yaml_tree.rb: ditto
Sun Jul 4 22:49:54 2010 Tanaka Akira <akr@fsij.org>
* test/ruby/test_syntax.rb: split test_syntax from test_system.rb.

6
ext/psych/lib/psych/scalar_scanner.rb
View File

@ -88,9 +88,11 @@ module Psych
time = Time.utc(yy, m, dd, hh, mm, ss, us)
return time if 'Z' == md[3]
return Time.at(time.to_i, us) unless md[3]
tz = md[3] ? Integer(md[3].split(':').first.sub(/([-+])0/, '\1')) : 0
Time.at((time - (tz * 3600)).to_i, us)
tz = md[3].split(':').map { |digit| Integer(digit.sub(/([-+])0/, '\1')) }
offset = tz.first * 3600 + ((tz[1] || 0) * 60)
Time.at((time - offset).to_i, us)
end
end
end

28
ext/psych/lib/psych/visitors/yaml_tree.rb
View File

@ -136,26 +136,13 @@ module Psych
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
formatted = format_time o.to_time
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?
formatted += ".%06dZ" % [o.nsec]
else
formatted += ".%06d %+.2d:00" % [o.nsec, o.gmt_offset / 3600]
end
formatted = format_time o
@emitter.scalar formatted, nil, nil, true, false, Nodes::Scalar::ANY
end
@ -281,6 +268,17 @@ module Psych
end
private
def format_time time
formatted = time.strftime("%Y-%m-%d %H:%M:%S")
if time.utc?
formatted += ".%06dZ" % [time.nsec]
else
formatted += ".%06d %+.2d:%.2d" % [time.nsec,
time.gmt_offset / 3600, time.gmt_offset % 3600 / 60]
end
formatted
end
# FIXME: remove this method once "to_yaml_properties" is removed
def find_ivars target
loc = target.method(:to_yaml_properties).source_location.first