Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
d6fe9e83
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,发现更多精彩内容 >>
提交
d6fe9e83
编写于
10月 23, 2013
作者:
R
Rafael Mendonça França
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #12612 from amatsuda/amo_validates_inclusion_of_time_range_error
Let validates_inclusion_of accept Time and DateTime ranges
上级
dc8a2067
68db6bc4
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
34 addition
and
6 deletion
+34
-6
activemodel/lib/active_model/validations/clusivity.rb
activemodel/lib/active_model/validations/clusivity.rb
+11
-5
activemodel/test/cases/validations/inclusion_validation_test.rb
...model/test/cases/validations/inclusion_validation_test.rb
+22
-0
activemodel/test/models/topic.rb
activemodel/test/models/topic.rb
+1
-1
未找到文件。
activemodel/lib/active_model/validations/clusivity.rb
浏览文件 @
d6fe9e83
...
...
@@ -30,12 +30,18 @@ def delimiter
@delimiter
||=
options
[
:in
]
||
options
[
:within
]
end
# In Ruby 1.9 <tt>Range#include?</tt> on non-num
eric 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
ranges.
# In Ruby 1.9 <tt>Range#include?</tt> on non-num
ber-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.
def
inclusion_method
(
enumerable
)
(
enumerable
.
is_a?
(
Range
)
&&
enumerable
.
first
.
is_a?
(
Numeric
))
?
:cover?
:
:include?
return
:include?
unless
enumerable
.
is_a?
(
Range
)
case
enumerable
.
first
when
Numeric
,
Time
,
DateTime
:cover?
else
:include?
end
end
end
end
...
...
activemodel/test/cases/validations/inclusion_validation_test.rb
浏览文件 @
d6fe9e83
# encoding: utf-8
require
'cases/helper'
require
'active_support/all'
require
'models/topic'
require
'models/person'
...
...
@@ -20,6 +21,27 @@ def test_validates_inclusion_of_range
assert
Topic
.
new
(
"title"
=>
"bbb"
,
"content"
=>
"abc"
).
valid?
end
def
test_validates_inclusion_of_time_range
Topic
.
validates_inclusion_of
(
:created_at
,
in:
1
.
year
.
ago
..
Time
.
now
)
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?
end
def
test_validates_inclusion_of_date_range
Topic
.
validates_inclusion_of
(
:created_at
,
in:
1
.
year
.
until
(
Date
.
today
)
..
Date
.
today
)
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?
end
def
test_validates_inclusion_of_date_time_range
Topic
.
validates_inclusion_of
(
:created_at
,
in:
1
.
year
.
until
(
DateTime
.
current
)
..
DateTime
.
current
)
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?
end
def
test_validates_inclusion_of
Topic
.
validates_inclusion_of
(
:title
,
in:
%w( a b c d e f g )
)
...
...
activemodel/test/models/topic.rb
浏览文件 @
d6fe9e83
...
...
@@ -6,7 +6,7 @@ def self._validates_default_keys
super
|
[
:message
]
end
attr_accessor
:title
,
:author_name
,
:content
,
:approved
attr_accessor
:title
,
:author_name
,
:content
,
:approved
,
:created_at
attr_accessor
:after_validation_performed
after_validation
:perform_after_validation
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录