Update user-streams branch to use AFNetworking 2

.gitmodules

@@ -1,7 +1,6 @@
 [submodule "External/AFNetworking"]
 	path = External/AFNetworking
-	url = https://github.com/AFNetworking/AFNetworking
-	ignore = dirty
-[submodule "SocketShuttle"]
+	url = https://github.com/AFNetworking/AFNetworking.git
+[submodule "External/SocketShuttle"]
 	path = External/SocketShuttle
-	url=https://github.com/joeldev/SocketShuttle.git
+	url = https://github.com/tonyarnold/SocketShuttle.git

ADNKit-OSX/ADNKit-OSX-Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2</string>
+	<string>1.9.99</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

ADNKit/ADNKit.h

@@ -69,14 +69,15 @@
 #import <ADNKit/ANKOEmbed.h>
 
 #import <ADNKit/ANKValueTransformations.h>
-#import <ADNKit/ANKJSONRequestOperation.h>
 #import <ADNKit/ANKAPIResponse.h>
 #import <ADNKit/ANKAPIResponseMeta.h>
-#import <ADNKit/ANKJSONRequestOperation.h>
 #import <ADNKit/ANKPaginationSettings.h>
 #import <ADNKit/ANKGeneralParameters.h>
 #import <ADNKit/ANKSearchQuery.h>
 
+#import <ADNKit/ANKAPIRequestSerializer.h>
+#import <ADNKit/ANKAPIResponseSerializer.h>
+
 #import <ADNKit/ANKUsernameFormatter.h>
 
 #ifdef __IPHONE_OS_VERSION_MIN_REQUIRED

ADNKit/ANKAPIRequestSerializer.h

@@ -0,0 +1,11 @@
+//
+//  Created by Tony Arnold on 7/04/2014.
+//
+
+#import "AFURLRequestSerialization.h"
+
+@interface ANKAPIRequestSerializer : AFJSONRequestSerializer
+
+@property (strong) NSDictionary *defaultParameters;
+
+@end

ADNKit/ANKAPIRequestSerializer.m

@@ -0,0 +1,32 @@
+//
+//  Created by Tony Arnold on 7/04/2014.
+//
+
+#import "ANKAPIRequestSerializer.h"
+#import "ADNKit.h"
+
+@implementation ANKAPIRequestSerializer
+
+- (NSMutableURLRequest *)requestWithMethod:(NSString *)method
+                                 URLString:(NSString *)URLString
+                                parameters:(id)parameters
+                                     error:(NSError *__autoreleasing *)error
+{
+    if ((self.defaultParameters.count > 0) && [parameters isKindOfClass:[NSDictionary class]]) {
+        parameters = [(NSDictionary *)parameters ank_dictionaryByAppendingDictionary : self.defaultParameters];
+    }
+
+    NSMutableString *modifiedURLString = [URLString mutableCopy];
+
+    [self.defaultParameters enumerateKeysAndObjectsUsingBlock:^(NSString *key, NSString *obj, BOOL *stop) {
+                                NSString *delimiter = (NSNotFound == [modifiedURLString rangeOfString:@"?"].location) ? @"?" : @"&";
+                                [modifiedURLString appendFormat:@"%@%@=%@", delimiter, key, obj];
+                            }];
+
+    return [super requestWithMethod:method
+                          URLString:modifiedURLString
+                         parameters:parameters
+                              error:error];
+}
+
+@end

ADNKit/ANKAPIResponse.h

@@ -1,9 +1,9 @@
 /*
  Copyright (c) 2013, Joel Levin
  All rights reserved.
- 
+
  Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
- 
+
  Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
  Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
  Neither the name of ADNKit nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
@@ -23,6 +23,6 @@ static NSString *const kANKAPIResponseKey = @"ANKAPIResponse";
 @property (readonly, strong) id data;
 @property (readonly, strong) ANKAPIResponseMeta *meta;
 
-- (id)initWithResponseObject:(id)responseObject;
+- (id)initWithResponseObject:(id)responseObject andHeaders:(NSDictionary*)headers;
 
 @end

ADNKit/ANKAPIResponse.m

@@ -1,16 +1,17 @@
 /*
  Copyright (c) 2013, Joel Levin
  All rights reserved.
- 
+
  Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
- 
+
  Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
  Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
  Neither the name of ADNKit nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #import "ANKAPIResponse.h"
+#import "ANKResourceMap.h"
 #import "ANKAPIResponseMeta.h"
 
 
@@ -24,12 +25,20 @@ @interface ANKAPIResponse ()
 
 @implementation ANKAPIResponse
 
-- (id)initWithResponseObject:(id)responseObject {
+- (id)initWithResponseObject:(id)responseObject andHeaders:(NSDictionary*)headers{
 	if ((self = [super init])) {
 		if ([responseObject isKindOfClass:[NSDictionary class]]) {
 			NSDictionary *responseDictionary = (NSDictionary *)responseObject;
 			self.data = responseDictionary[@"data"];
-			self.meta = [ANKAPIResponseMeta objectFromJSONDictionary:responseDictionary[@"meta"]];
+			self.meta = [ANKResolve(ANKAPIResponseMeta) objectFromJSONDictionary:responseDictionary[@"meta"]];
+
+			if (headers)
+			{
+				self.meta.rateLimitReset = [headers objectForKey:@"X-RateLimit-Reset"];
+				self.meta.rateLimitRemaining = [headers objectForKey:@"X-RateLimit-Remaining"];
+				self.meta.rateLimitLimit = [headers objectForKey:@"X-RateLimit-Limit"];
+				self.meta.rateLimitRetryAfter = [headers objectForKey:@"Retry-After"];
+			}
 		}
 	}
 	return self;

ADNKit/ANKAPIResponseMeta.h

@@ -59,6 +59,12 @@ static NSString *const kANKErrorIDKey = @"ANKErrorID";
 @property (strong) NSString *errorSlug;
 @property (strong) NSString *errorID;
 
+// rate limits
+@property (strong) NSString *rateLimitRemaining;
+@property (strong) NSString *rateLimitLimit;
+@property (strong) NSString *rateLimitReset;
+@property (strong) NSString *rateLimitRetryAfter;
+
 // user streaming properties
 @property (assign) BOOL isDeleted;
 @property (strong) NSString *deletedID;

ADNKit/ANKAPIResponseSerializer.h

@@ -0,0 +1,9 @@
+//
+//  Created by Tony Arnold on 7/04/2014.
+//
+
+#import "AFURLResponseSerialization.h"
+
+@interface ANKAPIResponseSerializer : AFJSONResponseSerializer
+
+@end

ADNKit/ANKAPIResponseSerializer.m

@@ -0,0 +1,34 @@
+//
+//  Created by Tony Arnold on 7/04/2014.
+//
+
+#import "ANKAPIResponseSerializer.h"
+#import "ADNKit.h"
+
+@implementation ANKAPIResponseSerializer
+
+- (id)responseObjectForResponse:(NSURLResponse *)response
+                           data:(NSData *)data
+                          error:(NSError *__autoreleasing *)error
+{
+    NSError *responseError;
+
+    id originalResponse = [super responseObjectForResponse:response data:data error:&responseError];
+
+    NSDictionary* headers = [(NSHTTPURLResponse *)response allHeaderFields];
+    ANKAPIResponse *apiResponse = [[ANKAPIResponse alloc] initWithResponseObject:originalResponse andHeaders:headers];
+
+    if (responseError) {
+        NSMutableDictionary *modifiedUserInfo = [responseError.userInfo mutableCopy];
+        modifiedUserInfo[kANKAPIResponseKey] = apiResponse;
+        responseError = [NSError errorWithDomain:responseError.domain code:responseError.code userInfo:modifiedUserInfo];
+    }
+
+    if (error && responseError) {
+        *error = responseError;
+    }
+
+    return apiResponse;
+}
+
+@end

ADNKit/ANKChannel.h

@@ -30,6 +30,8 @@
 @property (assign) BOOL isEditableByCurrentUser;
 @property (assign) BOOL isInactive;
 @property (assign) BOOL hasUnreadMessages;
+@property (assign) BOOL youMuted;
+@property (assign) BOOL autoSubscribe;
 
 - (BOOL)isPrivateMessageChannel;
 

ADNKit/ANKChannel.m

@@ -24,7 +24,9 @@ + (NSDictionary *)JSONToLocalKeyMapping {
 			@"has_unread": @"hasUnreadMessages",
 			@"recent_message_id": @"latestMessageID",
 			@"recent_message": @"latestMessage",
-            @"is_inactive" : @"isInactive"}];
+            @"is_inactive" : @"isInactive",
+            @"you_muted" : @"youMuted",
+            @"auto_subscribe" : @"autoSubscribe"}];
 }
 
 

ADNKit/ANKClient+ANKChannel.h

@@ -17,37 +17,40 @@
 
 @interface ANKClient (ANKChannel)
 
-- (ANKJSONRequestOperation *)fetchCurrentUserSubscribedChannelsWithCompletion:(ANKClientCompletionBlock)completionHandler;
-- (ANKJSONRequestOperation *)fetchCurrentUserSubscribedChannelsWithTypes:(NSArray *)types completion:(ANKClientCompletionBlock)completionHandler;
-- (ANKJSONRequestOperation *)fetchCurrentUserPrivateMessageChannelsWithCompletion:(ANKClientCompletionBlock)completionHandler;
-- (ANKJSONRequestOperation *)fetchCurrentUserCreatedChannelsWithCompletion:(ANKClientCompletionBlock)completionHandler;
-- (ANKJSONRequestOperation *)fetchUnreadPMChannelsCountWithCompletion:(ANKClientCompletionBlock)completionHandler;
-
-- (ANKJSONRequestOperation *)fetchChannelWithID:(NSString *)channelID completion:(ANKClientCompletionBlock)completionHandler;
-- (ANKJSONRequestOperation *)fetchChannelsWithIDs:(NSArray *)channelIDs completion:(ANKClientCompletionBlock)completionHandler;
-
-- (ANKJSONRequestOperation *)fetchUsersSubscribedToChannel:(ANKChannel *)channel completion:(ANKClientCompletionBlock)completionHandler;
-- (ANKJSONRequestOperation *)fetchUsersSubscribedToChannelWithID:(NSString *)channelID completion:(ANKClientCompletionBlock)completionHandler;
-- (ANKJSONRequestOperation *)fetchUserIDsSubscribedToChannel:(ANKChannel *)channel completion:(ANKClientCompletionBlock)completionHandler;
-- (ANKJSONRequestOperation *)fetchUserIDsSubscribedToChannelWithID:(NSString *)channelID completion:(ANKClientCompletionBlock)completionHandler;
-- (ANKJSONRequestOperation *)fetchUserIDsSubscribedToChannelIDs:(NSArray *)channelIDs completion:(ANKClientCompletionBlock)completionHandler;
-
-- (ANKJSONRequestOperation *)fetchMutedChannelsForCurrentUserWithCompletion:(ANKClientCompletionBlock)completionHandler;
-
-- (ANKJSONRequestOperation *)createChannel:(ANKChannel *)channel completion:(ANKClientCompletionBlock)completionHandler;
-- (ANKJSONRequestOperation *)createChannelWithType:(NSString *)type readers:(ANKACL *)readersACL writers:(ANKACL *)writersACL completion:(ANKClientCompletionBlock)completionHandler;
-
-- (ANKJSONRequestOperation *)updateChannel:(ANKChannel *)channel completion:(ANKClientCompletionBlock)completionHandler;
-- (ANKJSONRequestOperation *)updateChannelWithID:(NSString *)channelID readers:(ANKACL *)readersACL writers:(ANKACL *)writersACL completion:(ANKClientCompletionBlock)completionHandler;
-
-- (ANKJSONRequestOperation *)subscribeToChannel:(ANKChannel *)channel completion:(ANKClientCompletionBlock)completionHandler;
-- (ANKJSONRequestOperation *)subscribeToChannelWithID:(NSString *)channelID completion:(ANKClientCompletionBlock)completionHandler;
-- (ANKJSONRequestOperation *)unsubscribeToChannel:(ANKChannel *)channel completion:(ANKClientCompletionBlock)completionHandler;
-- (ANKJSONRequestOperation *)unsubscribeToChannelWithID:(NSString *)channelID completion:(ANKClientCompletionBlock)completionHandler;
-
-- (ANKJSONRequestOperation *)muteChannel:(ANKChannel *)channel completion:(ANKClientCompletionBlock)completionHandler;
-- (ANKJSONRequestOperation *)muteChannelWithID:(NSString *)channelID completion:(ANKClientCompletionBlock)completionHandler;
-- (ANKJSONRequestOperation *)unmuteChannel:(ANKChannel *)channel completion:(ANKClientCompletionBlock)completionHandler;
-- (ANKJSONRequestOperation *)unmuteChannelWithID:(NSString *)channelID completion:(ANKClientCompletionBlock)completionHandler;
+- (AFHTTPRequestOperation *)fetchCurrentUserSubscribedChannelsWithCompletion:(ANKClientCompletionBlock)completionHandler;
+- (AFHTTPRequestOperation *)fetchCurrentUserSubscribedChannelsWithTypes:(NSArray *)types completion:(ANKClientCompletionBlock)completionHandler;
+- (AFHTTPRequestOperation *)fetchCurrentUserPrivateMessageChannelsWithCompletion:(ANKClientCompletionBlock)completionHandler;
+- (AFHTTPRequestOperation *)fetchCurrentUserCreatedChannelsWithCompletion:(ANKClientCompletionBlock)completionHandler;
+- (AFHTTPRequestOperation *)fetchUnreadPMChannelsCountWithCompletion:(ANKClientCompletionBlock)completionHandler;
+
+- (AFHTTPRequestOperation *)fetchChannelWithID:(NSString *)channelID completion:(ANKClientCompletionBlock)completionHandler;
+- (AFHTTPRequestOperation *)fetchChannelsWithIDs:(NSArray *)channelIDs completion:(ANKClientCompletionBlock)completionHandler;
+
+- (AFHTTPRequestOperation *)fetchUsersSubscribedToChannel:(ANKChannel *)channel completion:(ANKClientCompletionBlock)completionHandler;
+- (AFHTTPRequestOperation *)fetchUsersSubscribedToChannelWithID:(NSString *)channelID completion:(ANKClientCompletionBlock)completionHandler;
+- (AFHTTPRequestOperation *)fetchUserIDsSubscribedToChannel:(ANKChannel *)channel completion:(ANKClientCompletionBlock)completionHandler;
+- (AFHTTPRequestOperation *)fetchUserIDsSubscribedToChannelWithID:(NSString *)channelID completion:(ANKClientCompletionBlock)completionHandler;
+- (AFHTTPRequestOperation *)fetchUserIDsSubscribedToChannelIDs:(NSArray *)channelIDs completion:(ANKClientCompletionBlock)completionHandler;
+
+- (AFHTTPRequestOperation *)fetchMutedChannelsForCurrentUserWithCompletion:(ANKClientCompletionBlock)completionHandler;
+
+- (AFHTTPRequestOperation *)createChannel:(ANKChannel *)channel completion:(ANKClientCompletionBlock)completionHandler;
+- (AFHTTPRequestOperation *)createChannelWithType:(NSString *)type readers:(ANKACL *)readersACL writers:(ANKACL *)writersACL completion:(ANKClientCompletionBlock)completionHandler;
+
+- (AFHTTPRequestOperation *)updateChannel:(ANKChannel *)channel completion:(ANKClientCompletionBlock)completionHandler;
+- (AFHTTPRequestOperation *)updateChannelWithID:(NSString *)channelID readers:(ANKACL *)readersACL writers:(ANKACL *)writersACL completion:(ANKClientCompletionBlock)completionHandler;
+
+- (AFHTTPRequestOperation *)subscribeToChannel:(ANKChannel *)channel completion:(ANKClientCompletionBlock)completionHandler;
+- (AFHTTPRequestOperation *)subscribeToChannelWithID:(NSString *)channelID completion:(ANKClientCompletionBlock)completionHandler;
+- (AFHTTPRequestOperation *)unsubscribeToChannel:(ANKChannel *)channel completion:(ANKClientCompletionBlock)completionHandler;
+- (AFHTTPRequestOperation *)unsubscribeToChannelWithID:(NSString *)channelID completion:(ANKClientCompletionBlock)completionHandler;
+
+- (AFHTTPRequestOperation *)muteChannel:(ANKChannel *)channel completion:(ANKClientCompletionBlock)completionHandler;
+- (AFHTTPRequestOperation *)muteChannelWithID:(NSString *)channelID completion:(ANKClientCompletionBlock)completionHandler;
+- (AFHTTPRequestOperation *)unmuteChannel:(ANKChannel *)channel completion:(ANKClientCompletionBlock)completionHandler;
+- (AFHTTPRequestOperation *)unmuteChannelWithID:(NSString *)channelID completion:(ANKClientCompletionBlock)completionHandler;
+
+- (AFHTTPRequestOperation *)deactivateChannel:(ANKChannel *)channel completion:(ANKClientCompletionBlock)completionHandler;
+- (AFHTTPRequestOperation *)deactivateChannelWithID:(NSString *)channelID completion:(ANKClientCompletionBlock)completionHandler;
 
 @end