Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
229c9ed8
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,发现更多精彩内容 >>
提交
229c9ed8
编写于
5月 24, 2014
作者:
A
Aaron Patterson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Always construct route objects with Constraint objects
上级
98c7fe87
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
10 addition
and
9 deletion
+10
-9
actionpack/lib/action_dispatch/routing/inspector.rb
actionpack/lib/action_dispatch/routing/inspector.rb
+3
-3
actionpack/lib/action_dispatch/routing/mapper.rb
actionpack/lib/action_dispatch/routing/mapper.rb
+3
-5
actionpack/lib/action_dispatch/routing/route_set.rb
actionpack/lib/action_dispatch/routing/route_set.rb
+1
-1
actionpack/test/dispatch/routing_test.rb
actionpack/test/dispatch/routing_test.rb
+3
-0
未找到文件。
actionpack/lib/action_dispatch/routing/inspector.rb
浏览文件 @
229c9ed8
...
...
@@ -14,10 +14,10 @@ def constraints
def
rack_app
(
app
=
self
.
app
)
@rack_app
||=
begin
app
=
app
.
app
class_name
=
app
.
class
.
name
.
to_s
if
class_name
==
"ActionDispatch::Routing::Mapper::Constraints"
app
.
app
elsif
ActionDispatch
::
Routing
::
Redirect
===
app
||
class_name
!~
/^ActionDispatch::Routing/
if
ActionDispatch
::
Routing
::
Redirect
===
app
||
class_name
!~
/^ActionDispatch::Routing/
app
end
end
...
...
actionpack/lib/action_dispatch/routing/mapper.rb
浏览文件 @
229c9ed8
...
...
@@ -216,10 +216,12 @@ def normalize_conditions!
end
def
app
endpoint
=
to
.
respond_to?
(
:call
)
?
to
:
dispatcher
if
blocks
.
any?
Constraints
.
new
(
endpoint
,
blocks
,
@set
.
request_class
)
else
endpoint
Constraints
.
new
(
endpoint
,
blocks
,
@set
.
request_class
)
end
end
...
...
@@ -306,10 +308,6 @@ def strexp
Journey
::
Router
::
Strexp
.
compile
(
path
,
requirements
,
SEPARATORS
)
end
def
endpoint
to
.
respond_to?
(
:call
)
?
to
:
dispatcher
end
def
dispatcher
Routing
::
RouteSet
::
Dispatcher
.
new
(
defaults
)
end
...
...
actionpack/lib/action_dispatch/routing/route_set.rb
浏览文件 @
229c9ed8
...
...
@@ -704,7 +704,7 @@ def recognize_path(path, environment = {})
old_params
=
req
.
path_parameters
req
.
path_parameters
=
old_params
.
merge
params
dispatcher
=
route
.
app
if
dispatcher
.
is_a?
(
Mapper
::
Constraints
)
&&
dispatcher
.
matches?
(
env
)
if
dispatcher
.
matches?
(
env
)
dispatcher
=
dispatcher
.
app
end
...
...
actionpack/test/dispatch/routing_test.rb
浏览文件 @
229c9ed8
...
...
@@ -3389,6 +3389,9 @@ def ip
def
x_header
@env
[
"HTTP_X_HEADER"
]
||
""
end
def
reset_parameters
end
end
class
XHeader
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录