Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
53edd326
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,发现更多精彩内容 >>
提交
53edd326
编写于
7月 20, 2012
作者:
R
Rafael Mendonça França
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
`validates_inclusion_of` and `validates_exclusion_of` now accept
`:within` option as alias of `:in` as documented. Fix #7118
上级
f3e4d209
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
26 addition
and
3 deletion
+26
-3
activemodel/lib/active_model/validations/clusivity.rb
activemodel/lib/active_model/validations/clusivity.rb
+6
-3
activemodel/test/cases/validations/exclusion_validation_test.rb
...model/test/cases/validations/exclusion_validation_test.rb
+10
-0
activemodel/test/cases/validations/inclusion_validation_test.rb
...model/test/cases/validations/inclusion_validation_test.rb
+10
-0
未找到文件。
activemodel/lib/active_model/validations/clusivity.rb
浏览文件 @
53edd326
...
...
@@ -7,7 +7,7 @@ module Clusivity #:nodoc:
"and must be supplied as the :in option of the configuration hash"
def
check_validity!
unless
[
:include?
,
:call
].
any?
{
|
method
|
options
[
:in
]
.
respond_to?
(
method
)
}
unless
[
:include?
,
:call
].
any?
{
|
method
|
range
.
respond_to?
(
method
)
}
raise
ArgumentError
,
ERROR_MESSAGE
end
end
...
...
@@ -15,11 +15,14 @@ def check_validity!
private
def
include?
(
record
,
value
)
delimiter
=
options
[
:in
]
exclusions
=
delimiter
.
respond_to?
(
:call
)
?
delimiter
.
call
(
record
)
:
delimiter
exclusions
=
range
.
respond_to?
(
:call
)
?
range
.
call
(
record
)
:
range
exclusions
.
send
(
inclusion_method
(
exclusions
),
value
)
end
def
range
@range
||=
options
[
:in
]
||
options
[
:within
]
end
# In Ruby 1.9 <tt>Range#include?</tt> on non-numeric ranges checks all possible values in the
# range for equality, so it may be slow for large ranges. The new <tt>Range#cover?</tt>
# uses the previous logic of comparing a value with the range endpoints.
...
...
activemodel/test/cases/validations/exclusion_validation_test.rb
浏览文件 @
53edd326
...
...
@@ -28,6 +28,16 @@ def test_validates_exclusion_of_with_formatted_message
assert_equal
[
"option monkey is restricted"
],
t
.
errors
[
:title
]
end
def
test_validates_exclusion_of_with_within_option
Topic
.
validates_exclusion_of
(
:title
,
:within
=>
%w( abe monkey )
)
assert
Topic
.
new
(
"title"
=>
"something"
,
"content"
=>
"abc"
)
t
=
Topic
.
new
(
"title"
=>
"monkey"
)
assert
t
.
invalid?
assert
t
.
errors
[
:title
].
any?
end
def
test_validates_exclusion_of_for_ruby_class
Person
.
validates_exclusion_of
:karma
,
:in
=>
%w( abe monkey )
...
...
activemodel/test/cases/validations/inclusion_validation_test.rb
浏览文件 @
53edd326
...
...
@@ -60,6 +60,16 @@ def test_validates_inclusion_of_with_formatted_message
assert_equal
[
"option uhoh is not in the list"
],
t
.
errors
[
:title
]
end
def
test_validates_inclusion_of_with_within_option
Topic
.
validates_inclusion_of
(
:title
,
:within
=>
%w( a b c d e f g )
)
assert
Topic
.
new
(
"title"
=>
"a"
,
"content"
=>
"abc"
).
valid?
t
=
Topic
.
new
(
"title"
=>
"uhoh"
,
"content"
=>
"abc"
)
assert
t
.
invalid?
assert
t
.
errors
[
:title
].
any?
end
def
test_validates_inclusion_of_for_ruby_class
Person
.
validates_inclusion_of
:karma
,
:in
=>
%w( abe monkey )
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录