default cancelable subscribables to use a replay subject but allow ov…

…erriding
sam-splat · Jul 20, 2012 · 7ce6ace · 7ce6ace
1 parent aeb1b3f
commit 7ce6ace
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 2 deletions.
diff --git a/ReactiveCocoaFramework/ReactiveCocoa/RACCancelableSubscribable+Private.h b/ReactiveCocoaFramework/ReactiveCocoa/RACCancelableSubscribable+Private.h
@@ -11,6 +11,8 @@
 
 @interface RACCancelableSubscribable ()
 
+// Defaults to using a RACReplaySubject.
 + (RACCancelableSubscribable *)cancelableSubscribableSourceSubscribable:(id<RACSubscribable>)subscribable withBlock:(void (^)(void))block;
++ (RACCancelableSubscribable *)cancelableSubscribableSourceSubscribable:(id<RACSubscribable>)sourceSubscribable subject:(RACSubject *)subject withBlock:(void (^)(void))block;
 
 @end
diff --git a/ReactiveCocoaFramework/ReactiveCocoa/RACCancelableSubscribable.m b/ReactiveCocoaFramework/ReactiveCocoa/RACCancelableSubscribable.m
@@ -9,7 +9,7 @@
 #import "RACCancelableSubscribable.h"
 #import "RACSubscribable+Private.h"
 #import "RACConnectableSubscribable+Private.h"
-#import "RACSubject.h"
+#import "RACReplaySubject.h"
 
 @interface RACCancelableSubscribable ()
 @property (nonatomic, copy) void (^cancelBlock)(void);
@@ -36,7 +36,11 @@ - (void)tearDown {
 @synthesize cancelBlock;
 
 + (RACCancelableSubscribable *)cancelableSubscribableSourceSubscribable:(id<RACSubscribable>)sourceSubscribable withBlock:(void (^)(void))block {
-	RACCancelableSubscribable *subscribable = [self connectableSubscribableWithSourceSubscribable:sourceSubscribable subject:[RACSubject subject]];
+	return [self cancelableSubscribableSourceSubscribable:sourceSubscribable subject:[RACReplaySubject subject] withBlock:block];
+}
+
++ (RACCancelableSubscribable *)cancelableSubscribableSourceSubscribable:(id<RACSubscribable>)sourceSubscribable subject:(RACSubject *)subject withBlock:(void (^)(void))block {
+	RACCancelableSubscribable *subscribable = [self connectableSubscribableWithSourceSubscribable:sourceSubscribable subject:subject];
 	[subscribable connect];
 	subscribable.cancelBlock = block;
 	return subscribable;

diff --git a/ReactiveCocoaFramework/ReactiveCocoa/RACSubscribable+Operations.h b/ReactiveCocoaFramework/ReactiveCocoa/RACSubscribable+Operations.h
@@ -240,6 +240,10 @@ typedef NSInteger RACSubscribableError;
 // Resubscribes to the receiving subscribable if an error occurs.
 - (RACSubscribable *)retry;
 
+// Creates a cancelable subscribable multicasted to the given subject with the
+// given cancelation block.
+- (RACCancelableSubscribable *)asCancelableToSubject:(RACSubject *)subject withBlock:(void (^)(void))block;
+
 // Creates a cancelable subscribable with the given cancelation block.
 - (RACCancelableSubscribable *)asCancelableWithBlock:(void (^)(void))block;
 

diff --git a/ReactiveCocoaFramework/ReactiveCocoa/RACSubscribable+Operations.m b/ReactiveCocoaFramework/ReactiveCocoa/RACSubscribable+Operations.m
@@ -1092,6 +1092,10 @@ - (RACSubscribable *)retry {
 	return [self retry:0];
 }
 
+- (RACCancelableSubscribable *)asCancelableToSubject:(RACSubject *)subject withBlock:(void (^)(void))block {
+	return [RACCancelableSubscribable cancelableSubscribableSourceSubscribable:self subject:subject withBlock:block];
+}
+
 - (RACCancelableSubscribable *)asCancelableWithBlock:(void (^)(void))block {
 	return [RACCancelableSubscribable cancelableSubscribableSourceSubscribable:self withBlock:block];
 }