aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel/lib
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2012-10-02 23:56:12 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2012-10-02 23:57:00 -0300
commit86062005a73589dc4919cfac401ce061f061c6a0 (patch)
treee12b9e1621ef050d069c77937051ee51d9fa0ff8 /activemodel/lib
parent454d820bf0a18fe1db4c55b0145197d70fef1f82 (diff)
downloadrails-86062005a73589dc4919cfac401ce061f061c6a0.tar.gz
rails-86062005a73589dc4919cfac401ce061f061c6a0.tar.bz2
rails-86062005a73589dc4919cfac401ce061f061c6a0.zip
Revert "Merge pull request #7826 from sikachu/master-validators-kind"
This reverts commit 4e9f53f9736544f070e75e516c71137b7eb49a7a, reversing changes made to 6b802cdb4f5b84e1bf49aaeb0e994b3be6028af9. Revert "Don't use tap in this case." This reverts commit 454d820bf0a18fe1db4c55b0145197d70fef1f82. Reason: Is not a good idea to add options to this method since we can do the same thing using method composition. Person.validators_on(:name).select { |v| v.kind == :presence } Also it avoids to change the method again to add more options.
Diffstat (limited to 'activemodel/lib')
-rw-r--r--activemodel/lib/active_model/validations.rb15
1 files changed, 1 insertions, 14 deletions
diff --git a/activemodel/lib/active_model/validations.rb b/activemodel/lib/active_model/validations.rb
index be780d570b..4762f39044 100644
--- a/activemodel/lib/active_model/validations.rb
+++ b/activemodel/lib/active_model/validations.rb
@@ -187,23 +187,10 @@ module ActiveModel
# # #<ActiveModel::Validations::PresenceValidator:0x007fe604914e60 @attributes=[:name], @options={}>,
# # #<ActiveModel::Validations::InclusionValidator:0x007fe603bb8780 @attributes=[:age], @options={:in=>0..99}>
# # ]
- #
- # You can also pass a +:kind+ option to filter the validators based on their kind.
- #
- # Person.validators_on(:name, kind: :presence)
- # # => [#<ActiveModel::Validations::PresenceValidator:0x007fe604914e60 @attributes=[:name], @options={}>]
def validators_on(*attributes)
- options = attributes.extract_options!
-
- validators = attributes.map do |attribute|
+ attributes.map do |attribute|
_validators[attribute.to_sym]
end.flatten
-
- if options[:kind]
- validators.select! { |validator| validator.kind == options[:kind] }
- else
- validators
- end
end
# Returns +true+ if +attribute+ is an attribute method, +false+ otherwise.