Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
4280b20c
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,发现更多精彩内容 >>
提交
4280b20c
编写于
1月 17, 2012
作者:
J
José Valim
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #4494 from Dreamfa11/patch-0
Validates method should not change options argument
上级
5f8274ef
7c3a5ec4
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
10 addition
and
4 deletion
+10
-4
activemodel/lib/active_model/validations/validates.rb
activemodel/lib/active_model/validations/validates.rb
+4
-4
activemodel/test/cases/validations_test.rb
activemodel/test/cases/validations_test.rb
+6
-0
未找到文件。
activemodel/lib/active_model/validations/validates.rb
浏览文件 @
4280b20c
...
@@ -59,7 +59,7 @@ module ClassMethods
...
@@ -59,7 +59,7 @@ module ClassMethods
#
#
# validates :name, :'film/title' => true
# validates :name, :'film/title' => true
#
#
# The validators hash can also handle regular expressions, ranges,
# The validators hash can also handle regular expressions, ranges,
# arrays and strings in shortcut form, e.g.
# arrays and strings in shortcut form, e.g.
#
#
# validates :email, :format => /@/
# validates :email, :format => /@/
...
@@ -70,7 +70,7 @@ module ClassMethods
...
@@ -70,7 +70,7 @@ module ClassMethods
# validator's initializer as +options[:in]+ while other types including
# validator's initializer as +options[:in]+ while other types including
# regular expressions and strings are passed as +options[:with]+
# regular expressions and strings are passed as +options[:with]+
#
#
# Finally, the options +:if+, +:unless+, +:on+, +:allow_blank+, +:allow_nil+ and +:strict+
# Finally, the options +:if+, +:unless+, +:on+, +:allow_blank+, +:allow_nil+ and +:strict+
# can be given to one specific validator, as a hash:
# can be given to one specific validator, as a hash:
#
#
# validates :password, :presence => { :if => :password_required? }, :confirmation => true
# validates :password, :presence => { :if => :password_required? }, :confirmation => true
...
@@ -80,7 +80,7 @@ module ClassMethods
...
@@ -80,7 +80,7 @@ module ClassMethods
# validates :password, :presence => true, :confirmation => true, :if => :password_required?
# validates :password, :presence => true, :confirmation => true, :if => :password_required?
#
#
def
validates
(
*
attributes
)
def
validates
(
*
attributes
)
defaults
=
attributes
.
extract_options!
defaults
=
attributes
.
extract_options!
.
dup
validations
=
defaults
.
slice!
(
*
_validates_default_keys
)
validations
=
defaults
.
slice!
(
*
_validates_default_keys
)
raise
ArgumentError
,
"You need to supply at least one attribute"
if
attributes
.
empty?
raise
ArgumentError
,
"You need to supply at least one attribute"
if
attributes
.
empty?
...
@@ -102,7 +102,7 @@ def validates(*attributes)
...
@@ -102,7 +102,7 @@ def validates(*attributes)
end
end
# This method is used to define validation that can not be corrected by end user
# This method is used to define validation that can not be corrected by end user
# and is considered exceptional.
# and is considered exceptional.
# So each validator defined with bang or <tt>:strict</tt> option set to <tt>true</tt>
# So each validator defined with bang or <tt>:strict</tt> option set to <tt>true</tt>
# will always raise <tt>ActiveModel::InternalValidationFailed</tt> instead of adding error
# will always raise <tt>ActiveModel::InternalValidationFailed</tt> instead of adding error
# when validation fails
# when validation fails
...
...
activemodel/test/cases/validations_test.rb
浏览文件 @
4280b20c
...
@@ -330,4 +330,10 @@ def test_validates_with_bang
...
@@ -330,4 +330,10 @@ def test_validates_with_bang
Topic
.
new
.
valid?
Topic
.
new
.
valid?
end
end
end
end
def
test_does_not_modify_options_argument
options
=
{
:presence
=>
true
}
Topic
.
validates
:title
,
options
assert_equal
({
:presence
=>
true
},
options
)
end
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录