Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
f28788b2
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,发现更多精彩内容 >>
提交
f28788b2
编写于
5月 30, 2014
作者:
A
Aaron Patterson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
only look up the format option from the hash once
上级
7a25444f
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
18 addition
and
16 deletion
+18
-16
actionpack/lib/action_dispatch/routing/mapper.rb
actionpack/lib/action_dispatch/routing/mapper.rb
+18
-16
未找到文件。
actionpack/lib/action_dispatch/routing/mapper.rb
浏览文件 @
f28788b2
...
...
@@ -75,13 +75,15 @@ def initialize(scope, path, options)
@default_controller
=
options
[
:controller
]
||
scope
[
:controller
]
@default_action
=
options
[
:action
]
||
scope
[
:action
]
path
=
normalize_path!
path
,
options
[
:format
]
formatted
=
options
[
:format
]
path
=
normalize_path!
path
,
formatted
ast
=
path_ast
path
path_params
=
path_params
ast
@options
=
normalize_options!
(
options
,
path_params
,
ast
)
normalize_requirements!
(
path_params
)
@options
=
normalize_options!
(
options
,
formatted
,
path_params
,
ast
)
normalize_requirements!
(
path_params
,
formatted
)
normalize_conditions!
(
path_params
,
path
,
ast
)
normalize_defaults!
normalize_defaults!
(
formatted
)
end
def
to_route
...
...
@@ -106,10 +108,10 @@ def optional_format?(path, format)
format
!=
false
&&
!
path
.
include?
(
':format'
)
&&
!
path
.
end_with?
(
'/'
)
end
def
normalize_options!
(
options
,
path_params
,
path_ast
)
def
normalize_options!
(
options
,
formatted
,
path_params
,
path_ast
)
# Add a constraint for wildcard route to make it non-greedy and match the
# optional format part of the route by default
if
options
[
:format
]
!=
false
if
formatted
!=
false
path_ast
.
grep
(
Journey
::
Nodes
::
Star
)
do
|
node
|
options
[
node
.
name
.
to_sym
]
||=
/.+?/
end
...
...
@@ -132,19 +134,19 @@ def normalize_options!(options, path_params, path_ast)
end
end
def
normalize_requirements!
(
path_params
)
def
normalize_requirements!
(
path_params
,
formatted
)
constraints
.
each
do
|
key
,
requirement
|
next
unless
path_params
.
include?
(
key
)
||
key
==
:controller
verify_regexp_requirement
(
requirement
)
if
requirement
.
is_a?
(
Regexp
)
@requirements
[
key
]
=
requirement
end
if
options
[
:format
]
==
true
if
formatted
==
true
@requirements
[
:format
]
||=
/.+/
elsif
Regexp
===
options
[
:format
]
@requirements
[
:format
]
=
options
[
:format
]
elsif
String
===
options
[
:format
]
@requirements
[
:format
]
=
Regexp
.
compile
(
options
[
:format
]
)
elsif
Regexp
===
formatted
@requirements
[
:format
]
=
formatted
elsif
String
===
formatted
@requirements
[
:format
]
=
Regexp
.
compile
(
formatted
)
end
end
...
...
@@ -158,7 +160,7 @@ def verify_regexp_requirement(requirement)
end
end
def
normalize_defaults!
def
normalize_defaults!
(
formatted
)
@defaults
.
merge!
(
scope
[
:defaults
])
if
scope
[
:defaults
]
@defaults
.
merge!
(
options
[
:defaults
])
if
options
[
:defaults
]
...
...
@@ -178,10 +180,10 @@ def normalize_defaults!
verify_callable_constraint
(
options
[
:constraints
])
end
if
Regexp
===
options
[
:format
]
if
Regexp
===
formatted
@defaults
[
:format
]
=
nil
elsif
String
===
options
[
:format
]
@defaults
[
:format
]
=
options
[
:format
]
elsif
String
===
formatted
@defaults
[
:format
]
=
formatted
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录