start of more useful data validator

Author: tomvanmele

src/compas/data/__init__.py

@@ -40,15 +40,13 @@
     is_int3
     is_float3
     is_float4x4
-    validate_data
 
 """
 from __future__ import absolute_import
 
 from .validators import is_int3
 from .validators import is_float3
 from .validators import is_float4x4
-from .validators import validate_data
 from .encoders import DataEncoder
 from .encoders import DataDecoder
 from .data import Data
@@ -62,7 +60,6 @@
     'is_int3',
     'is_float3',
     'is_float4x4',
-    'validate_data',
     'json_load',
     'json_loads',
     'json_dump',

src/compas/data/data.py

@@ -221,7 +221,7 @@ def __setstate__(self, state):
         self.data = state['data']
 
     def validate_data(self):
-        """Validate the data of this object against its data schema (`self.DATASCHEMA`).
+        """Validate the object's data against its data schema (`self.DATASCHEMA`).
 
         Returns
         -------
@@ -235,20 +235,19 @@ def validate_data(self):
         return self.DATASCHEMA.validate(self.data)
 
     def validate_json(self):
-        """Validate the data loaded from a JSON representation of the data of this object against its data schema (`self.DATASCHEMA`).
+        """Validate the object's data against its json schema (`self.JSONSCHEMA`).
 
         Returns
         -------
-        None
+        str
+            The validated JSON representation of the data.
 
         Raises
         ------
         SchemaError
         """
         import jsonschema
-        jsondata = json.dumps(self.data, cls=DataEncoder)
-        data = json.loads(jsondata, cls=DataDecoder)
-        jsonschema.validate(data, schema=self.JSONSCHEMA)
-        self.data = data
-        self.DATASCHEMA.validate(self.data)
-        return jsondata
+        jsonstring = json.dumps(self.data, cls=DataEncoder)
+        jsondata = json.loads(jsonstring, cls=DataDecoder)
+        jsonschema.validate(jsondata, schema=self.JSONSCHEMA)
+        return jsonstring

src/compas/data/validators.py

@@ -41,5 +41,5 @@ def validate_data(data, cls):
     SchemaError
     """
     import jsonschema
-    jsonschema.validate(data, schema=cls.get_JSONSCHEMA())
+    jsonschema.validate(data, schema=cls.JSONSCHEMA)
     return cls.DATASCHEMA.validate(data)