Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
1382f4de
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,发现更多精彩内容 >>
提交
1382f4de
编写于
5月 17, 2009
作者:
D
David Burger
提交者:
Pratik Naik
8月 09, 2009
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix that Hash#to_xml and Array#to_xml shouldn't modify their options hashes [#672 state:resolved]
Signed-off-by:
N
Pratik Naik
<
pratiknaik@gmail.com
>
上级
870750ed
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
16 addition
and
0 deletion
+16
-0
activesupport/lib/active_support/core_ext/array/conversions.rb
...esupport/lib/active_support/core_ext/array/conversions.rb
+1
-0
activesupport/lib/active_support/core_ext/hash/conversions.rb
...vesupport/lib/active_support/core_ext/hash/conversions.rb
+1
-0
activesupport/test/core_ext/array_ext_test.rb
activesupport/test/core_ext/array_ext_test.rb
+7
-0
activesupport/test/core_ext/hash_ext_test.rb
activesupport/test/core_ext/hash_ext_test.rb
+7
-0
未找到文件。
activesupport/lib/active_support/core_ext/array/conversions.rb
浏览文件 @
1382f4de
...
...
@@ -159,6 +159,7 @@ def to_xml(options = {})
raise
"Not all elements respond to to_xml"
unless
all?
{
|
e
|
e
.
respond_to?
:to_xml
}
require
'builder'
unless
defined?
(
Builder
)
options
=
options
.
dup
options
[
:root
]
||=
all?
{
|
e
|
e
.
is_a?
(
first
.
class
)
&&
first
.
class
.
to_s
!=
"Hash"
}
?
ActiveSupport
::
Inflector
.
pluralize
(
ActiveSupport
::
Inflector
.
underscore
(
first
.
class
.
name
))
:
"records"
options
[
:children
]
||=
options
[
:root
].
singularize
options
[
:indent
]
||=
2
...
...
activesupport/lib/active_support/core_ext/hash/conversions.rb
浏览文件 @
1382f4de
...
...
@@ -86,6 +86,7 @@ def to_query(namespace = nil)
def
to_xml
(
options
=
{})
require
'builder'
unless
defined?
(
Builder
)
options
=
options
.
dup
options
[
:indent
]
||=
2
options
.
reverse_merge!
({
:builder
=>
Builder
::
XmlMarkup
.
new
(
:indent
=>
options
[
:indent
]),
:root
=>
"hash"
})
...
...
activesupport/test/core_ext/array_ext_test.rb
浏览文件 @
1382f4de
...
...
@@ -302,6 +302,13 @@ def test_to_xml_with_empty
xml
=
[].
to_xml
assert_match
(
/type="array"\/>/
,
xml
)
end
def
test_to_xml_dups_options
options
=
{
:skip_instruct
=>
true
}
[].
to_xml
(
options
)
# :builder, etc, shouldn't be added to options
assert_equal
({
:skip_instruct
=>
true
},
options
)
end
end
class
ArrayExtractOptionsTests
<
Test
::
Unit
::
TestCase
...
...
activesupport/test/core_ext/hash_ext_test.rb
浏览文件 @
1382f4de
...
...
@@ -880,6 +880,13 @@ def test_datetime_xml_type_with_far_future_date
assert_equal
30
,
alert_at
.
min
assert_equal
45
,
alert_at
.
sec
end
def
test_to_xml_dups_options
options
=
{
:skip_instruct
=>
true
}
{}.
to_xml
(
options
)
# :builder, etc, shouldn't be added to options
assert_equal
({
:skip_instruct
=>
true
},
options
)
end
end
class
QueryTest
<
Test
::
Unit
::
TestCase
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录