Some ARTEventListener methods were using the call arg name instead …

…of `callback` (#404)
ably · May 16, 2016 · 6d4a884 · 6d4a884
1 parent 2fc9c76
commit 6d4a884
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 26 deletions.
diff --git a/Source/ARTConnection.m b/Source/ARTConnection.m
@@ -77,16 +77,16 @@ - (NSString *)getRecoveryKey {
     }
 }
 
-- (__GENERIC(ARTEventListener, ARTConnectionStateChange *) *)on:(ARTRealtimeConnectionState)event call:(void (^)(ARTConnectionStateChange *))cb {
-    return [_eventEmitter on:[NSNumber numberWithInt:event] call:cb];
+- (__GENERIC(ARTEventListener, ARTConnectionStateChange *) *)on:(ARTRealtimeConnectionState)event callback:(void (^)(ARTConnectionStateChange *))cb {
+    return [_eventEmitter on:[NSNumber numberWithInt:event] callback:cb];
 }
 
 - (__GENERIC(ARTEventListener, ARTConnectionStateChange *) *)on:(void (^)(ARTConnectionStateChange *))cb {
     return [_eventEmitter on:cb];
 }
 
-- (__GENERIC(ARTEventListener, ARTConnectionStateChange *) *)once:(ARTRealtimeConnectionState)event call:(void (^)(ARTConnectionStateChange *))cb {
-    return [_eventEmitter once:[NSNumber numberWithInt:event] call:cb];
+- (__GENERIC(ARTEventListener, ARTConnectionStateChange *) *)once:(ARTRealtimeConnectionState)event callback:(void (^)(ARTConnectionStateChange *))cb {
+    return [_eventEmitter once:[NSNumber numberWithInt:event] callback:cb];
 }
 
 - (__GENERIC(ARTEventListener, ARTConnectionStateChange *) *)once:(void (^)(ARTConnectionStateChange *))cb {

diff --git a/Source/ARTEventEmitter.h b/Source/ARTEventEmitter.h
@@ -21,10 +21,10 @@ ART_ASSUME_NONNULL_BEGIN
 
 @interface __GENERIC(ARTEventEmitter, EventType, ItemType) : NSObject
 
-- (__GENERIC(ARTEventListener, ItemType) *)on:(EventType)event call:(void (^)(ItemType __art_nullable))cb;
+- (__GENERIC(ARTEventListener, ItemType) *)on:(EventType)event callback:(void (^)(ItemType __art_nullable))cb;
 - (__GENERIC(ARTEventListener, ItemType) *)on:(void (^)(ItemType __art_nullable))cb;
 
-- (__GENERIC(ARTEventListener, ItemType) *)once:(EventType)event call:(void (^)(ItemType __art_nullable))cb;
+- (__GENERIC(ARTEventListener, ItemType) *)once:(EventType)event callback:(void (^)(ItemType __art_nullable))cb;
 - (__GENERIC(ARTEventListener, ItemType) *)once:(void (^)(ItemType __art_nullable))cb;
 
 - (void)off:(EventType)event listener:(__GENERIC(ARTEventListener, ItemType) *)listener;
@@ -39,10 +39,10 @@ ART_ASSUME_NONNULL_BEGIN
 // This way you can automatically "implement the EventEmitter pattern" for a class
 // as the spec say. It's supposed to be used together with ART_EMBED_IMPLEMENTATION_EVENT_EMITTER
 // in the implementation of the class.
-#define ART_EMBED_INTERFACE_EVENT_EMITTER(EventType, ItemType) - (__GENERIC(ARTEventListener, ItemType) *)on:(EventType)event call:(void (^)(ItemType __art_nullable))cb;\
+#define ART_EMBED_INTERFACE_EVENT_EMITTER(EventType, ItemType) - (__GENERIC(ARTEventListener, ItemType) *)on:(EventType)event callback:(void (^)(ItemType __art_nullable))cb;\
 - (__GENERIC(ARTEventListener, ItemType) *)on:(void (^)(ItemType __art_nullable))cb;\
 \
-- (__GENERIC(ARTEventListener, ItemType) *)once:(EventType)event call:(void (^)(ItemType __art_nullable))cb;\
+- (__GENERIC(ARTEventListener, ItemType) *)once:(EventType)event callback:(void (^)(ItemType __art_nullable))cb;\
 - (__GENERIC(ARTEventListener, ItemType) *)once:(void (^)(ItemType __art_nullable))cb;\
 \
 - (void)off:(EventType)event listener:(__GENERIC(ARTEventListener, ItemType) *)listener;\
@@ -53,16 +53,16 @@ ART_ASSUME_NONNULL_BEGIN
 // instance variable, which must be called _eventEmitter, of type ARTEventEmitter *.
 // It's supposed to be used together with ART_EMBED_IMPLEMENTATION_EVENT_EMITTER in the
 // header file of the class.
-#define ART_EMBED_IMPLEMENTATION_EVENT_EMITTER(EventType, ItemType) - (__GENERIC(ARTEventListener, ItemType) *)on:(EventType)event call:(void (^)(ItemType __art_nullable))cb {\
-return [_eventEmitter on:event call:cb];\
+#define ART_EMBED_IMPLEMENTATION_EVENT_EMITTER(EventType, ItemType) - (__GENERIC(ARTEventListener, ItemType) *)on:(EventType)event callback:(void (^)(ItemType __art_nullable))cb {\
+return [_eventEmitter on:event callback:cb];\
 }\
 \
 - (__GENERIC(ARTEventListener, ItemType) *)on:(void (^)(ItemType __art_nullable))cb {\
 return [_eventEmitter on:cb];\
 }\
 \
-- (__GENERIC(ARTEventListener, ItemType) *)once:(EventType)event call:(void (^)(ItemType __art_nullable))cb {\
-return [_eventEmitter once:event call:cb];\
+- (__GENERIC(ARTEventListener, ItemType) *)once:(EventType)event callback:(void (^)(ItemType __art_nullable))cb {\
+return [_eventEmitter once:event callback:cb];\
 }\
 \
 - (__GENERIC(ARTEventListener, ItemType) *)once:(void (^)(ItemType __art_nullable))cb {\

diff --git a/Source/ARTEventEmitter.m b/Source/ARTEventEmitter.m
@@ -80,13 +80,13 @@ - (instancetype)init {
     return self;
 }
 
-- (ARTEventListener *)on:(id)event call:(void (^)(id __art_nonnull))cb {
+- (ARTEventListener *)on:(id)event callback:(void (^)(id __art_nonnull))cb {
     ARTEventListener *listener = [[ARTEventListener alloc] initWithBlock:cb];
     [self addOnEntry:[[ARTEventEmitterEntry alloc] initWithListener:listener once:false] event:event];
     return listener;
 }
 
-- (ARTEventListener *)once:(id)event call:(void (^)(id __art_nonnull))cb {
+- (ARTEventListener *)once:(id)event callback:(void (^)(id __art_nonnull))cb {
     ARTEventListener *listener = [[ARTEventListener alloc] initWithBlock:cb];
     [self addOnEntry:[[ARTEventEmitterEntry alloc] initWithListener:listener once:true] event:event];
     return listener;

diff --git a/Source/ARTRealtimeChannel.m b/Source/ARTRealtimeChannel.m
@@ -171,7 +171,7 @@ - (void)publishProtocolMessage:(ARTProtocolMessage *)pm callback:(void (^)(ARTSt
                 ARTQueuedMessage *qm = [[ARTQueuedMessage alloc] initWithProtocolMessage:pm callback:cb];
                 [self.queuedMessages addObject:qm];
 
-                [_realtime.connection once:ARTRealtimeConnected call:^(ARTConnectionStateChange *__art_nullable change) {
+                [_realtime.connection once:ARTRealtimeConnected callback:^(ARTConnectionStateChange *__art_nullable change) {
                     [self sendQueuedMessages];
                 }];
             }
@@ -236,7 +236,7 @@ - (void)throwOnDisconnectedOrFailed {
         return nil;
     }
     [self attach:onAttach];
-    return [self.messagesEventEmitter on:name call:cb];
+    return [self.messagesEventEmitter on:name callback:cb];
 }
 
 - (void)unsubscribe {
@@ -251,16 +251,16 @@ - (void)unsubscribe:(NSString *)name listener:(ARTEventListener<ARTMessage *> *)
     [self.messagesEventEmitter off:name listener:listener];
 }
 
-- (__GENERIC(ARTEventListener, ARTErrorInfo *) *)on:(ARTChannelEvent)event call:(void (^)(ARTErrorInfo *))cb {
-    return [self.statesEventEmitter on:[NSNumber numberWithInt:event] call:cb];
+- (__GENERIC(ARTEventListener, ARTErrorInfo *) *)on:(ARTChannelEvent)event callback:(void (^)(ARTErrorInfo *))cb {
+    return [self.statesEventEmitter on:[NSNumber numberWithInt:event] callback:cb];
 }
 
 - (__GENERIC(ARTEventListener, ARTErrorInfo *) *)on:(void (^)(ARTErrorInfo *))cb {
     return [self.statesEventEmitter on:cb];
 }
 
-- (__GENERIC(ARTEventListener, ARTErrorInfo *) *)once:(ARTChannelEvent)event call:(void (^)(ARTErrorInfo *))cb {
-    return [self.statesEventEmitter once:[NSNumber numberWithInt:event] call:cb];
+- (__GENERIC(ARTEventListener, ARTErrorInfo *) *)once:(ARTChannelEvent)event callback:(void (^)(ARTErrorInfo *))cb {
+    return [self.statesEventEmitter once:[NSNumber numberWithInt:event] callback:cb];
 }
 
 - (__GENERIC(ARTEventListener, ARTErrorInfo *) *)once:(void (^)(ARTErrorInfo *))cb {

diff --git a/Source/ARTRealtimePresence.m b/Source/ARTRealtimePresence.m
@@ -188,7 +188,7 @@ - (BOOL)getSyncComplete {
         return nil;
     }
     [_channel attach:onAttach];
-    return [_channel.presenceEventEmitter on:[NSNumber numberWithUnsignedInteger:action] call:cb];
+    return [_channel.presenceEventEmitter on:[NSNumber numberWithUnsignedInteger:action] callback:cb];
 }
 
 - (void)unsubscribe {

diff --git a/Spec/Utilities.swift b/Spec/Utilities.swift
@@ -31,10 +31,10 @@ class Utilities: QuickSpec {
                     receivedBar = nil
                     receivedBarOnce = nil
                     receivedAll = nil
-                    listenerFoo1 = eventEmitter.on("foo", call: { receivedFoo1 = $0 as? Int })
-                    eventEmitter.on("foo", call: { receivedFoo2 = $0 as? Int })
-                    eventEmitter.on("bar", call: { receivedBar = $0 as? Int })
-                    eventEmitter.once("bar", call: { receivedBarOnce = $0 as? Int })
+                    listenerFoo1 = eventEmitter.on("foo", callback: { receivedFoo1 = $0 as? Int })
+                    eventEmitter.on("foo", callback: { receivedFoo2 = $0 as? Int })
+                    eventEmitter.on("bar", callback: { receivedBar = $0 as? Int })
+                    eventEmitter.once("bar", callback: { receivedBarOnce = $0 as? Int })
                     listenerAll = eventEmitter.on { receivedAll = $0 as? Int }
                     eventEmitter.once { receivedAllOnce = $0 as? Int }
                 }
@@ -133,7 +133,7 @@ class Utilities: QuickSpec {
 
                     it("should allow listening again") {
                         eventEmitter.off()
-                        eventEmitter.on("foo", call: { receivedFoo1 = $0 as? Int })
+                        eventEmitter.on("foo", callback: { receivedFoo1 = $0 as? Int })
                         eventEmitter.emit("foo", with: 111)
                         expect(receivedFoo1).to(equal(111))
                     }