lib/waffle/event.rb in waffle-0.3.5 vs lib/waffle/event.rb in waffle-0.4.0

@@ -1,34 +1,16 @@
-require 'singleton'
-
 module Waffle
   class Event
-    include Singleton
-
     class << self
-      # Syntactic sugar ^_^
-      def occured(*args)
-        self.instance.occured(*args)
-      end
-      alias :occurred :occured
-    end
+      def occured(event_name = 'event', event_data = nil)
+        unless event_data.is_a?(Hash)
+          event_data = {'body' => event_data.to_s}
+        end
 
-    def transport
-      @transport ||= Waffle::Base.new eval("Waffle::Transports::#{Waffle::Config.transport.capitalize}").new
-    end
+        event_data.merge!({'occured_at' => Time.now})
 
-    def encoder
-      @encoder ||= eval("Waffle::Encoders::#{Waffle::Config.encoder.capitalize}")
-    end
-
-    def occured(event_name = 'event', event_data = nil)
-      unless event_data.is_a? Hash
-        event_data = {'body' => event_data.to_s}
+        Waffle.publish(event_name, event_data)
       end
-
-      event_data.merge!({'occured_at' => Time.now})
-
-      transport.publish event_name, encoder.encode(event_data)
+      alias :occurred :occured
     end
-
   end
 end