Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
0741cf9c
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,发现更多精彩内容 >>
提交
0741cf9c
编写于
3月 24, 2016
作者:
R
Rafael França
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #24297 from ojab/master
Use Range#cover? for Date inclusion validator
上级
a7d587f2
3ece0d89
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
21 addition
and
6 deletion
+21
-6
activemodel/lib/active_model/validations/clusivity.rb
activemodel/lib/active_model/validations/clusivity.rb
+4
-3
activemodel/test/cases/validations/inclusion_validation_test.rb
...model/test/cases/validations/inclusion_validation_test.rb
+17
-3
未找到文件。
activemodel/lib/active_model/validations/clusivity.rb
浏览文件 @
0741cf9c
...
...
@@ -30,14 +30,15 @@ def delimiter
@delimiter
||=
options
[
:in
]
||
options
[
:within
]
end
# In Ruby
1.9
<tt>Range#include?</tt> on non-number-or-time-ish ranges checks all
# In Ruby
2.2
<tt>Range#include?</tt> on non-number-or-time-ish ranges checks all
# possible values in the range for equality, which is slower but more accurate.
# <tt>Range#cover?</tt> uses the previous logic of comparing a value with the range
# endpoints, which is fast but is only accurate on Numeric, Time, or DateTime ranges.
# endpoints, which is fast but is only accurate on Numeric, Time, Date,
# or DateTime ranges.
def
inclusion_method
(
enumerable
)
if
enumerable
.
is_a?
Range
case
enumerable
.
first
when
Numeric
,
Time
,
DateTime
when
Numeric
,
Time
,
DateTime
,
Date
:cover?
else
:include?
...
...
activemodel/test/cases/validations/inclusion_validation_test.rb
浏览文件 @
0741cf9c
...
...
@@ -21,24 +21,38 @@ def test_validates_inclusion_of_range
end
def
test_validates_inclusion_of_time_range
Topic
.
validates_inclusion_of
(
:created_at
,
in:
1
.
year
.
ago
..
Time
.
now
)
range_begin
=
1
.
year
.
ago
range_end
=
Time
.
now
Topic
.
validates_inclusion_of
(
:created_at
,
in:
range_begin
..
range_end
)
assert
Topic
.
new
(
title:
'aaa'
,
created_at:
2
.
years
.
ago
).
invalid?
assert
Topic
.
new
(
title:
'aaa'
,
created_at:
3
.
months
.
ago
).
valid?
assert
Topic
.
new
(
title:
'aaa'
,
created_at:
37
.
weeks
.
from_now
).
invalid?
assert
Topic
.
new
(
title:
'aaa'
,
created_at:
range_begin
).
valid?
assert
Topic
.
new
(
title:
'aaa'
,
created_at:
range_end
).
valid?
end
def
test_validates_inclusion_of_date_range
Topic
.
validates_inclusion_of
(
:created_at
,
in:
1
.
year
.
until
(
Date
.
today
)
..
Date
.
today
)
range_begin
=
1
.
year
.
until
(
Date
.
today
)
range_end
=
Date
.
today
Topic
.
validates_inclusion_of
(
:created_at
,
in:
range_begin
..
range_end
)
assert
Topic
.
new
(
title:
'aaa'
,
created_at:
2
.
years
.
until
(
Date
.
today
)).
invalid?
assert
Topic
.
new
(
title:
'aaa'
,
created_at:
3
.
months
.
until
(
Date
.
today
)).
valid?
assert
Topic
.
new
(
title:
'aaa'
,
created_at:
37
.
weeks
.
since
(
Date
.
today
)).
invalid?
assert
Topic
.
new
(
title:
'aaa'
,
created_at:
1
.
year
.
until
(
Date
.
today
)).
valid?
assert
Topic
.
new
(
title:
'aaa'
,
created_at:
Date
.
today
).
valid?
assert
Topic
.
new
(
title:
'aaa'
,
created_at:
range_begin
).
valid?
assert
Topic
.
new
(
title:
'aaa'
,
created_at:
range_end
).
valid?
end
def
test_validates_inclusion_of_date_time_range
Topic
.
validates_inclusion_of
(
:created_at
,
in:
1
.
year
.
until
(
DateTime
.
current
)
..
DateTime
.
current
)
range_begin
=
1
.
year
.
until
(
DateTime
.
current
)
range_end
=
DateTime
.
current
Topic
.
validates_inclusion_of
(
:created_at
,
in:
range_begin
..
range_end
)
assert
Topic
.
new
(
title:
'aaa'
,
created_at:
2
.
years
.
until
(
DateTime
.
current
)).
invalid?
assert
Topic
.
new
(
title:
'aaa'
,
created_at:
3
.
months
.
until
(
DateTime
.
current
)).
valid?
assert
Topic
.
new
(
title:
'aaa'
,
created_at:
37
.
weeks
.
since
(
DateTime
.
current
)).
invalid?
assert
Topic
.
new
(
title:
'aaa'
,
created_at:
range_begin
).
valid?
assert
Topic
.
new
(
title:
'aaa'
,
created_at:
range_end
).
valid?
end
def
test_validates_inclusion_of
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录