fold stream package into livedata. tests pass.

icerao · Dec 21, 2012 · 0368441 · 0368441
1 parent 821a237
commit 0368441
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 28 deletions.
diff --git a/packages/stream/sockjs-0.3.4.js → packages/livedata/sockjs-0.3.4.js b/packages/stream/sockjs-0.3.4.js → packages/livedata/sockjs-0.3.4.js
diff --git a/packages/stream/stream_client.js → packages/livedata/stream_client_sockjs.js b/packages/stream/stream_client.js → packages/livedata/stream_client_sockjs.js
@@ -1,7 +1,7 @@
 // @param url {String} URL to Meteor app
 //   "http://subdomain.meteor.com/" or "/" or
 //   "ddp+sockjs://foo-**.meteor.com/sockjs"
-Meteor._Stream = function (url) {
+Meteor._DdpClientStream = function (url) {
   var self = this;
 
   self.rawUrl = url;
@@ -63,7 +63,7 @@ Meteor._Stream = function (url) {
   self._launch_connection();
 };
 
-_.extend(Meteor._Stream, {
+_.extend(Meteor._DdpClientStream, {
   // @param url {String} URL to Meteor app, eg:
   //   "/" or "madewith.meteor.com" or "https://foo.meteor.com"
   //   or "ddp+sockjs://ddp--****-foo.meteor.com/sockjs"
@@ -113,7 +113,7 @@ _.extend(Meteor._Stream, {
   }
 });
 
-_.extend(Meteor._Stream.prototype, {
+_.extend(Meteor._DdpClientStream.prototype, {
   // Register for callbacks.
   on: function (name, callback) {
     var self = this;
@@ -337,7 +337,7 @@ _.extend(Meteor._Stream.prototype, {
     // can connect to random hostnames and get around browser per-host
     // connection limits.
     self.socket = new SockJS(
-      Meteor._Stream._toSockjsUrl(self.rawUrl),
+      Meteor._DdpClientStream._toSockjsUrl(self.rawUrl),
       undefined, {
         debug: false, protocols_whitelist: [
           // only allow polling protocols. no websockets or streaming.

diff --git a/packages/stream/stream_server.js → packages/livedata/stream_server.js b/packages/stream/stream_server.js → packages/livedata/stream_server.js
@@ -1,4 +1,4 @@
-Meteor._StreamServer = function () {
+Meteor._DdpStreamServer = function () {
   var self = this;
   self.registration_callbacks = [];
   self.open_sockets = [];
@@ -57,7 +57,7 @@ Meteor._StreamServer = function () {
 
 };
 
-_.extend(Meteor._StreamServer.prototype, {
+_.extend(Meteor._DdpStreamServer.prototype, {
   // call my callback when a new socket connects.
   // also call it for all current connections.
   register: function (callback) {

diff --git a/packages/stream/stream_tests.js → packages/livedata/stream_tests.js b/packages/stream/stream_tests.js → packages/livedata/stream_tests.js
@@ -35,7 +35,7 @@ testAsyncMulti("stream - reconnect", [
 
 Tinytest.add("stream - sockjs urls are computed correctly", function(test) {
   var testHasSockjsUrl = function(raw, expectedSockjsUrl) {
-    var actual = Meteor._Stream._toSockjsUrl(raw);
+    var actual = Meteor._DdpClientStream._toSockjsUrl(raw);
     if (expectedSockjsUrl instanceof RegExp)
       test.isTrue(actual.match(expectedSockjsUrl));
     else

diff --git a/packages/stream/package.js b/packages/stream/package.js