Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
1c1aba77
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,发现更多精彩内容 >>
提交
1c1aba77
编写于
2月 04, 2017
作者:
K
Kir Shatrov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Indicate action that failed in YamlColumn
上级
d13bc5df
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
10 addition
and
10 deletion
+10
-10
activerecord/lib/active_record/coders/yaml_column.rb
activerecord/lib/active_record/coders/yaml_column.rb
+4
-4
activerecord/lib/active_record/type/serialized.rb
activerecord/lib/active_record/type/serialized.rb
+1
-1
activerecord/test/cases/coders/yaml_column_test.rb
activerecord/test/cases/coders/yaml_column_test.rb
+4
-4
activerecord/test/cases/serialized_attribute_test.rb
activerecord/test/cases/serialized_attribute_test.rb
+1
-1
未找到文件。
activerecord/lib/active_record/coders/yaml_column.rb
浏览文件 @
1c1aba77
...
...
@@ -14,7 +14,7 @@ def initialize(attr_name, object_class = Object)
def
dump
(
obj
)
return
if
obj
.
nil?
assert_valid_value
(
obj
)
assert_valid_value
(
obj
,
action:
"dump"
)
YAML
.
dump
obj
end
...
...
@@ -23,16 +23,16 @@ def load(yaml)
return
yaml
unless
yaml
.
is_a?
(
String
)
&&
/^---/
.
match?
(
yaml
)
obj
=
YAML
.
load
(
yaml
)
assert_valid_value
(
obj
)
assert_valid_value
(
obj
,
action:
"load"
)
obj
||=
object_class
.
new
if
object_class
!=
Object
obj
end
def
assert_valid_value
(
obj
)
def
assert_valid_value
(
obj
,
action
:
)
unless
obj
.
nil?
||
obj
.
is_a?
(
object_class
)
raise
SerializationTypeMismatch
,
"
Attribute `
#{
@attr_name
}
`
was supposed to be a
#{
object_class
}
, but was a
#{
obj
.
class
}
. --
#{
obj
.
inspect
}
"
"
can't
#{
action
}
`
#{
@attr_name
}
`:
was supposed to be a
#{
object_class
}
, but was a
#{
obj
.
class
}
. --
#{
obj
.
inspect
}
"
end
end
...
...
activerecord/lib/active_record/type/serialized.rb
浏览文件 @
1c1aba77
...
...
@@ -43,7 +43,7 @@ def accessor
def
assert_valid_value
(
value
)
if
coder
.
respond_to?
(
:assert_valid_value
)
coder
.
assert_valid_value
(
value
)
coder
.
assert_valid_value
(
value
,
action:
"serialize"
)
end
end
...
...
activerecord/test/cases/coders/yaml_column_test.rb
浏览文件 @
1c1aba77
...
...
@@ -10,19 +10,19 @@ def test_initialize_takes_class
end
def
test_type_mismatch_on_different_classes_on_dump
coder
=
YAMLColumn
.
new
(
"
attr_name
"
,
Array
)
coder
=
YAMLColumn
.
new
(
"
tags
"
,
Array
)
error
=
assert_raises
(
SerializationTypeMismatch
)
do
coder
.
dump
(
"a"
)
end
assert_equal
%{
Attribute `attr_name`
was supposed to be a Array, but was a String. -- "a"}
,
error
.
to_s
assert_equal
%{
can't dump `tags`:
was supposed to be a Array, but was a String. -- "a"}
,
error
.
to_s
end
def
test_type_mismatch_on_different_classes
coder
=
YAMLColumn
.
new
(
"
attr_name
"
,
Array
)
coder
=
YAMLColumn
.
new
(
"
tags
"
,
Array
)
error
=
assert_raises
(
SerializationTypeMismatch
)
do
coder
.
load
"--- foo"
end
assert_equal
%{
Attribute `attr_name`
was supposed to be a Array, but was a String. -- "foo"}
,
error
.
to_s
assert_equal
%{
can't load `tags`:
was supposed to be a Array, but was a String. -- "foo"}
,
error
.
to_s
end
def
test_nil_is_ok
...
...
activerecord/test/cases/serialized_attribute_test.rb
浏览文件 @
1c1aba77
...
...
@@ -250,7 +250,7 @@ def test_unexpected_serialized_type
error
=
assert_raise
(
ActiveRecord
::
SerializationTypeMismatch
)
do
topic
.
content
end
expected
=
"
Attribute `content`
was supposed to be a Array, but was a Hash. -- {:zomg=>true}"
expected
=
"
can't load `content`:
was supposed to be a Array, but was a Hash. -- {:zomg=>true}"
assert_equal
expected
,
error
.
to_s
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录