Add take method.

leichunfeng · leichunfeng · commit ad29faa5bb94 · 2015-09-09T13:00:22.000+08:00
Former-commit-id: 3b3af2a
diff --git a/MVVMReactiveCocoa/ViewModel/MRCNewsViewModel.m b/MVVMReactiveCocoa/ViewModel/MRCNewsViewModel.m
@@ -115,7 +115,8 @@ - (RACSignal *)requestRemoteDataSignalWithPage:(NSUInteger)page {
         fetchSignal = [[self.services client] fetchPerformedEventsForUser:self.user offset:[self offsetForPage:page] perPage:self.perPage];
     }
     
-    return [[[fetchSignal
+    return [[[[fetchSignal
+        take:self.perPage]
     	collect]
     	doNext:^(NSArray *events) {
             if (self.isCurrentUser && page == 1) { // Cache the first page
diff --git a/MVVMReactiveCocoa/ViewModel/MRCOwnedReposViewModel.m b/MVVMReactiveCocoa/ViewModel/MRCOwnedReposViewModel.m
@@ -125,9 +125,10 @@ - (NSArray *)fetchLocalData {
 }
 
 - (RACSignal *)requestRemoteDataSignalWithPage:(NSUInteger)page {
-    return [[self.services
+    return [[[self.services
     	client]
-        fetchUserRepositories].collect;
+        fetchUserRepositories]
+    	collect];
 }
 
 - (NSArray *)sectionIndexTitlesWithRepositories:(NSArray *)repositories {
diff --git a/MVVMReactiveCocoa/ViewModel/MRCPublicReposViewModel.m b/MVVMReactiveCocoa/ViewModel/MRCPublicReposViewModel.m
@@ -53,9 +53,11 @@ - (NSArray *)fetchLocalData {
 
 - (RACSignal *)requestRemoteDataSignalWithPage:(NSUInteger)page {
     @weakify(self)
-    return [[[self.services
+    return [[[[[self.services
     	client]
-        fetchPublicRepositoriesForUser:self.user offset:[self offsetForPage:page] perPage:self.perPage].collect
+        fetchPublicRepositoriesForUser:self.user offset:[self offsetForPage:page] perPage:self.perPage]
+    	take:self.perPage]
+        collect]
     	map:^(NSArray *repositories) {
             @strongify(self)
             if (page != 1) {
diff --git a/MVVMReactiveCocoa/ViewModel/MRCStarredReposViewModel.m b/MVVMReactiveCocoa/ViewModel/MRCStarredReposViewModel.m
@@ -79,19 +79,22 @@ - (NSArray *)fetchLocalData {
 
 - (RACSignal *)requestRemoteDataSignalWithPage:(NSUInteger)page {
     if (self.isCurrentUser && self.entryPoint == MRCStarredReposViewModelEntryPointHomepage) {
-        return [[[self.services
+        return [[[[self.services
             client]
-            fetchUserStarredRepositories].collect
+            fetchUserStarredRepositories]
+        	collect]
             map:^(NSArray *repositories) {
                 for (OCTRepository *repo in repositories) {
                     repo.starredStatus = OCTRepositoryStarredStatusYES;
                 }
                 return repositories;
             }];
     } else {
-        return [[[[self.services
+        return [[[[[[self.services
         	client]
-            fetchStarredRepositoriesForUser:self.user offset:[self offsetForPage:page] perPage:self.perPage].collect
+            fetchStarredRepositoriesForUser:self.user offset:[self offsetForPage:page] perPage:self.perPage]
+        	take:self.perPage]
+            collect]
             doNext:^(NSArray *repositories) {
                 if (self.isCurrentUser) {
                     for (OCTRepository *repo in repositories) {
diff --git a/MVVMReactiveCocoa/ViewModel/MRCUserListViewModel.m b/MVVMReactiveCocoa/ViewModel/MRCUserListViewModel.m
@@ -115,9 +115,11 @@ - (RACSignal *)requestRemoteDataSignalWithPage:(NSUInteger)page {
     };
     
     if (self.type == MRCUserListViewModelTypeFollowers) {
-        return [[[[[self.services
+        return [[[[[[[self.services
         	client]
-            fetchFollowersForUser:self.user offset:[self offsetForPage:page] perPage:self.perPage].collect
+            fetchFollowersForUser:self.user offset:[self offsetForPage:page] perPage:self.perPage]
+            take:self.perPage]
+            collect]
         	map:^(NSArray *users) {
                 for (OCTUser *user in users) {
                     if (self.isCurrentUser) user.followerStatus = OCTUserFollowerStatusYES;
@@ -134,9 +136,11 @@ - (RACSignal *)requestRemoteDataSignalWithPage:(NSUInteger)page {
                 }
             }];
     } else if (self.type == MRCUserListViewModelTypeFollowing) {
-        return [[[[[self.services
+        return [[[[[[[self.services
             client]
-            fetchFollowingForUser:self.user offset:[self offsetForPage:page] perPage:self.perPage].collect
+            fetchFollowingForUser:self.user offset:[self offsetForPage:page] perPage:self.perPage]
+        	take:self.perPage]
+            collect]
             map:^(NSArray *users) {
                 for (OCTUser *user in users) {
                     if (self.isCurrentUser) user.followingStatus = OCTUserFollowingStatusYES;

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,8 @@ - (RACSignal *)requestRemoteDataSignalWithPage:(NSUInteger)page {`
`115`	`115`	`fetchSignal = [[self.services client] fetchPerformedEventsForUser:self.user offset:[self offsetForPage:page] perPage:self.perPage];`
`116`	`116`	`}`
`117`	`117`
`118`		`- return [[[fetchSignal`
	`118`	`+ return [[[[fetchSignal`
	`119`	`+ take:self.perPage]`
`119`	`120`	`collect]`
`120`	`121`	`doNext:^(NSArray *events) {`
`121`	`122`	`if (self.isCurrentUser && page == 1) { // Cache the first page`
Original file line number	Diff line number	Diff line change
`@@ -125,9 +125,10 @@ - (NSArray *)fetchLocalData {`
`125`	`125`	`}`
`126`	`126`
`127`	`127`	`- (RACSignal *)requestRemoteDataSignalWithPage:(NSUInteger)page {`
`128`		`- return [[self.services`
	`128`	`+ return [[[self.services`
`129`	`129`	`client]`
`130`		`- fetchUserRepositories].collect;`
	`130`	`+ fetchUserRepositories]`
	`131`	`+ collect];`
`131`	`132`	`}`
`132`	`133`
`133`	`134`	`- (NSArray )sectionIndexTitlesWithRepositories:(NSArray )repositories {`