Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
673fa7f0
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,发现更多精彩内容 >>
提交
673fa7f0
编写于
12月 26, 2009
作者:
J
Joshua Peek
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
rack-mount 0.4
上级
f53c3635
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
21 addition
and
21 deletion
+21
-21
actionpack/actionpack.gemspec
actionpack/actionpack.gemspec
+1
-1
actionpack/lib/action_dispatch/routing/mapper.rb
actionpack/lib/action_dispatch/routing/mapper.rb
+19
-19
actionpack/lib/action_dispatch/routing/route_set.rb
actionpack/lib/action_dispatch/routing/route_set.rb
+1
-1
未找到文件。
actionpack/actionpack.gemspec
浏览文件 @
673fa7f0
...
...
@@ -18,7 +18,7 @@
s
.
add_dependency
(
'activemodel'
,
'= 3.0.pre'
)
s
.
add_dependency
(
'rack'
,
'~> 1.1.0'
)
s
.
add_dependency
(
'rack-test'
,
'~> 0.5.0'
)
s
.
add_dependency
(
'rack-mount'
,
'~> 0.
3.3
'
)
s
.
add_dependency
(
'rack-mount'
,
'~> 0.
4.0
'
)
s
.
add_dependency
(
'erubis'
,
'~> 2.6.5'
)
s
.
require_path
=
'lib'
...
...
actionpack/lib/action_dispatch/routing/mapper.rb
浏览文件 @
673fa7f0
...
...
@@ -19,9 +19,9 @@ def call(env)
@constraints
.
each
{
|
constraint
|
if
constraint
.
respond_to?
(
:matches?
)
&&
!
constraint
.
matches?
(
req
)
return
[
4
17
,
{
},
[]
]
return
[
4
04
,
{
'X-Cascade'
=>
'pass'
},
[]
]
elsif
constraint
.
respond_to?
(
:call
)
&&
!
constraint
.
call
(
req
)
return
[
4
17
,
{
},
[]
]
return
[
4
04
,
{
'X-Cascade'
=>
'pass'
},
[]
]
end
}
...
...
@@ -34,11 +34,11 @@ def initialize(set, scope, args)
@set
,
@scope
=
set
,
scope
@path
,
@options
=
extract_path_and_options
(
args
)
end
def
to_route
[
app
,
conditions
,
requirements
,
defaults
,
@options
[
:as
]
]
end
private
def
extract_path_and_options
(
args
)
options
=
args
.
extract_options!
...
...
@@ -49,18 +49,18 @@ def extract_path_and_options(args)
else
path
=
args
.
first
end
[
normalize_path
(
path
),
options
]
end
def
normalize_path
(
path
)
path
=
nil
if
path
==
""
path
=
"
#{
@scope
[
:path
]
}#{
path
}
"
if
@scope
[
:path
]
path
=
Rack
::
Mount
::
Utils
.
normalize_path
(
path
)
if
path
path
=
Rack
::
Mount
::
Utils
.
normalize_path
(
path
)
if
path
raise
ArgumentError
,
"path is required"
unless
path
path
path
end
...
...
@@ -74,7 +74,7 @@ def app
def
conditions
{
:path_info
=>
@path
}.
merge
(
constraints
).
merge
(
request_method_condition
)
end
def
requirements
@requirements
||=
returning
(
@options
[
:constraints
]
||
{})
do
|
requirements
|
requirements
.
reverse_merge!
(
@scope
[
:constraints
])
if
@scope
[
:constraints
]
...
...
@@ -96,30 +96,30 @@ def defaults
else
default_controller
?
{
:controller
=>
default_controller
}
:
{}
end
if
defaults
[
:controller
].
blank?
&&
segment_keys
.
exclude?
(
"controller"
)
raise
ArgumentError
,
"missing :controller"
end
if
defaults
[
:action
].
blank?
&&
segment_keys
.
exclude?
(
"action"
)
raise
ArgumentError
,
"missing :action"
end
defaults
end
end
def
blocks
if
@options
[
:constraints
].
present?
&&
!
@options
[
:constraints
].
is_a?
(
Hash
)
block
=
@options
[
:constraints
]
else
block
=
nil
end
((
@scope
[
:blocks
]
||
[])
+
[
block
]).
compact
((
@scope
[
:blocks
]
||
[])
+
[
block
]).
compact
end
def
constraints
@constraints
||=
requirements
.
reject
{
|
k
,
v
|
segment_keys
.
include?
(
k
.
to_s
)
||
k
==
:controller
}
end
...
...
@@ -132,7 +132,7 @@ def request_method_condition
{
}
end
end
def
segment_keys
@segment_keys
||=
Rack
::
Mount
::
RegexpWithNamedGroups
.
new
(
Rack
::
Mount
::
Strexp
.
compile
(
@path
,
requirements
,
SEPARATORS
)
...
...
@@ -142,7 +142,7 @@ def segment_keys
def
to
@options
[
:to
]
end
def
default_controller
@scope
[
:controller
].
to_s
if
@scope
[
:controller
]
end
...
...
@@ -520,4 +520,4 @@ def with_scope_level(kind, resource = parent_resource)
include
Resources
end
end
end
\ No newline at end of file
end
actionpack/lib/action_dispatch/routing/route_set.rb
浏览文件 @
673fa7f0
...
...
@@ -21,7 +21,7 @@ def call(env)
prepare_params!
(
params
)
unless
controller
=
controller
(
params
)
return
[
4
17
,
{
},
[]]
return
[
4
04
,
{
'X-Cascade'
=>
'pass'
},
[]]
end
controller
.
action
(
params
[
:action
]).
call
(
env
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录