lib/chatterbox.rb in chatterbox-0.4.0 vs lib/chatterbox.rb in chatterbox-0.5.0

@@ -1,51 +1,48 @@
-require File.join(File.dirname(__FILE__), *%w[chatterbox notification])
-require File.join(File.dirname(__FILE__), *%w[consumers])
+require 'active_support'
 
 module Chatterbox
-
   def handle_notice(message)
     publish_notice(message)
+    message
   end
+  
+  alias_method :notify, :handle_notice
 
   def publish_notice(message)
-    Publishers.publishers.each { |p| p.call(message) }
+    Publishers.publishers.each { |p| p.call(message.with_indifferent_access) }
   end
   
   def logger
-    @logger ||= rails_default_logger || Logger.new(STDOUT)
+    @logger ||= Logger.new(nil)
   end
   
   def logger=(logger)
     @logger = logger
   end
   
-  def rails_default_logger
-    defined?(RAILS_DEFAULT_LOGGER) ? RAILS_DEFAULT_LOGGER : nil
+  def register(&blk)
+    Publishers.register(&blk)
   end
   
   extend self
   
   module Publishers
-
-    class << self
-
-      def publishers
-        @publishers ||= []
-      end
+    def publishers
+      @publishers ||= []
+    end
       
-      def register(&blk)
-        Chatterbox.logger.debug { "Registering publisher: #{blk}"}
-        publishers << blk
-        blk
-      end
-      
-      def clear!
-        @publishers = []
-      end
-
+    def register(&blk)
+      Chatterbox.logger.debug { "Registering publisher: #{blk}"}
+      publishers << blk
+      blk
     end
     
+    def clear!
+      @publishers = []
+    end
+
+    extend self
   end
-  
 end
 
+require "chatterbox/services"
\ No newline at end of file