Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
ba106986
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 搜索 >>
提交
ba106986
编写于
2月 05, 2020
作者:
R
Ryuta Kamizono
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix `with_options` to allow string key options
上级
fcb5e9d5
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
27 addition
and
11 deletion
+27
-11
activesupport/lib/active_support/option_merger.rb
activesupport/lib/active_support/option_merger.rb
+14
-3
activesupport/test/option_merger_test.rb
activesupport/test/option_merger_test.rb
+13
-8
未找到文件。
activesupport/lib/active_support/option_merger.rb
浏览文件 @
ba106986
...
...
@@ -24,9 +24,20 @@ def method_missing(method, *arguments, &block)
options
=
@options
end
if
options
@context
.
__send__
(
method
,
*
arguments
,
**
options
,
&
block
)
else
invoke_method
(
method
,
arguments
,
options
,
&
block
)
end
if
RUBY_VERSION
>=
"2.7"
def
invoke_method
(
method
,
arguments
,
options
,
&
block
)
if
options
@context
.
__send__
(
method
,
*
arguments
,
**
options
,
&
block
)
else
@context
.
__send__
(
method
,
*
arguments
,
&
block
)
end
end
else
def
invoke_method
(
method
,
arguments
,
options
,
&
block
)
arguments
<<
options
if
options
@context
.
__send__
(
method
,
*
arguments
,
&
block
)
end
end
...
...
activesupport/test/option_merger_test.rb
浏览文件 @
ba106986
...
...
@@ -8,13 +8,21 @@ def setup
@options
=
{
hello:
"world"
}
end
def
test_method_with_options_merges_string_options
local_options
=
{
"cool"
=>
true
}
with_options
(
@options
)
do
|
o
|
assert_equal
local_options
,
method_with_options
(
local_options
)
assert_equal
@options
.
merge
(
local_options
),
o
.
method_with_options
(
local_options
)
end
end
def
test_method_with_options_merges_options_when_options_are_present
local_options
=
{
cool:
true
}
with_options
(
@options
)
do
|
o
|
assert_equal
local_options
,
method_with_options
(
local_options
)
assert_equal
@options
.
merge
(
local_options
),
o
.
method_with_options
(
local_options
)
assert_equal
@options
.
merge
(
local_options
),
o
.
method_with_options
(
local_options
)
assert_equal
@options
.
merge
(
local_options
),
o
.
method_with_kwargs
(
local_options
)
assert_equal
@options
.
merge
(
local_options
),
o
.
method_with_kwargs_only
(
local_options
)
end
...
...
@@ -35,13 +43,11 @@ def test_method_with_options_allows_to_overwrite_options
with_options
(
@options
)
do
|
o
|
assert_equal
local_options
,
method_with_options
(
local_options
)
assert_equal
@options
.
merge
(
local_options
),
o
.
method_with_options
(
local_options
)
assert_equal
@options
.
merge
(
local_options
),
o
.
method_with_options
(
local_options
)
assert_equal
local_options
,
o
.
method_with_options
(
local_options
)
end
with_options
(
local_options
)
do
|
o
|
assert_equal
local_options
.
merge
(
@options
),
o
.
method_with_options
(
@options
)
assert_equal
local_options
.
merge
(
@options
),
o
.
method_with_options
(
@options
)
end
end
...
...
@@ -75,8 +81,7 @@ def test_nested_method_with_options_containing_hashes_going_deep
def
test_nested_method_with_options_using_lambda
local_lambda
=
lambda
{
{
lambda:
true
}
}
with_options
(
@options
)
do
|
o
|
assert_equal
@options
.
merge
(
local_lambda
.
call
),
o
.
method_with_options
(
local_lambda
).
call
assert_equal
@options
.
merge
(
local_lambda
.
call
),
o
.
method_with_options
(
local_lambda
).
call
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录