Fix for issue voxpupuli#472

jahir-husain · Jul 24, 2023 · e739c58 · e739c58
1 parent ed559de
commit e739c58
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/lib/json-schema/attribute.rb b/lib/json-schema/attribute.rb
@@ -33,8 +33,9 @@ def self.validation_errors(validator)
         'any' => Object,
       }
 
-      def self.data_valid_for_type?(data, type)
+      def self.data_valid_for_type?(data, type, nullable=false)
         valid_classes = TYPE_CLASS_MAPPINGS.fetch(type) { return true }
+        valid_classes = [valid_classes, NilClass] if nullable
         Array(valid_classes).any? { |c| data.is_a?(c) }
       end
 

diff --git a/lib/json-schema/attributes/type.rb b/lib/json-schema/attributes/type.rb
@@ -5,10 +5,12 @@ class Schema
     class TypeAttribute < Attribute
       def self.validate(current_schema, data, fragments, processor, validator, options = {})
         union = true
+        nullable = false
         if options[:disallow]
           types = current_schema.schema['disallow']
         else
           types = current_schema.schema['type']
+          nullable = current_schema.schema['nullable']
         end
 
         if !types.is_a?(Array)
@@ -22,7 +24,7 @@ def self.validate(current_schema, data, fragments, processor, validator, options
 
         types.each_with_index do |type, type_index|
           if type.is_a?(String)
-            valid = data_valid_for_type?(data, type)
+            valid = data_valid_for_type?(data, type, nullable)
           elsif type.is_a?(Hash) && union
             # Validate as a schema
             schema = JSON::Schema.new(type, current_schema.uri, validator)

diff --git a/lib/json-schema/attributes/type_v4.rb b/lib/json-schema/attributes/type_v4.rb
@@ -6,12 +6,13 @@ class TypeV4Attribute < Attribute
       def self.validate(current_schema, data, fragments, processor, validator, options = {})
         union = true
         types = current_schema.schema['type']
+        nullable = current_schema.schema['nullable']
         if !types.is_a?(Array)
           types = [types]
           union = false
         end
 
-        return if types.any? { |type| data_valid_for_type?(data, type) }
+        return if types.any? { |type| data_valid_for_type?(data, type, nullable) }
 
         types = types.map { |type| type.is_a?(String) ? type : '(schema)' }.join(', ')
         message = format(