Set {} results in an empty model instead of undefined

tanqhnguyen · Apr 15, 2014 · ca65d8b · ca65d8b
1 parent f73d40c
commit ca65d8b
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 16 deletions.
diff --git a/build/backbone.supermodel.amd.js b/build/backbone.supermodel.amd.js
@@ -154,11 +154,17 @@
         }
 
         var finalPath = path[lastKeyIndex];
+
         if (!_.isArray(value) && _.isObject(value) && isSimpleObject(value)) {
-          for (var j in value) {
-            var newPath = finalPath + '.' + j;
-            // let _nestedSet do its things
-            obj._nestedSet(newPath, value[j], options);
+          // special case when the object value is empty, just set it to an empty model
+          if (_.size(value) === 0) {
+            obj.attributes[finalPath] = new Model();
+          } else {
+            for (var j in value) {
+              var newPath = finalPath + '.' + j;
+              // let _nestedSet do its things
+              obj._nestedSet(newPath, value[j], options);
+            }
           }
         } else {
           if (this._valueForCollection(value)) {

diff --git a/build/backbone.supermodel.amd.min.js b/build/backbone.supermodel.amd.min.js
diff --git a/build/backbone.supermodel.js b/build/backbone.supermodel.js
@@ -144,11 +144,17 @@ Backbone.SuperModel = (function(_, Backbone){
       }
 
       var finalPath = path[lastKeyIndex];
+
       if (!_.isArray(value) && _.isObject(value) && isSimpleObject(value)) {
-        for (var j in value) {
-          var newPath = finalPath + '.' + j;
-          // let _nestedSet do its things
-          obj._nestedSet(newPath, value[j], options);
+        // special case when the object value is empty, just set it to an empty model
+        if (_.size(value) === 0) {
+          obj.attributes[finalPath] = new Model();
+        } else {
+          for (var j in value) {
+            var newPath = finalPath + '.' + j;
+            // let _nestedSet do its things
+            obj._nestedSet(newPath, value[j], options);
+          }
         }
       } else {
         if (this._valueForCollection(value)) {

diff --git a/build/backbone.supermodel.min.js b/build/backbone.supermodel.min.js
diff --git a/src/backbone.supermodel.js b/src/backbone.supermodel.js
@@ -144,11 +144,17 @@ Backbone.SuperModel = (function(_, Backbone){
       }
 
       var finalPath = path[lastKeyIndex];
+
       if (!_.isArray(value) && _.isObject(value) && isSimpleObject(value)) {
-        for (var j in value) {
-          var newPath = finalPath + '.' + j;
-          // let _nestedSet do its things
-          obj._nestedSet(newPath, value[j], options);
+        // special case when the object value is empty, just set it to an empty model
+        if (_.size(value) === 0) {
+          obj.attributes[finalPath] = new Model();
+        } else {
+          for (var j in value) {
+            var newPath = finalPath + '.' + j;
+            // let _nestedSet do its things
+            obj._nestedSet(newPath, value[j], options);
+          }
         }
       } else {
         if (this._valueForCollection(value)) {

diff --git a/tests.js b/tests.js
@@ -135,6 +135,12 @@ describe('Backbone.SuperModel', function(){
     should(this.zoo.get('location.address')).be.eql('address');
   });
 
+  it('sets {}', function(){
+    this.zoo.set('a', {});
+
+    should(this.zoo.get('a')).be.an.instanceOf(SuperModel);
+  });
+
   it('sets array', function(){
     var locations = [
         {