optimizely-sdk 4.0.1 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6c3ed7012fac749fdca7c3c328eed7157fbc506f7d69ccebbae2d8064f23efd
-  data.tar.gz: 0e3e8c5b066fed0afbb542a41441e84da94fa2c92aa323e995eb59a1323d0e45
+  metadata.gz: 7249ff9bec6f12c00a9a873df03e6f91c9692bcbe2388e87ea9a6a6f1472fbf5
+  data.tar.gz: 902fa025d32f1224833fa25f13158817ff3129244819a170ee3d907812290709
 SHA512:
-  metadata.gz: d04f0b497e127336af09e8ddf071767614e2a8c8bb63ab5e6681e18faefcc105864633ca667d79706637b2c49d5e1324ef63d225fb7e4f7388fce785be443854
-  data.tar.gz: 35d476afe2f1ff9a8d10367a59cd153485dd169324bd8f4f43faba56939bfbd85489160ca5453856bbaa16302357eebec603a9821e2551bb92df7290342d3deb
+  metadata.gz: b96a27927fd78a3d789b9edbb2c8488ba499c4f00220f08f9d9463691f38580db04f5dc6f7278873301a6c7217c54a9cf4f38d400b9feba196b7df70ec173e33
+  data.tar.gz: 368c9b5f096c8773c4bac487b8d6198ade424dde1ea6295449eaee3ecf5c0b4f7e2ab6b88a8bac4ab5ed2a2dce31f3ca24ef8c8596faae34cdae18aebfcdab79

data/LICENSE

@@ -187,7 +187,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2016, Optimizely and contributors
+   © Optimizely 2016
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

data/lib/optimizely/audience.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 #
-#    Copyright 2016-2017, 2019-2020, Optimizely and contributors
+#    Copyright 2016-2017, 2019-2020, 2023, 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.
@@ -59,7 +59,7 @@ module Optimizely
       user_condition_evaluator = UserConditionEvaluator.new(user_context, logger)
 
       evaluate_user_conditions = lambda do |condition|
-        return user_condition_evaluator.evaluate(condition)
+        user_condition_evaluator.evaluate(condition)
       end
 
       evaluate_audience = lambda do |audience_id|
@@ -112,12 +112,12 @@ module Optimizely
       # Returns array of segment names.
       segments = []
 
-      conditions.each do |condition|
-        case condition
-        when Array
+      case conditions
+      when Hash
+        segments.push(conditions['value']) if conditions.fetch('match', nil) == 'qualified'
+      when Array
+        conditions.each do |condition|
           segments.concat @parse_segments.call(condition)
-        when Hash
-          segments.push(condition['value']) if condition.fetch('match', nil) == 'qualified'
         end
       end
 

data/lib/optimizely/bucketer.rb

@@ -110,8 +110,8 @@ module Optimizely
       # parent_id - String entity ID to use for bucketing ID
       # traffic_allocations - Array of traffic allocations
       #
-      # Returns and array of two values where first value is the entity ID corresponding to the provided bucket value
-      # or nil if no match is found. The second value contains the array of reasons stating how the deicision was taken
+      # Returns an array of two values where first value is the entity ID corresponding to the provided bucket value
+      # or nil if no match is found. The second value contains the array of reasons stating how the decision was taken
       decide_reasons = []
       bucketing_key = format(BUCKETING_ID_TEMPLATE, bucketing_id: bucketing_id, entity_id: parent_id)
       bucket_value = generate_bucket_value(bucketing_key)

data/lib/optimizely/config/datafile_project_config.rb

@@ -93,7 +93,7 @@ module Optimizely
       @experiment_key_map = generate_key_map(@experiments, 'key')
       @experiment_id_map = generate_key_map(@experiments, 'id')
       @audience_id_map = generate_key_map(@audiences, 'id')
-      @integration_key_map = generate_key_map(@integrations, 'key')
+      @integration_key_map = generate_key_map(@integrations, 'key', first_value: true)
       @audience_id_map = @audience_id_map.merge(generate_key_map(@typed_audiences, 'id')) unless @typed_audiences.empty?
       @variation_id_map = {}
       @variation_key_map = {}
@@ -184,20 +184,19 @@ module Optimizely
       # skip_json_validation - Optional boolean param which allows skipping JSON schema
       #                       validation upon object invocation. By default JSON schema validation will be performed.
       # Returns instance of DatafileProjectConfig, nil otherwise.
+      logger ||= SimpleLogger.new
       if !skip_json_validation && !Helpers::Validator.datafile_valid?(datafile)
-        default_logger = SimpleLogger.new
-        default_logger.log(Logger::ERROR, InvalidInputError.new('datafile').message)
+        logger.log(Logger::ERROR, InvalidInputError.new('datafile').message)
         return nil
       end
 
       begin
         config = new(datafile, logger, error_handler)
       rescue StandardError => e
-        default_logger = SimpleLogger.new
         error_to_handle = e.instance_of?(InvalidDatafileVersionError) ? e : InvalidInputError.new('datafile')
         error_msg = error_to_handle.message
 
-        default_logger.log(Logger::ERROR, error_msg)
+        logger.log(Logger::ERROR, error_msg)
         error_handler.handle_error error_to_handle
         return nil
       end
@@ -224,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
 
@@ -239,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
 
@@ -254,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
 
@@ -269,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
 
@@ -284,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
 
@@ -309,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
 
@@ -332,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
 
@@ -355,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
 
@@ -378,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
 
@@ -398,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)
@@ -421,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
 
@@ -440,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
@@ -525,15 +540,19 @@ module Optimizely
       flag_variation_map
     end
 
-    def generate_key_map(array, key)
+    def generate_key_map(array, key, first_value: false)
       # Helper method to generate map from key to hash in array of hashes
       #
       # array - Array consisting of hash
       # key - Key in each hash which will be key in the map
+      # first_value - Determines which value to save if there are duplicate keys. By default the last instance of the key
+      #               will be saved. Set to true to save the first key/value encountered.
       #
       # Returns map mapping key to hash
 
-      Hash[array.map { |obj| [obj[key], obj] }]
+      array
+        .group_by { |obj| obj[key] }
+        .transform_values { |group| first_value ? group.first : group.last }
     end
   end
 end

data/lib/optimizely/config_manager/http_project_config_manager.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 #
-#    Copyright 2019-2020, 2022, Optimizely and contributors
+#    Copyright 2019-2020, 2022-2023, 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.
@@ -33,12 +33,12 @@ module Optimizely
   class HTTPProjectConfigManager < ProjectConfigManager
     # Config manager that polls for the datafile and updated ProjectConfig based on an update interval.
 
-    attr_reader :stopped
+    attr_reader :stopped, :sdk_key
 
     # Initialize config manager. One of sdk_key or url has to be set to be able to use.
     #
-    # sdk_key - Optional string uniquely identifying the datafile. It's required unless a URL is passed in.
-    # datafile: Optional JSON string representing the project.
+    # sdk_key - Optional string uniquely identifying the datafile. It's required unless a datafile with sdk_key is passed in.
+    # datafile - Optional JSON string representing the project. If nil, sdk_key is required.
     # polling_interval - Optional floating point number representing time interval in seconds
     #                  at which to request datafile and set ProjectConfig.
     # blocking_timeout - Optional Time in seconds to block the config call until config object has been initialized.
@@ -83,6 +83,10 @@ module Optimizely
       @notification_center = notification_center.is_a?(Optimizely::NotificationCenter) ? notification_center : NotificationCenter.new(@logger, @error_handler)
       @optimizely_config = nil
       @config = datafile.nil? ? nil : DatafileProjectConfig.create(datafile, @logger, @error_handler, @skip_json_validation)
+      @sdk_key = sdk_key || @config&.sdk_key
+
+      raise MissingSdkKeyError if @sdk_key.nil?
+
       @mutex = Mutex.new
       @resource = ConditionVariable.new
       @async_scheduler = AsyncScheduler.new(method(:fetch_datafile_config), @polling_interval, auto_update, @logger)
@@ -98,11 +102,6 @@ module Optimizely
     end
 
     def start!
-      if @stopped
-        @logger.log(Logger::WARN, 'Not starting. Already stopped.')
-        return
-      end
-
       @async_scheduler.start!
       @stopped = false
     end
@@ -142,7 +141,7 @@ module Optimizely
     end
 
     def optimizely_config
-      @optimizely_config = OptimizelyConfig.new(@config).config if @optimizely_config.nil?
+      @optimizely_config = OptimizelyConfig.new(@config, @logger).config if @optimizely_config.nil?
 
       @optimizely_config
     end
@@ -222,6 +221,10 @@ module Optimizely
 
       @notification_center.send_notifications(NotificationCenter::NOTIFICATION_TYPES[:OPTIMIZELY_CONFIG_UPDATE])
 
+      NotificationCenterRegistry
+        .get_notification_center(@sdk_key, @logger)
+        &.send_notifications(NotificationCenter::NOTIFICATION_TYPES[:OPTIMIZELY_CONFIG_UPDATE])
+
       @logger.log(Logger::DEBUG, 'Received new datafile and updated config. ' \
         "Old revision number: #{previous_revision}. New revision number: #{@config.revision}.")
     end
@@ -260,6 +263,13 @@ module Optimizely
         return
       end
 
+      if polling_interval < 30
+        @logger.log(
+          Logger::WARN,
+          'Polling intervals below 30 seconds are not recommended.'
+        )
+      end
+
       @polling_interval = polling_interval
     end
 

data/lib/optimizely/config_manager/project_config_manager.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 #
-#    Copyright 2019, Optimizely and contributors
+#    Copyright 2019, 2023, 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.
@@ -20,5 +20,6 @@ module Optimizely
     # Interface for fetching ProjectConfig instance.
 
     def config; end
+    def sdk_key; end
   end
 end

data/lib/optimizely/config_manager/static_project_config_manager.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 #
-#    Copyright 2019-2020, 2022, Optimizely and contributors
+#    Copyright 2019-2020, 2022-2023, 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.
@@ -23,7 +23,7 @@ require_relative 'project_config_manager'
 module Optimizely
   class StaticProjectConfigManager < ProjectConfigManager
     # Implementation of ProjectConfigManager interface.
-    attr_reader :config
+    attr_reader :config, :sdk_key
 
     def initialize(datafile, logger, error_handler, skip_json_validation)
       # Looks up and sets datafile and config based on response body.
@@ -41,11 +41,13 @@ module Optimizely
         error_handler,
         skip_json_validation
       )
+      @logger = logger
+      @sdk_key = @config&.sdk_key
       @optimizely_config = nil
     end
 
     def optimizely_config
-      @optimizely_config = OptimizelyConfig.new(@config).config if @optimizely_config.nil?
+      @optimizely_config = OptimizelyConfig.new(@config, @logger).config if @optimizely_config.nil?
 
       @optimizely_config
     end

data/lib/optimizely/event/event_factory.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 #
-#    Copyright 2019-2020, 2022, Optimizely and contributors
+#    Copyright 2019-2020, 2022-2023, 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.
@@ -72,7 +72,7 @@ module Optimizely
 
       def build_attribute_list(user_attributes, project_config)
         visitor_attributes = []
-        user_attributes&.keys&.each do |attribute_key|
+        user_attributes&.each_key do |attribute_key|
           # Omit attribute values that are not supported by the log endpoint.
           attribute_value = user_attributes[attribute_key]
           next unless Helpers::Validator.attribute_valid?(attribute_key, attribute_value)

data/lib/optimizely/event_builder.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 #
-#    Copyright 2016-2019, 2022, Optimizely and contributors
+#    Copyright 2016-2019, 2022-2023, 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.
@@ -62,20 +62,20 @@ module Optimizely
 
       visitor_attributes = []
 
-      attributes&.keys&.each do |attribute_key|
+      attributes&.each_key do |attribute_key|
         # Omit attribute values that are not supported by the log endpoint.
         attribute_value = attributes[attribute_key]
-        if Helpers::Validator.attribute_valid?(attribute_key, attribute_value)
-          attribute_id = project_config.get_attribute_id attribute_key
-          if attribute_id
-            visitor_attributes.push(
-              entity_id: attribute_id,
-              key: attribute_key,
-              type: CUSTOM_ATTRIBUTE_FEATURE_TYPE,
-              value: attribute_value
-            )
-          end
-        end
+        next unless Helpers::Validator.attribute_valid?(attribute_key, attribute_value)
+
+        attribute_id = project_config.get_attribute_id attribute_key
+        next unless attribute_id
+
+        visitor_attributes.push(
+          entity_id: attribute_id,
+          key: attribute_key,
+          type: CUSTOM_ATTRIBUTE_FEATURE_TYPE,
+          value: attribute_value
+        )
       end
       # Append Bot Filtering Attribute
       if project_config.bot_filtering == true || project_config.bot_filtering == false

data/lib/optimizely/event_dispatcher.rb

@@ -17,6 +17,7 @@
 #
 require_relative 'exceptions'
 require_relative 'helpers/http_utils'
+require_relative 'helpers/constants'
 
 module Optimizely
   class NoOpEventDispatcher
@@ -26,9 +27,6 @@ module Optimizely
   end
 
   class EventDispatcher
-    # @api constants
-    REQUEST_TIMEOUT = 10
-
     def initialize(logger: nil, error_handler: nil, proxy_config: nil)
       @logger = logger || NoOpLogger.new
       @error_handler = error_handler || NoOpErrorHandler.new
@@ -40,7 +38,7 @@ module Optimizely
     # @param event - Event object
     def dispatch_event(event)
       response = Helpers::HttpUtils.make_request(
-        event.url, event.http_verb, event.params.to_json, event.headers, REQUEST_TIMEOUT, @proxy_config
+        event.url, event.http_verb, event.params.to_json, event.headers, Helpers::Constants::EVENT_DISPATCH_CONFIG[:REQUEST_TIMEOUT], @proxy_config
       )
 
       error_msg = "Event failed to dispatch with response code: #{response.code}"

data/lib/optimizely/exceptions.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 #
-#    Copyright 2016-2020, 2022, Optimizely and contributors
+#    Copyright 2016-2020, 2022-2023, 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.
@@ -25,19 +25,45 @@ module Optimizely
     end
   end
 
+  class HTTPUriError < Error
+    # Raised when a provided URI is invalid.
+    def initialize(msg = 'Provided URI was invalid.')
+      super
+    end
+  end
+
+  class MissingSdkKeyError < Error
+    # Raised when a provided URI is invalid.
+    def initialize(msg = 'SDK key not provided/cannot be found in the datafile.')
+      super
+    end
+  end
+
   class InvalidAudienceError < Error
     # Raised when an invalid audience is provided
 
-    def initialize(msg = 'Provided audience is not in datafile.')
-      super
+    attr_reader :audience_id
+
+    def initialize(audience_id)
+      raise ArgumentError, 'audience_id must be provided' if audience_id.nil?
+
+      super("Audience id '#{audience_id}' is not in datafile.")
+
+      @audience_id = audience_id
     end
   end
 
   class InvalidAttributeError < Error
     # Raised when an invalid attribute is provided
 
-    def initialize(msg = 'Provided attribute is not in datafile.')
-      super
+    attr_reader :attribute_key
+
+    def initialize(attribute_key)
+      raise ArgumentError, 'attribute_key must be provided' if attribute_key.nil?
+
+      super("Attribute key '#{attribute_key}' is not in datafile.")
+
+      @attribute_key = attribute_key
     end
   end
 
@@ -60,24 +86,56 @@ module Optimizely
   class InvalidExperimentError < Error
     # Raised when an invalid experiment key is provided
 
-    def initialize(msg = 'Provided experiment is not in datafile.')
-      super
+    attr_reader :experiment_id, :experiment_key
+
+    def initialize(experiment_id: nil, experiment_key: nil)
+      raise ArgumentError, 'Either experiment_id or experiment_key must be provided.' if experiment_id.nil? && experiment_key.nil?
+      raise ArgumentError, 'Cannot provide both experiment_id and experiment_key.' if !experiment_id.nil? && !experiment_key.nil?
+
+      if experiment_id.nil?
+        @experiment_key = experiment_key
+        identifier = "key '#{@experiment_key}'"
+      else
+        @experiment_id = experiment_id
+        identifier = "id '#{@experiment_id}'"
+      end
+
+      super("Experiment #{identifier} is not in datafile.")
     end
   end
 
   class InvalidEventError < Error
     # Raised when an invalid event key is provided
 
-    def initialize(msg = 'Provided event is not in datafile.')
-      super
+    attr_reader :event_key
+
+    def initialize(event_key)
+      raise ArgumentError, 'event_key must be provided.' if event_key.nil?
+
+      super("Event key '#{event_key}' is not in datafile.")
+
+      @event_key = event_key
     end
   end
 
   class InvalidVariationError < Error
     # Raised when an invalid variation key or ID is provided
 
-    def initialize(msg = 'Provided variation is not in datafile.')
-      super
+    attr_reader :variation_id, :variation_key
+
+    def initialize(variation_id: nil, variation_key: nil)
+      raise ArgumentError, 'Either variation_id or variation_key must be provided.' if variation_id.nil? && variation_key.nil?
+      raise ArgumentError, 'Cannot provide both variation_id and variation_key.' if !variation_id.nil? && !variation_key.nil?
+
+      if variation_id.nil?
+        identifier = "key '#{variation_key}'"
+        @variation_key = variation_key
+      else
+        identifier = "id '#{variation_id}'"
+        @variation_id = variation_id
+      end
+
+      super("Variation #{identifier} is not in datafile.")
     end
   end