Merge user properties

Author: curtisliu

amplitude.js

@@ -238,7 +238,7 @@ var _loadCookieData = function(scope) {
       scope.options.userId = cookieData.userId;
     }
     if (cookieData.globalUserProperties) {
-      scope.options.globalUserProperties = cookieData.globalUserProperties;
+      scope.options.userProperties = cookieData.globalUserProperties;
     }
   }
 };
@@ -247,7 +247,7 @@ var _saveCookieData = function(scope) {
   Cookie.set(scope.options.cookieName, {
     deviceId: scope.options.deviceId,
     userId: scope.options.userId,
-    globalUserProperties: scope.options.globalUserProperties
+    globalUserProperties: scope.options.userProperties
   });
 };
 
@@ -283,9 +283,13 @@ Amplitude.prototype.setUserId = function(userId) {
   }
 };
 
-Amplitude.prototype.setUserProperties = function(userProperties) {
+Amplitude.prototype.setUserProperties = function(userProperties, opt_replace) {
   try {
-    this.options.globalUserProperties = userProperties;
+    if (opt_replace) {
+      this.options.userProperties = userProperties;
+    } else {
+      this.options.userProperties = object.merge(this.options.userProperties || {}, userProperties);
+    }
     _saveCookieData(this);
     //log('set userProperties=' + JSON.stringify(userProperties));
   } catch (e) {
@@ -334,7 +338,7 @@ Amplitude.prototype.logEvent = function(eventType, eventProperties) {
       os_version: ua.browser.version,
       device_model: ua.os.family,
       event_properties: eventProperties,
-      user_properties: this.options.globalUserProperties || {},
+      user_properties: this.options.userProperties || {},
       uuid: UUID(),
       library: {
         name: 'amplitude-js',

amplitude.min.js

@@ -128,7 +128,7 @@ var _loadCookieData = function(scope) {
       scope.options.userId = cookieData.userId;
     }
     if (cookieData.globalUserProperties) {
-      scope.options.globalUserProperties = cookieData.globalUserProperties;
+      scope.options.userProperties = cookieData.globalUserProperties;
     }
   }
 };
@@ -137,7 +137,7 @@ var _saveCookieData = function(scope) {
   Cookie.set(scope.options.cookieName, {
     deviceId: scope.options.deviceId,
     userId: scope.options.userId,
-    globalUserProperties: scope.options.globalUserProperties
+    globalUserProperties: scope.options.userProperties
   });
 };
 
@@ -173,9 +173,13 @@ Amplitude.prototype.setUserId = function(userId) {
   }
 };
 
-Amplitude.prototype.setUserProperties = function(userProperties) {
+Amplitude.prototype.setUserProperties = function(userProperties, opt_replace) {
   try {
-    this.options.globalUserProperties = userProperties;
+    if (opt_replace) {
+      this.options.userProperties = userProperties;
+    } else {
+      this.options.userProperties = object.merge(this.options.userProperties || {}, userProperties);
+    }
     _saveCookieData(this);
     //log('set userProperties=' + JSON.stringify(userProperties));
   } catch (e) {
@@ -224,7 +228,7 @@ Amplitude.prototype.logEvent = function(eventType, eventProperties) {
       os_version: ua.browser.version,
       device_model: ua.os.family,
       event_properties: eventProperties,
-      user_properties: this.options.globalUserProperties || {},
+      user_properties: this.options.userProperties || {},
       uuid: UUID(),
       library: {
         name: 'amplitude-js',

src/amplitude.js

@@ -51,6 +51,41 @@ describe('Amplitude', function() {
     });
   });
 
+  describe('setUserProperties', function() {
+    beforeEach(function() {
+      amplitude.init(apiKey);
+    });
+
+    afterEach(function() {
+      reset();
+    });
+
+    it('should set user properties', function() {
+      amplitude.setUserProperties({'prop': true});
+      assert.propertyVal(amplitude.options.userProperties, 'prop', true);
+    });
+
+    it('should merge user properties by default', function() {
+      amplitude.setUserProperties({'prop': true, 'prop2': true});
+      assert.propertyVal(amplitude.options.userProperties, 'prop', true);
+
+      amplitude.setUserProperties({'prop': false, 'prop3': false});
+      assert.propertyVal(amplitude.options.userProperties, 'prop', false);
+      assert.propertyVal(amplitude.options.userProperties, 'prop2', true);
+      assert.propertyVal(amplitude.options.userProperties, 'prop3', false);
+    });
+
+    it('should allow overwriting user properties', function() {
+      amplitude.setUserProperties({'prop': true, 'prop2': true});
+      assert.propertyVal(amplitude.options.userProperties, 'prop', true);
+
+      amplitude.setUserProperties({'prop': false, 'prop3': false}, true);
+      assert.notProperty(amplitude.options.userProperties, 'prop2');
+      assert.propertyVal(amplitude.options.userProperties, 'prop', false);
+      assert.propertyVal(amplitude.options.userProperties, 'prop3', false);
+    });
+  });
+
   describe('logEvent', function() {
 
     beforeEach(function() {