fix blank error message when allow_blank is false and value is balnk

Apipie · Jun 4, 2024 · 5c2552b · 5c2552b
1 parent eef4770
commit 5c2552b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/lib/apipie/param_description.rb b/lib/apipie/param_description.rb
@@ -120,11 +120,11 @@ def validate(value)
       return true if allow_nil && value.nil?
       return true if allow_blank && value.blank?
       value = normalized_value(value)
-      if (!allow_nil && value.nil?) || (blank_forbidden? && value.blank?) || !validator.valid?(value)
-        error = validator.error
-        error = ParamError.new(error) unless error.is_a? StandardError
-        raise error
-      end
+      return true if !validator.valid?(value)
+
+      error = validator.error
+      error = ParamError.new(error) unless error.is_a? StandardError
+      raise error
     end
 
     def blank_forbidden?

diff --git a/lib/apipie/validator.rb b/lib/apipie/validator.rb
@@ -50,6 +50,14 @@ def self.raise_if_missing_params
 
       # check if value is valid
       def valid?(value)
+        if !param_description.allow_nil && value.nil?
+          @error_value = nil
+          return false
+        elsif !param_description.allow_blank && value.blank?
+          @error_value = 'blank'
+          return false
+        end
+
         if self.validate(value)
           @error_value = nil
           true