Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
ad1a8916
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,发现更多精彩内容 >>
提交
ad1a8916
编写于
9月 12, 2011
作者:
A
Aaron Patterson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
unfactor the Route class to private factory methods
上级
943aa826
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
42 addition
and
45 deletion
+42
-45
actionpack/lib/action_dispatch/routing/route.rb
actionpack/lib/action_dispatch/routing/route.rb
+0
-40
actionpack/lib/action_dispatch/routing/route_set.rb
actionpack/lib/action_dispatch/routing/route_set.rb
+42
-5
未找到文件。
actionpack/lib/action_dispatch/routing/route.rb
已删除
100644 → 0
浏览文件 @
943aa826
module
ActionDispatch
module
Routing
class
Route
#:nodoc:
attr_reader
:conditions
,
:path
def
initialize
(
valid_conditions
,
app
,
conditions
,
requirements
,
defaults
,
name
,
anchor
)
@valid_conditions
=
valid_conditions
strexp
=
Journey
::
Router
::
Strexp
.
new
(
conditions
.
delete
(
:path_info
),
requirements
,
SEPARATORS
,
anchor
)
@path
=
Journey
::
Path
::
Pattern
.
new
(
strexp
)
@verbs
=
conditions
[
:request_method
]
||
[]
@conditions
=
conditions
.
dup
# Rack-Mount requires that :request_method be a regular expression.
# :request_method represents the HTTP verb that matches this route.
#
# Here we munge values before they get sent on to rack-mount.
unless
@verbs
.
empty?
@conditions
[
:request_method
]
=
%r[^
#{
@verbs
.
join
(
'|'
)
}
$]
end
@conditions
.
delete_if
{
|
k
,
v
|
!
valid_condition?
(
k
)
}
end
def
segment_keys
@segment_keys
||=
path
.
names
.
compact
.
map
{
|
key
|
key
.
to_sym
}
end
private
def
valid_condition?
(
method
)
segment_keys
.
include?
(
method
)
||
@valid_conditions
.
include?
(
method
)
end
end
end
end
actionpack/lib/action_dispatch/routing/route_set.rb
浏览文件 @
ad1a8916
...
...
@@ -222,9 +222,15 @@ def initialize(request_class = ActionDispatch::Request)
self
.
default_url_options
=
{}
self
.
request_class
=
request_class
self
.
valid_conditions
=
request_class
.
public_instance_methods
.
map
{
|
m
|
m
.
to_sym
}
@valid_conditions
=
{}
request_class
.
public_instance_methods
.
each
{
|
m
|
@valid_conditions
[
m
.
to_sym
]
=
true
}
@valid_conditions
[
:controller
]
=
true
@valid_conditions
[
:action
]
=
true
self
.
valid_conditions
.
delete
(
:id
)
self
.
valid_conditions
.
push
(
:controller
,
:action
)
@append
=
[]
@prepend
=
[]
...
...
@@ -345,13 +351,44 @@ 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
)
foo
=
Route
.
new
(
valid_conditions
,
app
,
conditions
,
requirements
,
defaults
,
name
,
anchor
)
path
=
foo
.
path
route
=
@set
.
add_route
(
app
,
path
,
foo
.
conditions
,
defaults
,
name
)
path
=
build_path
(
conditions
.
delete
(
:path_info
),
requirements
,
SEPARATORS
,
anchor
)
conditions
=
build_conditions
(
conditions
,
valid_conditions
,
path
.
names
.
map
{
|
x
|
x
.
to_sym
})
route
=
@set
.
add_route
(
app
,
path
,
conditions
,
defaults
,
name
)
named_routes
[
name
]
=
route
if
name
route
end
def
build_path
(
path
,
requirements
,
separators
,
anchor
)
strexp
=
Journey
::
Router
::
Strexp
.
new
(
path
,
requirements
,
SEPARATORS
,
anchor
)
Journey
::
Path
::
Pattern
.
new
(
strexp
)
end
private
:build_path
def
build_conditions
(
current_conditions
,
req_predicates
,
path_values
)
conditions
=
current_conditions
.
dup
verbs
=
conditions
[
:request_method
]
||
[]
# Rack-Mount requires that :request_method be a regular expression.
# :request_method represents the HTTP verb that matches this route.
#
# Here we munge values before they get sent on to rack-mount.
unless
verbs
.
empty?
conditions
[
:request_method
]
=
%r[^
#{
verbs
.
join
(
'|'
)
}
$]
end
conditions
.
delete_if
{
|
k
,
v
|
!
(
req_predicates
.
include?
(
k
)
||
path_values
.
include?
(
k
))
}
conditions
end
private
:build_conditions
class
Generator
#:nodoc:
PARAMETERIZE
=
lambda
do
|
name
,
value
|
if
name
==
:controller
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录