Merge pull request rendrjs#372 from saponifi3d/bootstrapData-recursive

Modify getBootstrappedData to check properties for more models and collections

fixes rendrjs#263

Author: saponifi3d

server/viewEngine.js

@@ -70,14 +70,26 @@ ViewEngine.prototype.getViewHtml = function getViewHtml(viewPath, locals, app) {
 };
 
 ViewEngine.prototype.getBootstrappedData = function getBootstrappedData(locals, app) {
-  var bootstrappedData = {};
+  var bootstrappedData = {},
+      scope = this;
 
   _.each(locals, function(modelOrCollection, name) {
     if (app.modelUtils.isModel(modelOrCollection) || app.modelUtils.isCollection(modelOrCollection)) {
       bootstrappedData[name] = {
         summary: app.fetcher.summarize(modelOrCollection),
         data: modelOrCollection.toJSON()
       };
+
+      if (app.modelUtils.isModel(modelOrCollection)) {
+        _.each(modelOrCollection.attributes, function (value, key) {
+          if (app.modelUtils.isModel(value) || app.modelUtils.isCollection(value)) {
+            var tempObject = {};
+            tempObject[key] = value;
+
+            _.defaults(bootstrappedData, scope.getBootstrappedData(tempObject, app));
+          }
+        })
+      }
     }
   });
   return bootstrappedData;

test/server/viewEngine.test.js

@@ -107,5 +107,55 @@ describe('ViewEngine', function() {
 
       data.should.deep.equal({});
     });
+
+    it('should create a flat bootstrap object if a model has a nested model', function () {
+        var bar = new Model({ id: 123 }),
+            locals = {
+              foo: new Model({ id: 321, bar: bar }, { app: app })
+            },
+            expectedData = {
+              foo: {
+                data: { bar: bar, id: 321 },
+                summary: { model: 'model', id: 321 }
+              },
+              bar: {
+                data: { id: 123 },
+                summary: { model: 'model', id: 123 }
+              }
+            },
+            data;
+
+        data = viewEngine.getBootstrappedData(locals, app);
+        data.should.deep.equal(expectedData);
+    });
+
+    it('should create a flat bootstrap object if a model has a nested collection', function () {
+        var foo = new  Model({ id: 321, foo: 'foo' }, { app: app }),
+            baz = new Collection([foo], { app: app }),
+            bar = new  Model({ id: 123, foo: 'bar', items: baz }, { app: app }),
+            locals = {
+              foo: foo,
+              bar: bar
+            },
+            expectedData = {
+                foo: {
+                  data: { foo: 'foo', id: 321 },
+                  summary: { model: 'model', id: 321 }
+                },
+                bar: {
+                  data: { foo: 'bar', id: 123, items: baz },
+                  summary: { model: 'model', id: 123 }
+                },
+                items: {
+                  data: [ { foo: 'foo', id: 321 } ],
+                  summary: { collection: 'collection', ids: [ 321 ], meta: {}, params: {} }
+                }
+            },
+            data;
+
+        data = viewEngine.getBootstrappedData(locals, app);
+        data.should.deep.equal(expectedData);
+    });
+
   });
 });