Notifier API == Fanout API, so replace Notifier with Fanout as they quack the same

2 files changed, 3 insertions, 29 deletions

diff --git a/activesupport/lib/active_support/log_subscriber/test_helper.rb b/activesupport/lib/active_support/log_subscriber/test_helper.rb
index 96506a4b2b..a3fb92778b 100644
--- a/activesupport/lib/active_support/log_subscriber/test_helper.rb
+++ b/activesupport/lib/active_support/log_subscriber/test_helper.rb
@@ -33,7 +33,7 @@ module ActiveSupport
     module TestHelper
       def setup
         @logger   = MockLogger.new
-        @notifier = ActiveSupport::Notifications::Notifier.new(queue)
+        @notifier = ActiveSupport::Notifications::Fanout.new
 
         ActiveSupport::LogSubscriber.colorize_logging = false
 
@@ -81,10 +81,6 @@ module ActiveSupport
       def set_logger(logger)
         ActiveSupport::LogSubscriber.logger = logger
       end
-
-      def queue
-        ActiveSupport::Notifications::Fanout.new
-      end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/activesupport/lib/active_support/notifications.rb b/activesupport/lib/active_support/notifications.rb
index bb5f497c83..93d1907edc 100644
--- a/activesupport/lib/active_support/notifications.rb
+++ b/activesupport/lib/active_support/notifications.rb
@@ -47,34 +47,12 @@ module ActiveSupport
       delegate :instrument, :to => :instrumenter
 
       def notifier
-        @notifier ||= Notifier.new
+        @notifier ||= Fanout.new
       end
 
       def instrumenter
         Thread.current[:"instrumentation_#{notifier.object_id}"] ||= Instrumenter.new(notifier)
       end
     end
-
-    class Notifier
-      def initialize(queue = Fanout.new)
-        @queue = queue
-      end
-
-      def publish(*args)
-        @queue.publish(*args)
-      end
-
-      def subscribe(pattern = nil, &block)
-        @queue.subscribe(pattern, &block)
-      end
-
-      def unsubscribe(subscriber)
-        @queue.unsubscribe(subscriber)
-      end
-
-      def wait
-        @queue.wait
-      end
-    end
   end
 end