1 files changed, 8 insertions, 7 deletions
diff --git a/activemodel/lib/active_model/validations.rb b/activemodel/lib/active_model/validations.rb
index 4762f39044..9e6ec17ce1 100644
--- a/activemodel/lib/active_model/validations.rb
+++ b/activemodel/lib/active_model/validations.rb
@@ -3,6 +3,7 @@ require 'active_support/core_ext/hash/keys'
 require 'active_support/core_ext/hash/except'
 require 'active_model/errors'
 require 'active_model/validations/callbacks'
+require 'active_model/validator'
 
 module ActiveModel
 
@@ -188,9 +189,9 @@ module ActiveModel
       #   #       #<ActiveModel::Validations::InclusionValidator:0x007fe603bb8780 @attributes=[:age], @options={:in=>0..99}>
       #   #    ]
       def validators_on(*attributes)
-        attributes.map do |attribute|
+        attributes.flat_map do |attribute|
           _validators[attribute.to_sym]
-        end.flatten
+        end
       end
 
       # Returns +true+ if +attribute+ is an attribute method, +false+ otherwise.
@@ -233,7 +234,7 @@ module ActiveModel
     #
     #   person = Person.new
     #   person.valid? # => false
-    #   person.errors # => #<ActiveModel::Errors:0x007fe603816640 @messages={:name=>["can't be blank"]}>
+    #   person.errors # => #<ActiveModel::Errors:0x007fe603816640 @messages={:name=>["can't be blank"]}>
     def errors
       @errors ||= Errors.new(self)
     end
@@ -250,7 +251,7 @@ module ActiveModel
     #
     #   person = Person.new
     #   person.name = ''
-    #   person.valid? # => false
+    #   person.valid? # => false
     #   person.name = 'david'
     #   person.valid? # => true
     #
@@ -265,7 +266,7 @@ module ActiveModel
     #   end
     #
     #   person = Person.new
-    #   person.valid?       # => true
+    #   person.valid?       # => true
     #   person.valid?(:new) # => false
     def valid?(context = nil)
       current_context, self.validation_context = validation_context, context
@@ -287,7 +288,7 @@ module ActiveModel
     #
     #   person = Person.new
     #   person.name = ''
-    #   person.invalid? # => true
+    #   person.invalid? # => true
     #   person.name = 'david'
     #   person.invalid? # => false
     #
@@ -302,7 +303,7 @@ module ActiveModel
     #   end
     #
     #   person = Person.new
-    #   person.invalid?       # => false
+    #   person.invalid?       # => false
     #   person.invalid?(:new) # => true
     def invalid?(context = nil)
       !valid?(context)