Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
84eba99c
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,发现更多精彩内容 >>
提交
84eba99c
编写于
12月 18, 2015
作者:
M
Matthew Draper
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #22645 from kaspth/parameters-only-deep-dup-hash-array
Only dup Ruby's Hash and Array.
上级
e16d7c68
4b46c5ce
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
46 addition
and
2 deletion
+46
-2
actionpack/lib/action_controller/metal/strong_parameters.rb
actionpack/lib/action_controller/metal/strong_parameters.rb
+18
-2
actionpack/test/controller/parameters/parameters_permit_test.rb
...pack/test/controller/parameters/parameters_permit_test.rb
+28
-0
未找到文件。
actionpack/lib/action_controller/metal/strong_parameters.rb
浏览文件 @
84eba99c
require
'active_support/core_ext/hash/indifferent_access'
require
'active_support/core_ext/hash/indifferent_access'
require
'active_support/core_ext/hash/transform_values'
require
'active_support/core_ext/array/wrap'
require
'active_support/core_ext/array/wrap'
require
'active_support/core_ext/string/filters'
require
'active_support/core_ext/string/filters'
require
'active_support/rescuable'
require
'active_support/rescuable'
...
@@ -175,7 +176,7 @@ def ==(other_hash)
...
@@ -175,7 +176,7 @@ def ==(other_hash)
# safe_params.to_h # => {"name"=>"Senjougahara Hitagi"}
# safe_params.to_h # => {"name"=>"Senjougahara Hitagi"}
def
to_h
def
to_h
if
permitted?
if
permitted?
@parameters
.
deep_dup
convert_parameters_to_hashes
(
@parameters
)
else
else
slice
(
*
self
.
class
.
always_permitted_parameters
).
permit!
.
to_h
slice
(
*
self
.
class
.
always_permitted_parameters
).
permit!
.
to_h
end
end
...
@@ -185,7 +186,7 @@ def to_h
...
@@ -185,7 +186,7 @@ def to_h
# <tt>ActiveSupport::HashWithIndifferentAccess</tt> representation of this
# <tt>ActiveSupport::HashWithIndifferentAccess</tt> representation of this
# parameter.
# parameter.
def
to_unsafe_h
def
to_unsafe_h
@parameters
.
deep_dup
convert_parameters_to_hashes
(
@parameters
)
end
end
alias_method
:to_unsafe_hash
,
:to_unsafe_h
alias_method
:to_unsafe_hash
,
:to_unsafe_h
...
@@ -594,6 +595,21 @@ def new_instance_with_inherited_permitted_status(hash)
...
@@ -594,6 +595,21 @@ def new_instance_with_inherited_permitted_status(hash)
end
end
end
end
def
convert_parameters_to_hashes
(
value
)
case
value
when
Array
value
.
map
{
|
v
|
convert_parameters_to_hashes
(
v
)
}
when
Hash
value
.
transform_values
do
|
v
|
convert_parameters_to_hashes
(
v
)
end
.
with_indifferent_access
when
Parameters
value
.
to_h
else
value
end
end
def
convert_hashes_to_parameters
(
key
,
value
)
def
convert_hashes_to_parameters
(
key
,
value
)
converted
=
convert_value_to_parameters
(
value
)
converted
=
convert_value_to_parameters
(
value
)
@parameters
[
key
]
=
converted
unless
converted
.
equal?
(
value
)
@parameters
[
key
]
=
converted
unless
converted
.
equal?
(
value
)
...
...
actionpack/test/controller/parameters/parameters_permit_test.rb
浏览文件 @
84eba99c
...
@@ -297,4 +297,32 @@ def assert_filtered_out(params, key)
...
@@ -297,4 +297,32 @@ def assert_filtered_out(params, key)
assert
@params
.
to_h
.
is_a?
ActiveSupport
::
HashWithIndifferentAccess
assert
@params
.
to_h
.
is_a?
ActiveSupport
::
HashWithIndifferentAccess
assert_not
@params
.
to_h
.
is_a?
ActionController
::
Parameters
assert_not
@params
.
to_h
.
is_a?
ActionController
::
Parameters
end
end
test
"to_h only deep dups Ruby collections"
do
company
=
Class
.
new
do
attr_reader
:dupped
def
dup
;
@dupped
=
true
;
end
end
.
new
params
=
ActionController
::
Parameters
.
new
(
prem:
{
likes:
%i( dancing )
})
assert_equal
({
'prem'
=>
{
'likes'
=>
%i( dancing )
}
},
params
.
permit!
.
to_h
)
params
=
ActionController
::
Parameters
.
new
(
companies:
[
company
,
:acme
])
assert_equal
({
'companies'
=>
[
company
,
:acme
]
},
params
.
permit!
.
to_h
)
assert_not
company
.
dupped
end
test
"to_unsafe_h only deep dups Ruby collections"
do
company
=
Class
.
new
do
attr_reader
:dupped
def
dup
;
@dupped
=
true
;
end
end
.
new
params
=
ActionController
::
Parameters
.
new
(
prem:
{
likes:
%i( dancing )
})
assert_equal
({
'prem'
=>
{
'likes'
=>
%i( dancing )
}
},
params
.
to_unsafe_h
)
params
=
ActionController
::
Parameters
.
new
(
companies:
[
company
,
:acme
])
assert_equal
({
'companies'
=>
[
company
,
:acme
]
},
params
.
to_unsafe_h
)
assert_not
company
.
dupped
end
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录