Changed subscription logic. Updated docs

README.md

@@ -175,7 +175,9 @@ successful. Otherwise it'll be rejected with the error.
 ------------------------------------------------------------
 ###Asteroid.subscribe(name, [param1, param2, ...])
 
-Subscribes to the specified subscription.
+Subscribes to the specified subscription. If a subscription
+by that name is already present (and successful), first
+Asteroid unsubscribes from it.
 
 #####Arguments
 

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "asteroid",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "homepage": "https://github.com/mondora/asteroid",
   "authors": [
     "Paolo Scanferla <[email protected]>"

dist/asteroid.js

@@ -243,9 +243,11 @@ Asteroid.prototype._onChanged = function (data) {
 Asteroid.prototype.subscribe = function (name /* , param1, param2, ... */) {
 	// Assert name must be a string
 	must.beString(name);
-	// If we're already subscribed, return the subscription
-	if (this.subscriptions[name]) {
-		return this.subscriptions[name];
+	// If we're already subscribed, unsubscribe before re-subscribing
+	var subPromise = this.subscriptions[name];
+	if (subPromise && subPromise.isFulfilled()) {
+		var subId = subPromise.inspect().value;
+		this.unsubscribe(subId);
 	}
 	// Init the promise that will be returned
 	var deferred = Q.defer();
@@ -258,7 +260,7 @@ Asteroid.prototype.subscribe = function (name /* , param1, param2, ... */) {
 		// This is the onReady/onNoSub callback
 		if (err) {
 			// Reject the promise if the server answered nosub
-			deferred.reject(err, id);
+			deferred.reject(err);
 		} else {
 			// Resolve the promise if the server answered ready
 			deferred.resolve(id);

docs/asteroid.md

@@ -121,7 +121,9 @@ successful. Otherwise it'll be rejected with the error.
 ------------------------------------------------------------
 ###Asteroid.subscribe(name, [param1, param2, ...])
 
-Subscribes to the specified subscription.
+Subscribes to the specified subscription. If a subscription
+by that name is already present (and successful), first
+Asteroid unsubscribes from it.
 
 #####Arguments
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "asteroid",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "Aletrnative Meteor client",
   "main": "dist/asteroid.js",
   "scripts": {

src/asteroid.js

@@ -135,9 +135,11 @@ Asteroid.prototype._onChanged = function (data) {
 Asteroid.prototype.subscribe = function (name /* , param1, param2, ... */) {
 	// Assert name must be a string
 	must.beString(name);
-	// If we're already subscribed, return the subscription
-	if (this.subscriptions[name]) {
-		return this.subscriptions[name];
+	// If we're already subscribed, unsubscribe before re-subscribing
+	var subPromise = this.subscriptions[name];
+	if (subPromise && subPromise.isFulfilled()) {
+		var subId = subPromise.inspect().value;
+		this.unsubscribe(subId);
 	}
 	// Init the promise that will be returned
 	var deferred = Q.defer();
@@ -150,7 +152,7 @@ Asteroid.prototype.subscribe = function (name /* , param1, param2, ... */) {
 		// This is the onReady/onNoSub callback
 		if (err) {
 			// Reject the promise if the server answered nosub
-			deferred.reject(err, id);
+			deferred.reject(err);
 		} else {
 			// Resolve the promise if the server answered ready
 			deferred.resolve(id);