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

Reverted affe50105f and added more JSON decoding tests.

Browse source 
Works on Ruby 1.8 and 1.9

[#1100 state:resolved]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
This commit is contained in:
Ubiratan Pires Alberton 2009-03-11 06:12:08 -03:00 committed by Jeremy Kemper
parent f2c7508bef
commit 7b382cb9e5
2 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
activesupport/lib/active_support/json/decoding.rb
View file

@ -59,7 +59,16 @@ module ActiveSupport
output = []
left_pos.each_with_index do |left, i|
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
output = output * " "

4
activesupport/test/json/decoding_test.rb
View file

@ -30,7 +30,9 @@ class TestJSONDecoding < Test::Unit::TestCase
%(false) => false,
%q("http:\/\/test.host\/posts\/1") => "http://test.host/posts/1",
%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|