Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
7176ade3
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,发现更多精彩内容 >>
提交
7176ade3
编写于
2月 05, 2011
作者:
C
Carl Lerche
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Do not require that validation attributes be specified as symbols
上级
b9309b47
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
12 addition
and
2 deletion
+12
-2
activemodel/lib/active_model/validations/validates.rb
activemodel/lib/active_model/validations/validates.rb
+1
-2
activemodel/test/cases/validations/validates_test.rb
activemodel/test/cases/validations/validates_test.rb
+11
-0
未找到文件。
activemodel/lib/active_model/validations/validates.rb
浏览文件 @
7176ade3
...
@@ -84,7 +84,6 @@ def validates(*attributes)
...
@@ -84,7 +84,6 @@ def validates(*attributes)
validations
=
defaults
.
slice!
(
:if
,
:unless
,
:on
,
:allow_blank
,
:allow_nil
)
validations
=
defaults
.
slice!
(
:if
,
:unless
,
:on
,
:allow_blank
,
:allow_nil
)
raise
ArgumentError
,
"You need to supply at least one attribute"
if
attributes
.
empty?
raise
ArgumentError
,
"You need to supply at least one attribute"
if
attributes
.
empty?
raise
ArgumentError
,
"Attribute names must be symbols"
if
attributes
.
any?
{
|
attribute
|
!
attribute
.
is_a?
(
Symbol
)
}
raise
ArgumentError
,
"You need to supply at least one validation"
if
validations
.
empty?
raise
ArgumentError
,
"You need to supply at least one validation"
if
validations
.
empty?
defaults
.
merge!
(
:attributes
=>
attributes
)
defaults
.
merge!
(
:attributes
=>
attributes
)
...
@@ -118,4 +117,4 @@ def _parse_validates_options(options) #:nodoc:
...
@@ -118,4 +117,4 @@ def _parse_validates_options(options) #:nodoc:
end
end
end
end
end
end
end
end
\ No newline at end of file
activemodel/test/cases/validations/validates_test.rb
浏览文件 @
7176ade3
...
@@ -21,6 +21,17 @@ def test_validates_with_built_in_validation
...
@@ -21,6 +21,17 @@ def test_validates_with_built_in_validation
assert_equal
[
'is not a number'
],
person
.
errors
[
:title
]
assert_equal
[
'is not a number'
],
person
.
errors
[
:title
]
end
end
def
test_validates_with_attribute_specified_as_string
Person
.
validates
"title"
,
:numericality
=>
true
person
=
Person
.
new
person
.
valid?
assert_equal
[
'is not a number'
],
person
.
errors
[
:title
]
person
=
Person
.
new
person
.
title
=
123
assert
person
.
valid?
end
def
test_validates_with_built_in_validation_and_options
def
test_validates_with_built_in_validation_and_options
Person
.
validates
:salary
,
:numericality
=>
{
:message
=>
'my custom message'
}
Person
.
validates
:salary
,
:numericality
=>
{
:message
=>
'my custom message'
}
person
=
Person
.
new
person
=
Person
.
new
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录