Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
ddaeb4b6
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,发现更多精彩内容 >>
提交
ddaeb4b6
编写于
3月 28, 2012
作者:
S
Santiago Pastorino
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #5643 from rafaelfranca/remove-duplication
Remove code duplication in InclusionValidator and ExclusionValidator.
上级
f0268d56
170956cd
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
39 addition
and
44 deletion
+39
-44
activemodel/lib/active_model/validations/clusivity.rb
activemodel/lib/active_model/validations/clusivity.rb
+31
-0
activemodel/lib/active_model/validations/exclusion.rb
activemodel/lib/active_model/validations/exclusion.rb
+4
-22
activemodel/lib/active_model/validations/inclusion.rb
activemodel/lib/active_model/validations/inclusion.rb
+4
-22
未找到文件。
activemodel/lib/active_model/validations/clusivity.rb
0 → 100644
浏览文件 @
ddaeb4b6
require
'active_support/core_ext/range.rb'
module
ActiveModel
module
Validations
module
Clusivity
ERROR_MESSAGE
=
"An object with the method #include? or a proc or lambda is required, "
<<
"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
)
}
raise
ArgumentError
,
ERROR_MESSAGE
end
end
private
def
include?
(
record
,
value
)
delimiter
=
options
[
:in
]
exclusions
=
delimiter
.
respond_to?
(
:call
)
?
delimiter
.
call
(
record
)
:
delimiter
exclusions
.
send
(
inclusion_method
(
exclusions
),
value
)
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.
def
inclusion_method
(
enumerable
)
enumerable
.
is_a?
(
Range
)
?
:cover?
:
:include?
end
end
end
end
activemodel/lib/active_model/validations/exclusion.rb
浏览文件 @
ddaeb4b6
require
'active_support/core_ext/range'
require
"active_model/validations/clusivity"
module
ActiveModel
# == Active Model Exclusion Validator
module
Validations
class
ExclusionValidator
<
EachValidator
ERROR_MESSAGE
=
"An object with the method #include? or a proc or lambda is required, "
<<
"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
)
}
raise
ArgumentError
,
ERROR_MESSAGE
end
end
include
Clusivity
def
validate_each
(
record
,
attribute
,
value
)
delimiter
=
options
[
:in
]
exclusions
=
delimiter
.
respond_to?
(
:call
)
?
delimiter
.
call
(
record
)
:
delimiter
if
exclusions
.
send
(
inclusion_method
(
exclusions
),
value
)
if
include
?(
record
,
value
)
record
.
errors
.
add
(
attribute
,
:exclusion
,
options
.
except
(
:in
).
merge!
(:
value
=>
value
))
end
end
private
# 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.
def
inclusion_method
(
enumerable
)
enumerable
.
is_a?
(
Range
)
?
:cover?
:
:include?
end
end
module
HelperMethods
...
...
@@ -59,7 +41,7 @@ module HelperMethods
# * <tt>:unless</tt> - Specifies a method, proc or string to call to determine if the validation should
# not occur (e.g. <tt>:unless => :skip_validation</tt>, or <tt>:unless => Proc.new { |user| user.signup_step <= 2 }</tt>). The
# method, proc or string should return or evaluate to a true or false value.
# * <tt>:strict</tt> - Specifies whether validation should be strict.
# * <tt>:strict</tt> - Specifies whether validation should be strict.
# See <tt>ActiveModel::Validation#validates!</tt> for more information
def
validates_exclusion_of
(
*
attr_names
)
validates_with
ExclusionValidator
,
_merge_attributes
(
attr_names
)
...
...
activemodel/lib/active_model/validations/inclusion.rb
浏览文件 @
ddaeb4b6
require
'active_support/core_ext/range'
require
"active_model/validations/clusivity"
module
ActiveModel
# == Active Model Inclusion Validator
module
Validations
class
InclusionValidator
<
EachValidator
ERROR_MESSAGE
=
"An object with the method #include? or a proc or lambda is required, "
<<
"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
)
}
raise
ArgumentError
,
ERROR_MESSAGE
end
end
include
Clusivity
def
validate_each
(
record
,
attribute
,
value
)
delimiter
=
options
[
:in
]
exclusions
=
delimiter
.
respond_to?
(
:call
)
?
delimiter
.
call
(
record
)
:
delimiter
unless
exclusions
.
send
(
inclusion_method
(
exclusions
),
value
)
unless
include
?(
record
,
value
)
record
.
errors
.
add
(
attribute
,
:inclusion
,
options
.
except
(
:in
).
merge!
(:
value
=>
value
))
end
end
private
# 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.
def
inclusion_method
(
enumerable
)
enumerable
.
is_a?
(
Range
)
?
:cover?
:
:include?
end
end
module
HelperMethods
...
...
@@ -59,7 +41,7 @@ module HelperMethods
# * <tt>:unless</tt> - Specifies a method, proc or string to call to determine if the validation should
# not occur (e.g. <tt>:unless => :skip_validation</tt>, or <tt>:unless => Proc.new { |user| user.signup_step <= 2 }</tt>). The
# method, proc or string should return or evaluate to a true or false value.
# * <tt>:strict</tt> - Specifies whether validation should be strict.
# * <tt>:strict</tt> - Specifies whether validation should be strict.
# See <tt>ActiveModel::Validation#validates!</tt> for more information
def
validates_inclusion_of
(
*
attr_names
)
validates_with
InclusionValidator
,
_merge_attributes
(
attr_names
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录