Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
4c99d087
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 搜索 >>
提交
4c99d087
编写于
11月 28, 2012
作者:
R
Rafael Mendonça França
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #8352 from steveklabnik/update_7858
Specify type of singular assication during serialization
上级
5f159563
9504b44c
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
18 addition
and
3 deletion
+18
-3
activemodel/CHANGELOG.md
activemodel/CHANGELOG.md
+2
-0
activemodel/lib/active_model/serializers/xml.rb
activemodel/lib/active_model/serializers/xml.rb
+6
-1
activemodel/test/cases/serializers/xml_serialization_test.rb
activemodel/test/cases/serializers/xml_serialization_test.rb
+10
-2
未找到文件。
activemodel/CHANGELOG.md
浏览文件 @
4c99d087
## Rails 4.0.0 (unreleased) ##
*
Specify type of singular association during serialization
*Steve Klabnik*
*
Fixed length validator to correctly handle nil values. Fixes #7180.
*Michal Zima*
...
...
activemodel/lib/active_model/serializers/xml.rb
浏览文件 @
4c99d087
...
...
@@ -149,7 +149,12 @@ def add_associations(association, records, opts)
end
else
merged_options
[
:root
]
=
association
.
to_s
records
.
to_xml
(
merged_options
)
unless
records
.
class
.
to_s
.
underscore
==
association
.
to_s
merged_options
[
:type
]
=
records
.
class
.
name
end
records
.
to_xml
merged_options
end
end
...
...
activemodel/test/cases/serializers/xml_serialization_test.rb
浏览文件 @
4c99d087
...
...
@@ -6,12 +6,12 @@
class
Contact
include
ActiveModel
::
Serializers
::
Xml
attr_accessor
:address
,
:friends
attr_accessor
:address
,
:friends
,
:contact
remove_method
:attributes
if
method_defined?
(
:attributes
)
def
attributes
instance_values
.
except
(
"address"
,
"friends"
)
instance_values
.
except
(
"address"
,
"friends"
,
"contact"
)
end
end
...
...
@@ -56,6 +56,9 @@ def setup
@contact
.
address
.
zip
=
11111
@contact
.
address
.
apt_number
=
35
@contact
.
friends
=
[
Contact
.
new
,
Contact
.
new
]
@related_contact
=
SerializableContact
.
new
@related_contact
.
name
=
"related"
@contact
.
contact
=
@related_contact
end
test
"should serialize default root"
do
...
...
@@ -256,4 +259,9 @@ def to_ary
assert_match
%r{<address>}
,
xml
assert_match
%r{<apt-number type="integer">}
,
xml
end
test
"association with sti"
do
xml
=
@contact
.
to_xml
(
include: :contact
)
assert
xml
.
include?
(
%(<contact type="SerializableContact">)
)
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录