backbone-documentmodel - npm Package Compare versions

Comparing version 0.6.3 to 0.6.4

backbone-documentmodel.js

 /**
  *
- * Backbone-DocumentModel v0.6.3
+ * Backbone-DocumentModel v0.6.4
  *
@@ -227,18 +227,23 @@ * Copyright (c) 2013 Michael Haselton & Aaron Herres, Loqwai LLC
 
-            _.each(_.keys(attributes), function (attrKey) {
-                if (attributes[attrKey] instanceof Backbone.Model || attributes[attrKey] instanceof Backbone.Collection) {
-                    omitList.push(attrKey);
+            // #7 - Strange output on nested collection models toJSON()
+            if (this.collection && this.collection.pseudoIdAttribute) {
+                response = this.get('value');
+            } else {
+                _.each(_.keys(attributes), function (attrKey) {
+                    if (attributes[attrKey] instanceof Backbone.Model || attributes[attrKey] instanceof Backbone.Collection) {
+                        omitList.push(attrKey);
+                    }
+                });
+
+                // clear pseudo parent id reference.
+                if (this.pseudoIdAttribute) {
+                    delete attributes[this.idAttribute];
                 }
-            });
 
-            // clear pseudo parent id reference.
-            if (this.pseudoIdAttribute) {
-                delete attributes[this.idAttribute];
+                response = _.omit(attributes, omitList);
+
+                _.each(omitList, function (omitKey) {
+                    response[omitKey] = attributes[omitKey].toJSON();
+                });
             }
-
-            response = _.omit(attributes, omitList);
-
-            _.each(omitList, function (omitKey) {
-                response[omitKey] = attributes[omitKey].toJSON();
-            });
         }
@@ -245,0 +250,0 @@

package.json

@@ -18,3 +18,3 @@ {
   "main": "backbone-documentmodel.js",
-  "version": "0.6.3",
+  "version": "0.6.4",
   "license": "MIT",
@@ -21,0 +21,0 @@ "repository": {

README.md

 # Backbone-DocumentModel [![Build Status](https://secure.travis-ci.org/icereval/backbone-documentmodel.png?branch=master)](https://travis-ci.org/icereval/backbone-documentmodel)
-
 A plugin to create entire Document structures with nested [Backbone.js](http://documentcloud.github.com/backbone) Models & Collections with `deep model` references and `event bubbling`.
@@ -313,2 +312,6 @@
 
+#### 0.6.4
+
+- Fixes issue #7 nested array's toJSON() now returns the value.
+
 #### 0.6.3
@@ -315,0 +318,0 @@

test/documentcollection.js

@@ -0,0 +0,0 @@ $(document).ready(function() {

test/documentmodel.js

@@ -1514,2 +1514,12 @@ $(document).ready(function() {
     });
+
+    test("#7 - strange output on nested collection models tojson()", 3, function () {
+        var model = new Backbone.DocumentModel({
+            emails : ['[e-mail]', '[e-mail]', '[e-mail]']
+        });
+
+        model.get('emails').each(function (eml) {
+            equal(eml.get('value'), eml.toJSON());
+        });
+    });
 });

test/environment.js

@@ -0,0 +0,0 @@ (function() {

test/noconflict.js

@@ -0,0 +0,0 @@ $(document).ready(function() {

test/vendor/backbone.js

@@ -0,0 +0,0 @@ //     Backbone.js 1.0.0

test/vendor/json2.js

@@ -0,0 +0,0 @@ /*

test/vendor/qunit.js

@@ -0,0 +0,0 @@ /**

test/vendor/runner.js

@@ -0,0 +0,0 @@ /*

test/vendor/underscore.js

@@ -0,0 +0,0 @@ //     Underscore.js 1.4.3

No alert changes

Improved metrics

Lines of code

15734

increased by0.08%

Number of lines in readme file

337

increased by0.9%

Worsened metrics

Total package byte prevSize

592515

decreased by-0.24%

Number of package files

18

decreased by-35.71%

No dependency changes