Check by the validation kind method instead of the full constant

heartcombo · Oct 3, 2012 · 274d6ec · 274d6ec
1 parent de29633
commit 274d6ec
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/lib/simple_form/components/maxlength.rb b/lib/simple_form/components/maxlength.rb
@@ -23,7 +23,7 @@ def maximum_length_from_validation
       end
 
       def find_length_validator
-        find_validator(ActiveModel::Validations::LengthValidator)
+        find_validator(:length)
       end
 
       def has_tokenizer?(length_validator)

diff --git a/lib/simple_form/components/min_max.rb b/lib/simple_form/components/min_max.rb
@@ -33,7 +33,7 @@ def maximum_value(validator_options)
       end
 
       def find_numericality_validator
-        find_validator(ActiveModel::Validations::NumericalityValidator)
+        find_validator(:numericality)
       end
 
       def evaluate_numericality_validator_option(option)

diff --git a/lib/simple_form/components/pattern.rb b/lib/simple_form/components/pattern.rb
@@ -19,7 +19,7 @@ def pattern_source
       end
 
       def find_pattern_validator
-        find_validator(ActiveModel::Validations::FormatValidator)
+        find_validator(:format)
       end
 
       def evaluate_format_validator_option(option)

diff --git a/lib/simple_form/helpers/validators.rb b/lib/simple_form/helpers/validators.rb
@@ -36,8 +36,8 @@ def action_validator_match?(validator)
         end
       end
 
-      def find_validator(validator)
-        attribute_validators.find { |v| validator === v } if has_validators?
+      def find_validator(kind)
+        attribute_validators.find { |v| v.kind == kind } if has_validators?
       end
     end
   end