diff --git a/lib/simple_form/components/maxlength.rb b/lib/simple_form/components/maxlength.rb index 488a42b9..4da24ed4 100644 --- a/lib/simple_form/components/maxlength.rb +++ b/lib/simple_form/components/maxlength.rb @@ -11,7 +11,7 @@ module SimpleForm def maximum_length_from_validation if options[:maxlength] == true - if has_validators? && (length_validator = find_length_validator) + if length_validator = find_length_validator length_validator.options[:maximum] end else diff --git a/lib/simple_form/components/min_max.rb b/lib/simple_form/components/min_max.rb index 72b1af47..c5aa674c 100644 --- a/lib/simple_form/components/min_max.rb +++ b/lib/simple_form/components/min_max.rb @@ -2,8 +2,6 @@ module SimpleForm module Components module MinMax def min_max - return unless has_validators? - if numeric_validator = find_numericality_validator validator_options = numeric_validator.options input_html_options[:min] ||= minimum_value(validator_options) @@ -48,4 +46,4 @@ module SimpleForm end end end -end \ No newline at end of file +end diff --git a/lib/simple_form/components/pattern.rb b/lib/simple_form/components/pattern.rb index bff46c1c..4c6604c6 100644 --- a/lib/simple_form/components/pattern.rb +++ b/lib/simple_form/components/pattern.rb @@ -11,7 +11,7 @@ module SimpleForm def pattern_source if options[:pattern] == true - if has_validators? && (pattern_validator = find_pattern_validator) + if pattern_validator = find_pattern_validator pattern_validator.options[:with].source end else diff --git a/lib/simple_form/helpers/validators.rb b/lib/simple_form/helpers/validators.rb index a92e7d7e..e6758f8a 100644 --- a/lib/simple_form/helpers/validators.rb +++ b/lib/simple_form/helpers/validators.rb @@ -37,7 +37,7 @@ module SimpleForm end def find_validator(validator) - attribute_validators.find { |v| validator === v } + attribute_validators.find { |v| validator === v } if has_validators? end end end