Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
22ad30ed
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,发现更多精彩内容 >>
提交
22ad30ed
编写于
3月 21, 2009
作者:
P
Pratik Naik
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Move validate_on_create and validate_on_update from ActiveModel to ActiveRecord
上级
6173e5bf
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
21 addition
and
20 deletion
+21
-20
activemodel/lib/active_model/validations.rb
activemodel/lib/active_model/validations.rb
+2
-6
activemodel/lib/active_model/validations/acceptance.rb
activemodel/lib/active_model/validations/acceptance.rb
+1
-1
activemodel/lib/active_model/validations/confirmation.rb
activemodel/lib/active_model/validations/confirmation.rb
+1
-2
activemodel/lib/active_model/validations/exclusion.rb
activemodel/lib/active_model/validations/exclusion.rb
+1
-2
activemodel/lib/active_model/validations/inclusion.rb
activemodel/lib/active_model/validations/inclusion.rb
+1
-2
activemodel/lib/active_model/validations/numericality.rb
activemodel/lib/active_model/validations/numericality.rb
+1
-1
activemodel/lib/active_model/validations/presence.rb
activemodel/lib/active_model/validations/presence.rb
+1
-2
activerecord/lib/active_record/validations.rb
activerecord/lib/active_record/validations.rb
+12
-2
activerecord/lib/active_record/validations/associated.rb
activerecord/lib/active_record/validations/associated.rb
+1
-2
未找到文件。
activemodel/lib/active_model/validations.rb
浏览文件 @
22ad30ed
...
...
@@ -62,7 +62,7 @@ def validates_each(*attrs)
attrs
=
attrs
.
flatten
# Declare the validation.
send
(
validation_method
(
options
[
:on
]
||
:save
),
options
)
do
|
record
|
send
(
validation_method
(
options
[
:on
]),
options
)
do
|
record
|
attrs
.
each
do
|
attr
|
value
=
record
.
get_attribute_value
(
attr
)
next
if
(
value
.
nil?
&&
options
[
:allow_nil
])
||
(
value
.
blank?
&&
options
[
:allow_blank
])
...
...
@@ -74,11 +74,7 @@ def validates_each(*attrs)
private
def
validation_method
(
on
)
case
on
when
:save
then
:validate
when
:create
then
:validate_on_create
when
:update
then
:validate_on_update
end
:validate
end
end
...
...
activemodel/lib/active_model/validations/acceptance.rb
浏览文件 @
22ad30ed
...
...
@@ -25,7 +25,7 @@ module ClassMethods
# 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.
def
validates_acceptance_of
(
*
attr_names
)
configuration
=
{
:
on
=>
:save
,
:
allow_nil
=>
true
,
:accept
=>
"1"
}
configuration
=
{
:allow_nil
=>
true
,
:accept
=>
"1"
}
configuration
.
update
(
attr_names
.
extract_options!
)
db_cols
=
begin
...
...
activemodel/lib/active_model/validations/confirmation.rb
浏览文件 @
22ad30ed
...
...
@@ -30,8 +30,7 @@ module ClassMethods
# 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.
def
validates_confirmation_of
(
*
attr_names
)
configuration
=
{
:on
=>
:save
}
configuration
.
update
(
attr_names
.
extract_options!
)
configuration
=
attr_names
.
extract_options!
attr_accessor
(
*
(
attr_names
.
map
{
|
n
|
"
#{
n
}
_confirmation"
}))
...
...
activemodel/lib/active_model/validations/exclusion.rb
浏览文件 @
22ad30ed
...
...
@@ -21,8 +21,7 @@ module ClassMethods
# 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.
def
validates_exclusion_of
(
*
attr_names
)
configuration
=
{
:on
=>
:save
}
configuration
.
update
(
attr_names
.
extract_options!
)
configuration
=
attr_names
.
extract_options!
enum
=
configuration
[
:in
]
||
configuration
[
:within
]
...
...
activemodel/lib/active_model/validations/inclusion.rb
浏览文件 @
22ad30ed
...
...
@@ -21,8 +21,7 @@ module ClassMethods
# 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.
def
validates_inclusion_of
(
*
attr_names
)
configuration
=
{
:on
=>
:save
}
configuration
.
update
(
attr_names
.
extract_options!
)
configuration
=
attr_names
.
extract_options!
enum
=
configuration
[
:in
]
||
configuration
[
:within
]
...
...
activemodel/lib/active_model/validations/numericality.rb
浏览文件 @
22ad30ed
...
...
@@ -32,7 +32,7 @@ module ClassMethods
# 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.
def
validates_numericality_of
(
*
attr_names
)
configuration
=
{
:on
=>
:save
,
:on
ly_integer
=>
false
,
:allow_nil
=>
false
}
configuration
=
{
:only_integer
=>
false
,
:allow_nil
=>
false
}
configuration
.
update
(
attr_names
.
extract_options!
)
numericality_options
=
ALL_NUMERICALITY_CHECKS
.
keys
&
configuration
.
keys
...
...
activemodel/lib/active_model/validations/presence.rb
浏览文件 @
22ad30ed
...
...
@@ -26,8 +26,7 @@ module ClassMethods
# The method, proc or string should return or evaluate to a true or false value.
#
def
validates_presence_of
(
*
attr_names
)
configuration
=
{
:on
=>
:save
}
configuration
.
update
(
attr_names
.
extract_options!
)
configuration
=
attr_names
.
extract_options!
# can't use validates_each here, because it cannot cope with nonexistent attributes,
# while errors.add_on_empty can
...
...
activerecord/lib/active_record/validations.rb
浏览文件 @
22ad30ed
...
...
@@ -99,9 +99,8 @@ def generate_message(attribute, message = :invalid, options = {})
module
Validations
def
self
.
included
(
base
)
# :nodoc:
base
.
extend
ClassMethods
base
.
send
:include
,
ActiveModel
::
Validations
base
.
extend
ClassMethods
base
.
send
:include
,
InstanceMethods
base
.
define_callbacks
:validate_on_create
,
:validate_on_update
...
...
@@ -125,6 +124,17 @@ def create!(attributes = nil, &block)
object
end
end
def
validation_method
(
on
)
case
on
when
:create
:validate_on_create
when
:update
:validate_on_update
else
:validate
end
end
end
module
InstanceMethods
...
...
activerecord/lib/active_record/validations/associated.rb
浏览文件 @
22ad30ed
...
...
@@ -33,8 +33,7 @@ module ClassMethods
# 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.
def
validates_associated
(
*
attr_names
)
configuration
=
{
:on
=>
:save
}
configuration
.
update
(
attr_names
.
extract_options!
)
configuration
=
attr_names
.
extract_options!
validates_each
(
attr_names
,
configuration
)
do
|
record
,
attr_name
,
value
|
unless
(
value
.
is_a?
(
Array
)
?
value
:
[
value
]).
collect
{
|
r
|
r
.
nil?
||
r
.
valid?
}.
all?
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录