Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
f5ab6805
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,发现更多精彩内容 >>
提交
f5ab6805
编写于
9月 11, 2011
作者:
A
Aaron Patterson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
delete unused code, pass path explicitly to journey
上级
d21e0e2a
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
7 addition
and
28 deletion
+7
-28
actionpack/lib/action_dispatch/routing/route.rb
actionpack/lib/action_dispatch/routing/route.rb
+5
-27
actionpack/lib/action_dispatch/routing/route_set.rb
actionpack/lib/action_dispatch/routing/route_set.rb
+2
-1
未找到文件。
actionpack/lib/action_dispatch/routing/route.rb
浏览文件 @
f5ab6805
module
ActionDispatch
module
Routing
class
Route
#:nodoc:
attr_reader
:app
,
:conditions
,
:defaults
,
:name
attr_reader
:path
,
:requirements
,
:set
attr_reader
:conditions
,
:path
def
initialize
(
set
,
app
,
conditions
,
requirements
,
defaults
,
name
,
anchor
)
@set
=
set
@app
=
app
@defaults
=
defaults
@name
=
name
# FIXME: we should not be doing this much work in a constructor.
@requirements
=
requirements
.
merge
(
defaults
)
@requirements
.
delete
(
:controller
)
if
@requirements
[
:controller
].
is_a?
(
Regexp
)
@requirements
.
delete_if
{
|
k
,
v
|
v
==
Regexp
.
compile
(
"[^
#{
SEPARATORS
.
join
}
]+"
)
}
if
path
=
conditions
[
:path_info
]
@path
=
path
conditions
[
:path_info
]
=
::
Rack
::
Mount
::
Strexp
.
compile
(
path
,
requirements
,
SEPARATORS
,
anchor
)
end
path
=
::
Rack
::
Mount
::
Strexp
.
new
(
conditions
[
:path_info
],
requirements
,
SEPARATORS
,
anchor
)
@verbs
=
conditions
[
:request_method
]
||
[]
...
...
@@ -32,9 +17,8 @@ def initialize(set, app, conditions, requirements, defaults, name, anchor)
#
# Here we munge values before they get sent on to rack-mount.
@conditions
[
:request_method
]
=
%r[^
#{
verb
}
$]
unless
@verbs
.
empty?
@conditions
[
:path_info
]
=
Rack
::
Mount
::
RegexpWithNamedGroups
.
new
(
@conditions
[
:path_info
])
if
@conditions
[
:path_info
]
@conditions
[
:path_info
]
=
Rack
::
Mount
::
RegexpWithNamedGroups
.
new
(
path
)
@conditions
.
delete_if
{
|
k
,
v
|
k
!=
:path_info
&&
!
valid_condition?
(
k
)
}
@requirements
.
delete_if
{
|
k
,
v
|
!
valid_condition?
(
k
)
}
end
def
verb
...
...
@@ -45,15 +29,9 @@ def segment_keys
@segment_keys
||=
conditions
[
:path_info
].
names
.
compact
.
map
{
|
key
|
key
.
to_sym
}
end
def
to_s
@to_s
||=
begin
"%-6s %-40s %s"
%
[(
verb
||
:any
).
to_s
.
upcase
,
path
,
requirements
.
inspect
]
end
end
private
def
valid_condition?
(
method
)
segment_keys
.
include?
(
method
)
||
set
.
valid_conditions
.
include?
(
method
)
segment_keys
.
include?
(
method
)
||
@
set
.
valid_conditions
.
include?
(
method
)
end
end
end
...
...
actionpack/lib/action_dispatch/routing/route_set.rb
浏览文件 @
f5ab6805
...
...
@@ -346,7 +346,8 @@ def empty?
def
add_route
(
app
,
conditions
=
{},
requirements
=
{},
defaults
=
{},
name
=
nil
,
anchor
=
true
)
raise
ArgumentError
,
"Invalid route name: '
#{
name
}
'"
unless
name
.
blank?
||
name
.
to_s
.
match
(
/^[_a-z]\w*$/i
)
route
=
Route
.
new
(
self
,
app
,
conditions
,
requirements
,
defaults
,
name
,
anchor
)
route
=
@set
.
add_route
(
app
,
route
.
conditions
,
defaults
,
name
)
path
=
route
.
conditions
[
:path_info
]
route
=
@set
.
add_route
(
app
,
path
,
route
.
conditions
,
defaults
,
name
)
named_routes
[
name
]
=
route
if
name
route
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录