writer (wip)

rzcoder · rzcoder · commit 8e1696296f39 · 2014-05-27T00:33:59.000+06:00
diff --git a/src/dataWriter.js b/src/dataWriter.js
@@ -102,18 +102,20 @@ typesTable[DataTypes.struct] = function (value, scheme) {
 };
 
 typesTable[DataTypes.list] = function (value, scheme) {
-    if (Object.prototype.toString.call(value) !== '[object Array]') {
-        throw Error('Value is not array.')
+    if (!Array.isArray(value)) {
+        throw Error('Value is not array.');
     }
 
     var res = [];
     var lenBuf = new Buffer(2);
     var length = value.length;
     lenBuf.writeUInt16BE(length,0);
     res.push(lenBuf);
+
     for(var i = 0; i < length; i++) {
         res.push(structureWriter(value[i], scheme));
     }
+
     return Buffer.concat(res);
 };
 
@@ -122,12 +124,16 @@ var structureWriter = function (object, scheme) {
     if(typeof scheme  === 'number') {
         res.push(typesTable[scheme](object));
     } else {
-        for (var el in scheme) {
-            var s = scheme[el];
-            if (typeof s === 'number') {
-                res.push(typesTable[s](object[el]));
-            } else {
-                res.push(typesTable[s.type](object[el], s.scheme));
+        if(Array.isArray(scheme)) {
+            console.log('bingo')
+        } else {
+            for (var el in scheme) {
+                var s = scheme[el];
+                if (typeof s === 'number') {
+                    res.push(typesTable[s](object[el]));
+                } else {
+                    res.push(typesTable[s.type](object[el], s.scheme));
+                }
             }
         }
     }
diff --git a/test/tests.js b/test/tests.js
@@ -150,6 +150,70 @@ suite("DataStruct", function(){
 
     };
 
+    var dataBundleExtend = {
+        nested: {
+            object: {
+                nested: {
+                    nested2: {
+                        nested3: {
+                            nested4: {
+                                nested5: 42
+                            }
+                        }
+                    }
+                }
+            },
+
+            scheme: {
+                nested: {
+                    type: DataTypes.struct,
+                    scheme: {
+                        nested2: {
+                            type: DataTypes.struct,
+                            scheme: {
+                                nested3: {
+                                    type: DataTypes.struct,
+                                    scheme: {
+                                        nested4: {
+                                            type: DataTypes.struct,
+                                            scheme: {
+                                                nested5: {
+                                                    type: DataTypes.struct,
+                                                    scheme: DataTypes.uint8
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        },
+
+        'list of list': {
+            object: {
+                list: [
+                    [90,10,101],
+                    [20,30,400],
+                    [100,110,1]
+                ]
+            },
+
+            scheme: {
+               list: {
+                    type: DataTypes.list,
+                    scheme: {
+                        type: DataTypes.list,
+                        scheme: DataTypes.int16
+                    }
+                }
+            }
+        }
+
+    };
+
     suite("Buffer to Object convert", function(){
         for(var suite in dataBundle) {
             var data = dataBundle[suite];
@@ -173,4 +237,17 @@ suite("DataStruct", function(){
             })(suite, data);
         }
     });
+
+    suite("Object to Buffer to Object convert", function() {
+        for(var suite in dataBundleExtend) {
+            var data = dataBundleExtend[suite];
+            (function(suite, data) {
+                test("should convert to buffer and read same for '" + suite + "' suite", function () {
+                    var buf = DataWriter(data.object, data.scheme);
+                    var obj = DataReader(buf, data.scheme);
+                    assert.deepEqual(obj, data.object);
+                });
+            })(suite, data);
+        }
+    });
 });
