Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
20bc3d4a
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,体验更适合开发者的 AI 搜索 >>
提交
20bc3d4a
编写于
2月 04, 2012
作者:
J
José Valim
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Clean up a bit default_response handling and cache format negotiation.
上级
776a3736
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
17 addition
and
19 deletion
+17
-19
actionpack/lib/action_controller/metal/mime_responds.rb
actionpack/lib/action_controller/metal/mime_responds.rb
+16
-17
actionpack/lib/action_controller/metal/responder.rb
actionpack/lib/action_controller/metal/responder.rb
+1
-2
未找到文件。
actionpack/lib/action_controller/metal/mime_responds.rb
浏览文件 @
20bc3d4a
...
...
@@ -192,8 +192,8 @@ def respond_to(*mimes, &block)
raise
ArgumentError
,
"respond_to takes either types or a block, never both"
if
mimes
.
any?
&&
block_given?
if
collector
=
retrieve_collector_from_mimes
(
mimes
,
&
block
)
response
=
collector
.
response
_for
(
negotiated_format
(
collector
))
||
collector
.
default_response
response
.
call
(
nil
)
response
=
collector
.
response
response
?
response
.
call
:
default_render
({}
)
end
end
...
...
@@ -236,14 +236,13 @@ def respond_with(*resources, &block)
if
collector
=
retrieve_collector_from_mimes
(
&
block
)
options
=
resources
.
size
==
1
?
{}
:
resources
.
extract_options!
if
defined_response
=
collector
.
response
_for
(
negotiated_format
(
collector
))
if
defined_response
=
collector
.
response
if
action
=
options
.
delete
(
:action
)
render
:action
=>
action
else
defined_response
.
call
(
nil
)
defined_response
.
call
end
else
options
.
merge!
(
:default_response
=>
collector
.
default_response
)
(
options
.
delete
(
:responder
)
||
self
.
class
.
responder
).
call
(
self
,
resources
,
options
)
end
end
...
...
@@ -275,10 +274,11 @@ def collect_mimes_from_class_level #:nodoc:
#
def
retrieve_collector_from_mimes
(
mimes
=
nil
,
&
block
)
#:nodoc:
mimes
||=
collect_mimes_from_class_level
collector
=
Collector
.
new
(
mimes
)
{
|
options
|
default_render
(
options
||
{})
}
collector
=
Collector
.
new
(
mimes
)
block
.
call
(
collector
)
if
block_given?
format
=
collector
.
negotiate_format
(
request
)
if
format
=
negotiated_format
(
collector
)
if
format
self
.
content_type
||=
format
.
to_s
lookup_context
.
freeze_formats
([
format
.
to_sym
])
collector
...
...
@@ -288,17 +288,12 @@ def retrieve_collector_from_mimes(mimes=nil, &block) #:nodoc:
end
end
def
negotiated_format
(
collector
)
request
.
negotiate_mime
(
collector
.
order
)
end
class
Collector
#:nodoc:
include
AbstractController
::
Collector
attr_accessor
:order
attr_reader
:default_response
attr_accessor
:order
,
:format
def
initialize
(
mimes
,
&
block
)
@order
,
@responses
,
@default_response
=
[],
{},
block
def
initialize
(
mimes
)
@order
,
@responses
=
[],
{}
mimes
.
each
{
|
mime
|
send
(
mime
)
}
end
...
...
@@ -317,8 +312,12 @@ def custom(mime_type, &block)
@responses
[
mime_type
]
||=
block
end
def
response_for
(
mime
)
@responses
[
mime
]
||
@responses
[
Mime
::
ALL
]
def
response
@responses
[
format
]
||
@responses
[
Mime
::
ALL
]
end
def
negotiate_format
(
request
)
@format
=
request
.
negotiate_mime
(
order
)
end
end
end
...
...
actionpack/lib/action_controller/metal/responder.rb
浏览文件 @
20bc3d4a
...
...
@@ -129,7 +129,6 @@ def initialize(controller, resources, options={})
@resources
=
resources
@options
=
options
@action
=
options
.
delete
(
:action
)
@default_response
=
options
.
delete
(
:default_response
)
end
delegate
:head
,
:render
,
:redirect_to
,
:to
=>
:controller
...
...
@@ -226,7 +225,7 @@ def resource_location
# controller.
#
def
default_render
@default_response
.
call
(
options
)
controller
.
default_render
(
options
)
end
# Display is just a shortcut to render a resource with the current format.
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录