Feature Toggle (#88)

Author: oakbani

lib/optimizely.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 #
-#    Copyright 2016-2017, Optimizely and contributors
+#    Copyright 2016-2018, 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.
@@ -263,23 +263,29 @@ def is_feature_enabled(feature_flag_key, user_id, attributes = nil)
       end
 
       decision = @decision_service.get_variation_for_feature(feature_flag, user_id, attributes)
-      unless decision.nil?
-        variation = decision['variation']
-        # Send event if Decision came from an experiment.
-        if decision.source == Optimizely::DecisionService::DECISION_SOURCE_EXPERIMENT
-          send_impression(decision.experiment, variation['key'], user_id, attributes)
-        else
-          @logger.log(Logger::DEBUG,
-                      "The user '#{user_id}' is not being experimented on in feature '#{feature_flag_key}'.")
-        end
+      if decision.nil?
+        @logger.log(Logger::INFO,
+                    "Feature '#{feature_flag_key}' is not enabled for user '#{user_id}'.")
+        return false
+      end
+
+      variation = decision['variation']
+      unless variation['featureEnabled']
+        @logger.log(Logger::INFO,
+                    "Feature '#{feature_flag_key}' is not enabled for user '#{user_id}'.")
+        return false
+      end
 
-        @logger.log(Logger::INFO, "Feature '#{feature_flag_key}' is enabled for user '#{user_id}'.")
-        return true
+      if decision.source == Optimizely::DecisionService::DECISION_SOURCE_EXPERIMENT
+        # Send event if Decision came from an experiment.
+        send_impression(decision.experiment, variation['key'], user_id, attributes)
+      else
+        @logger.log(Logger::DEBUG,
+                    "The user '#{user_id}' is not being experimented on in feature '#{feature_flag_key}'.")
       end
+      @logger.log(Logger::INFO, "Feature '#{feature_flag_key}' is enabled for user '#{user_id}'.")
 
-      @logger.log(Logger::INFO,
-                  "Feature '#{feature_flag_key}' is not enabled for user '#{user_id}'.")
-      false
+      true
     end
 
     def get_enabled_features(user_id, attributes = nil)

lib/optimizely/project_config.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-#    Copyright 2016-2017, Optimizely and contributors
+#    Copyright 2016-2018, 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.
@@ -126,16 +126,16 @@ def initialize(datafile, logger, error_handler)
       @all_experiments = @experiment_key_map.merge(@rollout_experiment_id_map)
       @all_experiments.each do |key, exp|
         variations = exp.fetch('variations')
-        @variation_id_map[key] = generate_key_map(variations, 'id')
-        @variation_key_map[key] = generate_key_map(variations, 'key')
-
         variations.each do |variation|
           variation_id = variation['id']
+          variation['featureEnabled'] = variation['featureEnabled'] == true
           variation_variables = variation['variables']
           unless variation_variables.nil?
             @variation_id_to_variable_usage_map[variation_id] = generate_key_map(variation_variables, 'id')
           end
         end
+        @variation_id_map[key] = generate_key_map(variations, 'id')
+        @variation_key_map[key] = generate_key_map(variations, 'key')
       end
       @feature_flag_key_map = generate_key_map(@feature_flags, 'key')
       @feature_variable_key_map = {}