ObjC tests: Review

ably-ios/ARTAuth.h

@@ -24,7 +24,7 @@ ART_ASSUME_NONNULL_BEGIN
 
 @interface ARTAuth : NSObject
 
-@property (nonatomic, readonly, strong) ARTAuthOptions *options;
+@property (nonatomic, readonly, weak) ARTAuthOptions *options;
 @property (nonatomic, readonly, assign) ARTAuthMethod method;
 
 @property (nonatomic, weak) ARTLog *logger;

ably-ios/ARTAuthOptions.m

@@ -65,11 +65,16 @@ - (NSString *)description {
 }
 
 - (NSString *)token {
-    return self.tokenDetails.token;
+    if (self.tokenDetails) {
+        return self.tokenDetails.token;
+    }
+    return nil;
 }
 
 - (void)setToken:(NSString *)token {
-    self.tokenDetails = [[ARTAuthTokenDetails alloc] initWithToken:token];
+    if (token && ![token isEqualToString:@""]) {
+        self.tokenDetails = [[ARTAuthTokenDetails alloc] initWithToken:token];
+    }
 }
 
 - (void)setAuthMethod:(NSString *)authMethod {
@@ -108,7 +113,13 @@ - (ARTAuthOptions *)mergeWith:(ARTAuthOptions *)precedenceOptions {
 }
 
 - (BOOL)isBasicAuth {
-    return self.useTokenAuth == false && self.key != nil && self.clientId == nil;
+    return self.useTokenAuth == false &&
+        self.key != nil &&
+        self.clientId == nil &&
+        self.token == nil &&
+        self.tokenDetails == nil &&
+        self.authUrl == nil &&
+        self.authCallback == nil;
 }
 
 - (BOOL)isMethodPOST {

ably-ios/ARTChannel+Private.h

@@ -13,10 +13,7 @@
 
 ART_ASSUME_NONNULL_BEGIN
 
-@interface ARTChannel() {
-@public
-    id<ARTPayloadEncoder> _payloadEncoder;
-}
+@interface ARTChannel()
 
 @property (nonatomic, strong, art_null_resettable) ARTChannelOptions *options;
 

ably-ios/ARTChannel.h

@@ -9,6 +9,8 @@
 #import <Foundation/Foundation.h>
 #import "ARTTypes.h"
 
+@protocol ARTPayloadEncoder;
+
 @class ARTChannelOptions;
 @class ARTMessage;
 @class ARTPaginatedResult;
@@ -20,6 +22,8 @@ ART_ASSUME_NONNULL_BEGIN
 
 @property (nonatomic, strong, readonly) NSString *name;
 
+@property (readonly, strong, nonatomic) id<ARTPayloadEncoder> payloadEncoder;
+
 - (instancetype)initWithName:(NSString *)name andOptions:(ARTChannelOptions *)options;
 
 - (void)publish:(art_nullable id)payload callback:(art_nullable ARTErrorCallback)callback;
@@ -30,9 +34,6 @@ ART_ASSUME_NONNULL_BEGIN
 
 - (void)history:(art_nullable ARTDataQuery *)query callback:(void(^)(ARTPaginatedResult /* <ARTMessage *> */ *__art_nullable result, NSError *__art_nullable error))callback;
 
-// TODO:
-//- (void)presence
-
 @end
 
 ART_ASSUME_NONNULL_END

ably-ios/ARTChannel.m

@@ -19,6 +19,7 @@ - (instancetype)initWithName:(NSString *)name andOptions:(ARTChannelOptions *)op
     if (self = [super init]) {
         _name = name;
         _options = options;
+        _payloadEncoder = [ARTPayload defaultPayloadEncoder:options.cipherParams];
     }
     return self;
 }
@@ -42,14 +43,14 @@ - (void)publish:(id)data name:(NSString *)name callback:(ARTErrorCallback)callba
 
 - (void)publishMessages:(NSArray *)messages callback:(ARTErrorCallback)callback {
     messages = [messages artMap:^(ARTMessage *message) {
-        return [message encode:_payloadEncoder];
+        return [message encode:self.payloadEncoder];
     }];
 
     [self internalPostMessages:messages callback:callback];
 }
 
 - (void)publishMessage:(ARTMessage *)message callback:(ARTErrorCallback)callback {
-    [self internalPostMessages:[message encode:_payloadEncoder] callback:callback];
+    [self internalPostMessages:[message encode:self.payloadEncoder] callback:callback];
 }
 
 - (void)history:(ARTDataQuery *)query callback:(void (^)(ARTPaginatedResult *, NSError *))callback {

ably-ios/ARTChannelCollection.h

@@ -10,18 +10,18 @@
 #import "CompatibilityMacros.h"
 
 @class ARTRest;
-@class ARTChannel;
+@class ARTRestChannel;
 @class ARTChannelOptions;
 
 @interface ARTChannelCollection : NSObject<NSFastEnumeration>
 
-@property (nonatomic, readonly) __GENERIC(NSMutableDictionary, NSString *, ARTChannel *) *channels;
+@property (nonatomic, readonly) __GENERIC(NSMutableDictionary, NSString *, ARTRestChannel *) *channels;
 
 - (instancetype)initWithRest:(ARTRest *)rest;
 
 - (BOOL)exists:(NSString *)channelName;
-- (ARTChannel *)get:(NSString *)channelName;
-- (ARTChannel *)get:(NSString *)channelName options:(ARTChannelOptions *)options;
-- (void)releaseChannel:(ARTChannel *)channel;
+- (ARTRestChannel *)get:(NSString *)channelName;
+- (ARTRestChannel *)get:(NSString *)channelName options:(ARTChannelOptions *)options;
+- (void)releaseChannel:(ARTRestChannel *)channel;
 
 @end

ably-ios/ARTChannelCollection.m

@@ -13,7 +13,6 @@
 #import "ARTRestChannel.h"
 #import "ARTChannel+Private.h"
 #import "ARTChannelOptions.h"
-#import "ARTPresence.h"
 
 @interface ARTChannelCollection() {
     __weak ARTRest *_rest;
@@ -44,20 +43,20 @@ - (BOOL)exists:(NSString *)channelName {
     return self->_channels[channelName] != nil;
 }
 
-- (ARTChannel *)get:(NSString *)channelName {
+- (ARTRestChannel *)get:(NSString *)channelName {
     return [self _getChannel:channelName options:nil];
 }
 
-- (ARTChannel *)get:(NSString *)channelName options:(ARTChannelOptions *)options {
+- (ARTRestChannel *)get:(NSString *)channelName options:(ARTChannelOptions *)options {
     return [self _getChannel:channelName options:options];
 }
 
 - (void)releaseChannel:(ARTChannel *)channel {
     [self->_channels removeObjectForKey:channel.name];
 }
 
-- (ARTChannel *)_getChannel:(NSString *)channelName options:(ARTChannelOptions *)options {
-    ARTChannel *channel = self->_channels[channelName];
+- (ARTRestChannel *)_getChannel:(NSString *)channelName options:(ARTChannelOptions *)options {
+    ARTRestChannel *channel = self->_channels[channelName];
     if (!channel) {
         channel = [[_rest.channelClass alloc] initWithName:channelName withOptions:options andRest:_rest];
         [self->_channels setObject:channel forKey:channelName];

ably-ios/ARTClientOptions.m

@@ -18,14 +18,6 @@ - (instancetype)initDefaults;
 
 @implementation ARTClientOptions
 
-- (instancetype)initWithKey:(NSString *)key {
-    self = [super initWithKey:key];
-    if (self) {
-        self = [self initDefaults];
-    }
-    return self;
-}
-
 - (instancetype)initDefaults {
     self = [super initDefaults];
     _restPort = [ARTDefault TLSPort];

ably-ios/ARTHttp.m

@@ -182,6 +182,10 @@ - (void)executeRequest:(NSMutableURLRequest *)request completion:(ARTHttpRequest
             } else {
                 [self.logger debug:@"%@ %@: statusCode %ld", request.HTTPMethod, request.URL.absoluteString, (long)httpResponse.statusCode];
                 [self.logger verbose:@"Headers %@", httpResponse.allHeaderFields];
+                NSString *headerErrorMessage = httpResponse.allHeaderFields[@"X-Ably-ErrorMessage"];
+                if (headerErrorMessage && ![headerErrorMessage isEqualToString:@""]) {
+                    [self.logger warn:@"%@", headerErrorMessage];
+                }
             }
             callback(httpResponse, data, error);
         });

ably-ios/ARTJsonEncoder.m

@@ -632,7 +632,6 @@ - (void)writePayload:(ARTPayload *)payload toDictionary:(NSMutableDictionary *)o
         [self.logger error:@"ARTJsonEncoder failed to encode payload"];
     }
     NSAssert(status.state == ARTStateOk, @"Error encoding payload");
-    NSAssert([payload.payload isKindOfClass:[NSString class]], @"Only string payloads are accepted");
 
     if (encoded.encoding.length) {
         output[@"encoding"] = encoded.encoding;

ably-ios/ARTMessage.h

@@ -16,7 +16,7 @@ ART_ASSUME_NONNULL_BEGIN
 /// The event name, if available
 @property (readwrite, strong, nonatomic) NSString *name;
 
-- (instancetype)initWithData:(id)data name:(NSString *)name;
+- (instancetype)initWithData:(id)data name:(art_nullable NSString *)name;
 
 + (ARTMessage *)messageWithPayload:(id)payload name:(art_nullable NSString *)name;
 + (NSArray *)messagesWithPayloads:(NSArray *)payloads;

ably-ios/ARTPaginatedResult+Private.h

@@ -8,14 +8,18 @@
 
 #import "ARTPaginatedResult.h"
 
-@protocol ARTHTTPExecutor;
+@class ARTRest;
+
+ART_ASSUME_NONNULL_BEGIN
 
 @interface ARTPaginatedResult ()
 
-typedef NSArray *(^ARTPaginatedResultResponseProcessor)(NSHTTPURLResponse *, NSData *);
+typedef NSArray *__art_nullable(^ARTPaginatedResultResponseProcessor)(NSHTTPURLResponse *__art_nullable, NSData *__art_nullable);
 
-+ (void)executePaginatedRequest:(NSMutableURLRequest *)request executor:(id<ARTHTTPExecutor>)executor
-              responseProcessor:(ARTPaginatedResultResponseProcessor)responseProcessor
++ (void)executePaginated:(ARTRest *)rest withRequest:(NSMutableURLRequest *)request
+              andResponseProcessor:(ARTPaginatedResultResponseProcessor)responseProcessor
                        callback:(ARTPaginatedResultCallback)callback;
 
-@end
+@end
+
+ART_ASSUME_NONNULL_END

ably-ios/ARTPaginatedResult.m

@@ -9,17 +9,19 @@
 #import "ARTPaginatedResult+Private.h"
 
 #import "ARTHttp.h"
+#import "ARTAuth.h"
+#import "ARTRest+Private.h"
 
 @implementation ARTPaginatedResult {
-    id<ARTHTTPExecutor> _executor;
+    __weak ARTRest *_rest;
     NSMutableURLRequest *_relFirst;
     NSMutableURLRequest *_relCurrent;
     NSMutableURLRequest *_relNext;
     ARTPaginatedResultResponseProcessor _responseProcessor;
 }
 
 - (instancetype)initWithItems:(NSArray *)items
-                     executor:(id<ARTHTTPExecutor>)executor
+                     rest:(ARTRest *)rest
                      relFirst:(NSMutableURLRequest *)relFirst
                    relCurrent:(NSMutableURLRequest *)relCurrent
                       relNext:(NSMutableURLRequest *)relNext
@@ -37,23 +39,23 @@ - (instancetype)initWithItems:(NSArray *)items
         _hasNext = !!relNext;
         _isLast = !_hasNext;
 
-        _executor = executor;
+        _rest = rest;
         _responseProcessor = responseProcessor;
     }
 
     return self;
 }
 
 - (void)first:(ARTPaginatedResultCallback)callback {
-    [self.class executePaginatedRequest:_relFirst executor:_executor responseProcessor:_responseProcessor callback:callback];
+    [self.class executePaginated:_rest withRequest:_relFirst andResponseProcessor:_responseProcessor callback:callback];
 }
 
 - (void)current:(ARTPaginatedResultCallback)callback {
-    [self.class executePaginatedRequest:_relCurrent executor:_executor responseProcessor:_responseProcessor callback:callback];
+    [self.class executePaginated:_rest withRequest:_relCurrent andResponseProcessor:_responseProcessor callback:callback];
 }
 
 - (void)next:(ARTPaginatedResultCallback)callback {
-    [self.class executePaginatedRequest:_relNext executor:_executor responseProcessor:_responseProcessor callback:callback];
+    [self.class executePaginated:_rest withRequest:_relNext andResponseProcessor:_responseProcessor callback:callback];
 }
 
 static NSDictionary *extractLinks(NSHTTPURLResponse *response) {
@@ -96,30 +98,27 @@ - (void)next:(ARTPaginatedResultCallback)callback {
     return [NSMutableURLRequest requestWithURL:url];
 }
 
-+ (void)executePaginatedRequest:(NSMutableURLRequest *)request executor:(id<ARTHTTPExecutor>)executor
-              responseProcessor:(ARTPaginatedResultResponseProcessor)responseProcessor
-                       callback:(ARTPaginatedResultCallback)callback {
++ (void)executePaginated:(ARTRest *)rest withRequest:(NSMutableURLRequest *)request andResponseProcessor:(ARTPaginatedResultResponseProcessor)responseProcessor callback:(ARTPaginatedResultCallback)callback {
 
-    // FIXME: review (no auth?!)
-    [executor executeRequest:request completion:^(NSHTTPURLResponse *response, NSData *data, NSError *error) {
+    [rest executeRequest:request withAuthOption:ARTAuthenticationOn completion:^(NSHTTPURLResponse *response, NSData *data, NSError *error) {
         if (error) {
             callback(nil, error);
         } else {
             NSArray *items = responseProcessor(response, data);
-            
+
             NSDictionary *links = extractLinks(response);
-            
+
             NSMutableURLRequest *firstRel = requestRelativeTo(request, links[@"first"]);
             NSMutableURLRequest *currentRel = requestRelativeTo(request, links[@"current"]);;
             NSMutableURLRequest *nextRel = requestRelativeTo(request, links[@"next"]);;
 
             ARTPaginatedResult *result = [[ARTPaginatedResult alloc] initWithItems:items
-                                                                          executor:executor
+                                                                          rest:rest
                                                                           relFirst:firstRel
                                                                         relCurrent:currentRel
                                                                            relNext:nextRel
                                                                  responseProcessor:responseProcessor];
-            
+
             callback(result, nil);
         }
     }];

ably-ios/ARTPresence.h

@@ -13,7 +13,6 @@
 @protocol ARTSubscription;
 
 @class ARTChannel;
-@class ARTRealtimeChannel;
 @class ARTPaginatedResult;
 @class ARTDataQuery;
 
@@ -24,7 +23,9 @@ ART_ASSUME_NONNULL_BEGIN
  */
 @interface ARTPresence : NSObject
 
-- (instancetype)initWithChannel:(ARTRealtimeChannel *)channel;
+@property (readonly, getter=getChannel) ARTChannel *channel;
+
+- (instancetype)initWithChannel:(ARTChannel *)channel;
 
 /**
  Get the presence state for one channel
@@ -36,20 +37,6 @@ ART_ASSUME_NONNULL_BEGIN
  */
 - (void)history:(art_nullable ARTDataQuery *)query callback:(void (^)(ARTPaginatedResult /* <ARTPresenceMessage *> */ *__art_nullable result, NSError *__art_nullable error))callback;
 
-- (void)enter:(id)data cb:(ARTStatusCallback)cb;
-- (void)update:(id)data cb:(ARTStatusCallback)cb;
-- (void)leave:(id) data cb:(ARTStatusCallback)cb;
-
-- (void)enterClient:(NSString *) clientId data:(id) data cb:(ARTStatusCallback) cb;
-- (void)updateClient:(NSString *) clientId data:(id) data cb:(ARTStatusCallback) cb;
-- (void)leaveClient:(NSString *) clientId data:(id) data cb:(ARTStatusCallback) cb;
-- (BOOL)isSyncComplete;
-
-- (id<ARTSubscription>)subscribe:(ARTRealtimeChannelPresenceCb)cb;
-- (id<ARTSubscription>)subscribe:(ARTPresenceAction)action cb:(ARTRealtimeChannelPresenceCb)cb;
-- (void)unsubscribe:(id<ARTSubscription>)subscription;
-- (void)unsubscribe:(id<ARTSubscription>)subscription action:(ARTPresenceAction)action;
-
 @end
 
 ART_ASSUME_NONNULL_END