addressing comments

Author: rashidsp

lib/optimizely.rb

@@ -64,15 +64,13 @@ def initialize(datafile, event_dispatcher = nil, logger = nil, error_handler = n
 
       begin
         @config = ProjectConfig.new(datafile, @logger, @error_handler)
-      rescue InvalidDatafileVersionError => e
+      rescue StandardError => e
         @is_valid = false
         @logger = SimpleLogger.new
-        @logger.log(Logger::ERROR, e.message)
-        return
-      rescue
-        @is_valid = false
-        @logger = SimpleLogger.new
-        @logger.log(Logger::ERROR, InvalidInputError.new('datafile').message)
+        error_msg = e.class == InvalidDatafileVersionError ? e.message : InvalidInputError.new('datafile').message
+        error_to_handle = e.class == InvalidDatafileVersionError ? InvalidDatafileVersionError : InvalidInputError
+        @logger.log(Logger::ERROR, error_msg)
+        @error_handler.handle_error error_to_handle
         return
       end
 

spec/project_spec.rb

@@ -110,10 +110,11 @@ class InvalidErrorHandler; end
       Optimizely::Project.new(config_body_JSON, nil, nil, nil, true)
     end
 
-    it 'should log an error when provided a datafile that is not JSON and skip_json_validation is true' do
+    it 'should log and raise an error when provided a datafile that is not JSON and skip_json_validation is true' do
       expect_any_instance_of(Optimizely::SimpleLogger).to receive(:log).once.with(Logger::ERROR, 'Provided datafile is in an invalid format.')
+      expect_any_instance_of(Optimizely::RaiseErrorHandler).to receive(:handle_error).once.with(Optimizely::InvalidInputError)
 
-      Optimizely::Project.new('this is not JSON', nil, nil, nil, true)
+      Optimizely::Project.new('this is not JSON', nil, nil, Optimizely::RaiseErrorHandler.new, true)
     end
 
     it 'should log an error when provided an invalid JSON datafile and skip_json_validation is true' do
@@ -122,11 +123,12 @@ class InvalidErrorHandler; end
       Optimizely::Project.new('{"version": "2", "foo": "bar"}', nil, nil, nil, true)
     end
 
-    it 'should log an error when provided a datafile of unsupported version' do
+    it 'should log and raise an error when provided a datafile of unsupported version' do
       config_body_invalid_json = JSON.parse(config_body_invalid_JSON)
       expect_any_instance_of(Optimizely::SimpleLogger).to receive(:log).once.with(Logger::ERROR, "This version of the Ruby SDK does not support the given datafile version: #{config_body_invalid_json['version']}.")
+      expect_any_instance_of(Optimizely::RaiseErrorHandler).to receive(:handle_error).once.with(Optimizely::InvalidDatafileVersionError)
 
-      Optimizely::Project.new(config_body_invalid_JSON, nil, nil, nil, true)
+      Optimizely::Project.new(config_body_invalid_JSON, nil, nil, Optimizely::RaiseErrorHandler.new, true)
     end
   end