optimizely-sdk 5.0.0.pre.beta → 5.0.1

data/lib/optimizely/condition_tree_evaluator.rb

@@ -1,123 +1,123 @@
-# frozen_string_literal: true
-
-#
-#    Copyright 2019, 2022, 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.
-#    You may obtain a copy of the License at
-#
-#        http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#    See the License for the specific language governing permissions and
-#    limitations under the License.
-#
-module Optimizely
-  module ConditionTreeEvaluator
-    # Operator types
-    AND_CONDITION = 'and'
-    OR_CONDITION = 'or'
-    NOT_CONDITION = 'not'
-
-    EVALUATORS_BY_OPERATOR_TYPE = {
-      AND_CONDITION => :and_evaluator,
-      OR_CONDITION => :or_evaluator,
-      NOT_CONDITION => :not_evaluator
-    }.freeze
-
-    OPERATORS = [AND_CONDITION, OR_CONDITION, NOT_CONDITION].freeze
-
-    module_function
-
-    def evaluate(conditions, leaf_evaluator)
-      # Top level method to evaluate audience conditions.
-      #
-      # conditions - Nested array of and/or conditions.
-      #              Example: ['and', operand_1, ['or', operand_2, operand_3]]
-      #
-      # leaf_evaluator - Function which will be called to evaluate leaf condition values.
-      #
-      # Returns boolean if the given user attributes match/don't match the given conditions,
-      #         nil if the given conditions are invalid or can't be evaluated.
-
-      if conditions.is_a? Array
-        first_operator =  conditions[0]
-        rest_of_conditions = conditions[1..]
-
-        # Operator to apply is not explicit - assume 'or'
-        unless EVALUATORS_BY_OPERATOR_TYPE.include?(conditions[0])
-          first_operator = OR_CONDITION
-          rest_of_conditions = conditions
-        end
-
-        return send(EVALUATORS_BY_OPERATOR_TYPE[first_operator], rest_of_conditions, leaf_evaluator)
-      end
-
-      leaf_evaluator.call(conditions)
-    end
-
-    def and_evaluator(conditions, leaf_evaluator)
-      # Evaluates an array of conditions as if the evaluator had been applied
-      # to each entry and the results AND-ed together.
-      #
-      # conditions - Array of conditions ex: [operand_1, operand_2]
-      #
-      # leaf_evaluator - Function which will be called to evaluate leaf condition values.
-      #
-      # Returns boolean if the user attributes match/don't match the given conditions,
-      #         nil if the user attributes and conditions can't be evaluated.
-
-      found_nil = false
-      conditions.each do |condition|
-        result = evaluate(condition, leaf_evaluator)
-        return result if result == false
-
-        found_nil = true if result.nil?
-      end
-
-      found_nil ? nil : true
-    end
-
-    def not_evaluator(single_condition, leaf_evaluator)
-      # Evaluates an array of conditions as if the evaluator had been applied
-      # to a single entry and NOT was applied to the result.
-      #
-      # single_condition - Array of a single condition ex: [operand_1]
-      #
-      # leaf_evaluator - Function which will be called to evaluate leaf condition values.
-      #
-      # Returns boolean if the user attributes match/don't match the given conditions,
-      #         nil if the user attributes and conditions can't be evaluated.
-
-      return nil if single_condition.empty?
-
-      result = evaluate(single_condition[0], leaf_evaluator)
-      result.nil? ? nil : !result
-    end
-
-    def or_evaluator(conditions, leaf_evaluator)
-      # Evaluates an array of conditions as if the evaluator had been applied
-      # to each entry and the results OR-ed together.
-      #
-      # conditions - Array of conditions ex: [operand_1, operand_2]
-      #
-      # leaf_evaluator - Function which will be called to evaluate leaf condition values.
-      #
-      # Returns boolean if the user attributes match/don't match the given conditions,
-      #         nil if the user attributes and conditions can't be evaluated.
-
-      found_nil = false
-      conditions.each do |condition|
-        result = evaluate(condition, leaf_evaluator)
-        return result if result == true
-
-        found_nil = true if result.nil?
-      end
-
-      found_nil ? nil : false
-    end
-  end
-end
+# frozen_string_literal: true
+
+#
+#    Copyright 2019, 2022, 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.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+module Optimizely
+  module ConditionTreeEvaluator
+    # Operator types
+    AND_CONDITION = 'and'
+    OR_CONDITION = 'or'
+    NOT_CONDITION = 'not'
+
+    EVALUATORS_BY_OPERATOR_TYPE = {
+      AND_CONDITION => :and_evaluator,
+      OR_CONDITION => :or_evaluator,
+      NOT_CONDITION => :not_evaluator
+    }.freeze
+
+    OPERATORS = [AND_CONDITION, OR_CONDITION, NOT_CONDITION].freeze
+
+    module_function
+
+    def evaluate(conditions, leaf_evaluator)
+      # Top level method to evaluate audience conditions.
+      #
+      # conditions - Nested array of and/or conditions.
+      #              Example: ['and', operand_1, ['or', operand_2, operand_3]]
+      #
+      # leaf_evaluator - Function which will be called to evaluate leaf condition values.
+      #
+      # Returns boolean if the given user attributes match/don't match the given conditions,
+      #         nil if the given conditions are invalid or can't be evaluated.
+
+      if conditions.is_a? Array
+        first_operator =  conditions[0]
+        rest_of_conditions = conditions[1..]
+
+        # Operator to apply is not explicit - assume 'or'
+        unless EVALUATORS_BY_OPERATOR_TYPE.include?(conditions[0])
+          first_operator = OR_CONDITION
+          rest_of_conditions = conditions
+        end
+
+        return send(EVALUATORS_BY_OPERATOR_TYPE[first_operator], rest_of_conditions, leaf_evaluator)
+      end
+
+      leaf_evaluator.call(conditions)
+    end
+
+    def and_evaluator(conditions, leaf_evaluator)
+      # Evaluates an array of conditions as if the evaluator had been applied
+      # to each entry and the results AND-ed together.
+      #
+      # conditions - Array of conditions ex: [operand_1, operand_2]
+      #
+      # leaf_evaluator - Function which will be called to evaluate leaf condition values.
+      #
+      # Returns boolean if the user attributes match/don't match the given conditions,
+      #         nil if the user attributes and conditions can't be evaluated.
+
+      found_nil = false
+      conditions.each do |condition|
+        result = evaluate(condition, leaf_evaluator)
+        return result if result == false
+
+        found_nil = true if result.nil?
+      end
+
+      found_nil ? nil : true
+    end
+
+    def not_evaluator(single_condition, leaf_evaluator)
+      # Evaluates an array of conditions as if the evaluator had been applied
+      # to a single entry and NOT was applied to the result.
+      #
+      # single_condition - Array of a single condition ex: [operand_1]
+      #
+      # leaf_evaluator - Function which will be called to evaluate leaf condition values.
+      #
+      # Returns boolean if the user attributes match/don't match the given conditions,
+      #         nil if the user attributes and conditions can't be evaluated.
+
+      return nil if single_condition.empty?
+
+      result = evaluate(single_condition[0], leaf_evaluator)
+      result.nil? ? nil : !result
+    end
+
+    def or_evaluator(conditions, leaf_evaluator)
+      # Evaluates an array of conditions as if the evaluator had been applied
+      # to each entry and the results OR-ed together.
+      #
+      # conditions - Array of conditions ex: [operand_1, operand_2]
+      #
+      # leaf_evaluator - Function which will be called to evaluate leaf condition values.
+      #
+      # Returns boolean if the user attributes match/don't match the given conditions,
+      #         nil if the user attributes and conditions can't be evaluated.
+
+      found_nil = false
+      conditions.each do |condition|
+        result = evaluate(condition, leaf_evaluator)
+        return result if result == true
+
+        found_nil = true if result.nil?
+      end
+
+      found_nil ? nil : false
+    end
+  end
+end

data/lib/optimizely/config/datafile_project_config.rb

@@ -223,8 +223,9 @@ module Optimizely
       experiment = @experiment_key_map[experiment_key]
       return experiment if experiment
 
-      @logger.log Logger::ERROR, "Experiment key '#{experiment_key}' is not in datafile."
-      @error_handler.handle_error InvalidExperimentError
+      invalid_experiment_error = InvalidExperimentError.new(experiment_key: experiment_key)
+      @logger.log Logger::ERROR, invalid_experiment_error.message
+      @error_handler.handle_error invalid_experiment_error
       nil
     end
 
@@ -238,8 +239,9 @@ module Optimizely
       experiment = @experiment_id_map[experiment_id]
       return experiment if experiment
 
-      @logger.log Logger::ERROR, "Experiment id '#{experiment_id}' is not in datafile."
-      @error_handler.handle_error InvalidExperimentError
+      invalid_experiment_error = InvalidExperimentError.new(experiment_id: experiment_id)
+      @logger.log Logger::ERROR, invalid_experiment_error.message
+      @error_handler.handle_error invalid_experiment_error
       nil
     end
 
@@ -253,8 +255,9 @@ module Optimizely
       experiment = @experiment_id_map[experiment_id]
       return experiment['key'] unless experiment.nil?
 
-      @logger.log Logger::ERROR, "Experiment id '#{experiment_id}' is not in datafile."
-      @error_handler.handle_error InvalidExperimentError
+      invalid_experiment_error = InvalidExperimentError.new(experiment_id: experiment_id)
+      @logger.log Logger::ERROR, invalid_experiment_error.message
+      @error_handler.handle_error invalid_experiment_error
       nil
     end
 
@@ -268,8 +271,9 @@ module Optimizely
       event = @event_key_map[event_key]
       return event if event
 
-      @logger.log Logger::ERROR, "Event '#{event_key}' is not in datafile."
-      @error_handler.handle_error InvalidEventError
+      invalid_event_error = InvalidEventError.new(event_key)
+      @logger.log Logger::ERROR, invalid_event_error.message
+      @error_handler.handle_error invalid_event_error
       nil
     end
 
@@ -283,8 +287,9 @@ module Optimizely
       audience = @audience_id_map[audience_id]
       return audience if audience
 
-      @logger.log Logger::ERROR, "Audience '#{audience_id}' is not in datafile."
-      @error_handler.handle_error InvalidAudienceError
+      invalid_audience_error = InvalidAudienceError.new(audience_id)
+      @logger.log Logger::ERROR, invalid_audience_error.message
+      @error_handler.handle_error invalid_audience_error
       nil
     end
 
@@ -308,13 +313,15 @@ module Optimizely
         variation = variation_id_map[variation_id]
         return variation if variation
 
-        @logger.log Logger::ERROR, "Variation id '#{variation_id}' is not in datafile."
-        @error_handler.handle_error InvalidVariationError
+        invalid_variation_error = InvalidVariationError.new(variation_id: variation_id)
+        @logger.log Logger::ERROR, invalid_variation_error.message
+        @error_handler.handle_error invalid_variation_error
         return nil
       end
 
-      @logger.log Logger::ERROR, "Experiment key '#{experiment_key}' is not in datafile."
-      @error_handler.handle_error InvalidExperimentError
+      invalid_experiment_error = InvalidExperimentError.new(experiment_key: experiment_key)
+      @logger.log Logger::ERROR, invalid_experiment_error.message
+      @error_handler.handle_error invalid_experiment_error
       nil
     end
 
@@ -331,13 +338,15 @@ module Optimizely
         variation = variation_id_map_by_experiment_id[variation_id]
         return variation if variation
 
-        @logger.log Logger::ERROR, "Variation id '#{variation_id}' is not in datafile."
-        @error_handler.handle_error InvalidVariationError
+        invalid_variation_error = InvalidVariationError.new(variation_id: variation_id)
+        @logger.log Logger::ERROR, invalid_variation_error.message
+        @error_handler.handle_error invalid_variation_error
         return nil
       end
 
-      @logger.log Logger::ERROR, "Experiment id '#{experiment_id}' is not in datafile."
-      @error_handler.handle_error InvalidExperimentError
+      invalid_experiment_error = InvalidExperimentError.new(experiment_id: experiment_id)
+      @logger.log Logger::ERROR, invalid_experiment_error.message
+      @error_handler.handle_error invalid_experiment_error
       nil
     end
 
@@ -354,13 +363,15 @@ module Optimizely
         variation = variation_key_map[variation_key]
         return variation['id'] if variation
 
-        @logger.log Logger::ERROR, "Variation key '#{variation_key}' is not in datafile."
-        @error_handler.handle_error InvalidVariationError
+        invalid_variation_error = InvalidVariationError.new(variation_key: variation_key)
+        @logger.log Logger::ERROR, invalid_variation_error.message
+        @error_handler.handle_error invalid_variation_error
         return nil
       end
 
-      @logger.log Logger::ERROR, "Experiment id '#{experiment_id}' is not in datafile."
-      @error_handler.handle_error InvalidExperimentError
+      invalid_experiment_error = InvalidExperimentError.new(experiment_id: experiment_id)
+      @logger.log Logger::ERROR, invalid_experiment_error.message
+      @error_handler.handle_error invalid_experiment_error
       nil
     end
 
@@ -377,13 +388,15 @@ module Optimizely
         variation = variation_key_map[variation_key]
         return variation['id'] if variation
 
-        @logger.log Logger::ERROR, "Variation key '#{variation_key}' is not in datafile."
-        @error_handler.handle_error InvalidVariationError
+        invalid_variation_error = InvalidVariationError.new(variation_key: variation_key)
+        @logger.log Logger::ERROR, invalid_variation_error.message
+        @error_handler.handle_error invalid_variation_error
         return nil
       end
 
-      @logger.log Logger::ERROR, "Experiment key '#{experiment_key}' is not in datafile."
-      @error_handler.handle_error InvalidExperimentError
+      invalid_experiment_error = InvalidExperimentError.new(experiment_key: experiment_key)
+      @logger.log Logger::ERROR, invalid_experiment_error.message
+      @error_handler.handle_error invalid_experiment_error
       nil
     end
 
@@ -397,8 +410,9 @@ module Optimizely
       experiment = @experiment_id_map[experiment_id]
       return experiment['forcedVariations'] if experiment
 
-      @logger.log Logger::ERROR, "Experiment ID '#{experiment_id}' is not in datafile."
-      @error_handler.handle_error InvalidExperimentError
+      invalid_experiment_error = InvalidExperimentError.new(experiment_id: experiment_id)
+      @logger.log Logger::ERROR, invalid_experiment_error.message
+      @error_handler.handle_error invalid_experiment_error
     end
 
     def get_attribute_id(attribute_key)
@@ -420,8 +434,9 @@ module Optimizely
       end
       return attribute_key if has_reserved_prefix
 
-      @logger.log Logger::ERROR, "Attribute key '#{attribute_key}' is not in datafile."
-      @error_handler.handle_error InvalidAttributeError
+      invalid_attribute_error = InvalidAttributeError.new(attribute_key)
+      @logger.log Logger::ERROR, invalid_attribute_error.message
+      @error_handler.handle_error invalid_attribute_error
       nil
     end
 
@@ -439,8 +454,9 @@ module Optimizely
         variation = variation_id_map[variation_id]
         return true if variation
 
-        @logger.log Logger::ERROR, "Variation ID '#{variation_id}' is not in datafile."
-        @error_handler.handle_error InvalidVariationError
+        invalid_variation_error = InvalidVariationError.new(variation_id: variation_id)
+        @logger.log Logger::ERROR, invalid_variation_error.message
+        @error_handler.handle_error invalid_variation_error
       end
 
       false

data/lib/optimizely/config/proxy_config.rb

@@ -1,34 +1,34 @@
-# frozen_string_literal: true
-
-#    Copyright 2020, 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.
-#    You may obtain a copy of the License at
-#
-#        http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#    See the License for the specific language governing permissions and
-#    limitations under the License.
-#
-#
-
-module Optimizely
-  class ProxyConfig
-    attr_reader :host, :port, :username, :password
-
-    def initialize(host, port = nil, username = nil, password = nil)
-      # host - DNS name or IP address of proxy
-      # port - port to use to acess the proxy
-      # username - username if authorization is required
-      # password - password if authorization is required
-      @host = host
-      @port = port
-      @username = username
-      @password = password
-    end
-  end
-end
+# frozen_string_literal: true
+
+#    Copyright 2020, 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.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+#
+
+module Optimizely
+  class ProxyConfig
+    attr_reader :host, :port, :username, :password
+
+    def initialize(host, port = nil, username = nil, password = nil)
+      # host - DNS name or IP address of proxy
+      # port - port to use to acess the proxy
+      # username - username if authorization is required
+      # password - password if authorization is required
+      @host = host
+      @port = port
+      @username = username
+      @password = password
+    end
+  end
+end