Completed JSON importer. Exported from import matches original data, must be working

pyaccuwage/__init__.py

@@ -94,6 +94,7 @@ def json_dumps(records):
     import decimal
 
     class JSONEncoder(json.JSONEncoder):
+
         def default(self, o):
             if hasattr(o, 'toJSON') and callable(getattr(o, 'toJSON')):
                 return o.toJSON()
@@ -108,13 +109,31 @@ def json_dumps(records):
 
 def json_loads(s, record_classes):
     import json
+    import fields
+    import decimal
+    import re
+
+    if not isinstance(record_classes, dict):
+        record_classes = dict([ (x.__class__.__name__, x) for x in record_classes])
 
     def object_hook(o):
-        return {'object_hook':str(o)}
+        if '__class__' in o:
+            klass = o['__class__']
+
+            if klass in record_classes:
+                return record_classes[klass]().fromJSON(o)
+
+            elif hasattr(fields, klass):
+                return getattr(fields, klass)().fromJSON(o)
+
+        return o
+
+        #print "OBJECTHOOK", str(o)
+        #return {'object_hook':str(o)}
         #def default(self, o):
         #    return super(JSONDecoder, self).default(o)
 
-    return json.loads(s, object_hook=object_hook)
+    return json.loads(s, parse_float=decimal.Decimal, object_hook=object_hook)
 
 # THIS WAS IN CONTROLLER, BUT UNLESS WE
 # REALLY NEED A CONTROLLER CLASS, IT'S SIMPLER