Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
af9caae9
R
rails
项目概览
张重言
/
rails
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
rails
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
af9caae9
编写于
9月 11, 2013
作者:
J
Jeremy Kemper
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #12201 from chancancode/json_load
Replace JSON.load with JSON.parse
上级
71cf717e
b9e142af
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
16 addition
and
3 deletion
+16
-3
activesupport/lib/active_support/json/decoding.rb
activesupport/lib/active_support/json/decoding.rb
+2
-2
activesupport/test/json/decoding_test.rb
activesupport/test/json/decoding_test.rb
+14
-1
未找到文件。
activesupport/lib/active_support/json/decoding.rb
浏览文件 @
af9caae9
...
...
@@ -13,8 +13,8 @@ class << self
#
# ActiveSupport::JSON.decode("{\"team\":\"rails\",\"players\":\"36\"}")
# => {"team" => "rails", "players" => "36"}
def
decode
(
json
,
proc
=
nil
,
options
=
{})
data
=
::
JSON
.
load
(
json
,
proc
,
options
)
def
decode
(
json
,
options
=
{})
data
=
::
JSON
.
parse
(
json
,
options
.
merge
(
create_additions:
false
)
)
if
ActiveSupport
.
parse_json_times
convert_dates_from
(
data
)
else
...
...
activesupport/test/json/decoding_test.rb
浏览文件 @
af9caae9
...
...
@@ -4,6 +4,12 @@
require
'active_support/time'
class
TestJSONDecoding
<
ActiveSupport
::
TestCase
class
Foo
def
self
.
json_create
(
object
)
"Foo"
end
end
TESTS
=
{
%q({"returnTo":{"\/categories":"\/"}})
=>
{
"returnTo"
=>
{
"/categories"
=>
"/"
}},
%q({"return
\\
"To
\\
":":{"\/categories":"\/"}})
=>
{
"return
\"
To
\"
:"
=>
{
"/categories"
=>
"/"
}},
...
...
@@ -52,7 +58,8 @@ class TestJSONDecoding < ActiveSupport::TestCase
# tests escaping of "\n" char with Yaml backend
%q({"a":"\n"})
=>
{
"a"
=>
"
\n
"
},
%q({"a":"\u000a"})
=>
{
"a"
=>
"
\n
"
},
%q({"a":"Line1\u000aLine2"})
=>
{
"a"
=>
"Line1
\n
Line2"
}
%q({"a":"Line1\u000aLine2"})
=>
{
"a"
=>
"Line1
\n
Line2"
},
%q({"json_class":"TestJSONDecoding::Foo"})
=>
{
"json_class"
=>
"TestJSONDecoding::Foo"
}
}
TESTS
.
each_with_index
do
|
(
json
,
expected
),
index
|
...
...
@@ -78,5 +85,11 @@ class TestJSONDecoding < ActiveSupport::TestCase
def
test_failed_json_decoding
assert_raise
(
ActiveSupport
::
JSON
.
parse_error
)
{
ActiveSupport
::
JSON
.
decode
(
%({: 1})
)
}
end
def
test_cannot_force_json_unmarshalling
encodeded
=
%q({"json_class":"TestJSONDecoding::Foo"})
decodeded
=
{
"json_class"
=>
"TestJSONDecoding::Foo"
}
assert_equal
decodeded
,
ActiveSupport
::
JSON
.
decode
(
encodeded
,
create_additions:
true
)
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录