Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Standardise on initialized #284

Merged
merged 1 commit into from
Mar 8, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Source/ARTRealtime.m
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ - (instancetype)initWithOptions:(ARTClientOptions *)options {
_connection = [[ARTConnection alloc] initWithRealtime:self];
[self.connection setState:ARTRealtimeInitialized];

[self.logger debug:__FILE__ line:__LINE__ message:@"initialised %p", self];
[self.logger debug:__FILE__ line:__LINE__ message:@"initialized %p", self];

if (options.autoConnect) {
[self connect];
Expand Down Expand Up @@ -266,7 +266,7 @@ - (void)transition:(ARTRealtimeConnectionState)state withErrorInfo:(ARTErrorInfo
}
// For every Channel
for (ARTRealtimeChannel* channel in self.channels) {
if (channel.state == ARTRealtimeChannelInitialised || channel.state == ARTRealtimeChannelAttaching || channel.state == ARTRealtimeChannelAttached) {
if (channel.state == ARTRealtimeChannelInitialized || channel.state == ARTRealtimeChannelAttaching || channel.state == ARTRealtimeChannelAttached) {
if(state == ARTRealtimeClosing) {
//do nothing. Closed state is coming.
}
Expand Down
6 changes: 3 additions & 3 deletions Source/ARTRealtimeChannel.m
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ - (instancetype)initWithRealtime:(ARTRealtime *)realtime andName:(NSString *)nam
self = [super initWithName:name withOptions:options andRest:realtime.rest];
if (self) {
_realtime = realtime;
_state = ARTRealtimeChannelInitialised;
_state = ARTRealtimeChannelInitialized;
_queuedMessages = [NSMutableArray array];
_attachSerial = nil;
_presenceMap =[[ARTPresenceMap alloc] init];
Expand Down Expand Up @@ -128,7 +128,7 @@ - (void)publishPresence:(ARTPresenceMessage *)msg callback:(art_nullable void (^

- (void)publishProtocolMessage:(ARTProtocolMessage *)pm callback:(void (^)(ARTStatus *))cb {
switch (self.state) {
case ARTRealtimeChannelInitialised:
case ARTRealtimeChannelInitialized:
[self attach];
// intentional fall-through
case ARTRealtimeChannelAttaching:
Expand Down Expand Up @@ -491,7 +491,7 @@ - (void)attach:(void (^)(ARTErrorInfo * _Nullable))cb {

- (void)detach:(void (^)(ARTErrorInfo * _Nullable))cb {
switch (self.state) {
case ARTRealtimeChannelInitialised:
case ARTRealtimeChannelInitialized:
[self.realtime.logger debug:__FILE__ line:__LINE__ message:@"can't detach when not attached"];
if (cb) [_detachedEventEmitter once:cb];
return;
Expand Down
2 changes: 1 addition & 1 deletion Source/ARTRest.m
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ - (instancetype)initWithOptions:(ARTClientOptions *)options {
_auth = [[ARTAuth alloc] init:self withOptions:_options];
_channels = [[ARTRestChannels alloc] initWithRest:self];

[self.logger debug:__FILE__ line:__LINE__ message:@"initialised %p", self];
[self.logger debug:__FILE__ line:__LINE__ message:@"initialized %p", self];
}
return self;
}
Expand Down
4 changes: 2 additions & 2 deletions Source/ARTTypes.h
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ typedef NS_ENUM(NSUInteger, ARTRealtimeConnectionState) {
};

typedef NS_ENUM(NSUInteger, ARTRealtimeChannelState) {
ARTRealtimeChannelInitialised,
ARTRealtimeChannelInitialized,
ARTRealtimeChannelAttaching,
ARTRealtimeChannelAttached,
ARTRealtimeChannelDetaching,
Expand All @@ -53,7 +53,7 @@ typedef NS_ENUM(NSUInteger, ARTRealtimeChannelState) {
};

typedef NS_ENUM(NSUInteger, ARTChannelEvent) {
ARTChannelEventInitialised,
ARTChannelEventInitialized,
ARTChannelEventAttaching,
ARTChannelEventAttached,
ARTChannelEventDetaching,
Expand Down
8 changes: 4 additions & 4 deletions Spec/RealtimeClientChannel.swift
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ class RealtimeClientChannel: QuickSpec {
defer { client.close() }

let channel = client.channels.get("test")
expect(channel.state).to(equal(ARTRealtimeChannelState.Initialised))
expect(channel.state).to(equal(ARTRealtimeChannelState.Initialized))

channel.attach()
expect(channel.state).to(equal(ARTRealtimeChannelState.Attaching))
Expand Down Expand Up @@ -536,11 +536,11 @@ class RealtimeClientChannel: QuickSpec {
var errorInfo: ARTErrorInfo?
let channel = client.channels.get("test")

expect(channel.state).to(equal(ARTRealtimeChannelState.Initialised))
expect(channel.state).to(equal(ARTRealtimeChannelState.Initialized))
channel.detach { errorInfo in
expect(errorInfo).to(beNil())
}
expect(channel.state).to(equal(ARTRealtimeChannelState.Initialised))
expect(channel.state).to(equal(ARTRealtimeChannelState.Initialized))

channel.attach()
expect(channel.state).toEventually(equal(ARTRealtimeChannelState.Attaching), timeout: testTimeout)
Expand Down Expand Up @@ -1134,7 +1134,7 @@ class RealtimeClientChannel: QuickSpec {
let publishedMessage = ARTMessage(name: "foo", data: "bar")

waitUntil(timeout: testTimeout) { done in
expect(channel.state).to(equal(ARTRealtimeChannelState.Initialised))
expect(channel.state).to(equal(ARTRealtimeChannelState.Initialized))

channel.subscribeWithAttachCallback({ errorInfo in
expect(errorInfo).to(beNil())
Expand Down
2 changes: 1 addition & 1 deletion Tests/ARTRealtimePresenceTest.m
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ - (void) testEnterAttachesTheChannel {
XCTestExpectation *exp = [self expectationWithDescription:@"testEnterAttachesTheChannel"];
[self withRealtimeClientId:^(ARTRealtime *realtime) {
ARTRealtimeChannel *channel = [realtime.channels get:@"channel"];
XCTAssertEqual(channel.state, ARTRealtimeChannelInitialised);
XCTAssertEqual(channel.state, ARTRealtimeChannelInitialized);
[channel.presence enter:@"entered" callback:^(ARTErrorInfo *errorInfo) {
XCTAssertNil(errorInfo);
XCTAssertEqual(channel.state, ARTRealtimeChannelAttached);
Expand Down