The Snowplow function name is passed into out_queue.js to help with namespacing in localStorage (snowplow#24)

Author: fblundun

src/js/in_queue.js

@@ -46,7 +46,7 @@
 	 *   after the Tracker has been initialized and loaded
 	 ************************************************************/
 
-	object.InQueueManager = function(TrackerConstructor, version, mutSnowplowState, asyncQueue) {
+	object.InQueueManager = function(TrackerConstructor, version, mutSnowplowState, asyncQueue, functionName) {
 
 		var trackerDictionary = {},
 			usedCookieNames = {};
@@ -88,12 +88,12 @@
 		 * TODO: remove this in 2.1.0
 		 */
 		function legacyCreateNewNamespace(f, endpoint, namespace) {
-			helpers.warn(f + ' is deprecated.'); //TODO: more instructions for switching
+			helpers.warn(f + ' is deprecated. Set the collector when a new tracker instance using newTracker.');
 
 			var name;
 
 			if (lodash.isUndefined(namespace)) {
-				name = 'sp';    // TODO: make default names work properly
+				name = 'sp';
 			} else {
 				name = namespace;
 			}
@@ -115,7 +115,7 @@
 			} else {
 				usedCookieNames[argmap.cookieName] = true;
 			}
-			trackerDictionary[namespace] = new TrackerConstructor(namespace, version, mutSnowplowState, argmap);
+			trackerDictionary[namespace] = new TrackerConstructor(functionName, namespace, version, mutSnowplowState, argmap);
 			trackerDictionary[namespace].setCollectorUrl(endpoint);
 		}
 

src/js/init.js

@@ -46,8 +46,8 @@ var snowplow = require('./snowplow'),
 if (windowAlias.GlobalSnowplowNamespace && windowAlias.GlobalSnowplowNamespace.length > 0) {
 	queueName = windowAlias.GlobalSnowplowNamespace.shift();
 	queue = windowAlias[queueName];
-	queue.q = new snowplow.Snowplow(queue.q);
+	queue.q = new snowplow.Snowplow(queue.q, queueName);
 } else {
 	windowAlias._snaq = windowAlias._snaq || [];
-	windowAlias._snaq = new snowplow.Snowplow(windowAlias._snaq);
+	windowAlias._snaq = new snowplow.Snowplow(windowAlias._snaq, '_snaq');
 }

src/js/out_queue.js

@@ -40,9 +40,9 @@
 		localStorageAccessible = require('./lib/detectors').localStorageAccessible(),
 		object = typeof exports !== 'undefined' ? exports : this; // For eventual node.js environment support
 
-	object.OutQueueManager = function(namespace) {
+	object.OutQueueManager = function(functionName, namespace) {
 
-		var	queueName = 'snowplowOutQueue_' + namespace,
+		var	queueName = ['snowplowOutQueue', functionName, namespace].join('_'),
 			executingQueue = false,
 			configCollectorUrl,
 			outQueue;

src/js/snowplow.js

@@ -82,7 +82,7 @@
 
 		object = typeof exports !== 'undefined' ? exports : this; // For eventual node.js environment support
 
-	object.Snowplow = function(asynchronousQueue) {
+	object.Snowplow = function(asynchronousQueue, functionName) {
 
 		var
 			documentAlias = document,
@@ -203,7 +203,7 @@
 		 	* @param string distSubdomain The subdomain on your CloudFront collector's distribution
 		 	*/
 		 	getTrackerCf: function (distSubdomain) {
-		 		var t = new tracker.Tracker('', version, mutSnowplowState, {});
+		 		var t = new tracker.Tracker(functionName, '', version, mutSnowplowState, {});
 		 		t.setCollectorCf(distSubdomain);
 		 		return t;
 		 	},
@@ -215,7 +215,7 @@
 		 	* @param string rawUrl The collector URL minus protocol and /i
 		 	*/
 		 	getTrackerUrl: function (rawUrl) {
-		 		var t = new tracker.Tracker('', version, mutSnowplowState, {});
+		 		var t = new tracker.Tracker(functionName, '', version, mutSnowplowState, {});
 		 		t.setCollectorCf(rawUrl);
 		 		return t;
 		 	},
@@ -226,7 +226,7 @@
 		 	* @return Tracker
 		 	*/
 		 	getAsyncTracker: function () {
-		 		return new tracker.Tracker('', version, mutSnowplowState, {});
+		 		return new tracker.Tracker(functionName, '', version, mutSnowplowState, {});
 		 	}
 		 };
 
@@ -239,7 +239,7 @@
 		addReadyListener();
 
 		// Now replace initialization array with queue manager object
-		return new queue.InQueueManager(tracker.Tracker, version, mutSnowplowState, asynchronousQueue);
+		return new queue.InQueueManager(tracker.Tracker, version, mutSnowplowState, asynchronousQueue, functionName);
 	}
 
 }());

src/js/tracker.js

@@ -70,7 +70,7 @@
 	 * 9. pageUnloadTimer, 500
 	 * 10. writeCookies, true
 	 */
-	object.Tracker = function Tracker(namespace, version, mutSnowplowState, argmap) {
+	object.Tracker = function Tracker(functionName, namespace, version, mutSnowplowState, argmap) {
 
 		/************************************************************
 		 * Private members
@@ -213,7 +213,7 @@
 			// Will be committed, sent and emptied by a call to trackTrans.
 			ecommerceTransaction = ecommerceTransactionTemplate(),
 
-			outQueueManager = new requestQueue.OutQueueManager(namespace);
+			outQueueManager = new requestQueue.OutQueueManager(functionName, namespace);
 
 		/*
 		 * Creates a JSON from the default header and a custom contexts array