Implicit unsubscription works

pdcawley · Oct 15, 2011 · 6cf8b58 · 6cf8b58
1 parent 8036807
commit 6cf8b58
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 13 deletions.
diff --git a/lib/Announcements/Subscription.pm b/lib/Announcements/Subscription.pm
@@ -16,9 +16,12 @@ has do => (
     required => 1,
 );
 
-has for => (
+has subscriber => (
-    is => 'ro',
+    is        => 'ro',
-    isa => 'Ref',
+    isa       => 'Ref',
+    init_arg  => 'for',
+    predicate => 'has_subscriber',
+    weak_ref  => 1
 );
 
 has _registry => (
@@ -51,20 +54,23 @@ sub BUILDARGS {
     return $params;
 }
 
-
-
 sub send {
     my $self         = shift;
     my $announcement = shift;
     my $announcer    = shift;
 
-    return unless $self->matches($announcement, $announcer);
+    if ($self->has_subscriber && !$self->subscriber) {
-
+        $self->unsubscribe;
-    $self->do->(
+    }
-        $announcement,
+    else {
-        $announcer,
+        return unless $self->matches($announcement, $announcer);
-        $self,
+
-    );
+        $self->do->(
+            $announcement,
+            $announcer,
+            $self,
+        );
+    }
 }
 
 sub matches {

diff --git a/lib/Announcements/SubscriptionRegistry.pm b/lib/Announcements/SubscriptionRegistry.pm
@@ -50,7 +50,7 @@ sub _subscriptions_for {
 
     my @subs = @_;
     $self->_foreach_subscription(sub {
-        my $for = $_->for;
+        my $for = $_->subscriber;
         push @subs, $_ if $for && $for == $subscriber;
     });
     return @subs;

diff --git a/t/unsubscribing.t b/t/unsubscribing.t
@@ -189,6 +189,33 @@ subtest "unsubscription by subscriber" => sub {
     is $count, 1;
 };
 
+subtest "subscriptions disappear when a subscriber disappears" => sub {
+    my $button = PushedButton->new;
+
+    my $subscriber = {};
+
+    my $count = 0;
+
+    $button->add_subscription(
+        when => 'PushedButton',
+        do   => sub { $count++ },
+        for => $subscriber,
+    );
+
+    $button->add_subscription(
+        when => 'PushedButton',
+        do => sub { $count++ },
+    );
+
+    $button->push;
+    is $count, 2;
+
+    $count = 0;
+    $subscriber = undef;
+    $button->push;
+    is $count, 1;
+};
+
 
 done_testing;