From 86062005a73589dc4919cfac401ce061f061c6a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Tue, 2 Oct 2012 23:56:12 -0300
Subject: 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.
---
 activemodel/lib/active_model/validations.rb | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

(limited to 'activemodel/lib/active_model/validations.rb')

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.
-- 
cgit v1.2.3