Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
633589c1
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,发现更多精彩内容 >>
提交
633589c1
编写于
5月 24, 2014
作者:
A
Aaron Patterson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
push is_a?(Dispatcher) check in to one place
上级
229c9ed8
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
12 addition
and
14 deletion
+12
-14
actionpack/lib/action_dispatch/journey/route.rb
actionpack/lib/action_dispatch/journey/route.rb
+1
-9
actionpack/lib/action_dispatch/routing/mapper.rb
actionpack/lib/action_dispatch/routing/mapper.rb
+7
-0
actionpack/lib/action_dispatch/routing/route_set.rb
actionpack/lib/action_dispatch/routing/route_set.rb
+3
-5
actionpack/test/journey/router_test.rb
actionpack/test/journey/router_test.rb
+1
-0
未找到文件。
actionpack/lib/action_dispatch/journey/route.rb
浏览文件 @
633589c1
...
...
@@ -16,14 +16,6 @@ def initialize(name, app, path, constraints, defaults = {})
@app
=
app
@path
=
path
# 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
app
.
is_a?
(
Routing
::
Mapper
::
Constraints
)
app
=
app
.
app
end
@dispatcher
=
app
.
is_a?
(
Routing
::
RouteSet
::
Dispatcher
)
@constraints
=
constraints
@defaults
=
defaults
@required_defaults
=
nil
...
...
@@ -99,7 +91,7 @@ def glob?
end
def
dispatcher?
@
dispatcher
@
app
.
dispatcher?
end
def
matches?
(
request
)
...
...
actionpack/lib/action_dispatch/routing/mapper.rb
浏览文件 @
633589c1
...
...
@@ -28,9 +28,16 @@ def initialize(app, constraints, request)
app
=
app
.
app
end
# 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.
@dispatcher
=
app
.
is_a?
(
Routing
::
RouteSet
::
Dispatcher
)
@app
,
@constraints
,
@request
=
app
,
constraints
,
request
end
def
dispatcher?
;
@dispatcher
;
end
def
matches?
(
env
)
req
=
@request
.
new
(
env
)
...
...
actionpack/lib/action_dispatch/routing/route_set.rb
浏览文件 @
633589c1
...
...
@@ -703,12 +703,10 @@ def recognize_path(path, environment = {})
end
old_params
=
req
.
path_parameters
req
.
path_parameters
=
old_params
.
merge
params
dispatcher
=
route
.
app
if
dispatcher
.
matches?
(
env
)
dispatcher
=
dispatcher
.
app
end
app
=
route
.
app
if
app
.
matches?
(
env
)
&&
app
.
dispatcher?
dispatcher
=
app
.
app
if
dispatcher
.
is_a?
(
Dispatcher
)
if
dispatcher
.
controller
(
params
,
false
)
dispatcher
.
prepare_params!
(
params
)
return
params
...
...
actionpack/test/journey/router_test.rb
浏览文件 @
633589c1
...
...
@@ -9,6 +9,7 @@ class StubDispatcher < Routing::RouteSet::Dispatcher
def
initialize
super
({})
end
def
dispatcher?
;
true
;
end
end
attr_reader
:routes
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录