kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* ext/psych/lib/psych/scalar_scanner.rb: Ignore bad timestamps. If

Browse source 
something looks like a timestamp but has an invalid component, treat
  it as a string instead of throwing an ArgumentError.
  Thanks Rhett Sutphin!

* test/psych/test_scalar_scanner.rb: appropriate tests.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37288 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
tenderlove 2012-10-22 21:09:56 +00:00
parent c05952c6a1
commit ec3056ae22
3 changed files with 25 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
Tue Oct 23 06:07:57 2012 Aaron Patterson <aaron@tenderlovemaking.com>
* ext/psych/lib/psych/scalar_scanner.rb: Ignore bad timestamps. If
something looks like a timestamp but has an invalid component, treat
it as a string instead of throwing an ArgumentError.
Thanks Rhett Sutphin!
* test/psych/test_scalar_scanner.rb: appropriate tests.
Tue Oct 23 06:04:07 2012 Aaron Patterson <aaron@tenderlovemaking.com> Tue Oct 23 06:04:07 2012 Aaron Patterson <aaron@tenderlovemaking.com>
* ext/psych/lib/psych/scalar_scanner.rb: Fix scalar_scanner to * ext/psych/lib/psych/scalar_scanner.rb: Fix scalar_scanner to

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

@ -45,7 +45,11 @@ module Psych
string string
end end
when TIME when TIME
parse_time string begin
parse_time string
rescue ArgumentError
string
end
when /^\d{4}-(?:1[012]|0\d|\d)-(?:[12]\d|3[01]|0\d|\d)$/ when /^\d{4}-(?:1[012]|0\d|\d)-(?:[12]\d|3[01]|0\d|\d)$/
require 'date' require 'date'
begin begin

11
test/psych/test_scalar_scanner.rb
View file

@ -21,6 +21,17 @@ module Psych
end end
end end
def test_scan_bad_time
[ '2001-12-15T02:59:73.1Z',
'2001-12-14t90:59:43.10-05:00',
'2001-92-14 21:59:43.10 -5',
'2001-12-15 92:59:43.10',
'2011-02-24 81:17:06 -0800',
].each do |time_str|
assert_equal time_str, @ss.tokenize(time_str)
end
end
def test_scan_bad_dates def test_scan_bad_dates
x = '2000-15-01' x = '2000-15-01'
assert_equal x, @ss.tokenize(x) assert_equal x, @ss.tokenize(x)