Merge branch 'master' into rev_bucketing_id

# Conflicts:
#	lib/optimizely/event_builder.rb

Author: oakbani

lib/optimizely/event_builder.rb

@@ -99,15 +99,16 @@ def get_common_params(user_id, attributes)
     end 
 
     common_params = {
-      account_id: @config.account_id,
-      project_id: @config.project_id,
-      visitors: [
-        {
-          attributes: visitor_attributes,
-          snapshots: [],
-          visitor_id: user_id
-        }
+        account_id: @config.account_id,
+        project_id: @config.project_id,
+        visitors: [
+          {
+            attributes: visitor_attributes,
+            snapshots: [],
+            visitor_id: user_id
+          }
         ],
+        anonymize_ip: @config.anonymize_ip,
         revision: @config.revision,
         client_name: CLIENT_ENGINE,
         client_version: VERSION

lib/optimizely/project_config.rb

@@ -38,6 +38,8 @@ class ProjectConfig
     attr_reader :groups
     attr_reader :parsing_succeeded
     attr_reader :project_id
+    # Boolean - denotes if Optimizely should remove the last block of visitors' IP address before storing event data
+    attr_reader :anonymize_ip
     attr_reader :revision
     attr_reader :rollouts
     attr_reader :version
@@ -86,6 +88,7 @@ def initialize(datafile, logger, error_handler)
       @feature_flags = config.fetch('featureFlags', [])
       @groups = config.fetch('groups', [])
       @project_id = config['projectId']
+      @anonymize_ip = (config.has_key? 'anonymizeIP')? config['anonymizeIP'] :false
       @revision = config['revision']
       @rollouts = config.fetch('rollouts', [])
 

spec/event_builder_spec.rb

@@ -57,6 +57,7 @@
           }]
         }]
       }],
+      anonymize_ip: false,
       revision: '42',
       client_name: Optimizely::CLIENT_ENGINE,
       client_version: Optimizely::VERSION
@@ -81,6 +82,7 @@
           }]
         }]
       }],
+      anonymize_ip: false,
       revision: '42',
       client_name: Optimizely::CLIENT_ENGINE,
       client_version: Optimizely::VERSION

spec/project_spec.rb

@@ -142,6 +142,7 @@ class InvalidErrorHandler; end
           }],
           visitor_id: 'test_user'
         }],
+        anonymize_ip: false,
         revision: '42',
         client_name: Optimizely::CLIENT_ENGINE,
         client_version: Optimizely::VERSION
@@ -345,6 +346,7 @@ class InvalidErrorHandler; end
           }],
           visitor_id: 'test_user'
         }],
+        anonymize_ip: false,
         revision: '42',
         client_name: Optimizely::CLIENT_ENGINE,
         client_version: Optimizely::VERSION
@@ -628,6 +630,7 @@ class InvalidErrorHandler; end
           }],
           visitor_id: 'test_user'
         }],
+        anonymize_ip: false,
         revision: '42',
         client_name: Optimizely::CLIENT_ENGINE,
         client_version: Optimizely::VERSION

spec/spec_params.rb

@@ -21,6 +21,7 @@ module OptimizelySpec
   VALID_CONFIG_BODY = {
     'accountId' => '12001',
     'projectId' => '111001',
+    'anonymizeIP'=> false,
     'revision' => '42',
     'version' => '2',
     'events' => [{