Merge pull request #614 from dm1try/refuse_params_with_nil_by_regex_validator

regex validator refuses params with nil value

Author: dblock

CHANGELOG.md

@@ -3,6 +3,10 @@ Next Release
 
 * Your contribution here.
 
+#### Fixes
+
+* [#614](https://github.com/intridea/grape/pull/614): Params with `nil` value are now refused by `RegexpValidator` - [@dm1try](https://github.com/dm1try).
+
 0.7.0 (4/2/2013)
 =================
 

lib/grape/validations/regexp.rb

@@ -2,7 +2,8 @@ module Grape
   module Validations
     class RegexpValidator < SingleOptionValidator
       def validate_param!(attr_name, params)
-        if params[attr_name] && !(params[attr_name].to_s =~ @option)
+        if params.has_key?(attr_name) &&
+          (params[attr_name].nil? || !(params[attr_name].to_s =~ @option))
           raise Grape::Exceptions::Validation, param: @scope.full_name(attr_name), message_key: :regexp
         end
       end

spec/grape/validations/regexp_spec.rb

@@ -20,9 +20,16 @@ def app
     ValidationsSpec::RegexpValidatorSpec::API
   end
 
-  it 'refuses invalid input' do
-    get '/', name: "invalid name"
-    last_response.status.should == 400
+  context 'invalid input' do
+    it 'refuses inapppopriate' do
+      get '/', name: "invalid name"
+      last_response.status.should == 400
+    end
+
+    it 'refuses nil' do
+      get '/', name: nil
+      last_response.status.should == 400
+    end
   end
 
   it 'accepts valid input' do