Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
9e4efed6
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,发现更多精彩内容 >>
提交
9e4efed6
编写于
10月 30, 2013
作者:
J
Jeremy Kemper
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #12214 from chancancode/json_decode_does_not_take_options
Raise an error when AS::JSON.decode is called with options
上级
dae66a0c
1fb79691
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
14 addition
and
5 deletion
+14
-5
activesupport/CHANGELOG.md
activesupport/CHANGELOG.md
+4
-0
activesupport/lib/active_support/json/decoding.rb
activesupport/lib/active_support/json/decoding.rb
+8
-1
activesupport/test/json/decoding_test.rb
activesupport/test/json/decoding_test.rb
+2
-4
未找到文件。
activesupport/CHANGELOG.md
浏览文件 @
9e4efed6
*
Calling ActiveSupport::JSON.decode with unsupported options now raises an error.
*Godfrey Chan*
*
Support :unless_exist in FileStore
*Michael Grosser*
...
...
activesupport/lib/active_support/json/decoding.rb
浏览文件 @
9e4efed6
...
...
@@ -14,7 +14,14 @@ class << self
# ActiveSupport::JSON.decode("{\"team\":\"rails\",\"players\":\"36\"}")
# => {"team" => "rails", "players" => "36"}
def
decode
(
json
,
options
=
{})
data
=
::
JSON
.
parse
(
json
,
options
.
merge
(
create_additions:
false
,
quirks_mode:
true
))
if
options
.
present?
raise
ArgumentError
,
"In Rails 4.1, ActiveSupport::JSON.decode no longer "
\
"accepts an options hash for MultiJSON. MultiJSON reached its end of life "
\
"and has been removed."
end
data
=
::
JSON
.
parse
(
json
,
quirks_mode:
true
)
if
ActiveSupport
.
parse_json_times
convert_dates_from
(
data
)
else
...
...
activesupport/test/json/decoding_test.rb
浏览文件 @
9e4efed6
...
...
@@ -98,10 +98,8 @@ def test_failed_json_decoding
assert_raise
(
ActiveSupport
::
JSON
.
parse_error
)
{
ActiveSupport
::
JSON
.
decode
(
%()
)
}
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
)
def
test_cannot_pass_unsupported_options
assert_raise
(
ArgumentError
)
{
ActiveSupport
::
JSON
.
decode
(
""
,
create_additions:
true
)
}
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录