Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
7a7ec74c
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,发现更多精彩内容 >>
提交
7a7ec74c
编写于
8月 02, 2012
作者:
J
José Valim
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Check validity of options[:as] just once
上级
ac1a5d42
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
18 addition
and
12 deletion
+18
-12
actionpack/lib/action_view/renderer/partial_renderer.rb
actionpack/lib/action_view/renderer/partial_renderer.rb
+18
-12
未找到文件。
actionpack/lib/action_view/renderer/partial_renderer.rb
浏览文件 @
7a7ec74c
...
...
@@ -337,11 +337,16 @@ def setup(context, options, block)
end
end
if
as
=
options
[
:as
]
raise_invalid_identifier
(
as
)
unless
as
.
to_s
=~
/\A[a-z_]\w*\z/
as
=
as
.
to_sym
end
if
@path
@variable
,
@variable_counter
=
retrieve_variable
(
@path
)
@variable
,
@variable_counter
=
retrieve_variable
(
@path
,
as
)
@template_keys
=
retrieve_template_keys
else
paths
.
map!
{
|
path
|
retrieve_variable
(
path
).
unshift
(
path
)
}
paths
.
map!
{
|
path
|
retrieve_variable
(
path
,
as
).
unshift
(
path
)
}
end
self
...
...
@@ -450,21 +455,22 @@ def retrieve_template_keys
keys
end
IDENTIFIER_ERROR_MESSAGE
=
"The partial name (%s) is not a valid Ruby identifier; "
+
"make sure your partial name starts with a lowercase letter or underscore, "
+
"and is followed by any combination of letters, numbers and underscores."
def
retrieve_variable
(
path
)
variable
=
if
as
=
@options
[
:as
]
raise
ArgumentError
.
new
(
IDENTIFIER_ERROR_MESSAGE
%
(
path
))
unless
as
.
to_s
=~
/\A[a-z_]\w*\z/
as
.
to_sym
else
def
retrieve_variable
(
path
,
as
)
variable
=
as
||
begin
base
=
path
[
-
1
]
==
"/"
?
""
:
File
.
basename
(
path
)
raise
ArgumentError
.
new
(
IDENTIFIER_ERROR_MESSAGE
%
(
path
)
)
unless
base
=~
/\A_?([a-z]\w*)(\.\w+)*\z/
raise
_invalid_identifier
(
path
)
unless
base
=~
/\A_?([a-z]\w*)(\.\w+)*\z/
$1
.
to_sym
end
variable_counter
=
:"
#{
variable
}
_counter"
if
@collection
[
variable
,
variable_counter
]
end
IDENTIFIER_ERROR_MESSAGE
=
"The partial name (%s) is not a valid Ruby identifier; "
+
"make sure your partial name starts with a lowercase letter or underscore, "
+
"and is followed by any combination of letters, numbers and underscores."
def
raise_invalid_identifier
(
path
)
raise
ArgumentError
.
new
(
IDENTIFIER_ERROR_MESSAGE
%
(
path
))
end
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录