Reverted affe50105f7027a44eb6e9cfb56f5b3fc070b19b and added more JSON decoding tests.
Works on Ruby 1.8 and 1.9 [#1100 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
This commit is contained in:
parent
f2c7508bef
commit
7b382cb9e5
@ -59,7 +59,16 @@ def convert_json_to_yaml(json) #:nodoc:
|
|||||||
output = []
|
output = []
|
||||||
left_pos.each_with_index do |left, i|
|
left_pos.each_with_index do |left, i|
|
||||||
scanner.pos = left.succ
|
scanner.pos = left.succ
|
||||||
output << scanner.peek(right_pos[i] - scanner.pos + 1)
|
output << scanner.peek(right_pos[i] - scanner.pos + 1).gsub(/\\([\\\/]|u[[:xdigit:]]{4})/) do
|
||||||
|
ustr = $1
|
||||||
|
if ustr.starts_with?('u')
|
||||||
|
[ustr[1..-1].to_i(16)].pack("U")
|
||||||
|
elsif ustr == '\\'
|
||||||
|
'\\\\'
|
||||||
|
else
|
||||||
|
ustr
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
output = output * " "
|
output = output * " "
|
||||||
|
|
||||||
|
@ -30,7 +30,9 @@ class TestJSONDecoding < Test::Unit::TestCase
|
|||||||
%(false) => false,
|
%(false) => false,
|
||||||
%q("http:\/\/test.host\/posts\/1") => "http://test.host/posts/1",
|
%q("http:\/\/test.host\/posts\/1") => "http://test.host/posts/1",
|
||||||
%q("\u003cunicode\u0020escape\u003e") => "<unicode escape>",
|
%q("\u003cunicode\u0020escape\u003e") => "<unicode escape>",
|
||||||
%q("\\\\u0020skip double backslashes") => "\\u0020skip double backslashes"
|
%q("\\\\u0020skip double backslashes") => "\\u0020skip double backslashes",
|
||||||
|
%q({a: "\u003cbr /\u003e"}) => {'a' => "<br />"},
|
||||||
|
%q({b:["\u003ci\u003e","\u003cb\u003e","\u003cu\u003e"]}) => {'b' => ["<i>","<b>","<u>"]}
|
||||||
}
|
}
|
||||||
|
|
||||||
TESTS.each do |json, expected|
|
TESTS.each do |json, expected|
|
||||||
|
Loading…
Reference in New Issue
Block a user