update from master

Author: djih

CHANGELOG.md

@@ -1,5 +1,7 @@
 ## Unreleased
 
+### 2.9.1 (March 6, 2016)
+
 * Fix bug where saveReferrer throws exception if sessionStorage is disabled.
 * Log messages with a try/catch to support IE 8.
 * Validate event properties during logEvent and initialization before sending request.

amplitude.js

@@ -2289,12 +2289,10 @@ var validatePropertyValue = function(key, value) {
   if (invalidValueTypes.indexOf(valueType) !== -1) {
     log('WARNING: Property key "' + key + '" with invalid value type ' + valueType + ', ignoring');
     value = null;
-  }
-  else if (valueType === 'error') {
+  } else if (valueType === 'error') {
     value = String(value);
     log('WARNING: Property key "' + key + '" with value type error, coercing to ' + value);
-  }
-  else if (valueType === 'array') {
+  } else if (valueType === 'array') {
     // check for nested arrays or objects
     var arrayCopy = [];
     for (var i = 0; i < value.length; i++) {
@@ -2307,8 +2305,7 @@ var validatePropertyValue = function(key, value) {
       arrayCopy.push(validatePropertyValue(key, element));
     }
     value = arrayCopy;
-  }
-  else if (valueType === 'object') {
+  } else if (valueType === 'object') {
     value = validateProperties(value);
   }
   return value;
@@ -3805,7 +3802,7 @@ module.exports = uuid;
 
 }, {}],
 15: [function(require, module, exports) {
-module.exports = '2.9.0';
+module.exports = '2.9.1';
 
 }, {}],
 16: [function(require, module, exports) {

amplitude.min.js

@@ -3,7 +3,7 @@
   "main": "src/index.js",
   "repo": "amplitude/amplitude-javascript",
   "description": "Javascript library for Amplitude Analytics",
-  "version": "2.9.0",
+  "version": "2.9.1",
   "keywords": [
     "analytics",
     "amplitude"

component.json

@@ -1,7 +1,7 @@
 {
   "name": "amplitude-js",
   "author": "Amplitude <support@amplitude.com>",
-  "version": "2.9.0",
+  "version": "2.9.1",
   "license": "MIT",
   "description": "Javascript library for Amplitude Analytics",
   "keywords": [

package.json

@@ -52,12 +52,10 @@ var validatePropertyValue = function(key, value) {
   if (invalidValueTypes.indexOf(valueType) !== -1) {
     log('WARNING: Property key "' + key + '" with invalid value type ' + valueType + ', ignoring');
     value = null;
-  }
-  else if (valueType === 'error') {
+  } else if (valueType === 'error') {
     value = String(value);
     log('WARNING: Property key "' + key + '" with value type error, coercing to ' + value);
-  }
-  else if (valueType === 'array') {
+  } else if (valueType === 'array') {
     // check for nested arrays or objects
     var arrayCopy = [];
     for (var i = 0; i < value.length; i++) {
@@ -70,8 +68,7 @@ var validatePropertyValue = function(key, value) {
       arrayCopy.push(validatePropertyValue(key, element));
     }
     value = arrayCopy;
-  }
-  else if (valueType === 'object') {
+  } else if (valueType === 'object') {
     value = validateProperties(value);
   }
   return value;

src/utils.js

@@ -1 +1 @@
-module.exports = '2.9.0';
+module.exports = '2.9.1';

src/version.js

@@ -394,6 +394,50 @@ describe('Amplitude', function() {
       assert.equal(events[0].event_id, 49);
       assert.equal(events[1].event_type, '$identify');
     });
+
+    it('should validate event properties when loading saved events from localStorage', function() {
+      var existingEvents = '[{"device_id":"15a82aaa-0d9e-4083-a32d-2352191877e6","user_id":"15a82aaa-0d9e-4083-a32d' +
+          '-2352191877e6","timestamp":1455744744413,"event_id":2,"session_id":1455744733865,"event_type":"clicked",' +
+          '"version_name":"Web","platform":"Web","os_name":"Chrome","os_version":"48","device_model":"Mac","language"' +
+          ':"en-US","api_properties":{},"event_properties":"{}","user_properties":{},"uuid":"1b8859d9-e91e-403e-92d4-' +
+          'c600dfb83432","library":{"name":"amplitude-js","version":"2.9.0"},"sequence_number":4},{"device_id":"15a82a' +
+          'aa-0d9e-4083-a32d-2352191877e6","user_id":"15a82aaa-0d9e-4083-a32d-2352191877e6","timestamp":1455744746295,' +
+          '"event_id":3,"session_id":1455744733865,"event_type":"clicked","version_name":"Web","platform":"Web",' +
+          '"os_name":"Chrome","os_version":"48","device_model":"Mac","language":"en-US","api_properties":{},' +
+          '"event_properties":{"10":"false","bool":true,"null":null,"string":"test","array":' +
+          '[0,1,2,"3"],"nested_array":["a",{"key":"value"},["b"]],"object":{"key":"value"},"nested_object":' +
+          '{"k":"v","l":[0,1],"o":{"k2":"v2","l2":["e2",{"k3":"v3"}]}}},"user_properties":{},"uuid":"650407a1-d705-' +
+          '47a0-8918-b4530ce51f89","library":{"name":"amplitude-js","version":"2.9.0"},"sequence_number":5}]';
+      localStorage.setItem('amplitude_unsent', existingEvents);
+
+      var amplitude2 = new Amplitude();
+      amplitude2.init(apiKey, null, {
+        batchEvents: true
+      });
+
+      var expected = {
+        '10': 'false',
+        'bool': true,
+        'string': 'test',
+        'array': [0, 1, 2, '3'],
+        'nested_array': ['a'],
+        'object': {
+          'key': 'value'
+        },
+        'nested_object': {
+          'k': 'v',
+          'l': [0, 1],
+          'o': {
+              'k2': 'v2',
+              'l2': ['e2']
+          }
+        }
+      }
+
+      // check that event loaded into memory
+      assert.deepEqual(amplitude2._unsentEvents[0].event_properties, {});
+      assert.deepEqual(amplitude2._unsentEvents[1].event_properties, expected);
+    });
   });
 
   describe('runQueuedFunctions', function() {
@@ -1628,7 +1672,7 @@ describe('Amplitude', function() {
         10: 'false', // coerce key
         'bool': true,
         'null': null, // should be ignored
-        'function': utils.log, // should be ignored
+        'function': console.log, // should be ignored
         'regex': /afdg/, // should be ignored
         'error': e, // coerce value
         'string': 'test',