More work on param validation

Author: noteflakes

lib/syntropy/context.rb

@@ -17,30 +17,42 @@ def params
     def validate_param(name, *clauses)
       value = @request.query[name]
       clauses.each do |c|
-        valid = is_valid_param?(value, c)
+        valid = param_is_valid?(value, c)
         raise(Syntropy::ValidationError, 'Validation error') if !valid
-        if c == Integer
-          value = value.to_i
-        elsif c == Float
-          value = value.to_f
-        end
+        value = param_convert(value, c)
       end
       value
     end
 
+    BOOL_REGEXP = /^(t|f|true|false|on|off|1|0|yes|no)$/
+    BOOL_TRUE_REGEXP = /^(t|true|on|1|yes)$/
     INTEGER_REGEXP = /^[\+\-]?[0-9]+$/
     FLOAT_REGEXP = /^[\+\-]?[0-9]+(\.[0-9]+)?$/
 
-    def is_valid_param?(value, cond)
-      if cond == Integer
-        return (value.is_a?(String) && value =~ INTEGER_REGEXP)
+    def param_is_valid?(value, cond)
+      if cond == :bool
+        return (value && value =~ BOOL_REGEXP)
+      elsif cond == Integer
+        return (value && value =~ INTEGER_REGEXP)
       elsif cond == Float
-        return (value.is_a?(String) && value =~ FLOAT_REGEXP)
+        return (value && value =~ FLOAT_REGEXP)
       elsif cond.is_a?(Array)
-        return cond.any? { |c| is_valid_param?(value, c) }
+        return cond.any? { |c| param_is_valid?(value, c) }
       end
 
       cond === value
     end
+
+    def param_convert(value, klass)
+      if klass == :bool
+        value = value =~ BOOL_TRUE_REGEXP ? true : false
+      elsif klass == Integer
+        value = value.to_i
+      elsif klass == Float
+        value = value.to_f
+      else
+        value
+      end
+    end
   end
 end

test/test_context.rb

@@ -4,7 +4,7 @@
 
 class ContextTest < Minitest::Test
   def setup
-    @req = mock_req(':method' => 'GET', ':path' => '/foo?q=foo&x=bar&y=123')
+    @req = mock_req(':method' => 'GET', ':path' => '/foo?q=foo&x=bar&y=123&z1=t&z2=f')
     @ctx = Syntropy::Context.new(@req)
   end
 
@@ -25,11 +25,16 @@ def test_validate_param
     assert_equal 123, @ctx.validate_param(:y, Integer, 120..125)
     assert_equal 123.0, @ctx.validate_param(:y, Float)
 
+    assert_equal true, @ctx.validate_param(:z1, :bool)
+    assert_equal false, @ctx.validate_param(:z2, :bool)
+
     assert_raises(VE) { @ctx.validate_param(:azerty, String) }
     assert_raises(VE) { @ctx.validate_param(:q, Integer) }
     assert_raises(VE) { @ctx.validate_param(:q, Float) }
     assert_raises(VE) { @ctx.validate_param(:q, nil) }
 
     assert_raises(VE) { @ctx.validate_param(:y, Integer, 1..100) }
+
+    assert_raises(VE) { @ctx.validate_param(:y, :bool) }
   end
 end