refact: separated finite_number condition

lib/optimizely/custom_attribute_condition_evaluator.rb

@@ -112,19 +112,25 @@ def exact_evaluator(condition)
  user_provided_value = @user_attributes[condition['name']]
 
  if user_provided_value.is_a?(Numeric) && condition_value.is_a?(Numeric)
- unless Helpers::Validator.finite_number?(user_provided_value)
+
+ return nil unless valid_numeric_values?(user_provided_value, condition_value, condition)
+
+ return true if condition_value == user_provided_value
+
+ unless Helpers::Validator.same_types?(condition_value, user_provided_value)
  @logger.log(
  Logger::DEBUG,
  format(
- Helpers::Constants::AUDIENCE_EVALUATION_LOGS['INFINIT_ATTRIBUTE_VALUE'],
+ Helpers::Constants::AUDIENCE_EVALUATION_LOGS['UNEXPECTED_TYPE'],
  condition,
- user_provided_value
+ user_provided_value.class,
+ condition['name']
  )
  )
  return nil
  end
 
- return true if condition_value.to_f == user_provided_value.to_f
+ return false
  end
 
  if !value_valid_for_exact_conditions?(user_provided_value) ||
@@ -171,38 +177,7 @@ def greater_than_evaluator(condition)
  condition_value = condition['value']
  user_provided_value = @user_attributes[condition['name']]
 
- unless user_provided_value.is_a?(Numeric)
- @logger.log(
- Logger::DEBUG,
- format(
- Helpers::Constants::AUDIENCE_EVALUATION_LOGS['UNEXPECTED_TYPE'],
- condition,
- user_provided_value.class,
- condition['name']
- )
- )
- return nil
- end
-
- unless Helpers::Validator.finite_number?(user_provided_value)
- @logger.log(
- Logger::DEBUG,
- format(
- Helpers::Constants::AUDIENCE_EVALUATION_LOGS['INFINIT_ATTRIBUTE_VALUE'],
- condition,
- user_provided_value
- )
- )
- return nil
- end
-
- unless Helpers::Validator.finite_number?(condition_value)
- @logger.log(
- Logger::WARN,
- format(Helpers::Constants::AUDIENCE_EVALUATION_LOGS['UNKNOWN_CONDITION_VALUE'], condition)
- )
- return nil
- end
+ return nil unless valid_numeric_values?(user_provided_value, condition_value, condition)
 
  user_provided_value > condition_value
  end
@@ -216,7 +191,21 @@ def less_than_evaluator(condition)
  condition_value = condition['value']
  user_provided_value = @user_attributes[condition['name']]
 
- unless user_provided_value.is_a?(Numeric)
+ return nil unless valid_numeric_values?(user_provided_value, condition_value, condition)
+
+ user_provided_value < condition_value
+ end
+
+ def substring_evaluator(condition)
+ # Evaluate the given substring match condition for the given user attributes.
+ # Returns boolean true if the condition value is a substring of the user attribute value,
+ # false if the condition value is not a substring of the user attribute value,
+ # nil if the condition value isn't a string or the user attribute value isn't a string.
+
+ condition_value = condition['value']
+ user_provided_value = @user_attributes[condition['name']]
+
+ unless user_provided_value.is_a?(String)
  @logger.log(
  Logger::DEBUG,
  format(
@@ -229,69 +218,62 @@ def less_than_evaluator(condition)
  return nil
  end
 
- unless Helpers::Validator.finite_number?(user_provided_value)
- @logger.log(
- Logger::DEBUG,
- format(
- Helpers::Constants::AUDIENCE_EVALUATION_LOGS['INFINIT_ATTRIBUTE_VALUE'],
- condition,
- user_provided_value
- )
- )
- return nil
- end
-
- unless Helpers::Validator.finite_number?(condition_value)
+ unless condition_value.is_a?(String)
  @logger.log(
  Logger::WARN,
  format(Helpers::Constants::AUDIENCE_EVALUATION_LOGS['UNKNOWN_CONDITION_VALUE'], condition)
  )
  return nil
  end
 
- user_provided_value < condition_value
+ user_provided_value.include? condition_value
  end
 
- def substring_evaluator(condition)
- # Evaluate the given substring match condition for the given user attributes.
- # Returns boolean true if the condition value is a substring of the user attribute value,
- # false if the condition value is not a substring of the user attribute value,
- # nil if the condition value isn't a string or the user attribute value isn't a string.
+ private
 
- condition_value = condition['value']
- user_provided_value = @user_attributes[condition['name']]
+ def valid_numeric_values?(user_value, condition_value, condition)
+ # Returns true if user and condition values are valid numeric.
+ # false otherwise.
 
- unless user_provided_value.is_a?(String)
+ unless user_value.is_a?(Numeric)
  @logger.log(
  Logger::DEBUG,
  format(
  Helpers::Constants::AUDIENCE_EVALUATION_LOGS['UNEXPECTED_TYPE'],
  condition,
- user_provided_value.class,
+ user_value.class,
  condition['name']
  )
  )
- return nil
+ return false
  end
 
- unless condition_value.is_a?(String)
+ unless Helpers::Validator.finite_number?(user_value)
+ @logger.log(
+ Logger::DEBUG,
+ format(
+ Helpers::Constants::AUDIENCE_EVALUATION_LOGS['INFINITE_ATTRIBUTE_VALUE'],
+ condition,
+ user_value
+ )
+ )
+ return false
+ end
+
+ unless Helpers::Validator.finite_number?(condition_value)
  @logger.log(
  Logger::WARN,
  format(Helpers::Constants::AUDIENCE_EVALUATION_LOGS['UNKNOWN_CONDITION_VALUE'], condition)
  )
- return nil
+ return false
  end
 
- user_provided_value.include? condition_value
+ true
  end
 
- private
-
  def value_valid_for_exact_conditions?(value)
  # Returns true if the value is valid for exact conditions. Valid values include
- # strings, booleans, and numbers that aren't NaN, -Infinity, or Infinity.
-
- return Helpers::Validator.finite_number?(value) if value.is_a? Numeric
+ # strings and booleans.
 
  (Helpers::Validator.boolean? value) || (value.is_a? String)
  end

lib/optimizely/helpers/constants.rb

@@ -339,7 +339,7 @@ module Constants
  'EVALUATING_AUDIENCE_WITH_CONDITIONS' => "Starting to evaluate audience '%s' with conditions: '%s'.",
  'MISMATCH_TYPE' => "Audience condition '%s' evaluated as UNKNOWN because the value for " \
  "user attribute '%s' is '%s' while expected is '%s'.",
- 'INFINIT_ATTRIBUTE_VALUE' => "Audience condition '%s' evaluated to UNKNOWN because the number value " \
+ 'INFINITE_ATTRIBUTE_VALUE' => "Audience condition '%s' evaluated to UNKNOWN because the number value " \
  "for user attribute '%s' is not in the range [-2^53, +2^53].",
  'MISSING_ATTRIBUTE_VALUE' => "Audience condition '%s' evaluated as UNKNOWN because no value " \
  "was passed for user attribute '%s'.",