Merge branch 'feature/2.2.1'

Author: alexanderdean

CHANGELOG

@@ -1,3 +1,13 @@
+Version 2.2.1 (2015-01-28)
+--------------------------
+Fixed QuotaExceededError bug with localStorage in Safari (#308)
+Stopped sending empty PerformanceTiming context (#306)
+Prevented PerformanceTiming context being sent multiple times (#309)
+Stopped automatically setting Cloudfront URL in synchronous tracker, thanks @vassilevsky! (#311)
+Fixed lodash-cli version at 2.4.2 (#314)
+Prevented accidental publication of snowplow-tracker to npm (#300)
+Added missing tid ticket to CHANGELOG under 2.1.0 (#302)
+
 Version 2.2.0 (2014-12-15)
 --------------------------
 Made trackerDictionary object available in onload callbacks, thanks @murphybob! (#294)
@@ -30,6 +40,7 @@ Renamed /dist to /deploy (#216)
 Moved context querystring to end of JS-generated beacons (#204)
 Added guard to wait until outbound queue is empty before unloading (#202)
 Added event_id generation (#190)
+Stopped sending tid (#218)
 Added content field to link click events (#187)
 Replaced "Getting started" with Vagrant-using "Contributing quickstart" (#169)
 Added async-large.html (#162)

examples/ads/async.html

@@ -38,7 +38,7 @@ <h1>Asynchronous ad tracking examples for snowplow.js</h1>
         ;(function(p,l,o,w,i,n,g){if(!p[i]){p.GlobalSnowplowNamespace=p.GlobalSnowplowNamespace||[];
         p.GlobalSnowplowNamespace.push(i);p[i]=function(){(p[i].q=p[i].q||[]).push(arguments)
         };p[i].q=p[i].q||[];n=l.createElement(o);g=l.getElementsByTagName(o)[0];n.async=1;
-        n.src=w;g.parentNode.insertBefore(n,g)}}(window,document,"script","//d1fc8wv8zag5ca.cloudfront.net/2.2.0/sp.js","adTracker"));
+        n.src=w;g.parentNode.insertBefore(n,g)}}(window,document,"script","//d1fc8wv8zag5ca.cloudfront.net/2.2.1/sp.js","adTracker"));
 
         window.adTracker('newTracker', rnd, 'd3rkrsqld9gmqf.cloudfront.net', {
             'encodeBase64': false
@@ -110,7 +110,7 @@ <h1>Asynchronous ad tracking examples for snowplow.js</h1>
         ;(function(p,l,o,w,i,n,g){if(!p[i]){p.GlobalSnowplowNamespace=p.GlobalSnowplowNamespace||[];
         p.GlobalSnowplowNamespace.push(i);p[i]=function(){(p[i].q=p[i].q||[]).push(arguments)
         };p[i].q=p[i].q||[];n=l.createElement(o);g=l.getElementsByTagName(o)[0];n.async=1;
-        n.src=w;g.parentNode.insertBefore(n,g)}}(window,document,"script","//d1fc8wv8zag5ca.cloudfront.net/2.2.0/sp.js","adTracker"));
+        n.src=w;g.parentNode.insertBefore(n,g)}}(window,document,"script","//d1fc8wv8zag5ca.cloudfront.net/2.2.1/sp.js","adTracker"));
 
         window.adTracker('newTracker', rnd, 'd3rkrsqld9gmqf.cloudfront.net', {
             'encodeBase64': false
@@ -141,7 +141,7 @@ <h1>Asynchronous ad tracking examples for snowplow.js</h1>
         ;(function(p,l,o,w,i,n,g){if(!p[i]){p.GlobalSnowplowNamespace=p.GlobalSnowplowNamespace||[];
         p.GlobalSnowplowNamespace.push(i);p[i]=function(){(p[i].q=p[i].q||[]).push(arguments)
         };p[i].q=p[i].q||[];n=l.createElement(o);g=l.getElementsByTagName(o)[0];n.async=1;
-        n.src=w;g.parentNode.insertBefore(n,g)}}(window,document,"script","//d1fc8wv8zag5ca.cloudfront.net/2.2.0/sp.js","adTracker"));
+        n.src=w;g.parentNode.insertBefore(n,g)}}(window,document,"script","//d1fc8wv8zag5ca.cloudfront.net/2.2.1/sp.js","adTracker"));
 
         window.adTracker('newTracker', rnd, 'd3rkrsqld9gmqf.cloudfront.net', {
             'encodeBase64': false

examples/web/async-large.html

@@ -23,7 +23,7 @@
         ;(function(p,l,o,w,i,n,g){if(!p[i]){p.GlobalSnowplowNamespace=p.GlobalSnowplowNamespace||[];
         p.GlobalSnowplowNamespace.push(i);p[i]=function(){(p[i].q=p[i].q||[]).push(arguments)
         };p[i].q=p[i].q||[];n=l.createElement(o);g=l.getElementsByTagName(o)[0];n.async=1;
-        n.src=w;g.parentNode.insertBefore(n,g)}}(window,document,"script","//d1fc8wv8zag5ca.cloudfront.net/2.2.0/sp.js","snowplow_1"));
+        n.src=w;g.parentNode.insertBefore(n,g)}}(window,document,"script","//d1fc8wv8zag5ca.cloudfront.net/2.2.1/sp.js","snowplow_1"));
 
         window.snowplow_1('newTracker', 'cf', 'd3rkrsqld9gmqf.cloudfront.net', { // Initialise a tracker
           encodeBase64: false, // Default is true
@@ -70,7 +70,7 @@
         ;(function(p,l,o,w,i,n,g){if(!p[i]){p.GlobalSnowplowNamespace=p.GlobalSnowplowNamespace||[];
         p.GlobalSnowplowNamespace.push(i);p[i]=function(){(p[i].q=p[i].q||[]).push(arguments)
         };p[i].q=p[i].q||[];n=l.createElement(o);g=l.getElementsByTagName(o)[0];n.async=1;
-        n.src=w;g.parentNode.insertBefore(n,g)}}(window,document,"script","../../deploy/snowplow.js","snowplow_2"));
+        n.src=w;g.parentNode.insertBefore(n,g)}}(window,document,"script","//d1fc8wv8zag5ca.cloudfront.net/2.2.1/sp.js","snowplow_2"));
 
         window.snowplow_2('newTracker', 'cf', 'd3rkrsqld9gmqf.cloudfront.net', { // Initialise a tracker
           encodeBase64: false, // Default is true

examples/web/async-medium.html

@@ -24,7 +24,7 @@
         ;(function(p,l,o,w,i,n,g){if(!p[i]){p.GlobalSnowplowNamespace=p.GlobalSnowplowNamespace||[];
         p.GlobalSnowplowNamespace.push(i);p[i]=function(){(p[i].q=p[i].q||[]).push(arguments)
         };p[i].q=p[i].q||[];n=l.createElement(o);g=l.getElementsByTagName(o)[0];n.async=1;
-        n.src=w;g.parentNode.insertBefore(n,g)}}(window,document,"script","//d1fc8wv8zag5ca.cloudfront.net/2.2.0/sp.js","new_name_here"));
+        n.src=w;g.parentNode.insertBefore(n,g)}}(window,document,"script","//d1fc8wv8zag5ca.cloudfront.net/2.2.1/sp.js","new_name_here"));
 
         window.new_name_here('newTracker', 'cf', 'd3rkrsqld9gmqf.cloudfront.net', {
           encodeBase64: false,

examples/web/async-small.html

@@ -23,7 +23,7 @@
         ;(function(p,l,o,w,i,n,g){if(!p[i]){p.GlobalSnowplowNamespace=p.GlobalSnowplowNamespace||[];
         p.GlobalSnowplowNamespace.push(i);p[i]=function(){(p[i].q=p[i].q||[]).push(arguments)
         };p[i].q=p[i].q||[];n=l.createElement(o);g=l.getElementsByTagName(o)[0];n.async=1;
-        n.src=w;g.parentNode.insertBefore(n,g)}}(window,document,"script","//d1fc8wv8zag5ca.cloudfront.net/2.2.0/sp.js","snowplow"));
+        n.src=w;g.parentNode.insertBefore(n,g)}}(window,document,"script","//d1fc8wv8zag5ca.cloudfront.net/2.2.1/sp.js","snowplow"));
 
         window.snowplow('newTracker', 'cf', 'd3rkrsqld9gmqf.cloudfront.net', { // Initialise a tracker
           encodeBase64: false, // Default is true

examples/web/sync.html

@@ -19,7 +19,7 @@
 
     <!-- Snowplow starts plowing -->
     <script type="text/javascript">
-    var spSrc = ('https:' == document.location.protocol ? 'https' : 'http') + '://d1fc8wv8zag5ca.cloudfront.net/2.0.2/sp.js';
+    var spSrc = ('https:' == document.location.protocol ? 'https' : 'http') + '://d1fc8wv8zag5ca.cloudfront.net/2.2.1/sp.js';
     document.write(unescape("%3Cscript src='" + spSrc + "' type='text/javascript'%3E%3C/script%3E"));
     </script>
     <script type="text/javascript">

package.json

@@ -1,6 +1,6 @@
 {
   "name": "snowplow-tracker",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "devDependencies": {
     "JSON": "~1.0.0",
     "browser-cookie-lite": "~0.3.1",
@@ -14,6 +14,7 @@
     "grunt-yui-compressor": "git://github.com/fblundun/grunt-yui-compressor.git#feature/issue-8",
     "intern": "~1.5.0",
     "jstimezonedetect": "~1.0.5",
+    "lodash-cli": "^2.4.2",
     "murmurhash": "0.0.2",
     "semver": "~2.2.1",
     "sha1": "git://github.com/pvorb/node-sha1.git#v1.0.0",
@@ -37,5 +38,6 @@
     "events",
     "open source"
   ],
-  "license": "Simplified BSD"
+  "license": "Simplified BSD",
+  "private": true
 }

src/js/out_queue.js

@@ -37,7 +37,7 @@
 	var
 		json2 = require('JSON'),
 		lodash = require('./lib_managed/lodash'),
-		localStorageAccessible = require('./lib/detectors').localStorageAccessible(),
+		localStorageAccessible = require('./lib/detectors').localStorageAccessible,
 		object = typeof exports !== 'undefined' ? exports : this; // For eventual node.js environment support
 
 	/**
@@ -57,7 +57,7 @@
 			configCollectorUrl,
 			outQueue;
 
-		if (localStorageAccessible && useLocalStorage) {
+		if (localStorageAccessible() && useLocalStorage) {
 			// Catch any JSON parse errors that might be thrown
 			try {
 				outQueue = json2.parse(localStorage.getItem(queueName));
@@ -80,7 +80,7 @@
 		function enqueueRequest (request, url) {
 			outQueue.push(request);
 			configCollectorUrl = url;
-			if (localStorageAccessible && useLocalStorage) {
+			if (localStorageAccessible() && useLocalStorage) {
 				localStorage.setItem(queueName, json2.stringify(outQueue));
 			}
 
@@ -117,7 +117,7 @@
 
 			image.onload = function () {
 				outQueue.shift();
-				if (localStorageAccessible && useLocalStorage) {
+				if (localStorageAccessible() && useLocalStorage) {
 					localStorage.setItem(queueName, json2.stringify(outQueue));
 				}
 				executeQueue();

src/js/snowplow.js

@@ -227,7 +227,7 @@
 			 */
 			getTrackerUrl: function (rawUrl) {
 				var t = new tracker.Tracker(functionName, '', version, mutSnowplowState, {});
-				t.setCollectorCf(rawUrl);
+				t.setCollectorUrl(rawUrl);
 				return t;
 			},
 

src/js/tracker.js

@@ -586,7 +586,16 @@
 			if (performanceTracking) {
 				var performance = windowAlias.performance || windowAlias.mozPerformance || windowAlias.msPerformance || windowAlias.webkitPerformance;
 				if (performance) {
-					var performanceTiming = lodash.clone(performance.timing);
+
+					// On Safari, the fields we are interested in are on the prototype chain of
+					// performance.timing so we cannot copy them using lodash.clone
+					var performanceTiming = {};
+					for (var field in performance.timing) {
+						// Don't copy the toJSON method
+						if (!lodash.isFunction(performance.timing[field])) {
+							performanceTiming[field] = performance.timing[field];
+						}
+					}
 
 					// Old Chrome versions add an unwanted requestEnd field
 					delete performanceTiming.requestEnd;
@@ -596,7 +605,10 @@
 						performanceTiming.chromeFirstPaint = Math.round(window.chrome.loadTimes().firstPaintTime * 1000);
 					}
 
-					context = context || [];
+					// Avoid individual tracker instances mutating the shared context array
+					// See https://github.com/snowplow/snowplow-javascript-tracker/issues/309
+					context = context ? lodash.clone(context) : [];
+
 					context.push({
 						schema: 'iglu:org.w3/PerformanceTiming/jsonschema/1-0-0',
 						data: performanceTiming