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/json/stream.rb: fix JSON stream emits to use

Browse source 
double quotes during stream.
* test/psych/json/test_stream.rb: tests to reflect changes.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30928 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
tenderlove 2011-02-21 01:02:41 +00:00
parent 39160bd46d
commit 6673f4e8af
3 changed files with 36 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Mon Feb 21 10:01:01 2011 Aaron Patterson <aaron@tenderlovemaking.com>
* ext/psych/lib/psych/json/stream.rb: fix JSON stream emits to use
double quotes during stream.
* test/psych/json/test_stream.rb: tests to reflect changes.
Mon Feb 21 00:38:56 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
* test/ruby/test_system.rb (TestSystem#test_system_at):

11
ext/psych/lib/psych/json/stream.rb
View file

@ -23,8 +23,17 @@ module Psych
end
end
def visit_Time o
formatted = format_time o
@emitter.scalar formatted, nil, nil, false, true, Nodes::Scalar::DOUBLE_QUOTED
end
def visit_DateTime o
visit_Time o.to_time
end
def visit_String o
@emitter.scalar o.to_s, nil, nil, false, true, Nodes::Scalar::ANY
@emitter.scalar o.to_s, nil, nil, false, true, Nodes::Scalar::DOUBLE_QUOTED
end
alias :visit_Symbol :visit_String
end

26
test/psych/json/test_stream.rb
View file

@ -31,12 +31,12 @@ module Psych
def test_string
@stream.push "foo"
assert_match(/(['"])foo\1/, @io.string)
assert_match(/(["])foo\1/, @io.string)
end
def test_symbol
@stream.push :foo
assert_match(/(['"])foo\1/, @io.string)
assert_match(/(["])foo\1/, @io.string)
end
def test_int
@ -56,8 +56,8 @@ module Psych
json = @io.string
assert_match(/}$/, json)
assert_match(/^--- \{/, json)
assert_match(/['"]one['"]/, json)
assert_match(/['"]two['"]/, json)
assert_match(/["]one['"]/, json)
assert_match(/["]two['"]/, json)
end
def test_list_to_json
@ -67,8 +67,22 @@ module Psych
json = @io.string
assert_match(/]$/, json)
assert_match(/^--- \[/, json)
assert_match(/['"]one['"]/, json)
assert_match(/['"]two['"]/, json)
assert_match(/["]one["]/, json)
assert_match(/["]two["]/, json)
end
def test_time
time = Time.utc(2010, 10, 10)
@stream.push({'a' => time })
json = @io.string
assert_match "{\"a\": \"2010-10-10 00:00:00.000000000Z\"}\n", json
end
def test_datetime
time = Time.new(2010, 10, 10).to_datetime
@stream.push({'a' => time })
json = @io.string
assert_match "{\"a\": \"#{time.strftime("%Y-%m-%d %H:%M:%S.%9N %:z")}\"}\n", json
end
end
end