From 3348ca306337b7ac20781d202a6e0b5113acafe5 Mon Sep 17 00:00:00 2001
From: Adam Meehan <adam.meehan@gmail.com>
Date: Sun, 12 Apr 2009 10:23:09 +1000
Subject: [PATCH] dont rely on add_error return value to exit. sigh, less one
 liners

---
 lib/validates_timeliness/validator.rb | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/lib/validates_timeliness/validator.rb b/lib/validates_timeliness/validator.rb
index feebd9e..fd96ed5 100644
--- a/lib/validates_timeliness/validator.rb
+++ b/lib/validates_timeliness/validator.rb
@@ -38,8 +38,15 @@ module ValidatesTimeliness
 
       return if (raw_value.nil? && configuration[:allow_nil]) || (raw_value.blank? && configuration[:allow_blank])
 
-      add_error(record, attr_name, :blank) and return if raw_value.blank?
-      add_error(record, attr_name, "invalid_#{type}".to_sym) and return if value.nil?
+      if raw_value.blank?
+        add_error(record, attr_name, :blank)
+        return
+      end
+
+      if value.nil?
+        add_error(record, attr_name, "invalid_#{type}".to_sym)
+        return
+      end
 
       validate_restrictions(record, attr_name, value)
     end