Update ObjC tutorials to run with v0.7

camelpunch · camelpunch · commit 3d56cb2a97fc · 2016-06-06T11:55:35.000+01:00
Make them more reliable by:
- Sharing connection between send / receive in 4 &amp; 5
- Increase sleeps in 4 &amp; 5

[#120637007]
diff --git a/objective-c/tutorial1/Cartfile b/objective-c/tutorial1/Cartfile
@@ -1 +1 @@
-github "rabbitmq/rabbitmq-objc-client" "v0.6.1"
+github "rabbitmq/rabbitmq-objc-client" "v0.7"
diff --git a/objective-c/tutorial1/Cartfile.resolved b/objective-c/tutorial1/Cartfile.resolved
@@ -1,3 +1,3 @@
 github "robbiehanson/CocoaAsyncSocket" "7.4.3"
-github "Mantle/Mantle" "2.0.7"
-github "rabbitmq/rabbitmq-objc-client" "v0.6.1"
+github "jeffh/JKVValue" "v1.3.1"
+github "rabbitmq/rabbitmq-objc-client" "v0.7"
diff --git a/objective-c/tutorial1/tutorial1/ViewController.m b/objective-c/tutorial1/tutorial1/ViewController.m
@@ -36,7 +36,7 @@ - (void)receive {
 
     RMQQueue *q = [ch queue:@"hello"];
     NSLog(@"Waiting for messages.");
-    [q subscribe:^(RMQDeliveryInfo * _Nonnull deliveryInfo, RMQMessage * _Nonnull message) {
+    [q subscribe:^(RMQMessage * _Nonnull message) {
         NSLog(@"Received %@", message.content);
     }];
 }
diff --git a/objective-c/tutorial2/Cartfile b/objective-c/tutorial2/Cartfile
@@ -1 +1 @@
-github "rabbitmq/rabbitmq-objc-client" "v0.6.1"
+github "rabbitmq/rabbitmq-objc-client" "v0.7"
diff --git a/objective-c/tutorial2/Cartfile.resolved b/objective-c/tutorial2/Cartfile.resolved
@@ -1,3 +1,3 @@
 github "robbiehanson/CocoaAsyncSocket" "7.4.3"
-github "Mantle/Mantle" "2.0.7"
-github "rabbitmq/rabbitmq-objc-client" "v0.6.1"
+github "jeffh/JKVValue" "v1.3.1"
+github "rabbitmq/rabbitmq-objc-client" "v0.7"
diff --git a/objective-c/tutorial2/tutorial2/ViewController.m b/objective-c/tutorial2/tutorial2/ViewController.m
@@ -44,7 +44,7 @@ - (void)workerNamed:(NSString *)name {
     NSLog(@"%@: Waiting for messages", name);
 
     RMQBasicConsumeOptions manualAck = RMQBasicConsumeNoOptions;
-    [q subscribe:manualAck handler:^(RMQDeliveryInfo * _Nonnull deliveryInfo, RMQMessage * _Nonnull message) {
+    [q subscribe:manualAck handler:^(RMQMessage * _Nonnull message) {
         NSLog(@"%@: Received %@", name, message.content);
         // imitate some work
         unsigned int sleepTime = (unsigned int)[message.content componentsSeparatedByString:@"."].count - 1;
diff --git a/objective-c/tutorial3/Cartfile b/objective-c/tutorial3/Cartfile
@@ -1 +1 @@
-github "rabbitmq/rabbitmq-objc-client" "v0.6.1"
+github "rabbitmq/rabbitmq-objc-client" "v0.7"
diff --git a/objective-c/tutorial3/Cartfile.resolved b/objective-c/tutorial3/Cartfile.resolved
@@ -1,3 +1,3 @@
 github "robbiehanson/CocoaAsyncSocket" "7.4.3"
-github "Mantle/Mantle" "2.0.7"
-github "rabbitmq/rabbitmq-objc-client" "v0.6.1"
+github "jeffh/JKVValue" "v1.3.1"
+github "rabbitmq/rabbitmq-objc-client" "v0.7"
diff --git a/objective-c/tutorial3/tutorial3/ViewController.m b/objective-c/tutorial3/tutorial3/ViewController.m
@@ -42,7 +42,7 @@ - (void)receiveLogs {
 
     NSLog(@"Waiting for logs.");
 
-    [q subscribe:^(RMQDeliveryInfo * _Nonnull deliveryInfo, RMQMessage * _Nonnull message) {
+    [q subscribe:^(RMQMessage * _Nonnull message) {
         NSLog(@"Received %@", message);
     }];
 }
diff --git a/objective-c/tutorial4/Cartfile b/objective-c/tutorial4/Cartfile
@@ -1 +1 @@
-github "rabbitmq/rabbitmq-objc-client" "v0.6.1"
+github "rabbitmq/rabbitmq-objc-client" "v0.7"
diff --git a/objective-c/tutorial4/Cartfile.resolved b/objective-c/tutorial4/Cartfile.resolved
@@ -1,3 +1,3 @@
 github "robbiehanson/CocoaAsyncSocket" "7.4.3"
-github "Mantle/Mantle" "2.0.7"
-github "rabbitmq/rabbitmq-objc-client" "v0.6.1"
+github "jeffh/JKVValue" "v1.3.1"
+github "rabbitmq/rabbitmq-objc-client" "v0.7"
diff --git a/objective-c/tutorial4/tutorial4/ViewController.m b/objective-c/tutorial4/tutorial4/ViewController.m
@@ -9,17 +9,17 @@ @implementation ViewController
 
 - (void)viewDidLoad {
     [super viewDidLoad];
-    [self receiveLogsDirect];
-    sleep(1);
-    [self emitLogDirect:@"Hello World!" severity:@"info"];
-    [self emitLogDirect:@"Missile button pressed" severity:@"warning"];
-    [self emitLogDirect:@"Launch mechanism jammed" severity:@"error"];
-}
-
-- (void)receiveLogsDirect {
     RMQConnection *conn = [[RMQConnection alloc] initWithDelegate:[RMQConnectionDelegateLogger new]];
     [conn start];
 
+    [self receiveLogsDirect:conn];
+    sleep(2);
+    [self emitLogDirect:conn message:@"Hello World!" severity:@"info"];
+    [self emitLogDirect:conn message:@"Missile button pressed" severity:@"warning"];
+    [self emitLogDirect:conn message:@"Launch mechanism jammed" severity:@"error"];
+}
+
+- (void)receiveLogsDirect:(RMQConnection *)conn {
     id<RMQChannel> ch = [conn createChannel];
     RMQExchange *x    = [ch direct:@"direct_logs"];
     RMQQueue *q       = [ch queue:@"" options:RMQQueueDeclareExclusive];
@@ -31,22 +31,17 @@ - (void)receiveLogsDirect {
 
     NSLog(@"Waiting for logs.");
 
-    [q subscribe:^(RMQDeliveryInfo * _Nonnull deliveryInfo, RMQMessage * _Nonnull message) {
-        NSLog(@"%@:%@", deliveryInfo.routingKey, message.content);
+    [q subscribe:^(RMQMessage * _Nonnull message) {
+        NSLog(@"%@:%@", message.routingKey, message.content);
     }];
 }
 
-- (void)emitLogDirect:(NSString *)msg severity:(NSString *)severity {
-    RMQConnection *conn = [[RMQConnection alloc] initWithDelegate:[RMQConnectionDelegateLogger new]];
-    [conn start];
-
+- (void)emitLogDirect:(RMQConnection *)conn message:(NSString *)msg severity:(NSString *)severity {
     id<RMQChannel> ch = [conn createChannel];
     RMQExchange *x    = [ch direct:@"direct_logs"];
 
     [x publish:msg routingKey:severity];
     NSLog(@"Sent '%@'", msg);
-
-    [conn close];
 }
 
 @end
diff --git a/objective-c/tutorial5/Cartfile b/objective-c/tutorial5/Cartfile
@@ -1 +1 @@
-github "rabbitmq/rabbitmq-objc-client" "v0.6.1"
+github "rabbitmq/rabbitmq-objc-client" "v0.7"
diff --git a/objective-c/tutorial5/Cartfile.resolved b/objective-c/tutorial5/Cartfile.resolved
@@ -1,3 +1,3 @@
 github "robbiehanson/CocoaAsyncSocket" "7.4.3"
-github "Mantle/Mantle" "2.0.7"
-github "rabbitmq/rabbitmq-objc-client" "v0.6.1"
+github "jeffh/JKVValue" "v1.3.1"
+github "rabbitmq/rabbitmq-objc-client" "v0.7"
diff --git a/objective-c/tutorial5/tutorial5/ViewController.m b/objective-c/tutorial5/tutorial5/ViewController.m
@@ -9,19 +9,18 @@ @implementation ViewController
 
 - (void)viewDidLoad {
     [super viewDidLoad];
-
-    [self receiveLogsTopic:@[@"kern.*", @"*.critical"]];
-    sleep(1);
-    [self emitLogTopic:@"Hello World!" routingKey:@"kern.info"];
-    [self emitLogTopic:@"A critical kernel error" routingKey:@"kern.critical"];
-    [self emitLogTopic:@"Critical module error" routingKey:@"somemod.critical"];
-    [self emitLogTopic:@"Just some module info. You won't get this." routingKey:@"somemod.info"];
-}
-
-- (void)receiveLogsTopic:(NSArray *)routingKeys {
     RMQConnection *conn = [[RMQConnection alloc] initWithDelegate:[RMQConnectionDelegateLogger new]];
     [conn start];
 
+    [self receiveLogsTopic:conn routingKeys:@[@"kern.*", @"*.critical"]];
+    sleep(2);
+    [self emitLogTopic:conn message:@"Hello World!" routingKey:@"kern.info"];
+    [self emitLogTopic:conn message:@"A critical kernel error" routingKey:@"kern.critical"];
+    [self emitLogTopic:conn message:@"Critical module error" routingKey:@"somemod.critical"];
+    [self emitLogTopic:conn message:@"Just some module info. You won't get this." routingKey:@"somemod.info"];
+}
+
+- (void)receiveLogsTopic:(RMQConnection *)conn routingKeys:(NSArray *)routingKeys {
     id<RMQChannel> ch = [conn createChannel];
     RMQExchange *x    = [ch topic:@"topic_logs"];
     RMQQueue *q       = [ch queue:@"" options:RMQQueueDeclareExclusive];
@@ -32,22 +31,17 @@ - (void)receiveLogsTopic:(NSArray *)routingKeys {
 
     NSLog(@"Waiting for logs.");
 
-    [q subscribe:^(RMQDeliveryInfo * _Nonnull deliveryInfo, RMQMessage * _Nonnull message) {
-        NSLog(@"%@:%@", deliveryInfo.routingKey, message.content);
+    [q subscribe:^(RMQMessage * _Nonnull message) {
+        NSLog(@"%@:%@", message.routingKey, message.content);
     }];
 }
 
-- (void)emitLogTopic:(NSString *)msg routingKey:(NSString *)routingKey {
-    RMQConnection *conn = [[RMQConnection alloc] initWithDelegate:[RMQConnectionDelegateLogger new]];
-    [conn start];
-
+- (void)emitLogTopic:(RMQConnection *)conn message:(NSString *)msg routingKey:(NSString *)routingKey {
     id<RMQChannel> ch = [conn createChannel];
     RMQExchange *x    = [ch topic:@"topic_logs"];
 
     [x publish:msg routingKey:routingKey];
     NSLog(@"Sent '%@'", msg);
-
-    [conn close];
 }
 
 @end

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-github "rabbitmq/rabbitmq-objc-client" "v0.6.1"`
	`1`	`+github "rabbitmq/rabbitmq-objc-client" "v0.7"`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ - (void)receive {`
`36`	`36`
`37`	`37`	`RMQQueue *q = [ch queue:@"hello"];`
`38`	`38`	`NSLog(@"Waiting for messages.");`
`39`		`- [q subscribe:^(RMQDeliveryInfo * _Nonnull deliveryInfo, RMQMessage * _Nonnull message) {`
	`39`	`+ [q subscribe:^(RMQMessage * _Nonnull message) {`
`40`	`40`	`NSLog(@"Received %@", message.content);`
`41`	`41`	`}];`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ - (void)receiveLogs {`
`42`	`42`
`43`	`43`	`NSLog(@"Waiting for logs.");`
`44`	`44`
`45`		`- [q subscribe:^(RMQDeliveryInfo * _Nonnull deliveryInfo, RMQMessage * _Nonnull message) {`
	`45`	`+ [q subscribe:^(RMQMessage * _Nonnull message) {`
`46`	`46`	`NSLog(@"Received %@", message);`
`47`	`47`	`}];`
`48`	`48`	`}`