Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
333a4d09
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,发现更多精彩内容 >>
提交
333a4d09
编写于
5月 29, 2014
作者:
A
Aaron Patterson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
pass the parsed path from mapper to the Strexp
上级
15ffbedf
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
9 addition
and
5 deletion
+9
-5
actionpack/lib/action_dispatch/routing/mapper.rb
actionpack/lib/action_dispatch/routing/mapper.rb
+3
-2
actionpack/lib/action_dispatch/routing/route_set.rb
actionpack/lib/action_dispatch/routing/route_set.rb
+6
-3
未找到文件。
actionpack/lib/action_dispatch/routing/mapper.rb
浏览文件 @
333a4d09
...
...
@@ -80,7 +80,7 @@ def initialize(set, scope, path, options)
path_params
=
path_params
ast
@options
=
normalize_options!
(
options
,
path_params
,
ast
)
normalize_requirements!
(
path_params
)
normalize_conditions!
(
path_params
,
path
)
normalize_conditions!
(
path_params
,
path
,
ast
)
normalize_defaults!
end
...
...
@@ -192,8 +192,9 @@ def verify_callable_constraint(callable_constraint)
end
end
def
normalize_conditions!
(
path_params
,
path
)
def
normalize_conditions!
(
path_params
,
path
,
ast
)
@conditions
[
:path_info
]
=
path
@conditions
[
:parsed_path_info
]
=
ast
constraints
.
each
do
|
key
,
condition
|
unless
path_params
.
include?
(
key
)
||
key
==
:controller
...
...
actionpack/lib/action_dispatch/routing/route_set.rb
浏览文件 @
333a4d09
...
...
@@ -418,7 +418,9 @@ def add_route(app, conditions = {}, requirements = {}, defaults = {}, name = nil
"http://guides.rubyonrails.org/routing.html#restricting-the-routes-created"
end
path
=
build_path
(
conditions
.
delete
(
:path_info
),
requirements
,
SEPARATORS
,
anchor
)
path
=
conditions
.
delete
:path_info
ast
=
conditions
.
delete
:parsed_path_info
path
=
build_path
(
path
,
ast
,
requirements
,
SEPARATORS
,
anchor
)
conditions
=
build_conditions
(
conditions
,
path
.
names
.
map
{
|
x
|
x
.
to_sym
})
route
=
@set
.
add_route
(
app
,
path
,
conditions
,
defaults
,
name
)
...
...
@@ -426,8 +428,9 @@ def add_route(app, conditions = {}, requirements = {}, defaults = {}, name = nil
route
end
def
build_path
(
path
,
requirements
,
separators
,
anchor
)
strexp
=
Journey
::
Router
::
Strexp
.
build
(
def
build_path
(
path
,
ast
,
requirements
,
separators
,
anchor
)
strexp
=
Journey
::
Router
::
Strexp
.
new
(
ast
,
path
,
requirements
,
SEPARATORS
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录