Merge pull request #113 from karlwestin/fix-78

Look ahead one step when building nested structures (#78)

Author: afeld

backbone-nested.js

@@ -246,7 +246,7 @@
       var fullPathLength = attrPath.length;
       var model = this;
 
-      Backbone.NestedModel.walkPath(newAttrs, attrPath, function(val, path){
+      Backbone.NestedModel.walkPath(newAttrs, attrPath, function(val, path, next){
         var attr = _.last(path);
         var attrStr = Backbone.NestedModel.createAttrStr(path);
 
@@ -301,7 +301,7 @@
 
 
         } else if (!val[attr]){
-          if (_.isNumber(attr)){
+          if (_.isNumber(next)){
             val[attr] = [];
           } else {
             val[attr] = {};
@@ -360,7 +360,7 @@
 
       // walk through the child attributes
       for (var i = 0; i < attrPath.length; i++){
-        callback.call(scope || this, val, attrPath.slice(0, i + 1));
+        callback.call(scope || this, val, attrPath.slice(0, i + 1), attrPath[i + 1]);
 
         childAttr = attrPath[i];
         val = val[childAttr];

test/nested-model.js

@@ -309,6 +309,32 @@ $(document).ready(function() {
     deepEqual(json, doc.attributes);
   });
 
+  test("#toJSON() after an 1-N set using brackets", function() {
+    var provider = new Klass({
+      "fields[0].key": 'LOGIN'
+    });
+    equal(provider.get('fields[0].key'), 'LOGIN');
+
+    deepEqual(provider.toJSON(), {
+      "fields": [{
+        "key": "LOGIN"
+      }]
+    });
+  });
+
+  test("#toJSON() after an 1-N set using dots", function() {
+    var provider = new Klass({
+      "fields.0.key": 'LOGIN2'
+    });
+    equal(provider.get('fields.0.key'), 'LOGIN2');
+
+    deepEqual(provider.toJSON(), {
+      "fields": [{
+        "key": "LOGIN2"
+      }]
+    });
+  });
+
 
   // ----- CHANGE EVENTS --------