kylefang/GroceryList
1
0
Fork 0
mirror of https://github.com/zhigang1992/GroceryList.git synced 2026-04-30 13:01:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update code for OctoKit and RAC breaking changes

Browse Source
This commit is contained in:
Justin Spahr-Summers
2014-05-25 14:33:10 -07:00
parent 763e61681c
commit a8ba534a8c
2 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
GroceryList/GCYGroceryListViewModel.m
View File

@@ -95,7 +95,6 @@
ignore:nil]
map:^(NSArray *items) {
return [items.rac_signal flattenMap:^(GCYGroceryItemViewModel *viewModel) {
@strongify(self);
return [[RACObserve(viewModel, inCart)
skip:1]
mapReplace:viewModel];
@@ -151,15 +150,13 @@
}]
action];
RACAction *editItemAction = [[RACSamplingSignalGenerator
generatorBySampling:[RACObserve(self, list) ignore:nil]
forGenerator:[RACDynamicSignalGenerator generatorWithBlock:^(RACTuple *xs) {
GCYGroceryItem *item = xs[0];
GCYGroceryList *list = xs[1];
RACAction *editItemAction = [[RACDynamicSignalGenerator
generatorWithBlock:^(GCYGroceryItem *item) {
@strongify(self);
id viewModel = [[GCYEditableGroceryItemViewModel alloc] initWithList:list item:item];
id viewModel = [[GCYEditableGroceryItemViewModel alloc] initWithList:self.list item:item];
return [RACSignal return:viewModel];
}]]
}]
action];
RAC(self, editingItem) = editItemAction.results;
@@ -186,7 +183,6 @@
map:^(NSArray *items) {
NSArray *inCartSignals = [[[items.rac_signal
map:^(GCYGroceryItemViewModel *viewModel) {
@strongify(self);
return RACObserve(viewModel, inCart);
}]
startWith:[RACSignal return:@NO]]
@@ -237,10 +233,11 @@
catchTo:[RACSignal empty]];
}]
flattenMap:^(GCYGroceryListViewModel *viewModel) {
return [[[viewModel.loadItemsAction
return [[[[viewModel.loadItemsAction
signalWithValue:nil]
concat:[RACSignal return:RACUnit.defaultUnit]]
catchTo:[RACSignal empty]];
ignoreValues]
catchTo:[RACSignal empty]]
materialize];
}]
take:1]
subscribe:nil];

2
GroceryList/GCYUserController.m
View File

@@ -72,7 +72,7 @@
NSURLCredential *credential = [NSURLCredentialStorage.sharedCredentialStorage defaultCredentialForProtectionSpace:self.protectionSpace];
if (credential == nil || !credential.hasPassword) return [RACSignal empty];
OCTUser *user = [OCTUser userWithLogin:credential.user server:OCTServer.dotComServer];
OCTUser *user = [OCTUser userWithRawLogin:credential.user server:OCTServer.dotComServer];
return [RACSignal return:[OCTClient authenticatedClientWithUser:user token:credential.password]];
}];
}