o Ensuring all items has data too.HEADmaster

2 files changed, 20 insertions, 3 deletions

diff --git a/index.js b/index.js
index 07078cc..4ff993e 100644
--- a/index.js
+++ b/index.js
@@ -18,6 +18,7 @@ function fixTemplate(t) {
 function fromObject(root) {
 //  console.log('in ', root);
 
+  root = _.isObject(root) ? root : {collection: {}};
   root.isCollection = function() {
     return typeof this.collection == 'object';
   }
@@ -29,7 +30,6 @@ function fromObject(root) {
     fixTemplate(root.template);
   }
   else {
-    root = _.isObject(root) ? root : {collection: {}};
     if(!_.isObject(root.collection)) {
       root.collection = {};
     }
@@ -38,6 +38,7 @@ function fromObject(root) {
     c.version = _.isString(c.version) ? c.version : "1.0";
     c.items = _.isArray(c.items) ? c.items : [];
     _.each(c.items, function(item) {
+      item.data = _.isArray(item.data) ? item.data : [];
       item.links = _.isArray(item.links) ? item.links : [];
       item.toObject = toObject;
     });
diff --git a/package.json b/package.json
index c4cccba..5db759f 100644
--- a/package.json
+++ b/package.json
@@ -2,11 +2,27 @@
   "name": "collection_json",
   "version": "0.0.1",
   "description": "application/vnd.collection+json Utility library",
-  "author": "Trygve Laugstøl <trygvis@inamo.no>",
+  "author": {
+    "name": "Trygve Laugstøl",
+    "email": "trygvis@inamo.no"
+  },
   "dependencies": {
     "underscore": "~1.3.3"
   },
   "devDependencies": {
     "mocha": "1.0.3"
-  }
+  },
+  "_id": "collection_json@0.0.1",
+  "optionalDependencies": {},
+  "engines": {
+    "node": "*"
+  },
+  "_engineSupported": true,
+  "_npmVersion": "1.1.24",
+  "_nodeVersion": "v0.6.19",
+  "_defaultsLoaded": true,
+  "dist": {
+    "shasum": "da0f9fcde4c882b1046ed6a828d4fe2967287495"
+  },
+  "_from": "collection+json@git+http://trygvis.dyndns.org/~trygvis/git/2012/06/collection+json.js.git"
 }