Merge pull request #734 from esl/andres.FixSlotSignature

improved api naming and fixed api error when creating slots
robbiehanson · May 26, 2016 · cc83f0b · cc83f0b
2 parents aefd72a + af933b5
commit cc83f0b
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/Extensions/XEP-0363/XMPPHTTPFileUpload.h b/Extensions/XEP-0363/XMPPHTTPFileUpload.h
@@ -23,7 +23,7 @@ static NSString *const XMPPHTTPFileUploadNamespace = @"urn:xmpp:http:upload";
 - (id)initWithServiceName:(NSString *)serviceName;
 - (id)initWithServiceName:(NSString *)serviceName dispatchQueue:(dispatch_queue_t)queue;
 
-- (void)requestSlotForFile:(NSString *) filename size:(NSInteger) size contentType:(NSString*) contentType;
+- (void)requestSlotForFilename:(NSString *) filename size:(NSInteger) size contentType:(NSString*) contentType;
 
 @end
 

diff --git a/Extensions/XEP-0363/XMPPHTTPFileUpload.m b/Extensions/XEP-0363/XMPPHTTPFileUpload.m
@@ -65,7 +65,7 @@ - (void)deactivate {
 }
 
 
-- (void)requestSlotForFile:(NSString *) filename size:(NSInteger) size contentType:(NSString*) contentType {
+- (void)requestSlotForFilename:(NSString *) filename size:(NSInteger) size contentType:(NSString*) contentType {
 
 
 

diff --git a/Extensions/XEP-0363/XMPPSlot.h b/Extensions/XEP-0363/XMPPSlot.h
@@ -14,7 +14,7 @@
 
 @interface XMPPSlot: NSObject
 
-- (id)initWithGet:(NSString *)put andGet:(NSString *)get;
+- (id)initWithPut:(NSString *)put andGet:(NSString *)get;
 - (id)initWithIQ:(XMPPIQ *)iq;
 
 @property (nonatomic, copy, readonly) NSString *put;

diff --git a/Extensions/XEP-0363/XMPPSlot.m b/Extensions/XEP-0363/XMPPSlot.m
@@ -10,7 +10,7 @@
 
 @implementation XMPPSlot
 
-- (id)initWithGet:(NSString *)put andGet:(NSString *)get {
+- (id)initWithPut:(NSString *)put andGet:(NSString *)get {
 
 	self = [super init];
 	if(self) {

diff --git a/Xcode/Testing-pod/XMPPFrameworkTests/XMPPHTTPFileUploadTests.m b/Xcode/Testing-pod/XMPPFrameworkTests/XMPPHTTPFileUploadTests.m
@@ -48,7 +48,7 @@ - (void) testSlotInitWithIQ {
 
 - (void) testSlotInit {
 
-	XMPPSlot *slot = [[XMPPSlot alloc] initWithGet:@"http://put.com" andGet:@"http://get.com"];
+	XMPPSlot *slot = [[XMPPSlot alloc] initWithPut:@"http://put.com" andGet:@"http://get.com"];
 
 	XCTAssertEqualObjects(slot.get, @"http://get.com");
 	XCTAssertEqualObjects(slot.put, @"http://put.com");
@@ -99,7 +99,7 @@ - (void) testRequestSlot {
 
 	XMPPHTTPFileUpload *xmppFileUpload = [[XMPPHTTPFileUpload alloc] initWithServiceName:@"upload.montague.tld"];
 	[xmppFileUpload activate:streamTest];
-	[xmppFileUpload requestSlotForFile:@"my_juliet.png" size:23456 contentType:@"image/jpeg"];
+	[xmppFileUpload requestSlotForFilename:@"my_juliet.png" size:23456 contentType:@"image/jpeg"];
 
 	[self waitForExpectationsWithTimeout:1 handler:^(NSError * _Nullable error) {
 		if(error){
@@ -125,7 +125,7 @@ - (void) testResponseSlot {
 		[weakStreamTest fakeIQResponse:iq];
 	};
 
-	[xmppFileUpload requestSlotForFile:@"my_juliet.png" size:23456 contentType:@"image/jpeg"];
+	[xmppFileUpload requestSlotForFilename:@"my_juliet.png" size:23456 contentType:@"image/jpeg"];
 
 	[self waitForExpectationsWithTimeout:10 handler:^(NSError * _Nullable error) {
 		if(error){
@@ -149,7 +149,7 @@ - (void) testResponseSlotWithError {
 		[weakStreamTest fakeIQResponse:iq];
 	};
 
-	[xmppFileUpload requestSlotForFile:@"my_juliet.png" size:23456 contentType:@"image/jpeg"];
+	[xmppFileUpload requestSlotForFilename:@"my_juliet.png" size:23456 contentType:@"image/jpeg"];
 
 	[self waitForExpectationsWithTimeout:10 handler:^(NSError * _Nullable error) {
 		if(error){