Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
f1e1e765
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,发现更多精彩内容 >>
提交
f1e1e765
编写于
5月 17, 2011
作者:
J
José Valim
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #1090 from dchelimsky/issue-1089
3.1: params_wrapper raises error on anynomous controllers
上级
f627da15
13950a8c
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
54 addition
and
21 deletion
+54
-21
actionpack/lib/action_controller/metal/params_wrapper.rb
actionpack/lib/action_controller/metal/params_wrapper.rb
+4
-2
actionpack/lib/action_controller/test_case.rb
actionpack/lib/action_controller/test_case.rb
+5
-1
actionpack/test/controller/params_wrapper_test.rb
actionpack/test/controller/params_wrapper_test.rb
+45
-18
未找到文件。
actionpack/lib/action_controller/metal/params_wrapper.rb
浏览文件 @
f1e1e765
...
...
@@ -140,6 +140,8 @@ def inherited(klass)
# This method also does namespace lookup. Foo::Bar::UsersController will
# try to find Foo::Bar::User, Foo::User and finally User.
def
_default_wrap_model
#:nodoc:
return
nil
if
self
.
name
.
nil?
model_name
=
self
.
name
.
sub
(
/Controller$/
,
''
).
singularize
begin
...
...
@@ -168,7 +170,7 @@ def _set_wrapper_defaults(options, model=nil)
end
end
unless
options
[
:name
]
unless
options
[
:name
]
||
self
.
name
.
nil?
model
||=
_default_wrap_model
options
[
:name
]
=
model
?
model
.
to_s
.
demodulize
.
underscore
:
controller_name
.
singularize
...
...
@@ -226,7 +228,7 @@ def _wrap_parameters(parameters)
# Checks if we should perform parameters wrapping.
def
_wrapper_enabled?
ref
=
request
.
content_mime_type
.
try
(
:ref
)
_wrapper_formats
.
include?
(
ref
)
&&
!
request
.
request_parameters
[
_wrapper_key
]
_wrapper_formats
.
include?
(
ref
)
&&
_wrapper_key
&&
!
request
.
request_parameters
[
_wrapper_key
]
end
end
end
actionpack/lib/action_controller/test_case.rb
浏览文件 @
f1e1e765
...
...
@@ -413,7 +413,11 @@ def process(action, parameters = nil, session = nil, flash = nil, http_method =
@request
.
env
[
'REQUEST_METHOD'
]
=
http_method
parameters
||=
{}
@request
.
assign_parameters
(
@routes
,
@controller
.
class
.
name
.
underscore
.
sub
(
/_controller$/
,
''
),
action
.
to_s
,
parameters
)
controller_class_name
=
@controller
.
class
.
name
?
@controller
.
class
.
name
.
underscore
.
sub
(
/_controller$/
,
''
)
:
"anonymous_controller"
@request
.
assign_parameters
(
@routes
,
controller_class_name
,
action
.
to_s
,
parameters
)
@request
.
session
=
ActionController
::
TestSession
.
new
(
session
)
if
session
@request
.
session
[
"flash"
]
=
@request
.
flash
.
update
(
flash
||
{})
...
...
actionpack/test/controller/params_wrapper_test.rb
浏览文件 @
f1e1e765
...
...
@@ -2,7 +2,21 @@
module
Admin
;
class
User
;
end
;
end
module
ParamsWrapperTestHelp
def
with_default_wrapper_options
(
&
block
)
@controller
.
class
.
_wrapper_options
=
{
:format
=>
[
:json
]}
@controller
.
class
.
inherited
(
@controller
.
class
)
yield
end
def
assert_parameters
(
expected
)
assert_equal
expected
,
self
.
class
.
controller_class
.
last_parameters
end
end
class
ParamsWrapperTest
<
ActionController
::
TestCase
include
ParamsWrapperTestHelp
class
UsersController
<
ActionController
::
Base
class
<<
self
attr_accessor
:last_parameters
...
...
@@ -166,20 +180,11 @@ def test_not_wrapping_abstract_model
assert_parameters
({
'username'
=>
'sikachu'
,
'title'
=>
'Developer'
,
'user'
=>
{
'username'
=>
'sikachu'
,
'title'
=>
'Developer'
}})
end
end
private
def
with_default_wrapper_options
(
&
block
)
@controller
.
class
.
_wrapper_options
=
{
:format
=>
[
:json
]}
@controller
.
class
.
inherited
(
@controller
.
class
)
yield
end
def
assert_parameters
(
expected
)
assert_equal
expected
,
UsersController
.
last_parameters
end
end
class
NamespacedParamsWrapperTest
<
ActionController
::
TestCase
include
ParamsWrapperTestHelp
module
Admin
module
Users
class
UsersController
<
ActionController
::
Base
;
...
...
@@ -247,14 +252,36 @@ def test_hierarchy_namespace_lookup_from_model
end
end
private
def
with_default_wrapper_options
(
&
block
)
@controller
.
class
.
_wrapper_options
=
{
:format
=>
[
:json
]}
@controller
.
class
.
inherited
(
@controller
.
class
)
yield
end
class
AnonymousControllerParamsWrapperTest
<
ActionController
::
TestCase
include
ParamsWrapperTestHelp
tests
(
Class
.
new
(
ActionController
::
Base
)
do
class
<<
self
attr_accessor
:last_parameters
end
def
assert_parameters
(
expected
)
assert_equal
expected
,
Admin
::
Users
::
UsersController
.
last_parameters
def
parse
self
.
class
.
last_parameters
=
request
.
params
.
except
(
:controller
,
:action
)
head
:ok
end
end
)
def
test_does_not_implicitly_wrap_params
with_default_wrapper_options
do
@request
.
env
[
'CONTENT_TYPE'
]
=
'application/json'
post
:parse
,
{
'username'
=>
'sikachu'
}
assert_parameters
({
'username'
=>
'sikachu'
})
end
end
def
test_does_wrap_params_if_name_provided
with_default_wrapper_options
do
@controller
.
class
.
wrap_parameters
(
:name
=>
"guest"
)
@request
.
env
[
'CONTENT_TYPE'
]
=
'application/json'
post
:parse
,
{
'username'
=>
'sikachu'
}
assert_parameters
({
'username'
=>
'sikachu'
,
'guest'
=>
{
'username'
=>
'sikachu'
}})
end
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录