From 7273fda9352215da3ba3114dd2a96e5944d044e7 Mon Sep 17 00:00:00 2001 From: Gant Date: Thu, 21 Aug 2014 14:29:45 -0500 Subject: [PATCH] lowered shortcircuit to the base valid? so it works for everyone --- motion/ruby_motion_query/validation.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/motion/ruby_motion_query/validation.rb b/motion/ruby_motion_query/validation.rb index 8ffff82..07e33b4 100644 --- a/motion/ruby_motion_query/validation.rb +++ b/motion/ruby_motion_query/validation.rb @@ -105,6 +105,11 @@ module RubyMotionQuery end def valid?(data, options={}) + # shortcircuit if debugging + return true if RubyMotionQuery::RMQ.debugging? + # shortcircuit for optionals + return true if (options[:allow_blank] && (data.nil? || data.empty?)) + @options = options.merge(@options) @valid_status = @rule.call(data, @options) end @@ -182,11 +187,6 @@ module RubyMotionQuery # # @return [Boolean] def valid?(value, rule, options={}) - # shortcircuit if debugging - return true if RubyMotionQuery::RMQ.debugging? - # shortcircuit for optionals - return true if (options[:allow_blank] && (value.nil? || value.empty?)) - Validation.new(rule).valid?(value, options) end