Complete when NSUserDefaults deallocates

TeaWhen · Dec 23, 2013 · 71c8af0 · 71c8af0
1 parent dd5d9fa
commit 71c8af0
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/ReactiveCocoaFramework/ReactiveCocoa/NSUserDefaults+RACSupport.m b/ReactiveCocoaFramework/ReactiveCocoa/NSUserDefaults+RACSupport.m
@@ -13,6 +13,7 @@
 #import "RACScheduler.h"
 #import "RACSignal+Operations.h"
 #import "NSNotificationCenter+RACSupport.h"
+#import "NSObject+RACDeallocating.h"
 #import "NSObject+RACLifting.h"
 
 @implementation NSUserDefaults (RACSupport)
@@ -24,7 +25,7 @@ - (RACChannelTerminal *)rac_channelTerminalForKey:(NSString *)key {
 	__block BOOL ignoreNextValue = NO;
 
 	@weakify(self);
-	[[[[[[NSNotificationCenter.defaultCenter
+	[[[[[[[NSNotificationCenter.defaultCenter
 		rac_addObserverForName:NSUserDefaultsDidChangeNotification object:self]
 		map:^(id _) {
 			@strongify(self);
@@ -40,6 +41,7 @@ - (RACChannelTerminal *)rac_channelTerminalForKey:(NSString *)key {
 			return YES;
 		}]
 		distinctUntilChanged]
+		takeUntil:self.rac_willDeallocSignal]
 		subscribe:channel.leadingTerminal];
 
 	[[channel.leadingTerminal

diff --git a/ReactiveCocoaFramework/ReactiveCocoaTests/NSUserDefaultsRACSupportSpec.m b/ReactiveCocoaFramework/ReactiveCocoaTests/NSUserDefaultsRACSupportSpec.m
@@ -104,4 +104,14 @@ @implementation TestObserver
 	expect(value).to.beNil();
 });
 
+it(@"should complete when the NSUserDefaults deallocates", ^{
+	defaults = [NSUserDefaults new];
+
+	RACChannelTerminal *terminal = [defaults rac_channelTerminalForKey:NSUserDefaultsRACSupportSpecStringDefault];
+
+	defaults = nil;
+
+	expect([terminal asynchronouslyWaitUntilCompleted:NULL]).to.beTruthy();
+});
+
 SpecEnd