Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
ed7614aa
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,发现更多精彩内容 >>
提交
ed7614aa
编写于
2月 05, 2011
作者:
C
Carl Lerche
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Provide a way to specify alternate option keys for validates
上级
7176ade3
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
22 addition
and
1 deletion
+22
-1
activemodel/lib/active_model/validations/validates.rb
activemodel/lib/active_model/validations/validates.rb
+7
-1
activemodel/test/cases/validations/validates_test.rb
activemodel/test/cases/validations/validates_test.rb
+11
-0
activemodel/test/models/topic.rb
activemodel/test/models/topic.rb
+4
-0
未找到文件。
activemodel/lib/active_model/validations/validates.rb
浏览文件 @
ed7614aa
...
...
@@ -81,7 +81,7 @@ module ClassMethods
#
def
validates
(
*
attributes
)
defaults
=
attributes
.
extract_options!
validations
=
defaults
.
slice!
(
:if
,
:unless
,
:on
,
:allow_blank
,
:allow_nil
)
validations
=
defaults
.
slice!
(
*
_validates_default_keys
)
raise
ArgumentError
,
"You need to supply at least one attribute"
if
attributes
.
empty?
raise
ArgumentError
,
"You need to supply at least one validation"
if
validations
.
empty?
...
...
@@ -103,6 +103,12 @@ def validates(*attributes)
protected
# When creating custom validators, it might be useful to be able to specify
# additional default keys. This can be done by overwriting this method.
def
_validates_default_keys
[
:if
,
:unless
,
:on
,
:allow_blank
,
:allow_nil
]
end
def
_parse_validates_options
(
options
)
#:nodoc:
case
options
when
TrueClass
...
...
activemodel/test/cases/validations/validates_test.rb
浏览文件 @
ed7614aa
# encoding: utf-8
require
'cases/helper'
require
'models/person'
require
'models/topic'
require
'models/person_with_validator'
require
'validators/email_validator'
require
'validators/namespace/email_validator'
...
...
@@ -11,6 +12,7 @@ class ValidatesTest < ActiveModel::TestCase
def
reset_callbacks
Person
.
reset_callbacks
(
:validate
)
Topic
.
reset_callbacks
(
:validate
)
PersonWithValidator
.
reset_callbacks
(
:validate
)
end
...
...
@@ -139,4 +141,13 @@ def test_validates_with_included_validator_and_wildcard_shortcut
person
.
valid?
assert_equal
[
'does not appear to be like Mr.'
],
person
.
errors
[
:title
]
end
def
test_defining_extra_default_keys_for_validates
Topic
.
validates
:title
,
:confirmation
=>
true
,
:message
=>
'Y U NO CONFIRM'
topic
=
Topic
.
new
topic
.
title
=
"What's happening"
topic
.
title_confirmation
=
"Not this"
assert
!
topic
.
valid?
assert_equal
[
'Y U NO CONFIRM'
],
topic
.
errors
[
:title
]
end
end
activemodel/test/models/topic.rb
浏览文件 @
ed7614aa
...
...
@@ -2,6 +2,10 @@ class Topic
include
ActiveModel
::
Validations
include
ActiveModel
::
Validations
::
Callbacks
def
self
.
_validates_default_keys
super
|
[
:message
]
end
attr_accessor
:title
,
:author_name
,
:content
,
:approved
attr_accessor
:after_validation_performed
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录