lib/metacosm/simulation.rb in metacosm-0.2.3 vs lib/metacosm/simulation.rb in metacosm-0.2.4

@@ -64,19 +64,31 @@
     end
 
     protected
     def handler_for(command)
       @handlers ||= {}
-      @handlers[command.class] ||= Object.const_get(command.class.name.split('::').last + "Handler").new
+      @handlers[command.class] ||= construct_handler_for(command)
     end
 
+    def construct_handler_for(command)
+      #binding.pry
+      module_name = command.class.name.deconstantize # || "Object"
+      module_name = "Object" if module_name.empty?
+      (module_name.constantize).
+      #Object.
+        const_get(command.class.name.demodulize + "Handler").new
+      #Object
+    end
+
     def listener_for(event)
       @listeners ||= {}
       @listeners[event.class] ||= construct_listener_for(event)
     end
 
     def construct_listener_for(event)
-      listener = Object.const_get(event.class.name.split('::').last + "Listener").new(self)
+      module_name = event.class.name.deconstantize # || "Object"
+      module_name = "Object" if module_name.empty?
+      listener = (module_name.constantize).const_get(event.class.name.demodulize + "Listener").new(self)
       listener
     end
   end
 end