lib/emittance/dispatcher.rb in emittance-0.0.2 vs lib/emittance/dispatcher.rb in emittance-0.0.3

@@ -8,108 +8,57 @@
     @registrations = {}
     @enabled = true
 
     class << self
       def process_event(event)
-        new.process_event event
+        registrations_for(event).each do |registration|
+          registration.call event
+        end
       end
 
+      def registrations_for(identifier)
+        event_klass = find_event_klass identifier
+        registrations[event_klass] ||= empty_registration
+        registrations[event_klass]
+      end
+
       def register(identifier, &callback)
-        identifier = normalize_identifier identifier
-        registrations[identifier] ||= empty_registration
-        registrations_for(identifier) << Emittance::Registration.new(identifier, &callback)
+        event_klass = find_event_klass identifier
+        registrations[event_klass] ||= empty_registration
+        registrations_for(event_klass) << Emittance::Registration.new(event_klass, &callback)
+
+        callback
       end
 
       def register_method_call(identifier, object, method_name)
         register identifier, &lambda_for_method_call(object, method_name)
       end
 
       def clear_registrations!
-        registrations.keys.each do |identifier|
-          clear_registrations_for! identifier
+        registrations.each_key do |event_klass|
+          clear_registrations_for! event_klass
         end
       end
 
       def clear_registrations_for!(identifier)
-        identifier = normalize_identifier identifier
-        registrations[identifier].clear
+        event_klass = find_event_klass identifier
+        registrations[event_klass].clear
       end
 
-      def registrations_for(identifier)
-        identifier = normalize_identifier identifier
-        registrations[identifier] || empty_registration
-      end
-
-      def enable!
-        @enabled = true
-      end
-
-      def disable!
-        @enabled = false
-      end
-
-      def enabled?
-        @enabled
-      end
-
       private
 
-      attr_accessor :enabled, :registrations
+      attr_accessor :registrations
 
       def empty_registration
         Set.new
       end
 
-      def normalize_identifier(identifier)
-        if event_klass?(identifier) || event_object?(identifier)
-          identifier.identifier
-        else
-          coerce_identifier_type identifier
-        end
+      def find_event_klass(event)
+        Emittance::EventLookup.find_event_klass(event)
       end
 
       def lambda_for_method_call(object, method_name)
         ->(event) { object.send method_name, event }
       end
-
-      def event_klass?(identifier)
-        identifier.is_a?(Class) && identifier < Emittance::Event
-      end
-
-      def event_object?(identifier)
-        identifier.is_a? Emittance::Event
-      end
-
-      def coerce_identifier_type(identifier)
-        identifier.to_sym
-      end
-    end
-
-    def initialize(suppressed = false)
-      @suppressed = suppressed
-    end
-
-    def process_event(event)
-      return unless enabled?
-
-      registrations_for(event).each do |registration|
-        registration.call event
-      end
-    end
-
-    private
-
-    attr_reader :suppressed
-
-    def registrations_for(event)
-      self.class.registrations_for event
-    end
-
-    def enabled?
-      self.class.enabled? && !suppressed?
-    end
-
-    def suppressed?
-      suppressed
     end
   end
 end