fix: pass the valid null object (#17) (#18)

getschema/impl.py

@@ -320,13 +320,13 @@ def fix_type(obj, schema, dict_path=[], on_invalid_property="raise",
         if not nullable:
             if on_invalid_property == "raise":
                 raise ValueError("Null object given at %s" % dict_path)
-            return None
+        return None
 
     # Recurse if object or array types
     if obj_type == "object":
         if type(obj) is not dict:
             raise KeyError("property type (object) Expected a dict object." +
-                           "Got: %s %s" % (type(obj), str(obj)))
+                           "Got: %s %s at %s" % (type(obj), str(obj), str(dict_path)))
         cleaned = dict()
         keys = obj.keys()
         for key in keys:

tests/test_fix_type.py

@@ -65,19 +65,19 @@
         "some_prop": "1",
     },
 }
+
 null_entries = {
     "index": None,
     "array": [
         "1.5",
         None,
     ],
-    "nested_field": {
-        "some_prop": "3",
-    },
+    "nested_field": None,
     "boolean_field": None,
     "number_field": None,
     "string_field": None,
 }
+
 invalid_datetime_record = {
     "index": 2,
     "array": [
@@ -236,3 +236,17 @@ def test_reject_null_string():
         assert(str(e).startswith("Null object given at"))
     else:
         raise Exception("Supposed to fail with null value")
+
+
+def test_reject_null_object():
+    schema = getschema.infer_schema(records)
+    # This will pass
+    _ = getschema.fix_type(null_entries, schema)
+
+    schema["properties"]["nested_field"]["type"] = ["object"]
+    try:
+        _ = getschema.fix_type(null_entries, schema)
+    except Exception as e:
+        assert(str(e).startswith("Null object given at"))
+    else:
+        raise Exception("Supposed to fail with null value")