Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
419ca7a7
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,发现更多精彩内容 >>
提交
419ca7a7
编写于
7月 28, 2009
作者:
J
José Valim
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Ensure that developers options are overwritten by user options.
上级
67c2f539
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
35 addition
and
17 deletion
+35
-17
railties/lib/generators/base.rb
railties/lib/generators/base.rb
+21
-17
railties/test/generators_test.rb
railties/test/generators_test.rb
+14
-0
未找到文件。
railties/lib/generators/base.rb
浏览文件 @
419ca7a7
...
...
@@ -111,7 +111,7 @@ def self.hook_for(*names, &block)
names
.
each
do
|
name
|
defaults
=
if
options
[
:type
]
==
:boolean
{
}
elsif
[
true
,
false
].
include?
(
options
.
fetch
(
:default
,
default_value_for_option
(
name
)
))
elsif
[
true
,
false
].
include?
(
default_value_for_option
(
name
,
options
))
{
:banner
=>
""
}
else
{
:desc
=>
"
#{
name
.
to_s
.
humanize
}
to be invoked"
,
:banner
=>
"NAME"
}
...
...
@@ -144,8 +144,8 @@ def self.remove_hook_for(*names)
#
def
self
.
class_option
(
name
,
options
=
{})
#:nodoc:
options
[
:desc
]
=
"Indicates when to generate
#{
name
.
to_s
.
humanize
.
downcase
}
"
unless
options
.
key?
(
:desc
)
options
[
:aliases
]
=
default_aliases_for_option
(
name
)
unless
options
.
key?
(
:aliase
s
)
options
[
:default
]
=
default_value_for_option
(
name
)
unless
options
.
key?
(
:default
)
options
[
:aliases
]
=
default_aliases_for_option
(
name
,
option
s
)
options
[
:default
]
=
default_value_for_option
(
name
,
options
)
super
(
name
,
options
)
end
...
...
@@ -226,32 +226,36 @@ def self.generator_name
# Return the default value for the option name given doing a lookup in
# Rails::Generators.options.
#
def
self
.
default_value_for_option
(
option
)
options
=
Rails
::
Generators
.
options
def
self
.
default_value_for_option
(
name
,
options
)
config
=
Rails
::
Generators
.
options
generator
,
base
=
generator_name
.
to_sym
,
base_name
.
to_sym
if
options
[
generator
]
&&
options
[
generator
].
key?
(
option
)
options
[
generator
][
option
]
elsif
options
[
base
]
&&
options
[
base
].
key?
(
option
)
options
[
base
][
option
]
if
config
[
generator
]
&&
config
[
generator
].
key?
(
name
)
config
[
generator
][
name
]
elsif
config
[
base
]
&&
config
[
base
].
key?
(
name
)
config
[
base
][
name
]
elsif
config
[
:rails
].
key?
(
name
)
config
[
:rails
][
name
]
else
options
[
:
rails
][
option
]
options
[
:
default
]
end
end
# Return default aliases for the option name given doing a lookup in
# Rails::Generators.aliases.
#
def
self
.
default_aliases_for_option
(
option
)
aliases
=
Rails
::
Generators
.
aliases
def
self
.
default_aliases_for_option
(
name
,
options
)
config
=
Rails
::
Generators
.
aliases
generator
,
base
=
generator_name
.
to_sym
,
base_name
.
to_sym
if
aliases
[
generator
]
&&
aliases
[
generator
].
key?
(
option
)
aliases
[
generator
][
option
]
elsif
aliases
[
base
]
&&
aliases
[
base
].
key?
(
option
)
aliases
[
base
][
option
]
if
config
[
generator
]
&&
config
[
generator
].
key?
(
name
)
config
[
generator
][
name
]
elsif
config
[
base
]
&&
config
[
base
].
key?
(
name
)
config
[
base
][
name
]
elsif
config
[
:rails
].
key?
(
name
)
config
[
:rails
][
name
]
else
aliases
[
:rails
][
option
]
options
[
:aliases
]
end
end
...
...
railties/test/generators_test.rb
浏览文件 @
419ca7a7
...
...
@@ -134,4 +134,18 @@ def test_nested_fallbacks_for_generators
TestUnit
::
Generators
::
ModelGenerator
.
expects
(
:start
).
with
([
"Account"
],
{})
Rails
::
Generators
.
invoke
"super_shoulda:model"
,
[
"Account"
]
end
def
test_developer_options_are_overwriten_by_user_options
Rails
::
Generators
.
options
[
:new_generator
]
=
{
:generate
=>
false
}
klass
=
Class
.
new
(
Rails
::
Generators
::
Base
)
do
def
self
.
name
"NewGenerator"
end
class_option
:generate
,
:default
=>
true
end
assert_equal
false
,
klass
.
class_options
[
:generate
].
default
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录