Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
605ab030
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,发现更多精彩内容 >>
提交
605ab030
编写于
5月 26, 2014
作者:
A
Aaron Patterson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
push is_a check up to where the Constraints object is allocated
上级
b18f22d1
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
11 addition
and
6 deletion
+11
-6
actionpack/lib/action_dispatch/routing/inspector.rb
actionpack/lib/action_dispatch/routing/inspector.rb
+1
-1
actionpack/lib/action_dispatch/routing/mapper.rb
actionpack/lib/action_dispatch/routing/mapper.rb
+10
-5
未找到文件。
actionpack/lib/action_dispatch/routing/inspector.rb
浏览文件 @
605ab030
...
...
@@ -16,7 +16,7 @@ def rack_app
@rack_app
||=
begin
endpoint
=
app
.
app
if
ActionDispatch
::
Routing
::
Redirect
===
endpoint
||
!
app
.
dispatcher?
if
app
.
redirect?
||
!
app
.
dispatcher?
endpoint
end
end
...
...
actionpack/lib/action_dispatch/routing/mapper.rb
浏览文件 @
605ab030
...
...
@@ -18,7 +18,7 @@ class Mapper
class
Constraints
#:nodoc:
attr_reader
:app
,
:constraints
def
initialize
(
app
,
constraints
,
request
,
dispatcher_p
)
def
initialize
(
app
,
constraints
,
request
,
dispatcher_p
,
redirect_p
)
# Unwrap Constraints objects. I don't actually think it's possible
# to pass a Constraints object to this constructor, but there were
# multiple places that kept testing children of this object. I
...
...
@@ -28,12 +28,14 @@ def initialize(app, constraints, request, dispatcher_p)
app
=
app
.
app
end
@dispatcher
=
dispatcher_p
@dispatcher
=
dispatcher_p
@redirect
=
redirect_p
@app
,
@constraints
,
@request
=
app
,
constraints
,
request
end
def
dispatcher?
;
@dispatcher
;
end
def
redirect?
;
@redirect
;
end
def
matches?
(
req
)
@constraints
.
all?
do
|
constraint
|
...
...
@@ -218,21 +220,24 @@ def normalize_conditions!
end
def
app
dispatcher_p
=
false
redirect
=
false
# Unwrap any constraints so we can see what's inside for route generation.
# This allows the formatter to skip over any mounted applications or redirects
# that shouldn't be matched when using a url_for without a route name.
if
to
.
respond_to?
(
:call
)
dispatcher_p
=
false
endpoint
=
to
redirect
=
Redirect
===
endpoint
else
dispatcher_p
=
true
endpoint
=
dispatcher
end
if
blocks
.
any?
Constraints
.
new
(
endpoint
,
blocks
,
@set
.
request_class
,
dispatcher_p
)
Constraints
.
new
(
endpoint
,
blocks
,
@set
.
request_class
,
dispatcher_p
,
redirect
)
else
Constraints
.
new
(
endpoint
,
blocks
,
@set
.
request_class
,
dispatcher_p
)
Constraints
.
new
(
endpoint
,
blocks
,
@set
.
request_class
,
dispatcher_p
,
redirect
)
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录