Move more methods into <RACStream>

GHAPIDemo/GHAPIDemo/GHDLoginViewController.m

@@ -8,6 +8,7 @@
 
 #import "GHDLoginViewController.h"
 #import "EXTKeyPathCoding.h"
+#import "EXTScope.h"
 #import "GHDLoginView.h"
 #import "GHGitHubClient.h"
 #import "GHGitHubUser.h"
@@ -49,16 +50,16 @@ - (id)init {
 		}]
 		block:NULL];
 
-	[[self.loginCommand 
-		injectObjectWeakly:self] 
-		subscribeNext:^(RACTuple *t) {
-			GHDLoginViewController *self = t.last;
-			self.user = [GHGitHubUser userWithUsername:self.username password:self.password];
-			self.client = [GHGitHubClient clientForUser:self.user];
-			self.loggingIn = YES;
-		}];
+	@unsafeify(self);
+
+	[self.loginCommand subscribeNext:^(id _) {
+		@strongify(self);
+
+		self.user = [GHGitHubUser userWithUsername:self.username password:self.password];
+		self.client = [GHGitHubClient clientForUser:self.user];
+		self.loggingIn = YES;
+	}];
 
-	__block __unsafe_unretained id weakSelf = self;
 	// Note the -repeat and -asMaybes at the end. -repeat means that this
 	// Signal will resubscribe to its source right after it completes.
 	// This lets us subscribe to the same Signal even though the source
@@ -67,35 +68,35 @@ - (id)init {
 	// API hits an error, the Signal will still be valid.
 	RACSignal *loginResult = [[[self.loginCommand 
 		addAsyncBlock:^(id _) {
-			GHDLoginViewController *strongSelf = weakSelf;
-			return [strongSelf.client login];
+			@strongify(self);
+			return [self.client login];
 		}]
 		asMaybes] 
 		repeat];
 
 	// Since we used -asMaybes above, we'll need to filter out the specific
 	// error or success cases.
-	[[[[loginResult 
+	[[[loginResult 
 		filter:^(id x) {
 			return [x hasError];
 		}] 
 		map:^(id x) {
 			return [x error];
 		}] 
-		injectObjectWeakly:self]
-		subscribeNext:^(RACTuple *t) {
-			GHDLoginViewController *self = t.last;
+		subscribeNext:^(NSError *error) {
+			@strongify(self);
+
 			self.loginFailedHidden = NO;
-			NSLog(@"error logging in: %@", t.first);
+			NSLog(@"error logging in: %@", error);
 		}];
 
-	[[[loginResult 
+	[[loginResult 
 		filter:^(id x) {
 			return [x hasObject];
 		}]
-		injectObjectWeakly:self]
-		subscribeNext:^(RACTuple *t) {
-			GHDLoginViewController *self = t.last;
+		subscribeNext:^(id _) {
+			@strongify(self);
+
 			self.successHidden = NO;
 			[self.didLoginSubject sendNext:self.user];
 		}];
@@ -108,11 +109,11 @@ - (id)init {
 
 	// When either username or password change, hide the success or failure
 	// message.
-	[[[RACSignal
+	[[RACSignal
 		combineLatest:@[ RACAble(self.username), RACAble(self.password)]]
-		injectObjectWeakly:self] 
-		subscribeNext:^(RACTuple *t) {
-			GHDLoginViewController *self = t.last;
+		subscribeNext:^(id _) {
+			@strongify(self);
+
 			self.successHidden = self.loginFailedHidden = YES;
 		}];
 

GHAPIDemo/GHAPIDemo/GHDUserViewController.m

@@ -7,9 +7,10 @@
 //
 
 #import "GHDUserViewController.h"
+#import "EXTScope.h"
 #import "GHDUserView.h"
-#import "GHGitHubUser.h"
 #import "GHGitHubClient.h"
+#import "GHGitHubUser.h"
 #import "NSView+GHDExtensions.h"
 
 @interface GHDUserViewController ()
@@ -57,16 +58,17 @@ - (id)initWithUserAccount:(GHGitHubUser *)user {
 	self.client = [GHGitHubClient clientForUser:self.userAccount];
 	self.loading = YES;
 
-	__block __unsafe_unretained id weakSelf = self;
+	@unsafeify(self);
+
 	// We're using -merge: so that -fetchUser, -fetchRepos, and -fetchOrgs are 
 	// all executed independently. We're then told when they've all completed.
 	// -finally: lets us share logic regardless of whether we get an error or 
 	// complete successfully.
 	[[[RACSignal 
 		merge:[NSArray arrayWithObjects:[self fetchUser], [self fetchRepos], [self fetchOrgs], nil]] 
 		finally:^{
-			GHDUserViewController *strongSelf = weakSelf;
-			strongSelf.loading = NO;
+			@strongify(self);
+			self.loading = NO;
 		}]
 		subscribeNext:^(id x) {
 			// nothing
@@ -79,15 +81,15 @@ - (id)initWithUserAccount:(GHGitHubUser *)user {
 	// We're using -deliverOn: to load the image in a background queue and then 
 	// finish with another -deliverOn: so that subscribers get the result on the 
 	// main queue.
-	RACSignal *loadedAvatar = [[[[[RACAble(self.userAccount.avatarURL) 
+	RACSignal *loadedAvatar = [[[[RACAble(self.userAccount.avatarURL) 
 		filter:^ BOOL (id x) {
 			return x != nil;
 		}] 
 		deliverOn:[RACScheduler sharedOperationQueueScheduler]] 
-		injectObjectWeakly:self]
-		flattenMap:^(RACTuple *t) {
-			GHDUserViewController *self = t.last;
-			return [self loadImageAtURL:t.first];
+		flattenMap:^(NSURL *URL) {
+			@strongify(self);
+
+			return [self loadImageAtURL:URL];
 		}] 
 		deliverOn:[RACScheduler mainQueueScheduler]];
 
@@ -103,32 +105,31 @@ - (id)initWithUserAccount:(GHGitHubUser *)user {
 }
 
 - (RACSignal *)fetchUser {	
-	return [[[self.client 
+	@unsafeify(self);
+	return [[self.client 
 				fetchUserInfo] 
-				injectObjectWeakly:self]
-				map:^(RACTuple *t) {
-					GHDUserViewController *self = t.last;
-					[self.userAccount setValuesForKeysWithDictionary:t.first];
+				map:^(NSDictionary *userDict) {
+					@strongify(self);
+
+					[self.userAccount setValuesForKeysWithDictionary:userDict];
 					return [RACUnit defaultUnit];
 				}];
 }
 
 - (RACSignal *)fetchRepos {	
-	return [[[self.client 
+	return [[self.client 
 				fetchUserRepos] 
-				injectObjectWeakly:self] 
-				map:^(RACTuple *t) {
-					NSLog(@"repos: %@", t.first);
+				map:^(NSArray *repos) {
+					NSLog(@"repos: %@", repos);
 					return [RACUnit defaultUnit];
 				}];
 }
 
 - (RACSignal *)fetchOrgs {	
-	return [[[self.client 
-				fetchUserRepos] 
-				injectObjectWeakly:self]
-				map:^(RACTuple *t) {
-					NSLog(@"orgs: %@", t.first);
+	return [[self.client 
+				fetchUserOrgs] 
+				map:^(NSArray *orgs) {
+					NSLog(@"orgs: %@", orgs);
 					return [RACUnit defaultUnit];
 				}];
 }

ReactiveCocoaFramework/ReactiveCocoa/RACSignalProtocol.h

@@ -86,24 +86,6 @@ typedef NSInteger RACSignalError;
 // Convenience method to subscribe to `error` and `completed` events.
 - (RACDisposable *)subscribeError:(void (^)(NSError *error))errorBlock completed:(void (^)(void))completedBlock;
 
-// For each value sent on the receiving signal, the given object is sent on the
-// returned signal.
-//
-// object - The object to send for each value sent on the receiver.
-//
-// Returns a signal that sends the given object for each value sent on the
-// receiver.
-- (id<RACSignal>)mapReplace:(id)object;
-
-// Injects the given object weakly into the receiver's stream. The returned 
-// signal sends a tuple where the first object is the value received by the
-// receiver signal and the second is the weak object.
-//
-// This is most useful for bringing the caller's self into the signal while
-// preventing retain cycles so we don't always have to do the
-// weakObject / strongObject dance.
-- (id<RACSignal>)injectObjectWeakly:(id)object;
-
 // Do the given block on `next`. This should be used to inject side effects into
 // the signal.
 - (id<RACSignal>)doNext:(void (^)(id x))block;
@@ -197,11 +179,6 @@ typedef NSInteger RACSignalError;
 // block is called to get a new start object for each subscription.
 - (id<RACSignal>)aggregateWithStartFactory:(id (^)(void))startFactory combine:(id (^)(id running, id next))combineBlock;
 
-// Similar to -aggregateWithStart:combine: with an important difference: it
-// sends the combined value with each `next` instead of waiting for the
-// receiving signal to complete.
-- (id<RACSignal>)scanWithStart:(id)start combine:(id (^)(id running, id next))combineBlock;
-
 // Set the object's keyPath to the value of `next`.
 - (RACDisposable *)toProperty:(NSString *)keyPath onObject:(NSObject *)object;
 
@@ -215,12 +192,6 @@ typedef NSInteger RACSignalError;
 // Take `next`s until the `signalTrigger` sends a `next`.
 - (id<RACSignal>)takeUntil:(id<RACSignal>)signalTrigger;
 
-// Take `next`s until the given block returns YES.
-- (id<RACSignal>)takeUntilBlock:(BOOL (^)(id x))predicate;
-
-// Take `next`s until the given block returns NO.
-- (id<RACSignal>)takeWhileBlock:(BOOL (^)(id x))predicate;
-
 // Convert every `next` and `error` into a RACMaybe.
 - (id<RACSignal>)asMaybes;
 
@@ -244,12 +215,6 @@ typedef NSInteger RACSignalError;
 // Both success and error may be NULL.
 - (id)firstOrDefault:(id)defaultValue success:(BOOL *)success error:(NSError **)error;
 
-// Skips values until the block returns YES.
-- (id<RACSignal>)skipUntilBlock:(BOOL (^)(id x))block;
-
-// Skips values until the block returns NO.
-- (id<RACSignal>)skipWhileBlock:(BOOL (^)(id x))block;
-
 // Defer creation of a signal until the signal's actually subscribed to.
 //
 // This can be used to effectively turn a hot signal into a cold signal.

ReactiveCocoaFramework/ReactiveCocoa/RACSignalProtocol.m

@@ -117,26 +117,6 @@ - (RACDisposable *)subscribeError:(void (^)(NSError *))errorBlock completed:(voi
 	return [self subscribe:o];
 }
 
-- (id<RACSignal>)mapReplace:(id)object {
-	return [self map:^(id _) {
-		return object;
-	}];
-}
-
-- (id<RACSignal>)injectObjectWeakly:(id)object {
-	__unsafe_unretained id weakObject = object;
-	return [RACSignal createSignal:^(id<RACSubscriber> subscriber) {
-		return [self subscribeNext:^(id x) {
-			id strongObject = weakObject;
-			[subscriber sendNext:[RACTuple tupleWithObjectsFromArray:[NSArray arrayWithObjects:x ? : [RACTupleNil tupleNil], strongObject, nil]]];
-		} error:^(NSError *error) {
-			[subscriber sendError:error];
-		} completed:^{
-			[subscriber sendCompleted];
-		}];
-	}];
-}
-
 - (id<RACSignal>)doNext:(void (^)(id x))block {
 	NSParameterAssert(block != NULL);
 
@@ -670,23 +650,6 @@ - (RACDisposable *)subscribeError:(void (^)(NSError *))errorBlock completed:(voi
 	}];
 }
 
-- (id<RACSignal>)scanWithStart:(id)start combine:(id (^)(id running, id next))combineBlock {
-	NSParameterAssert(combineBlock != NULL);
-
-	return [RACSignal createSignal:^(id<RACSubscriber> subscriber) {
-		__block id runningValue = start;
-
-		return [self subscribeNext:^(id x) {
-			runningValue = combineBlock(runningValue, x);
-			[subscriber sendNext:runningValue];
-		} error:^(NSError *error) {
-			[subscriber sendError:error];
-		} completed:^{
-			[subscriber sendCompleted];
-		}];
-	}];
-}
-
 - (id<RACSignal>)aggregateWithStart:(id)start combine:(id (^)(id running, id next))combineBlock {
 	return [self aggregateWithStartFactory:^{
 		return start;
@@ -757,39 +720,6 @@ + (void)intervalTimerFired:(NSTimer *)timer {
 	}];
 }
 
-- (id<RACSignal>)takeUntilBlock:(BOOL (^)(id x))predicate {
-	NSParameterAssert(predicate != NULL);
-
-	return [RACSignal createSignal:^(id<RACSubscriber> subscriber) {
-		__block RACDisposable *selfDisposable = [self subscribeNext:^(id x) {
-			BOOL stop = predicate(x);
-			if(stop) {
-				[selfDisposable dispose], selfDisposable = nil;
-				[subscriber sendCompleted];
-				return;
-			}
-
-			[subscriber sendNext:x];
-		} error:^(NSError *error) {
-			[subscriber sendError:error];
-		} completed:^{
-			[subscriber sendCompleted];
-		}];
-
-		return [RACDisposable disposableWithBlock:^{
-			[selfDisposable dispose];
-		}];
-	}];
-}
-
-- (id<RACSignal>)takeWhileBlock:(BOOL (^)(id x))predicate {
-	NSParameterAssert(predicate != NULL);
-
-	return [self takeUntilBlock:^BOOL(id x) {
-		return !predicate(x);
-	}];
-}
-
 - (id<RACSignal>)switch {
 	return [RACSignal createSignal:^(id<RACSubscriber> subscriber) {
 		__block RACDisposable *innerDisposable = nil;
@@ -890,35 +820,6 @@ - (id)firstOrDefault:(id)defaultValue success:(BOOL *)success error:(NSError **)
 	}];
 }
 
-- (id<RACSignal>)skipUntilBlock:(BOOL (^)(id x))block {
-	NSParameterAssert(block != NULL);
-
-	return [RACSignal createSignal:^(id<RACSubscriber> subscriber) {
-		__block BOOL keepSkipping = YES;
-		return [self subscribeNext:^(id x) {
-			if(keepSkipping) {
-				keepSkipping = !block(x);
-			}
-
-			if(!keepSkipping) {
-				[subscriber sendNext:x];
-			}
-		} error:^(NSError *error) {
-			[subscriber sendError:error];
-		} completed:^{
-			[subscriber sendCompleted];
-		}];
-	}];
-}
-
-- (id<RACSignal>)skipWhileBlock:(BOOL (^)(id x))block {
-	NSParameterAssert(block != NULL);
-
-	return [self skipUntilBlock:^BOOL(id x) {
-		return !block(x);
-	}];
-}
-
 - (id<RACSignal>)distinctUntilChanged {
 	return [RACSignal createSignal:^(id<RACSubscriber> subscriber) {
 		__block id lastValue = nil;