Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
a501638e
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,发现更多精彩内容 >>
提交
a501638e
编写于
3月 23, 2009
作者:
Y
Yehuda Katz and Carl Lerche
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Checkpoint
上级
34f058e0
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
139 addition
and
62 deletion
+139
-62
actionpack/lib/action_controller/abstract/layouts.rb
actionpack/lib/action_controller/abstract/layouts.rb
+36
-0
actionpack/lib/action_controller/new_base/layouts.rb
actionpack/lib/action_controller/new_base/layouts.rb
+0
-26
actionpack/test/abstract_controller/layouts_test.rb
actionpack/test/abstract_controller/layouts_test.rb
+64
-0
actionpack/test/abstract_controller/test_helper.rb
actionpack/test/abstract_controller/test_helper.rb
+2
-0
actionpack/test/lib/fixture_template.rb
actionpack/test/lib/fixture_template.rb
+35
-0
actionpack/test/new_base/test_helper.rb
actionpack/test/new_base/test_helper.rb
+2
-36
未找到文件。
actionpack/lib/action_controller/abstract/layouts.rb
浏览文件 @
a501638e
module
AbstractController
module
Layouts
def
self
.
included
(
base
)
base
.
extend
ClassMethods
end
module
ClassMethods
def
_layout
()
end
end
def
_render_template
(
template
,
options
)
_action_view
.
_render_template_with_layout
(
template
,
options
[
:_layout
])
end
private
def
_layout_for_option
(
name
)
case
name
when
String
then
_layout_for_name
(
name
)
when
true
then
_default_layout
(
true
)
when
false
then
nil
end
end
def
_layout_for_name
(
name
)
view_paths
.
find_by_parts
(
name
,
formats
,
"layouts"
)
end
def
_default_layout
(
require_layout
=
false
)
# begin
# _layout_for_name(controller_path)
# rescue ActionView::MissingTemplate
# begin
# _layout_for_name("application")
# rescue ActionView::MissingTemplate => e
# raise e if require_layout
# end
# end
_layout_for_option
(
self
.
class
.
_layout
)
end
end
end
\ No newline at end of file
actionpack/lib/action_controller/new_base/layouts.rb
浏览文件 @
a501638e
...
...
@@ -7,31 +7,5 @@ def render_to_string(options)
super
end
private
def
_layout_for_option
(
name
)
case
name
when
String
then
_layout_for_name
(
name
)
when
true
then
_default_layout
(
true
)
when
false
then
nil
end
end
def
_layout_for_name
(
name
)
view_paths
.
find_by_parts
(
name
,
formats
,
"layouts"
)
end
def
_default_layout
(
require_layout
=
false
)
begin
_layout_for_name
(
controller_path
)
rescue
ActionView
::
MissingTemplate
begin
_layout_for_name
(
"application"
)
rescue
ActionView
::
MissingTemplate
=>
e
raise
e
if
require_layout
end
end
end
end
end
\ No newline at end of file
actionpack/test/abstract_controller/layouts_test.rb
0 → 100644
浏览文件 @
a501638e
require
File
.
join
(
File
.
expand_path
(
File
.
dirname
(
__FILE__
)),
"test_helper"
)
module
AbstractControllerTests
module
Layouts
# Base controller for these tests
class
Base
<
AbstractController
::
Base
include
AbstractController
::
Renderer
include
AbstractController
::
Layouts
self
.
view_paths
=
[
ActionView
::
FixtureTemplate
::
FixturePath
.
new
(
"layouts/hello.html.erb"
=>
"With String <%= yield %>"
)]
def
render_to_string
(
options
)
options
[
:_layout
]
=
_default_layout
super
end
end
class
Blank
<
Base
self
.
view_paths
=
[]
def
index
render
:_template
=>
ActionView
::
TextTemplate
.
new
(
"Hello blank!"
)
end
end
class
WithString
<
Base
layout
"hello"
def
index
render
:_template
=>
ActionView
::
TextTemplate
.
new
(
"Hello string!"
)
end
end
class
WithMissingLayout
<
Base
layout
"missing"
def
index
render
:_template
=>
ActionView
::
TextTemplate
.
new
(
"Hello missing!"
)
end
end
class
TestBase
<
ActiveSupport
::
TestCase
test
"when no layout is specified, and no default is available, render without a layout"
do
result
=
Blank
.
process
(
:index
)
assert_equal
"Hello blank!"
,
result
.
response_obj
[
:body
]
end
test
"when layout is specified as a string, render with that layout"
do
result
=
Blank
.
process
(
:index
)
assert_equal
"With String Hello string!"
,
result
.
response_obj
[
:body
]
end
test
"when layout is specified as a string, but the layout is missing, raise an exception"
do
assert_raises
(
ActionView
::
MissingTemplate
)
{
WithMissingLayout
.
process
(
:index
)
}
end
end
end
end
\ No newline at end of file
actionpack/test/abstract_controller/test_helper.rb
浏览文件 @
a501638e
$:
.
unshift
(
File
.
dirname
(
__FILE__
)
+
'/../../lib'
)
$:
.
unshift
(
File
.
dirname
(
__FILE__
)
+
'/../../../activesupport/lib'
)
$:
.
unshift
(
File
.
dirname
(
__FILE__
)
+
'/../lib'
)
require
'test/unit'
require
'active_support'
require
'active_support/test_case'
require
'action_controller'
require
'action_view/base'
require
'fixture_template'
begin
require
'ruby-debug'
...
...
actionpack/test/lib/fixture_template.rb
0 → 100644
浏览文件 @
a501638e
module
ActionView
#:nodoc:
class
FixtureTemplate
<
Template
class
FixturePath
<
Template
::
Path
def
initialize
(
hash
=
{})
@hash
=
{}
hash
.
each
do
|
k
,
v
|
@hash
[
k
.
sub
(
/\.\w+$/
,
''
)]
=
FixtureTemplate
.
new
(
v
,
k
.
split
(
"/"
).
last
,
self
)
end
super
(
"fixtures://root"
)
end
def
find_template
(
path
)
@hash
[
path
]
end
end
def
initialize
(
body
,
*
args
)
@body
=
body
super
(
*
args
)
end
def
source
@body
end
private
def
find_full_path
(
path
,
load_paths
)
return
'/'
,
path
end
end
end
\ No newline at end of file
actionpack/test/new_base/test_helper.rb
浏览文件 @
a501638e
$:
.
unshift
(
File
.
dirname
(
__FILE__
)
+
'/../../lib'
)
$:
.
unshift
(
File
.
dirname
(
__FILE__
)
+
'/../../../activesupport/lib'
)
$:
.
unshift
(
File
.
dirname
(
__FILE__
)
+
'/../lib'
)
require
'test/unit'
require
'active_support'
require
'active_support/test_case'
require
'action_controller'
require
'action_view/base'
require
'fixture_template'
begin
require
'ruby-debug'
...
...
@@ -50,42 +52,6 @@ def self.subclasses
end
end
module
ActionView
#:nodoc:
class
FixtureTemplate
<
Template
class
FixturePath
<
Template
::
Path
def
initialize
(
hash
=
{})
@hash
=
{}
hash
.
each
do
|
k
,
v
|
@hash
[
k
.
sub
(
/\.\w+$/
,
''
)]
=
FixtureTemplate
.
new
(
v
,
k
.
split
(
"/"
).
last
,
self
)
end
super
(
"fixtures://root"
)
end
def
find_template
(
path
)
@hash
[
path
]
end
end
def
initialize
(
body
,
*
args
)
@body
=
body
super
(
*
args
)
end
def
source
@body
end
private
def
find_full_path
(
path
,
load_paths
)
return
'/'
,
path
end
end
end
# Temporary base class
class
Rack::TestCase
<
ActiveSupport
::
TestCase
include
Rack
::
Test
::
Methods
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录