Merge pull request #207 from derrh/master

Maybe not critical, but good housekeeping?

Author: bdpluim

CanvasKit.podspec

@@ -1,11 +1,11 @@
 Pod::Spec.new do |s|
   s.name     = 'CanvasKit'
-  s.version  = '0.6.48'
+  s.version  = '0.6.49'
   s.license  = 'MIT'
   s.summary  = 'A Canvas API integration framework better than bamboo'
   s.homepage = 'https://github.com/instructure/CanvasKit'
   s.authors  = { 'Rick Roberts' => 'elgreco84@gmail.com', 'Jason Larsen' => 'jason.larsen@gmail.com' }
-  s.source   = { :git => 'https://github.com/instructure/CanvasKit.git', :tag => '0.6.48' }
+  s.source   = { :git => 'https://github.com/instructure/CanvasKit.git', :tag => '0.6.49' }
   s.requires_arc = true
 
   s.ios.deployment_target = '7.0'

CanvasKit/Networking/CKIClient.m

@@ -8,6 +8,7 @@
 #import <ReactiveCocoa/ReactiveCocoa.h>
 #import <AFNetworking/AFHTTPRequestOperation.h>
 #import <Mantle/Mantle.h>
+#import <Mantle/EXTScope.h>
 
 #import "CKIClient.h"
 #import "CKIClient+CKIUser.h"
@@ -27,6 +28,7 @@ @interface CKIClient ()
 @property (nonatomic, strong) NSString *clientSecret;
 @property (nonatomic, strong) NSString *accessToken;
 @property (nonatomic, strong) CKIUser *currentUser;
+@property (nonatomic, assign) BOOL invalidated;
 
 #if TARGET_IPHONE_SIMULATOR || TARGET_OS_IPHONE
 @property (nonatomic, weak) UIViewController *webLoginViewController;
@@ -46,6 +48,13 @@ - (instancetype)initWithBaseURL:(NSURL *)url
 
         [self setRequestSerializer:[AFJSONRequestSerializer serializer]];
         [self setResponseSerializer:[AFJSONResponseSerializer serializerWithReadingOptions:NSJSONReadingAllowFragments]];
+        
+        @weakify(self);
+        [self setSessionDidBecomeInvalidBlock:^(NSURLSession *session, NSError *error) {
+            @strongify(self);
+            
+            self.invalidated = true;
+        }];
     }
     return self;
 }
@@ -89,6 +98,11 @@ - (id)copyWithZone:(NSZone *)zone
     dup.accessToken = self.accessToken;
     dup.currentUser = [self.currentUser copy];
     dup.actAsUserID = self.actAsUserID;
+    @weakify(dup);
+    [self setSessionDidBecomeInvalidBlock:^(NSURLSession *session, NSError *error) {
+        @strongify(dup);
+        dup.invalidated = true;
+    }];
     return dup;
 }
 
@@ -250,6 +264,11 @@ - (RACSignal *)fetchResponseAtPath:(NSString *)path parameters:(NSDictionary *)p
     NSDictionary *newParameters = [@{@"per_page": @50} dictionaryByAddingObjectsFromDictionary:parameters];
 
     return [[[RACSignal createSignal:^RACDisposable *(id <RACSubscriber> subscriber) {
+        if (self.invalidated) {
+            [subscriber sendCompleted];
+            return [RACDisposable disposableWithBlock:^{}];
+        }
+        
         NSDictionary *finalParameters = newParameters;
         if ([self.actAsUserID length]) {
             finalParameters = [@{@"as_user_id": self.actAsUserID} dictionaryByAddingObjectsFromDictionary:finalParameters];
@@ -359,6 +378,11 @@ - (RACSignal *)createModelAtPath:(NSString *)path parameters:(NSDictionary *)par
     NSAssert([modelClass isSubclassOfClass:[CKIModel class]], @"Can only create CKIModels");
 
     return [RACSignal createSignal:^RACDisposable *(id<RACSubscriber> subscriber) {
+        if (self.invalidated) {
+            [subscriber sendCompleted];
+            return [RACDisposable disposableWithBlock:^{}];
+        }
+        
         NSURLSessionDataTask *task = [self POST:path parameters:parameters success:^(NSURLSessionDataTask *task, id responseObject) {
 
             NSString *jsonContentKey = [modelClass keyForJSONAPIContent];
@@ -383,6 +407,11 @@ - (RACSignal *)createModelAtPath:(NSString *)path parameters:(NSDictionary *)par
 - (RACSignal *)updateModel:(CKIModel *)model parameters:(NSDictionary *)parameters
 {
     return [RACSignal createSignal:^RACDisposable *(id<RACSubscriber> subscriber) {
+        if (self.invalidated) {
+            [subscriber sendCompleted];
+            return [RACDisposable disposableWithBlock:^{}];
+        }
+        
         NSURLSessionDataTask *task = [self PUT:model.path parameters:parameters success:^(NSURLSessionDataTask *task, id responseObject) {
             Class modelClass = model.class;
             NSAssert([modelClass isSubclassOfClass:[CKIModel class]], @"Can only create CKIModels");