Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
ae9f258e
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,发现更多精彩内容 >>
提交
ae9f258e
编写于
3月 24, 2009
作者:
T
thedarkone
提交者:
Joshua Peek
3月 24, 2009
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix template extension parsing. [#2315 state:resolved] [#2284 state:resolved]
Signed-off-by:
N
Joshua Peek
<
josh@joshpeek.com
>
上级
e3b166aa
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
46 addition
and
30 deletion
+46
-30
actionpack/lib/action_view/template.rb
actionpack/lib/action_view/template.rb
+14
-30
actionpack/test/template/template_test.rb
actionpack/test/template/template_test.rb
+32
-0
未找到文件。
actionpack/lib/action_view/template.rb
浏览文件 @
ae9f258e
...
...
@@ -217,46 +217,30 @@ def valid_extension?(extension)
end
def
valid_locale?
(
locale
)
I18n
.
available_locales
.
include?
(
locale
.
to_sym
)
locale
&&
I18n
.
available_locales
.
include?
(
locale
.
to_sym
)
end
# Returns file split into an array
# [base_path, name, locale, format, extension]
def
split
(
file
)
if
m
=
file
.
to_s
.
match
(
/^(.*\/)?([^\.]+)\.(.*)$/
)
base_path
=
m
[
1
]
name
=
m
[
2
]
extensions
=
m
[
3
]
else
return
[
m
[
1
],
m
[
2
],
*
parse_extensions
(
m
[
3
])]
end
end
locale
=
nil
format
=
nil
extension
=
nil
if
m
=
extensions
.
split
(
"."
)
if
valid_locale?
(
m
[
0
])
&&
m
[
1
]
&&
valid_extension?
(
m
[
2
])
# All three
locale
=
m
[
0
]
format
=
m
[
1
]
extension
=
m
[
2
]
elsif
m
[
0
]
&&
m
[
1
]
&&
valid_extension?
(
m
[
2
])
# Multipart formats
format
=
"
#{
m
[
0
]
}
.
#{
m
[
1
]
}
"
extension
=
m
[
2
]
elsif
valid_locale?
(
m
[
0
])
&&
valid_extension?
(
m
[
1
])
# locale and extension
locale
=
m
[
0
]
extension
=
m
[
1
]
elsif
valid_extension?
(
m
[
1
])
# format and extension
format
=
m
[
0
]
extension
=
m
[
1
]
elsif
valid_extension?
(
m
[
0
])
# Just extension
extension
=
m
[
0
]
else
# No extension
format
=
m
[
0
]
end
# returns parsed extensions as an array
# [locale, format, extension]
def
parse_extensions
(
extensions
)
exts
=
extensions
.
split
(
"."
)
if
extension
=
valid_extension?
(
exts
.
last
)
&&
exts
.
pop
||
nil
locale
=
valid_locale?
(
exts
.
first
)
&&
exts
.
shift
||
nil
format
=
exts
.
join
(
'.'
)
if
exts
.
any?
# join('.') is needed for multipart templates
else
# no extension, just format
format
=
exts
.
last
end
[
base_path
,
name
,
locale
,
format
,
extension
]
[
locale
,
format
,
extension
]
end
end
end
actionpack/test/template/template_test.rb
0 → 100644
浏览文件 @
ae9f258e
require
'abstract_unit'
class
TemplateTest
<
Test
::
Unit
::
TestCase
def
test_template_path_parsing
with_options
:base_path
=>
nil
,
:name
=>
'abc'
,
:locale
=>
nil
,
:format
=>
'html'
,
:extension
=>
'erb'
do
|
t
|
t
.
assert_parses_template_path
'abc.en.html.erb'
,
:locale
=>
'en'
t
.
assert_parses_template_path
'abc.en.plain.html.erb'
,
:locale
=>
'en'
,
:format
=>
'plain.html'
t
.
assert_parses_template_path
'abc.html.erb'
t
.
assert_parses_template_path
'abc.plain.html.erb'
,
:format
=>
'plain.html'
t
.
assert_parses_template_path
'abc.erb'
,
:format
=>
nil
t
.
assert_parses_template_path
'abc.html'
,
:extension
=>
nil
t
.
assert_parses_template_path
'_abc.html.erb'
,
:name
=>
'_abc'
t
.
assert_parses_template_path
'test/abc.html.erb'
,
:base_path
=>
'test'
t
.
assert_parses_template_path
'./test/abc.html.erb'
,
:base_path
=>
'./test'
t
.
assert_parses_template_path
'../test/abc.html.erb'
,
:base_path
=>
'../test'
t
.
assert_parses_template_path
'abc'
,
:extension
=>
nil
,
:format
=>
nil
,
:name
=>
nil
t
.
assert_parses_template_path
'abc.xxx'
,
:extension
=>
nil
,
:format
=>
'xxx'
,
:name
=>
'abc'
t
.
assert_parses_template_path
'abc.html.xxx'
,
:extension
=>
nil
,
:format
=>
'xxx'
,
:name
=>
'abc'
end
end
private
def
assert_parses_template_path
(
path
,
parse_results
)
template
=
ActionView
::
Template
.
new
(
path
,
''
)
parse_results
.
each_pair
do
|
k
,
v
|
assert_block
(
%Q{Expected template to parse
#{
k
.
inspect
}
from "
#{
path
}
" as
#{
v
.
inspect
}
, but got
#{
template
.
send
(
k
).
inspect
}
}
)
{
v
==
template
.
send
(
k
)
}
end
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录