Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
0777b17d
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,发现更多精彩内容 >>
提交
0777b17d
编写于
7月 01, 2014
作者:
A
Aaron Patterson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
RouteSet should be in charge of constructing the dispather
Now we can override how requests are dispatched in the routeset object
上级
93e09f52
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
15 addition
and
10 deletion
+15
-10
actionpack/lib/action_dispatch/routing/mapper.rb
actionpack/lib/action_dispatch/routing/mapper.rb
+9
-8
actionpack/lib/action_dispatch/routing/route_set.rb
actionpack/lib/action_dispatch/routing/route_set.rb
+4
-0
actionpack/test/dispatch/mapper_test.rb
actionpack/test/dispatch/mapper_test.rb
+2
-2
未找到文件。
actionpack/lib/action_dispatch/routing/mapper.rb
浏览文件 @
0777b17d
...
...
@@ -66,7 +66,7 @@ class Mapping #:nodoc:
attr_reader
:requirements
,
:conditions
,
:defaults
attr_reader
:to
,
:default_controller
,
:default_action
,
:as
,
:anchor
def
self
.
build
(
scope
,
path
,
options
)
def
self
.
build
(
scope
,
set
,
path
,
options
)
options
=
scope
[
:options
].
merge
(
options
)
if
scope
[
:options
]
options
.
delete
:only
...
...
@@ -77,12 +77,13 @@ def self.build(scope, path, options)
defaults
=
(
scope
[
:defaults
]
||
{}).
merge
options
.
delete
(
:defaults
)
||
{}
new
scope
,
path
,
defaults
,
options
new
scope
,
set
,
path
,
defaults
,
options
end
def
initialize
(
scope
,
path
,
defaults
,
options
)
def
initialize
(
scope
,
set
,
path
,
defaults
,
options
)
@requirements
,
@conditions
=
{},
{}
@defaults
=
defaults
@set
=
set
@to
=
options
.
delete
:to
@default_controller
=
options
.
delete
(
:controller
)
||
scope
[
:controller
]
...
...
@@ -249,9 +250,9 @@ def app(blocks)
Constraints
.
new
(
to
,
blocks
,
false
)
else
if
blocks
.
any?
Constraints
.
new
(
dispatcher
,
blocks
,
true
)
Constraints
.
new
(
dispatcher
(
defaults
)
,
blocks
,
true
)
else
dispatcher
dispatcher
(
defaults
)
end
end
end
...
...
@@ -348,8 +349,8 @@ def path_ast(path)
parser
.
parse
path
end
def
dispatcher
Routing
::
RouteSet
::
Dispatcher
.
new
(
defaults
)
def
dispatcher
(
defaults
)
@set
.
dispatcher
defaults
end
end
...
...
@@ -1551,7 +1552,7 @@ def add_route(action, options) # :nodoc:
options
[
:as
]
=
name_for_action
(
options
[
:as
],
action
)
end
mapping
=
Mapping
.
build
(
@scope
,
URI
.
parser
.
escape
(
path
),
options
)
mapping
=
Mapping
.
build
(
@scope
,
@set
,
URI
.
parser
.
escape
(
path
),
options
)
app
,
conditions
,
requirements
,
defaults
,
as
,
anchor
=
mapping
.
to_route
@set
.
add_route
(
app
,
conditions
,
requirements
,
defaults
,
as
,
anchor
)
end
...
...
actionpack/lib/action_dispatch/routing/route_set.rb
浏览文件 @
0777b17d
...
...
@@ -334,6 +334,10 @@ def clear!
@prepend
.
each
{
|
blk
|
eval_block
(
blk
)
}
end
def
dispatcher
(
defaults
)
Routing
::
RouteSet
::
Dispatcher
.
new
(
defaults
)
end
module
MountedHelpers
#:nodoc:
extend
ActiveSupport
::
Concern
include
UrlFor
...
...
actionpack/test/dispatch/mapper_test.rb
浏览文件 @
0777b17d
...
...
@@ -3,7 +3,7 @@
module
ActionDispatch
module
Routing
class
MapperTest
<
ActiveSupport
::
TestCase
class
FakeSet
class
FakeSet
<
ActionDispatch
::
Routing
::
RouteSet
attr_reader
:routes
alias
:set
:routes
...
...
@@ -38,7 +38,7 @@ def test_initialize
def
test_mapping_requirements
options
=
{
:controller
=>
'foo'
,
:action
=>
'bar'
,
:via
=>
:get
}
m
=
Mapper
::
Mapping
.
build
({},
'/store/:name(*rest)'
,
options
)
m
=
Mapper
::
Mapping
.
build
({},
FakeSet
.
new
,
'/store/:name(*rest)'
,
options
)
_
,
_
,
requirements
,
_
=
m
.
to_route
assert_equal
(
/.+?/
,
requirements
[
:rest
])
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录