Merge branch 'master' of github.com:rails/rails

1 files changed, 15 insertions, 5 deletions

diff --git a/activesupport/lib/active_support/notifications/fanout.rb b/activesupport/lib/active_support/notifications/fanout.rb
index a3ddc7705a..300ec842a9 100644
--- a/activesupport/lib/active_support/notifications/fanout.rb
+++ b/activesupport/lib/active_support/notifications/fanout.rb
@@ -19,8 +19,8 @@ module ActiveSupport
       end
 
       def unsubscribe(subscriber)
-        @subscribers.delete(subscriber)
         @listeners_for.clear
+        @subscribers.reject! {|s| s.matches?(subscriber)}
       end
 
       def publish(name, *args)
@@ -60,7 +60,7 @@ module ActiveSupport
         end
 
         def publish(*args)
-          return unless matches?(args.first)
+          return unless subscribed_to?(args.first)
           push(*args)
           true
         end
@@ -69,10 +69,20 @@ module ActiveSupport
           true
         end
 
-        private
-          def matches?(name)
-            !@pattern || @pattern =~ name.to_s
+        def subscribed_to?(name)
+          !@pattern || @pattern =~ name.to_s
+        end
+
+        def matches?(subscriber_or_name)
+          case subscriber_or_name
+          when String
+            @pattern && @pattern =~ subscriber_or_name
+          when self
+            true
           end
+        end
+
+        private
 
           def push(*args)
             @block.call(*args)