rolled back include in events manager

Author: chillaq

lib/splitclient-rb/engine/events/events_manager.rb

@@ -4,8 +4,6 @@ module SplitIoClient
   module Engine
     module Events
       class EventsManager
-        include SplitIoClient::Engine::Models
-
         def initialize(events_manager_config, events_delivery, config)
           @manager_config = events_manager_config
           @events_delivery = events_delivery
@@ -20,15 +18,15 @@ def register(sdk_event, event_handler)
 
           @mutex.synchronize do
             # SDK ready already fired
-            if sdk_event == SdkEvent::SDK_READY && event_already_triggered(sdk_event)
-              @active_subscriptions[sdk_event] = EventActiveSubscriptions.new(true, event_handler)
+            if sdk_event == Engine::Models::SdkEvent::SDK_READY && event_already_triggered(sdk_event)
+              @active_subscriptions[sdk_event] = Engine::Models::EventActiveSubscriptions.new(true, event_handler)
               @config.logger.debug('EventsManager: Firing SDK_READY event for new subscription') if @config.debug_enabled
               fire_sdk_event(sdk_event, nil)
               return
             end
 
             @config.logger.debug("EventsManager: Register event: #{sdk_event}") if @config.debug_enabled
-            @active_subscriptions[sdk_event] = EventActiveSubscriptions.new(false, event_handler)
+            @active_subscriptions[sdk_event] = Engine::Models::EventActiveSubscriptions.new(false, event_handler)
           end
         end
 
@@ -52,7 +50,7 @@ def notify_internal_event(sdk_internal_event, event_metadata)
               # if client is not subscribed to SDK_READY
               if check_if_register_needed(sorted_event)
                 @config.logger.debug('EventsManager: Registering SDK_READY event as fired') if @config.debug_enabled
-                @active_subscriptions[SdkEvent::SDK_READY] = EventActiveSubscriptions.new(true, nil)
+                @active_subscriptions[Engine::Models::SdkEvent::SDK_READY] = Engine::Models::EventActiveSubscriptions.new(true, nil)
               end
             end
           end
@@ -68,7 +66,7 @@ def destroy
         private
 
         def check_if_register_needed(sorted_event)
-          sorted_event == SdkEvent::SDK_READY &&
+          sorted_event == Engine::Models::SdkEvent::SDK_READY &&
             get_event_handler(sorted_event).nil? &&
             !@active_subscriptions.include?(sorted_event)
         end
@@ -112,15 +110,15 @@ def get_event_handler(sdk_event)
         end
 
         def get_sdk_event_if_applicable(sdk_internal_event)
-          final_sdk_event = ValidSdkEvent.new(nil, false)
+          final_sdk_event = Engine::Models::ValidSdkEvent.new(nil, false)
 
           events_to_fire = []
           require_any_sdk_event = check_require_any(sdk_internal_event)
           if require_any_sdk_event.valid
             if (!event_already_triggered(require_any_sdk_event.sdk_event) &&
                execution_limit(require_any_sdk_event.sdk_event) == 1) ||
                execution_limit(require_any_sdk_event.sdk_event) == -1
-              final_sdk_event = ValidSdkEvent.new(
+              final_sdk_event = Engine::Models::ValidSdkEvent.new(
                 require_any_sdk_event.sdk_event,
                 check_prerequisites(require_any_sdk_event.sdk_event) &&
                 check_suppressed_by(require_any_sdk_event.sdk_event)
@@ -180,10 +178,10 @@ def execution_limit(sdk_event)
         end
 
         def check_require_any(sdk_internal_event)
-          valid_sdk_event = ValidSdkEvent.new(nil, false)
+          valid_sdk_event = Engine::Models::ValidSdkEvent.new(nil, false)
           @manager_config.require_any.each do |name, val|
             if val.include?(sdk_internal_event)
-              valid_sdk_event = ValidSdkEvent.new(name, true)
+              valid_sdk_event = Engine::Models::ValidSdkEvent.new(name, true)
               return valid_sdk_event
             end
           end