Change context.subscribe API to send FR data

lib/server/context.js

@@ -38,15 +38,23 @@ Context.prototype.subscribe = function(subName /*, params */) {
     var subscription = {name: subName, params: params}
     var publishContext = new PublishContext(this, subscription);
 
-    this.processPublication(publishHandler, publishContext, params);
+    return this.processPublication(publishHandler, publishContext, params);
   } else {
     console.warn('There is no such publish handler named:', subName);
+    return {};
   }
 };
 
 Context.prototype.processPublication = function(publishHandler, publishContext, params) {
   var self = this;
-
+  var data = {};
+  var ensureCollection = function(collectionName) {
+    self._ensureCollection(collectionName);
+    if(!data[collectionName]) {
+      data[collectionName] = [];
+    }
+  };
+
   var future = new Future();
   //detect when the context is ready to be sent to the client
   publishContext.onStop(function() {
@@ -79,8 +87,10 @@ Context.prototype.processPublication = function(publishHandler, publishContext,
         (cursor._cursorDescription)? cursor._cursorDescription.collectionName: null || //for meteor-collections
         (cursor._collection)? cursor._collection._name: null; //for smart-collections
 
-      self._ensureCollection(collectionName);
-      self._collectionData[collectionName].push(cursor.fetch());
+      ensureCollection(collectionName);
+      var cursorData = cursor.fetch();
+      data[collectionName].push(cursorData);
+      self._collectionData[collectionName].push(cursorData);
     });
 
     //the subscription is ready
@@ -104,7 +114,15 @@ Context.prototype.processPublication = function(publishHandler, publishContext,
 
     // wait for the subscription became ready.
     future.wait();
+
+    // get the data
+    _.each(publishContext._collectionData, function(collData, collectionName) {
+      ensureCollection(collectionName);
+      data[collectionName].push(collData);
+    });
   }
+
+  return data;
 };
 
 Context.prototype.completeSubscriptions = function(subscription) {