Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
285cc001
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,发现更多精彩内容 >>
未验证
提交
285cc001
编写于
12月 12, 2019
作者:
A
Aaron Patterson
提交者:
GitHub
12月 12, 2019
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #37073 from woahdae/fix-hierarchical-route-options
Fix route from "(:a)(:b)" when given only :a or :b
上级
cad13033
c2182334
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
28 addition
and
5 deletion
+28
-5
actionpack/lib/action_dispatch/routing/mapper.rb
actionpack/lib/action_dispatch/routing/mapper.rb
+13
-4
actionpack/test/dispatch/routing_test.rb
actionpack/test/dispatch/routing_test.rb
+15
-1
未找到文件。
actionpack/lib/action_dispatch/routing/mapper.rb
浏览文件 @
285cc001
...
...
@@ -398,12 +398,21 @@ def dispatcher(raise_on_name_error)
end
end
# Invokes Journey::Router::Utils.normalize_path
and ensure
that
#
(:locale) becomes (/:locale) instead of /(:locale). Except
# for
root cases, where the latt
er is the correct one.
# Invokes Journey::Router::Utils.normalize_path
, then ensures
that
#
/(:locale) becomes (/:locale). Except for root cases, where the
# for
m
er is the correct one.
def
self
.
normalize_path
(
path
)
path
=
Journey
::
Router
::
Utils
.
normalize_path
(
path
)
path
.
gsub!
(
%r{/(
\(
+)/?}
,
'\1/'
)
unless
%r{^/(
\(
+[^)]+
\)
){1,}$}
.
match?
(
path
)
# the path for a root URL at this point can be something like
# "/(/:locale)(/:platform)/(:browser)", and we would want
# "/(:locale)(/:platform)(/:browser)"
# reverse "/(", "/((" etc to "(/", "((/" etc
path
.
gsub!
(
%r{/(
\(
+)/?}
,
'\1/'
)
# if a path is all optional segments, change the leading "(/" back to
# "/(" so it evaluates to "/" when interpreted with no options.
path
.
sub!
(
%r{^(
\(
+)/}
,
'/\1'
)
if
%r{^(
\(
+[^)]+
\)
){1,}$}
.
match?
(
path
)
path
end
...
...
actionpack/test/dispatch/routing_test.rb
浏览文件 @
285cc001
...
...
@@ -1382,7 +1382,7 @@ def test_scoped_root_as_name
assert_equal
"projects#index"
,
@response
.
body
end
def
test_optional
ly_scoped_root_unscoped_access
def
test_optional
_scoped_root_hierarchy
draw
do
scope
"(:locale)"
do
scope
"(:platform)"
do
...
...
@@ -1394,8 +1394,22 @@ def test_optionally_scoped_root_unscoped_access
end
assert_equal
"/"
,
root_path
assert_equal
"/en"
,
root_path
(
locale:
"en"
)
assert_equal
"/en/osx"
,
root_path
(
locale:
"en"
,
platform:
"osx"
)
assert_equal
"/en/osx/chrome"
,
root_path
(
locale:
"en"
,
platform:
"osx"
,
browser:
"chrome"
)
get
"/"
assert_equal
"projects#index"
,
@response
.
body
get
"/en"
assert_equal
"projects#index"
,
@response
.
body
get
"/en/osx"
assert_equal
"projects#index"
,
@response
.
body
get
"/en/osx/chrome"
assert_equal
"projects#index"
,
@response
.
body
end
def
test_scope_with_format_option
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录