Merge pull request #44 from formix/anyDepthDeclarer

Any depth declarer

Author: Jean-Philippe Gravel

damn-simple-xml.js

@@ -358,6 +358,8 @@ function createTagContent(root, behavior, fieldPath, level, attrset, buffer, cal
         var itemName = root.name + "Item";
         if (behavior.arrays[fieldPath]) {
             itemName = behavior.arrays[fieldPath];
+        } else if (behavior.arrays["*." + root.name]) {
+            itemName = behavior.arrays["*." + root.name];
         }
         for (var i = 0; i < root.data.length; i++) {
             var item = root.data[i];
@@ -442,10 +444,10 @@ function convert(value) {
 }
 
 
-function createObject(stack, nodeName, arrayNameSet) {
+function createObject(stack, nodeName, arrays) {
     var obj = {};
     var fullName = createNodeName(stack, nodeName);
-    if (arrayNameSet[fullName]) {
+    if (arrays[fullName] || arrays["*." + nodeName]) {
         obj = [];
     }
     return obj;    
@@ -512,3 +514,15 @@ function countFields(obj) {
     }
     return count;
 }
+
+
+function mergeArrays(a1, a2) {
+    var target = [];
+    for (var i = 0; i < a1.length; i++) {
+        target.push(a1[i]);
+    }
+    for (var j = 0; j < a2.length; j++) {
+        target.push(a2[j]);
+    }
+    return target;
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "damn-simple-xml",
-  "version": "1.1.3",
+  "version": "1.2.0",
   "description": "XML serialization library meant to simplify programmer's life",
   "author": "Jean-Philippe Gravel <jeanphilippe.gravel@gmail.com>",
   "homepage": "https://github.com/formix/damn-simple-xml",

test/test-deserialize.js

@@ -372,7 +372,70 @@ describe("DamnSimpleXml.deserialize()", function() {
 
     });
 
+    
+
+    describe("using '*.' declarators", function() {
+        
+        it("should deserialize arrays at any depth", function(done) {
+
+            var expected = {
+                name: "root",
+                children: [
+                    {
+                        name: "child_1",
+                        children: [
+                            {
+                                name: "child_1_1",
+                                children: []
+                            },
+                            {
+                                name: "child_1_2",
+                                children: []
+                            }
+                        ]
+                    }
+                ]
+            }
 
+            var data = 
+                "<item>" +
+                    "<name>root</name>" +
+                    "<children>" +
+                        "<item>" +
+                            "<name>child_1</name>" +
+                            "<children>" +
+                                "<item>" +
+                                    "<name>child_1_1</name>" +
+                                    "<children/>"+
+                                "</item>" +
+                                "<item>" +
+                                    "<name>child_1_2</name>" +
+                                    "<children/>" +
+                                "</item>" +
+                            "</children>" +                                
+                        "</item>" +
+                    "</children>" +
+                "</item>";
+
+
+           var dsx = new Serializer({
+               arrays: {                  
+                   "*.children": "item"
+               }
+           });
+
+
+           dsx.deserialize(data, function(err, obj) {
+                assert.ifError(err);
+                assert.deepEqual(obj.data, expected);
+               done();
+           });
+
+        });
+
+        // Add other declarators implementation and depth
+
+    });
 
 
 });