Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
43d2105a
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,发现更多精彩内容 >>
提交
43d2105a
编写于
5月 30, 2014
作者:
A
Aaron Patterson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
remove IGNORE_OPTIONS
上级
5b71006c
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
8 addition
and
4 deletion
+8
-4
actionpack/lib/action_dispatch/routing/mapper.rb
actionpack/lib/action_dispatch/routing/mapper.rb
+8
-4
未找到文件。
actionpack/lib/action_dispatch/routing/mapper.rb
浏览文件 @
43d2105a
...
@@ -60,7 +60,6 @@ def constraint_args(constraint, request)
...
@@ -60,7 +60,6 @@ def constraint_args(constraint, request)
end
end
class
Mapping
#:nodoc:
class
Mapping
#:nodoc:
IGNORE_OPTIONS
=
[
:except
,
:shallow
,
:shallow_path
,
:shallow_prefix
]
ANCHOR_CHARACTERS_REGEX
=
%r{
\A
(
\\
A|
\^
)|(
\\
Z|
\\
z|
\$
)
\Z
}
ANCHOR_CHARACTERS_REGEX
=
%r{
\A
(
\\
A|
\^
)|(
\\
Z|
\\
z|
\$
)
\Z
}
attr_reader
:scope
,
:options
,
:requirements
,
:conditions
,
:defaults
attr_reader
:scope
,
:options
,
:requirements
,
:conditions
,
:defaults
...
@@ -174,7 +173,7 @@ def verify_regexp_requirement(requirement)
...
@@ -174,7 +173,7 @@ def verify_regexp_requirement(requirement)
def
normalize_defaults!
(
formatted
,
options_constraints
)
def
normalize_defaults!
(
formatted
,
options_constraints
)
options
.
each
do
|
key
,
default
|
options
.
each
do
|
key
,
default
|
unless
Regexp
===
default
||
IGNORE_OPTIONS
.
include?
(
key
)
unless
Regexp
===
default
@defaults
[
key
]
=
default
@defaults
[
key
]
=
default
end
end
end
end
...
@@ -214,7 +213,7 @@ def normalize_conditions!(path_params, path, ast, via, constraints)
...
@@ -214,7 +213,7 @@ def normalize_conditions!(path_params, path, ast, via, constraints)
required_defaults
=
[]
required_defaults
=
[]
options
.
each
do
|
key
,
required_default
|
options
.
each
do
|
key
,
required_default
|
unless
path_params
.
include?
(
key
)
||
IGNORE_OPTIONS
.
include?
(
key
)
||
Regexp
===
required_default
unless
path_params
.
include?
(
key
)
||
Regexp
===
required_default
required_defaults
<<
key
required_defaults
<<
key
end
end
end
end
...
@@ -317,7 +316,7 @@ def constraints(option_constraints, scope_constraints)
...
@@ -317,7 +316,7 @@ def constraints(option_constraints, scope_constraints)
constraints
=
{}
constraints
=
{}
constraints
.
merge!
(
scope_constraints
)
if
scope_constraints
constraints
.
merge!
(
scope_constraints
)
if
scope_constraints
options
.
e
xcept
(
*
IGNORE_OPTIONS
).
e
ach
do
|
key
,
option
|
options
.
each
do
|
key
,
option
|
constraints
[
key
]
=
option
if
Regexp
===
option
constraints
[
key
]
=
option
if
Regexp
===
option
end
end
...
@@ -1525,6 +1524,11 @@ def add_route(action, options) # :nodoc:
...
@@ -1525,6 +1524,11 @@ def add_route(action, options) # :nodoc:
end
end
options
.
delete
:only
options
.
delete
:only
options
.
delete
:except
options
.
delete
:shallow_path
options
.
delete
:shallow_prefix
options
.
delete
:shallow
mapping
=
Mapping
.
new
(
@scope
,
URI
.
parser
.
escape
(
path
),
options
)
mapping
=
Mapping
.
new
(
@scope
,
URI
.
parser
.
escape
(
path
),
options
)
app
,
conditions
,
requirements
,
defaults
,
as
,
anchor
=
mapping
.
to_route
app
,
conditions
,
requirements
,
defaults
,
as
,
anchor
=
mapping
.
to_route
@set
.
add_route
(
app
,
conditions
,
requirements
,
defaults
,
as
,
anchor
)
@set
.
add_route
(
app
,
conditions
,
requirements
,
defaults
,
as
,
anchor
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录