Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
430038dd
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,体验更适合开发者的 AI 搜索 >>
提交
430038dd
编写于
1月 01, 2017
作者:
K
kenta-s
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Remove unused argument `formats`
上级
190b82ae
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
27 addition
and
27 deletion
+27
-27
actionview/lib/action_view/template/resolver.rb
actionview/lib/action_view/template/resolver.rb
+2
-2
actionview/lib/action_view/testing/resolvers.rb
actionview/lib/action_view/testing/resolvers.rb
+25
-25
未找到文件。
actionview/lib/action_view/template/resolver.rb
浏览文件 @
430038dd
...
...
@@ -226,7 +226,7 @@ def query(path, details, formats, outside_app_allowed)
template_paths
=
reject_files_external_to_app
(
template_paths
)
unless
outside_app_allowed
template_paths
.
map
do
|
template
|
handler
,
format
,
variant
=
extract_handler_and_format_and_variant
(
template
,
formats
)
handler
,
format
,
variant
=
extract_handler_and_format_and_variant
(
template
)
contents
=
File
.
binread
(
template
)
Template
.
new
(
contents
,
File
.
expand_path
(
template
),
handler
,
...
...
@@ -289,7 +289,7 @@ def mtime(p)
# Extract handler, formats and variant from path. If a format cannot be found neither
# from the path, or the handler, we should return the array of formats given
# to the resolver.
def
extract_handler_and_format_and_variant
(
path
,
default_formats
)
def
extract_handler_and_format_and_variant
(
path
)
pieces
=
File
.
basename
(
path
).
split
(
"."
.
freeze
)
pieces
.
shift
...
...
actionview/lib/action_view/testing/resolvers.rb
浏览文件 @
430038dd
...
...
@@ -17,35 +17,35 @@ def to_s
@hash
.
keys
.
join
(
", "
)
end
private
def
query
(
path
,
exts
,
formats
,
_
)
query
=
""
EXTENSIONS
.
each_key
do
|
ext
|
query
<<
"("
<<
exts
[
ext
].
map
{
|
e
|
e
&&
Regexp
.
escape
(
".
#{
e
}
"
)
}.
join
(
"|"
)
<<
"|)"
end
query
=
/^(
#{
Regexp
.
escape
(
path
)
}
)
#{
query
}
$/
templates
=
[]
@hash
.
each
do
|
_path
,
array
|
source
,
updated_at
=
array
next
unless
query
.
match?
(
_path
)
handler
,
format
,
variant
=
extract_handler_and_format_and_variant
(
_path
,
formats
)
templates
<<
Template
.
new
(
source
,
_path
,
handler
,
virtual_path:
path
.
virtual
,
format:
format
,
variant:
variant
,
updated_at:
updated_at
)
private
def
query
(
path
,
exts
,
_
,
_
)
query
=
""
EXTENSIONS
.
each_key
do
|
ext
|
query
<<
"("
<<
exts
[
ext
].
map
{
|
e
|
e
&&
Regexp
.
escape
(
".
#{
e
}
"
)
}.
join
(
"|"
)
<<
"|)"
end
query
=
/^(
#{
Regexp
.
escape
(
path
)
}
)
#{
query
}
$/
templates
=
[]
@hash
.
each
do
|
_path
,
array
|
source
,
updated_at
=
array
next
unless
query
.
match?
(
_path
)
handler
,
format
,
variant
=
extract_handler_and_format_and_variant
(
_path
)
templates
<<
Template
.
new
(
source
,
_path
,
handler
,
virtual_path:
path
.
virtual
,
format:
format
,
variant:
variant
,
updated_at:
updated_at
)
end
templates
.
sort_by
{
|
t
|
-
t
.
identifier
.
match
(
/^
#{
query
}
$/
).
captures
.
reject
(
&
:blank?
).
size
}
end
templates
.
sort_by
{
|
t
|
-
t
.
identifier
.
match
(
/^
#{
query
}
$/
).
captures
.
reject
(
&
:blank?
).
size
}
end
end
class
NullResolver
<
PathResolver
def
query
(
path
,
exts
,
formats
,
_
)
handler
,
format
,
variant
=
extract_handler_and_format_and_variant
(
path
,
formats
)
def
query
(
path
,
exts
,
_
,
_
)
handler
,
format
,
variant
=
extract_handler_and_format_and_variant
(
path
)
[
ActionView
::
Template
.
new
(
"Template generated by Null Resolver"
,
path
.
virtual
,
handler
,
virtual_path:
path
.
virtual
,
format:
format
,
variant:
variant
)]
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录