Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
f65b2215
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,发现更多精彩内容 >>
提交
f65b2215
编写于
9月 12, 2011
作者:
A
Aaron Patterson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
removing backwards compatibility module
上级
68ec26c7
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
8 addition
and
9 deletion
+8
-9
actionpack/lib/action_dispatch/http/url.rb
actionpack/lib/action_dispatch/http/url.rb
+1
-1
actionpack/lib/action_dispatch/routing/mapper.rb
actionpack/lib/action_dispatch/routing/mapper.rb
+3
-3
actionpack/lib/action_dispatch/routing/route_set.rb
actionpack/lib/action_dispatch/routing/route_set.rb
+4
-5
未找到文件。
actionpack/lib/action_dispatch/http/url.rb
浏览文件 @
f65b2215
...
...
@@ -45,7 +45,7 @@ def url_for(options = {})
rewritten_url
<<
(
options
[
:trailing_slash
]
?
path
.
sub
(
/\?|\z/
)
{
"/"
+
$&
}
:
path
)
rewritten_url
<<
"?
#{
params
.
to_query
}
"
unless
params
.
empty?
rewritten_url
<<
"#
#{
Rack
::
Mount
::
Utils
.
escape_uri
(
options
[
:anchor
].
to_param
.
to_s
)
}
"
if
options
[
:anchor
]
rewritten_url
<<
"#
#{
Journey
::
Router
::
Utils
.
escape_uri
(
options
[
:anchor
].
to_param
.
to_s
)
}
"
if
options
[
:anchor
]
rewritten_url
end
...
...
actionpack/lib/action_dispatch/routing/mapper.rb
浏览文件 @
f65b2215
...
...
@@ -213,8 +213,8 @@ def request_method_condition
end
def
segment_keys
@segment_keys
||=
Rack
::
Mount
::
RegexpWithNamedGroups
.
new
(
Rack
::
Mount
::
Strexp
.
compile
(
@path
,
requirements
,
SEPARATORS
)
@segment_keys
||=
Journey
::
Path
::
Pattern
.
new
(
Journey
::
Router
::
Strexp
.
compile
(
@path
,
requirements
,
SEPARATORS
)
).
names
end
...
...
@@ -235,7 +235,7 @@ def default_action
# (:locale) becomes (/:locale) instead of /(:locale). Except
# for root cases, where the latter is the correct one.
def
self
.
normalize_path
(
path
)
path
=
Rack
::
Mount
::
Utils
.
normalize_path
(
path
)
path
=
Journey
::
Router
::
Utils
.
normalize_path
(
path
)
path
.
gsub!
(
%r{/(
\(
+)/?}
,
'\1/'
)
unless
path
=~
%r{^/
\(
+[^/]+
\)
$}
path
end
...
...
actionpack/lib/action_dispatch/routing/route_set.rb
浏览文件 @
f65b2215
require
'journey/router'
require
'journey/backwards'
require
'forwardable'
require
'active_support/core_ext/object/blank'
require
'active_support/core_ext/object/to_query'
...
...
@@ -394,10 +393,10 @@ class Generator #:nodoc:
if
name
==
:controller
value
elsif
value
.
is_a?
(
Array
)
value
.
map
{
|
v
|
Rack
::
Mount
::
Utils
.
escape_uri
(
v
.
to_param
)
}.
join
(
'/'
)
value
.
map
{
|
v
|
Journey
::
Router
::
Utils
.
escape_uri
(
v
.
to_param
)
}.
join
(
'/'
)
else
return
nil
unless
param
=
value
.
to_param
param
.
split
(
'/'
).
map
{
|
v
|
Rack
::
Mount
::
Utils
.
escape_uri
(
v
)
}.
join
(
"/"
)
param
.
split
(
'/'
).
map
{
|
v
|
Journey
::
Router
::
Utils
.
escape_uri
(
v
)
}.
join
(
"/"
)
end
end
...
...
@@ -496,7 +495,7 @@ def generate
return
[
path
,
params
.
keys
]
if
@extras
[
path
,
params
]
rescue
Rack
::
Mount
::
RoutingError
rescue
Journey
::
Router
::
RoutingError
raise_routing_error
end
...
...
@@ -573,7 +572,7 @@ def call(env)
def
recognize_path
(
path
,
environment
=
{})
method
=
(
environment
[
:method
]
||
"GET"
).
to_s
.
upcase
path
=
Rack
::
Mount
::
Utils
.
normalize_path
(
path
)
unless
path
=~
%r{://}
path
=
Journey
::
Router
::
Utils
.
normalize_path
(
path
)
unless
path
=~
%r{://}
begin
env
=
Rack
::
MockRequest
.
env_for
(
path
,
{
:method
=>
method
})
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录