Release version 1.2.0 (#44)

Author: elliotykim

CHANGELOG

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------------------
+1.2.0
+* Remove support for datafile version 1.
+* Refactor order of bucketing operations.
+* Always use Event Builder V2.
+-------------------------------------------------------------------------------
+
 -------------------------------------------------------------------------------
 1.1.2
 * Send name of event tags instead of event ID.

lib/optimizely.rb

@@ -1,5 +1,5 @@
 #
-#    Copyright 2016, Optimizely and contributors
+#    Copyright 2016-2017, Optimizely and contributors
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -37,11 +37,6 @@ class Project
     attr_accessor :logger
     attr_accessor :error_handler
 
-    EVENT_BUILDERS_BY_VERSION = {
-      Optimizely::V1_CONFIG_VERSION => EventBuilderV1,
-      Optimizely::V2_CONFIG_VERSION => EventBuilderV2
-    }
-
     def initialize(datafile, event_dispatcher = nil, logger = nil, error_handler = nil, skip_json_validation = false)
       # Constructor for Projects.
       #
@@ -58,7 +53,7 @@ def initialize(datafile, event_dispatcher = nil, logger = nil, error_handler = n
       @event_dispatcher = event_dispatcher || EventDispatcher.new
 
       begin
-        validate_inputs(datafile, skip_json_validation)
+        validate_instantiation_options(datafile, skip_json_validation)
       rescue InvalidInputError => e
         @is_valid = false
         logger = SimpleLogger.new
@@ -75,14 +70,15 @@ def initialize(datafile, event_dispatcher = nil, logger = nil, error_handler = n
         return
       end
 
-      begin
-        @bucketer = Bucketer.new(@config)
-        @event_builder = EVENT_BUILDERS_BY_VERSION[@config.version].new(@config, @bucketer)
-      rescue
+      unless @config.parsing_succeeded?
         @is_valid = false
         logger = SimpleLogger.new
-        logger.log(Logger::ERROR, InvalidDatafileVersionError.new)
+        logger.log(Logger::ERROR, InvalidDatafileVersionError.new.message)
+        return
       end
+
+      @bucketer = Bucketer.new(@config)
+      @event_builder = EventBuilderV2.new(@config)
     end
 
     def activate(experiment_key, user_id, attributes = nil)
@@ -101,24 +97,15 @@ def activate(experiment_key, user_id, attributes = nil)
         return nil
       end
 
-      if attributes && !attributes_valid?(attributes)
-        @logger.log(Logger::INFO, "Not activating user '#{user_id}'.")
-        return nil
-      end
-
-      unless preconditions_valid?(experiment_key, user_id, attributes)
-        @logger.log(Logger::INFO, "Not activating user '#{user_id}'.")
-        return nil
-      end
-
-      variation_id = @bucketer.bucket(experiment_key, user_id)
+      variation_key = get_variation(experiment_key, user_id, attributes)
 
-      if not variation_id
+      if variation_key.nil?
         @logger.log(Logger::INFO, "Not activating user '#{user_id}'.")
         return nil
       end
 
       # Create and dispatch impression event
+      variation_id = @config.get_variation_id_from_key(experiment_key, variation_key)
       impression_event = @event_builder.create_impression_event(experiment_key, variation_id, user_id, attributes)
       @logger.log(Logger::INFO,
                   'Dispatching impression event to URL %s with params %s.' % [impression_event.url,
@@ -129,7 +116,7 @@ def activate(experiment_key, user_id, attributes = nil)
         @logger.log(Logger::ERROR, "Unable to dispatch impression event. Error: #{e}")
       end
 
-      @config.get_variation_key_from_id(experiment_key, variation_id)
+      variation_key
     end
 
     def get_variation(experiment_key, user_id, attributes = nil)
@@ -148,24 +135,34 @@ def get_variation(experiment_key, user_id, attributes = nil)
         return nil
       end
 
-      if attributes && !attributes_valid?(attributes)
+      unless preconditions_valid?(experiment_key, attributes)
         @logger.log(Logger::INFO, "Not activating user '#{user_id}.")
         return nil
       end
 
-      unless preconditions_valid?(experiment_key, user_id, attributes)
-        @logger.log(Logger::INFO, "Not activating user '#{user_id}.")
+      variation_id = @bucketer.get_forced_variation_id(experiment_key, user_id)
+
+      unless variation_id.nil?
+        return @config.get_variation_key_from_id(experiment_key, variation_id)
+      end
+
+      unless Audience.user_in_experiment?(@config, experiment_key, attributes)
+        @logger.log(Logger::INFO,
+                    "User '#{user_id}' does not meet the conditions to be in experiment '#{experiment_key}'.")
         return nil
       end
 
       variation_id = @bucketer.bucket(experiment_key, user_id)
-      @config.get_variation_key_from_id(experiment_key, variation_id)
+      unless variation_id.nil?
+        return @config.get_variation_key_from_id(experiment_key, variation_id)
+      end
+      nil
     end
 
     def track(event_key, user_id, attributes = nil, event_tags = nil)
       # Send conversion event to Optimizely.
       #
-      # event_key - Goal key representing the event which needs to be recorded.
+      # event_key - Event key representing the event which needs to be recorded.
       # user_id - String ID for user.
       # attributes - Hash representing visitor attributes and values which need to be recorded.
       # event_tags - Hash representing metadata associated with the event.
@@ -183,34 +180,26 @@ def track(event_key, user_id, attributes = nil, event_tags = nil)
         @logger.log(Logger::WARN, 'Event value is deprecated in track call. Use event tags to pass in revenue value instead.')
       end
 
-      return nil if attributes && !attributes_valid?(attributes)
-      return nil if event_tags && !event_tags_valid?(event_tags)
+      return nil unless user_inputs_valid?(attributes, event_tags)
 
-      experiment_ids = @config.get_experiment_ids_for_goal(event_key)
+      experiment_ids = @config.get_experiment_ids_for_event(event_key)
       if experiment_ids.empty?
         @config.logger.log(Logger::INFO, "Not tracking user '#{user_id}'.")
         return nil
       end
 
       # Filter out experiments that are not running or that do not include the user in audience conditions
-      valid_experiment_keys = []
-      experiment_ids.each do |experiment_id|
-        experiment_key = @config.experiment_id_map[experiment_id]['key']
-        unless preconditions_valid?(experiment_key, user_id, attributes)
-          @config.logger.log(Logger::INFO, "Not tracking user '#{user_id}' for experiment '#{experiment_key}'.")
-          next
-        end
-        valid_experiment_keys.push(experiment_key)
-      end
+
+      experiment_variation_map = get_valid_experiments_for_event(event_key, user_id, attributes)
 
       # Don't track events without valid experiments attached
-      if valid_experiment_keys.empty?
+      if experiment_variation_map.empty?
         @logger.log(Logger::INFO, "There are no valid experiments for event '#{event_key}' to track.")
         return nil
       end
 
       conversion_event = @event_builder.create_conversion_event(event_key, user_id, attributes,
-                                                                event_tags, valid_experiment_keys)
+                                                                event_tags, experiment_variation_map)
       @logger.log(Logger::INFO,
                   'Dispatching conversion event to URL %s with params %s.' % [conversion_event.url,
                                                                               conversion_event.params])
@@ -223,7 +212,35 @@ def track(event_key, user_id, attributes = nil, event_tags = nil)
 
     private
 
-    def preconditions_valid?(experiment_key, user_id, attributes)
+    def get_valid_experiments_for_event(event_key, user_id, attributes)
+      # Get the experiments that we should be tracking for the given event.
+      #
+      # event_key - Event key representing the event which needs to be recorded.
+      # user_id - String ID for user.
+      # attributes - Map of attributes of the user.
+      #
+      # Returns Map where each object contains the ID of the experiment to track and the ID of the variation the user
+      # is bucketed into.
+
+      valid_experiments = {}
+      experiment_ids = @config.get_experiment_ids_for_event(event_key)
+      experiment_ids.each do |experiment_id|
+        experiment_key = @config.get_experiment_key(experiment_id)
+        variation_key = get_variation(experiment_key, user_id, attributes)
+
+        if variation_key.nil?
+          @logger.log(Logger::INFO, "Not tracking user '#{user_id}' for experiment '#{experiment_key}'.")
+          next
+        end
+
+        variation_id = @config.get_variation_id_from_key(experiment_key, variation_key)
+        valid_experiments[experiment_id] = variation_id
+      end
+
+      valid_experiments
+    end
+
+    def preconditions_valid?(experiment_key, attributes = nil, event_tags = nil)
       # Validates preconditions for bucketing a user.
       #
       # experiment_key - String key for an experiment.
@@ -232,18 +249,29 @@ def preconditions_valid?(experiment_key, user_id, attributes)
       #
       # Returns boolean representing whether all preconditions are valid.
 
+      return false unless user_inputs_valid?(attributes, event_tags)
+
       unless @config.experiment_running?(experiment_key)
         @logger.log(Logger::INFO, "Experiment '#{experiment_key}' is not running.")
         return false
       end
 
-      if @config.user_in_forced_variation?(experiment_key, user_id)
-        return true
+      true
+    end
+
+    def user_inputs_valid?(attributes = nil, event_tags = nil)
+      # Helper method to validate user inputs.
+      #
+      # attributes - Dict representing user attributes.
+      # event_tags - Dict representing metadata associated with an event.
+      #
+      # Returns boolean True if inputs are valid. False otherwise.
+
+      if !attributes.nil? && !attributes_valid?(attributes)
+        return false
       end
 
-      unless Audience.user_in_experiment?(@config, experiment_key, attributes)
-        @logger.log(Logger::INFO,
-                    "User '#{user_id}' does not meet the conditions to be in experiment '#{experiment_key}'.")
+      if !event_tags.nil? && !event_tags_valid?(event_tags)
         return false
       end
 
@@ -268,7 +296,7 @@ def event_tags_valid?(event_tags)
       true
     end
 
-    def validate_inputs(datafile, skip_json_validation)
+    def validate_instantiation_options(datafile, skip_json_validation)
       unless skip_json_validation
         raise InvalidInputError.new('datafile') unless Helpers::Validator.datafile_valid?(datafile)
       end

lib/optimizely/bucketer.rb

@@ -1,5 +1,5 @@
 #
-#    Copyright 2016, Optimizely and contributors
+#    Copyright 2016-2017, Optimizely and contributors
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -43,23 +43,6 @@ def bucket(experiment_key, user_id)
       #
       # Returns String variation ID in which visitor with ID user_id has been placed. Nil if no variation.
 
-      # handle forced variations if applicable
-      forced_variations = @config.get_forced_variations(experiment_key)
-      forced_variation_key = forced_variations[user_id]
-      if forced_variation_key
-        forced_variation_id = @config.get_variation_id_from_key(experiment_key, forced_variation_key)
-        if forced_variation_id
-          @config.logger.log(Logger::INFO, "User '#{user_id}' is forced in variation '#{forced_variation_key}'.")
-          return forced_variation_id
-        else
-          @config.logger.log(
-            Logger::INFO,
-            "Variation key '#{forced_variation_key}' is not in datafile. Not activating user '#{user_id}'."
-          )
-          return nil
-        end
-      end
-
       # check if experiment is in a group; if so, check if user is bucketed into specified experiment
       experiment_id = @config.get_experiment_id(experiment_key)
       group_id = @config.get_experiment_group_id(experiment_key)
@@ -118,6 +101,36 @@ def bucket(experiment_key, user_id)
       nil
     end
 
+    def get_forced_variation_id(experiment_key, user_id)
+      # Determine if a user is forced into a variation for the given experiment and return the id of that variation.
+      #
+      # experiment_key - Key representing the experiment for which user is to be bucketed.
+      # user_id - ID for the user.
+      #
+      # Returns variation ID in which the user with ID user_id is forced into. Nil if no variation.
+
+      forced_variations = @config.get_forced_variations(experiment_key)
+
+      return nil unless forced_variations
+
+      forced_variation_key = forced_variations[user_id]
+
+      return nil unless forced_variation_key
+
+      forced_variation_id = @config.get_variation_id_from_key(experiment_key, forced_variation_key)
+
+      unless forced_variation_id
+        @config.logger.log(
+          Logger::INFO,
+          "Variation key '#{forced_variation_key}' is not in datafile. Not activating user '#{user_id}'."
+        )
+        return nil
+      end
+
+      @config.logger.log(Logger::INFO, "User '#{user_id}' is forced in variation '#{forced_variation_key}'.")
+      forced_variation_id
+    end
+
     private
 
     def find_bucket(bucket_value, traffic_allocations)