test: Test against ruby version(s) (#133)

Author: Adam Panzer

.travis.yml

@@ -1,12 +1,16 @@
+branch:
+  only:
+    - master
 language: ruby
 rvm:
-  - 2.3.1
-before_install: gem install bundler -v 1.10.6
+  - 2.3.7
+  - 2.4.4
+  - 2.5.1
+before_install: gem install bundler
 install:
   - bundle install
-  - bundle exec rake install
+script: "bundle exec rake spec"
 before_script: "rubocop"
 addons:
   srcclr: true
-script: "rake spec"
 after_success: "coveralls"

Gemfile

@@ -4,6 +4,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in optimizely-sdk.gemspec
 gemspec
-gem 'coveralls', require: false
-gem 'murmurhash3'
-gem 'webmock'

lib/optimizely/condition.rb

@@ -103,6 +103,7 @@ def evaluate(conditions)
       if conditions.is_a? Array
         operator_type = conditions[0]
         return false unless DEFAULT_OPERATOR_TYPES.include?(operator_type)
+
         case operator_type
         when ConditionalOperatorTypes::AND
           return and_evaluator(conditions[1..-1])

lib/optimizely/decision_service.rb

@@ -166,6 +166,7 @@ def get_variation_for_feature_experiment(feature_flag, user_id, attributes = nil
         variation_id = get_variation(experiment_key, user_id, attributes)
 
         next unless variation_id
+
         variation = @config.variation_id_map[experiment_key][variation_id]
         @config.logger.log(
           Logger::INFO,
@@ -236,6 +237,7 @@ def get_variation_for_feature_rollout(feature_flag, user_id, attributes = nil)
         # Evaluate if user satisfies the traffic allocation for this rollout rule
         variation = @bucketer.bucket(rollout_rule, bucketing_id, user_id)
         return Decision.new(rollout_rule, variation, DECISION_SOURCE_ROLLOUT) unless variation.nil?
+
         break
       end
 
@@ -254,6 +256,7 @@ def get_variation_for_feature_rollout(feature_flag, user_id, attributes = nil)
       end
       variation = @bucketer.bucket(everyone_else_experiment, bucketing_id, user_id)
       return Decision.new(everyone_else_experiment, variation, DECISION_SOURCE_ROLLOUT) unless variation.nil?
+
       nil
     end
 
@@ -303,6 +306,7 @@ def get_saved_variation_id(experiment_id, user_profile)
 
       decision = user_profile[:experiment_bucket_map][experiment_id]
       return nil unless decision
+
       variation_id = decision[:variation_id]
       return variation_id if @config.variation_id_exists?(experiment_id, variation_id)
 

lib/optimizely/event_builder.rb

@@ -201,6 +201,7 @@ def get_conversion_params(event_key, event_tags, experiment_variation_map)
       single_snapshot[:decisions] = []
       experiment_variation_map.each do |experiment_id, variation_id|
         next unless variation_id
+
         single_snapshot[:decisions].push(
           campaign_id: @config.experiment_id_map[experiment_id]['layerId'],
           experiment_id: experiment_id,

lib/optimizely/helpers/validator.rb

@@ -106,9 +106,11 @@ def inputs_valid?(variables, logger = NoOpLogger.new, level = Logger::ERROR)
         # Returns boolean True if all of the values are valid, False otherwise.
 
         return false unless variables.respond_to?(:each) && !variables.empty?
+
         is_valid = true
         variables.each do |key, value|
           next if value.is_a?(String) && !value.empty?
+
           is_valid = false
           if logger_valid?(logger) && level
             logger.log(level, "#{Optimizely::Helpers::Constants::INPUT_VARIABLES[key.to_s.upcase]} is invalid")

lib/optimizely/notification_center.rb

@@ -42,6 +42,7 @@ def initialize(logger, error_handler)
 
     def add_notification_listener(notification_type, notification_callback)
       return nil unless notification_type_valid?(notification_type)
+
       unless notification_callback
         @logger.log Logger::ERROR, 'Callback can not be empty.'
         return nil

lib/optimizely/project_config.rb

@@ -161,6 +161,7 @@ def get_experiment_from_key(experiment_key)
 
       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
       nil
@@ -175,6 +176,7 @@ def get_experiment_key(experiment_id)
 
       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
       nil
@@ -189,6 +191,7 @@ def get_experiment_ids_for_event(event_key)
 
       event = @event_key_map[event_key]
       return event['experimentIds'] if event
+
       @logger.log Logger::ERROR, "Event '#{event_key}' is not in datafile."
       @error_handler.handle_error InvalidEventError
       []
@@ -203,6 +206,7 @@ def get_audience_from_id(audience_id)
 
       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
       nil
@@ -220,6 +224,7 @@ def get_variation_from_id(experiment_key, variation_id)
       if variation_id_map
         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
         return nil
@@ -242,6 +247,7 @@ def get_variation_id_from_key(experiment_key, variation_key)
       if variation_key_map
         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
         return nil
@@ -261,6 +267,7 @@ def get_whitelisted_variations(experiment_key)
 
       experiment = @experiment_key_map[experiment_key]
       return experiment['forcedVariations'] if experiment
+
       @logger.log Logger::ERROR, "Experiment key '#{experiment_key}' is not in datafile."
       @error_handler.handle_error InvalidExperimentError
     end
@@ -377,6 +384,7 @@ def get_attribute_id(attribute_key)
         return attribute['id']
       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
       nil
@@ -395,6 +403,7 @@ def variation_id_exists?(experiment_id, variation_id)
       if variation_id_map
         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
       end
@@ -410,6 +419,7 @@ def get_feature_flag_from_key(feature_flag_key)
       # Returns feature flag if found, otherwise nil
       feature_flag = @feature_flag_key_map[feature_flag_key]
       return feature_flag if feature_flag
+
       @logger.log Logger::ERROR, "Feature flag key '#{feature_flag_key}' is not in datafile."
       nil
     end
@@ -424,6 +434,7 @@ def get_feature_variable(feature_flag, variable_key)
       feature_flag_key = feature_flag['key']
       variable = @feature_variable_key_map[feature_flag_key][variable_key]
       return variable if variable
+
       @logger.log Logger::ERROR, "No feature variable was found for key '#{variable_key}' in feature flag "\
                   "'#{feature_flag_key}'."
       nil
@@ -437,6 +448,7 @@ def get_rollout_from_id(rollout_id)
       # Returns the rollout if found, otherwise nil
       rollout = @rollout_id_map[rollout_id]
       return rollout if rollout
+
       @logger.log Logger::ERROR, "Rollout with ID '#{rollout_id}' is not in the datafile."
       nil
     end

optimizely-sdk.gemspec

@@ -16,10 +16,12 @@ Gem::Specification.new do |spec|
   spec.files         = Dir['lib/**/*']
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 1.10'
-  spec.add_development_dependency 'rake', '~> 12.0'
-  spec.add_development_dependency 'rspec', '~> 3.8.0'
-  spec.add_development_dependency 'rubocop', '~> 0.58.0'
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'coveralls'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'webmock'
 
   spec.add_runtime_dependency 'httparty', '~> 0.11'
   spec.add_runtime_dependency 'json-schema', '~> 2.6'

spec/spec_helper.rb

@@ -20,5 +20,4 @@
 $LOAD_PATH.unshift File.expand_path('../lib', __dir__)
 require 'optimizely'
 require 'spec_params'
-
 require 'webmock/rspec'