From c6fe49b00921cda55af2dc311dd432795c4313f5 Mon Sep 17 00:00:00 2001 From: Pratik Naik Date: Sat, 8 Aug 2009 19:08:39 +0100 Subject: Simplyfy validates_length_of and remove puts --- activemodel/lib/active_model/validations/length.rb | 11 +++++++---- activemodel/test/cases/validations/length_validation_test.rb | 1 - 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'activemodel') diff --git a/activemodel/lib/active_model/validations/length.rb b/activemodel/lib/active_model/validations/length.rb index 81c97238d2..3e76796355 100644 --- a/activemodel/lib/active_model/validations/length.rb +++ b/activemodel/lib/active_model/validations/length.rb @@ -80,11 +80,14 @@ module ActiveModel validates_each(attrs, options) do |record, attr, value| value = options[:tokenizer].call(value) if value.kind_of?(String) - unless option == :maximum and value.nil? - unless !value.nil? and value.size.send(validity_checks[option], option_value) - record.errors.add(attr, key, :default => custom_message, :count => option_value) - end + + valid_value = if option == :maximum + value.nil? || value.size.send(validity_checks[option], option_value) + else + value && value.size.send(validity_checks[option], option_value) end + + record.errors.add(attr, key, :default => custom_message, :count => option_value) unless valid_value end end end diff --git a/activemodel/test/cases/validations/length_validation_test.rb b/activemodel/test/cases/validations/length_validation_test.rb index bc24900ecf..499f6a5e31 100644 --- a/activemodel/test/cases/validations/length_validation_test.rb +++ b/activemodel/test/cases/validations/length_validation_test.rb @@ -55,7 +55,6 @@ class LengthValidationTest < ActiveModel::TestCase def test_validates_length_of_using_maximum_should_allow_nil Topic.validates_length_of :title, :maximum => 10 t = Topic.create - puts t.errors assert t.valid? end -- cgit v1.2.3