pr fixes

packages/resin-event-log/src/adaptors/gosquared.js

@@ -30,7 +30,7 @@ module.exports = function (options) {
 			return gsClient.logout()
 		},
 		track: function (prefix, type, data) {
-			return gsClient.track(type, data)
+			return gsClient.track(prefix, type, data)
 		}
 	}
 }

packages/resin-event-log/test/resin-event-log.spec.js

@@ -116,10 +116,10 @@ function createGaMock(endpoint) {
 	return aggregateMock(mocks)
 }
 
-function validateGsQuery(event) {
+function validateGsQuery(queryString) {
 	return (
-		event.site_token === GOSQUARED_ID &&
-		event.api_key === GOSQUARED_API_KEY
+		queryString.site_token === GOSQUARED_ID &&
+		queryString.api_key === GOSQUARED_API_KEY
 	)
 }
 
@@ -133,7 +133,6 @@ function createGsMock(options, times) {
 		filterBody: function() { return true },
 		response: '1'
 	})
-	delete options.event
 
 	var mocks = _.range(times).map(function () {
 		return mock.create(options)
@@ -296,7 +295,7 @@ describe('ResinEventLog', function () {
 				endpoint: endpoint,
 				method: 'POST',
 				filterBody: function (body, eventName) {
-					return (body.event.name === EXPECTED_EVENT)
+					return (body.event.name === '[' + SYSTEM + '] ' + EXPECTED_EVENT)
 				}
 			})
 			eventLog = ResinEventLog({
@@ -315,8 +314,8 @@ describe('ResinEventLog', function () {
 						expect(mockedRequest.isDone()).to.be.ok
 						done()
 					} else {
-						// Don't mock browser tests see:
-						// https://github.com/resin-io-modules/resin-analytics/pull/14
+						// TODO: mock browser tests.
+						// see: https://github.com/resin-io-modules/resin-analytics/pull/14
 						done()
 					}
 				}
@@ -332,7 +331,7 @@ describe('ResinEventLog', function () {
 			var mockedRequest = createGsMock({
 				endpoint: endpoint,
 				filterBody: function (body, eventName) {
-					return (body.event.name === 'Device Rename')
+					return (body.event.name === '[' + SYSTEM + '] ' + EXPECTED_EVENT)
 				}
 			})
 
@@ -345,16 +344,15 @@ describe('ResinEventLog', function () {
 					if (err) {
 						console.error('gosquared error:', err)
 					}
-
 					expect(!err).to.be.ok
 					expect(type).to.be.equal(EXPECTED_EVENT)
 
 					if (!IS_BROWSER) {
 						expect(mockedRequest.isDone()).to.be.ok
 						done()
 					} else {
-						// Don't mock browser tests see:
-						// https://github.com/resin-io-modules/resin-analytics/pull/14
+						// TODO: mock browser tests.
+						// see: https://github.com/resin-io-modules/resin-analytics/pull/14
 						done()
 					}
 				}

packages/resin-universal-gosquared/src/browser.js

@@ -29,14 +29,14 @@ module.exports = function (gosquaredId, apiKey, debug) {
 				})
 			})
 		},
-		track: function (type, data) {
+		track: function (prefix, type, data) {
 			if (!loggedIn) return Promise.reject(new Error("Can't record gosquared events without a login first"))
 
 			return Promise.fromCallback(function (callback) {
 				if (type === 'Page Visit') {
 					window._gs(TRACKER_NAME + '.track', data.url || window.location.pathname)
 				} else {
-					window._gs(TRACKER_NAME + '.event', type, data)
+					window._gs(TRACKER_NAME + '.event', '[' + prefix + '] ' + type, data)
 				}
 				callback()
 			})

packages/resin-universal-gosquared/src/gs-loader.js

@@ -5,6 +5,6 @@ m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
 	window,
 	document,
 	'script',
-  'https://d1l6p2sc9645hc.cloudfront.net/tracker.js',
+	'https://d1l6p2sc9645hc.cloudfront.net/tracker.js',
 	'_gs'
 );

packages/resin-universal-gosquared/src/node.js

@@ -4,15 +4,16 @@ var GoSquared = require('gosquared')
 module.exports = function(gosquaredId, apiKey, debug) {
 	var visitor = null
 	function createVisitor(userId) {
+		if (visitor) return visitor
 		var gosquared = new GoSquared({
 			api_key: apiKey,
 			site_token: gosquaredId
 		})
+
 		if (userId) {
-			visitor = gosquared.createPerson(userId)
-		} else {
-			vistor = gosquared
+			gosquared.createPerson(userId)
 		}
+		visitor = gosquared
 	}
 	function destroyVisitor() {
 		visitor = null
@@ -24,13 +25,13 @@ module.exports = function(gosquaredId, apiKey, debug) {
 		logout: function() {
 			destroyVisitor()
 		},
-		track: function(type, data) {
+		track: function(prefix, type, data) {
 			// if called before `login` create the object with the random ID
 			createVisitor()
 			return Promise.fromCallback(function (callback) {
 				// node sdk doesn't support pageviews so no conditional here.
 				// https://www.gosquared.com/docs/api/tracking/pageview/node/
-				vistor.trackEvent(type, data, callback)
+				visitor.trackEvent('[' + prefix + '] ' + type, data, callback)
 			})
 		}
 	}